version 1.138, 2010/05/24 21:34:16 |
version 1.139, 2010/05/24 21:51:20 |
Line 207 term_flushln(struct termp *p) |
|
Line 207 term_flushln(struct termp *p) |
|
vend -= vis; |
vend -= vis; |
putchar('\n'); |
putchar('\n'); |
if (TERMP_NOBREAK & p->flags) { |
if (TERMP_NOBREAK & p->flags) { |
|
p->viscol = p->rmargin; |
for (j = 0; j < (int)p->rmargin; j++) |
for (j = 0; j < (int)p->rmargin; j++) |
putchar(' '); |
putchar(' '); |
vend += p->rmargin - p->offset; |
vend += p->rmargin - p->offset; |
} else { |
} else { |
|
p->viscol = 0; |
vbl = p->offset; |
vbl = p->offset; |
} |
} |
|
|
Line 251 term_flushln(struct termp *p) |
|
Line 253 term_flushln(struct termp *p) |
|
if (vbl) { |
if (vbl) { |
for (j = 0; j < (int)vbl; j++) |
for (j = 0; j < (int)vbl; j++) |
putchar(' '); |
putchar(' '); |
|
p->viscol += vbl; |
vbl = 0; |
vbl = 0; |
} |
} |
putchar(p->buf[i]); |
putchar(p->buf[i]); |
|
p->viscol += 1; |
} |
} |
vend += vbl; |
vend += vbl; |
vis = vend; |
vis = vend; |
Line 263 term_flushln(struct termp *p) |
|
Line 267 term_flushln(struct termp *p) |
|
p->overstep = 0; |
p->overstep = 0; |
|
|
if ( ! (TERMP_NOBREAK & p->flags)) { |
if ( ! (TERMP_NOBREAK & p->flags)) { |
|
p->viscol = 0; |
putchar('\n'); |
putchar('\n'); |
return; |
return; |
} |
} |
Line 294 term_flushln(struct termp *p) |
|
Line 299 term_flushln(struct termp *p) |
|
|
|
/* Right-pad. */ |
/* Right-pad. */ |
if (maxvis > vis + /* LINTED */ |
if (maxvis > vis + /* LINTED */ |
((TERMP_TWOSPACE & p->flags) ? 1 : 0)) |
((TERMP_TWOSPACE & p->flags) ? 1 : 0)) { |
|
p->viscol += maxvis - vis; |
for ( ; vis < maxvis; vis++) |
for ( ; vis < maxvis; vis++) |
putchar(' '); |
putchar(' '); |
else { /* ...or newline break. */ |
} else { /* ...or newline break. */ |
putchar('\n'); |
putchar('\n'); |
|
p->viscol = p->rmargin; |
for (i = 0; i < (int)p->rmargin; i++) |
for (i = 0; i < (int)p->rmargin; i++) |
putchar(' '); |
putchar(' '); |
} |
} |
Line 315 term_newln(struct termp *p) |
|
Line 322 term_newln(struct termp *p) |
|
{ |
{ |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
if (0 == p->col) { |
if (0 == p->col && 0 == p->viscol) { |
p->flags &= ~TERMP_NOLPAD; |
p->flags &= ~TERMP_NOLPAD; |
return; |
return; |
} |
} |
Line 335 term_vspace(struct termp *p) |
|
Line 342 term_vspace(struct termp *p) |
|
{ |
{ |
|
|
term_newln(p); |
term_newln(p); |
|
p->viscol = 0; |
putchar('\n'); |
putchar('\n'); |
} |
} |
|
|