version 1.134, 2010/05/15 16:18:23 |
version 1.136, 2010/05/17 02:03:49 |
Line 133 term_flushln(struct termp *p) |
|
Line 133 term_flushln(struct termp *p) |
|
int i; /* current input position in p->buf */ |
int i; /* current input position in p->buf */ |
size_t vis; /* current visual position on output */ |
size_t vis; /* current visual position on output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vbl; /* number of blanks to prepend to output */ |
size_t vsz; /* visual characters to write to output */ |
size_t vend; /* end of word visual position on output */ |
size_t bp; /* visual right border position */ |
size_t bp; /* visual right border position */ |
int j; /* temporary loop index */ |
int j; /* temporary loop index */ |
size_t maxvis, mmax; |
size_t maxvis, mmax; |
Line 156 term_flushln(struct termp *p) |
|
Line 156 term_flushln(struct termp *p) |
|
|
|
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
bp = TERMP_NOBREAK & p->flags ? mmax : maxvis; |
|
|
|
/* |
|
* Indent the first line of a paragraph. |
|
*/ |
|
vbl = p->flags & TERMP_NOLPAD ? 0 : p->offset; |
|
|
/* |
/* |
* FIXME: if bp is zero, we still output the first word before |
* FIXME: if bp is zero, we still output the first word before |
* breaking the line. |
* breaking the line. |
*/ |
*/ |
|
|
vis = 0; |
vis = vend = i = 0; |
|
while (i < (int)p->col) { |
|
|
/* |
|
* If in the standard case (left-justified), then begin with our |
|
* indentation, otherwise (columns, etc.) just start spitting |
|
* out text. |
|
*/ |
|
|
|
if ( ! (p->flags & TERMP_NOLPAD)) |
|
/* LINTED */ |
|
for (j = 0; j < (int)p->offset; j++) |
|
putchar(' '); |
|
|
|
for (i = 0; i < (int)p->col; i++) { |
|
/* |
/* |
* Count up visible word characters. Control sequences |
* Count up visible word characters. Control sequences |
* (starting with the CSI) aren't counted. A space |
* (starting with the CSI) aren't counted. A space |
Line 183 term_flushln(struct termp *p) |
|
Line 177 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
/* LINTED */ |
/* LINTED */ |
for (j = i, vsz = 0; j < (int)p->col; j++) { |
for (j = i; j < (int)p->col; j++) { |
if (j && ' ' == p->buf[j]) |
if (j && ' ' == p->buf[j]) |
break; |
break; |
if (8 == p->buf[j]) |
if (8 == p->buf[j]) |
vsz--; |
vend--; |
else |
else |
vsz++; |
vend++; |
} |
} |
|
|
/* |
/* |
* Choose the number of blanks to prepend: no blank at the |
|
* beginning of a line, one between words -- but do not |
|
* actually write them yet. |
|
*/ |
|
|
|
vbl = (size_t)(0 == vis ? 0 : 1); |
|
|
|
/* |
|
* Find out whether we would exceed the right margin. |
* Find out whether we would exceed the right margin. |
* If so, break to the next line. Otherwise, write the chosen |
* If so, break to the next line. |
* number of blanks. |
|
*/ |
*/ |
|
if (vend > bp && vis > 0) { |
if (vis && vis + vbl + vsz > bp) { |
vend -= vis; |
putchar('\n'); |
putchar('\n'); |
if (TERMP_NOBREAK & p->flags) { |
if (TERMP_NOBREAK & p->flags) { |
for (j = 0; j < (int)p->rmargin; j++) |
for (j = 0; j < (int)p->rmargin; j++) |
putchar(' '); |
putchar(' '); |
vis = p->rmargin - p->offset; |
vend += p->rmargin - p->offset; |
} else { |
} else { |
for (j = 0; j < (int)p->offset; j++) |
vbl = p->offset; |
putchar(' '); |
|
vis = 0; |
|
} |
} |
|
|
/* Remove the p->overstep width. */ |
/* Remove the p->overstep width. */ |
Line 223 term_flushln(struct termp *p) |
|
Line 206 term_flushln(struct termp *p) |
|
bp += (int)/* LINTED */ |
bp += (int)/* LINTED */ |
p->overstep; |
p->overstep; |
p->overstep = 0; |
p->overstep = 0; |
} else { |
|
for (j = 0; j < (int)vbl; j++) |
|
putchar(' '); |
|
vis += vbl; |
|
} |
} |
|
|
/* Write out the [remaining] word. */ |
/* Write out the [remaining] word. */ |
for ( ; i < (int)p->col; i++) |
for ( ; i < (int)p->col; i++) { |
if (' ' == p->buf[i]) |
if (' ' == p->buf[i]) { |
|
while (' ' == p->buf[i]) { |
|
vbl++; |
|
i++; |
|
} |
break; |
break; |
else if (31 == p->buf[i]) |
} |
putchar(' '); |
if (ASCII_NBRSP == p->buf[i]) { |
else |
vbl++; |
putchar(p->buf[i]); |
continue; |
|
} |
|
|
vis += vsz; |
/* |
|
* Now we definitely know there will be |
|
* printable characters to output, |
|
* so write preceding white space now. |
|
*/ |
|
if (vbl) { |
|
for (j = 0; j < (int)vbl; j++) |
|
putchar(' '); |
|
vbl = 0; |
|
} |
|
putchar(p->buf[i]); |
|
} |
|
vend += vbl; |
|
vis = vend; |
} |
} |
|
|
p->col = 0; |
p->col = 0; |