version 1.137, 2010/05/17 22:11:42 |
version 1.139, 2010/05/24 21:51:20 |
Line 84 term_alloc(enum termenc enc, size_t width) |
|
Line 84 term_alloc(enum termenc enc, size_t width) |
|
perror(NULL); |
perror(NULL); |
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
|
p->tabwidth = 5; |
p->enc = enc; |
p->enc = enc; |
/* Enforce some lower boundary. */ |
/* Enforce some lower boundary. */ |
if (width < 60) |
if (width < 60) |
Line 171 term_flushln(struct termp *p) |
|
Line 172 term_flushln(struct termp *p) |
|
while (i < (int)p->col) { |
while (i < (int)p->col) { |
|
|
/* |
/* |
|
* Handle literal tab characters. |
|
*/ |
|
for (j = i; j < (int)p->col; j++) { |
|
if ('\t' != p->buf[j]) |
|
break; |
|
vend = (vis/p->tabwidth+1)*p->tabwidth; |
|
vbl += vend - vis; |
|
vis = vend; |
|
} |
|
|
|
/* |
* 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 |
* generates a non-printing word, which is valid (the |
* generates a non-printing word, which is valid (the |
Line 178 term_flushln(struct termp *p) |
|
Line 190 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
/* LINTED */ |
/* LINTED */ |
for (j = i; j < (int)p->col; j++) { |
for ( ; j < (int)p->col; j++) { |
if (j && ' ' == p->buf[j]) |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
break; |
break; |
if (8 == p->buf[j]) |
if (8 == p->buf[j]) |
vend--; |
vend--; |
Line 195 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 209 term_flushln(struct termp *p) |
|
Line 223 term_flushln(struct termp *p) |
|
p->overstep = 0; |
p->overstep = 0; |
} |
} |
|
|
|
/* |
|
* Skip leading tabs, they were handled above. |
|
*/ |
|
while (i < (int)p->col && '\t' == p->buf[i]) |
|
i++; |
|
|
/* Write out the [remaining] word. */ |
/* Write out the [remaining] word. */ |
for ( ; i < (int)p->col; i++) { |
for ( ; i < (int)p->col; i++) { |
|
if ('\t' == p->buf[i]) |
|
break; |
if (' ' == p->buf[i]) { |
if (' ' == p->buf[i]) { |
while (' ' == p->buf[i]) { |
while (' ' == p->buf[i]) { |
vbl++; |
vbl++; |
Line 231 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 243 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 274 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 295 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 315 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'); |
} |
} |
|
|