version 1.205, 2012/07/16 21:30:42 |
version 1.209, 2013/08/08 20:07:47 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2011, 2012 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 162 term_flushln(struct termp *p) |
|
Line 162 term_flushln(struct termp *p) |
|
*/ |
*/ |
|
|
for (j = i, jhy = 0; j < p->col; j++) { |
for (j = i, jhy = 0; j < p->col; j++) { |
if ((j && ' ' == p->buf[j]) || '\t' == p->buf[j]) |
if (' ' == p->buf[j] || '\t' == p->buf[j]) |
break; |
break; |
|
|
/* Back over the the last printed character. */ |
/* Back over the the last printed character. */ |
|
|
term_fontpopq(struct termp *p, const void *key) |
term_fontpopq(struct termp *p, const void *key) |
{ |
{ |
|
|
while (p->fonti >= 0 && key != &p->fontq[p->fonti]) |
while (p->fonti >= 0 && key < (void *)(p->fontq + p->fonti)) |
p->fonti--; |
p->fonti--; |
assert(p->fonti >= 0); |
assert(p->fonti >= 0); |
} |
} |
Line 406 term_word(struct termp *p, const char *word) |
|
Line 406 term_word(struct termp *p, const char *word) |
|
|
|
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_NOSPACE & p->flags)) { |
if ( ! (TERMP_KEEP & p->flags)) { |
if ( ! (TERMP_KEEP & p->flags)) { |
if (TERMP_PREKEEP & p->flags) |
|
p->flags |= TERMP_KEEP; |
|
bufferc(p, ' '); |
bufferc(p, ' '); |
if (TERMP_SENTENCE & p->flags) |
if (TERMP_SENTENCE & p->flags) |
bufferc(p, ' '); |
bufferc(p, ' '); |
} else |
} else |
bufferc(p, ASCII_NBRSP); |
bufferc(p, ASCII_NBRSP); |
} |
} |
|
if (TERMP_PREKEEP & p->flags) |
|
p->flags |= TERMP_KEEP; |
|
|
if ( ! (p->flags & TERMP_NONOSPACE)) |
if ( ! (p->flags & TERMP_NONOSPACE)) |
p->flags &= ~TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
Line 480 term_word(struct termp *p, const char *word) |
|
Line 480 term_word(struct termp *p, const char *word) |
|
case (ESCAPE_FONTITALIC): |
case (ESCAPE_FONTITALIC): |
term_fontrepl(p, TERMFONT_UNDER); |
term_fontrepl(p, TERMFONT_UNDER); |
break; |
break; |
|
case (ESCAPE_FONTBI): |
|
term_fontrepl(p, TERMFONT_BI); |
|
break; |
case (ESCAPE_FONT): |
case (ESCAPE_FONT): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (ESCAPE_FONTROMAN): |
case (ESCAPE_FONTROMAN): |
Line 541 encode1(struct termp *p, int c) |
|
Line 544 encode1(struct termp *p, int c) |
|
return; |
return; |
} |
} |
|
|
if (p->col + 4 >= p->maxcols) |
if (p->col + 6 >= p->maxcols) |
adjbuf(p, p->col + 4); |
adjbuf(p, p->col + 6); |
|
|
f = term_fonttop(p); |
f = term_fonttop(p); |
|
|
if (TERMFONT_NONE == f) { |
if (TERMFONT_UNDER == f || TERMFONT_BI == f) { |
p->buf[p->col++] = c; |
|
return; |
|
} else if (TERMFONT_UNDER == f) { |
|
p->buf[p->col++] = '_'; |
p->buf[p->col++] = '_'; |
} else |
p->buf[p->col++] = 8; |
p->buf[p->col++] = c; |
} |
|
if (TERMFONT_BOLD == f || TERMFONT_BI == f) { |
p->buf[p->col++] = 8; |
if (ASCII_HYPH == c) |
|
p->buf[p->col++] = '-'; |
|
else |
|
p->buf[p->col++] = c; |
|
p->buf[p->col++] = 8; |
|
} |
p->buf[p->col++] = c; |
p->buf[p->col++] = c; |
} |
} |
|
|
static void |
static void |
encode(struct termp *p, const char *word, size_t sz) |
encode(struct termp *p, const char *word, size_t sz) |
{ |
{ |
enum termfont f; |
|
int i, len; |
int i, len; |
|
|
if (TERMP_SKIPCHAR & p->flags) { |
if (TERMP_SKIPCHAR & p->flags) { |
Line 578 encode(struct termp *p, const char *word, size_t sz) |
|
Line 582 encode(struct termp *p, const char *word, size_t sz) |
|
* character by character. |
* character by character. |
*/ |
*/ |
|
|
if (TERMFONT_NONE == (f = term_fonttop(p))) { |
if (TERMFONT_NONE == term_fonttop(p)) { |
if (p->col + len >= p->maxcols) |
if (p->col + len >= p->maxcols) |
adjbuf(p, p->col + len); |
adjbuf(p, p->col + len); |
for (i = 0; i < len; i++) |
for (i = 0; i < len; i++) |
Line 588 encode(struct termp *p, const char *word, size_t sz) |
|
Line 592 encode(struct termp *p, const char *word, size_t sz) |
|
|
|
/* Pre-buffer, assuming worst-case. */ |
/* Pre-buffer, assuming worst-case. */ |
|
|
if (p->col + 1 + (len * 3) >= p->maxcols) |
if (p->col + 1 + (len * 5) >= p->maxcols) |
adjbuf(p, p->col + 1 + (len * 3)); |
adjbuf(p, p->col + 1 + (len * 5)); |
|
|
for (i = 0; i < len; i++) { |
for (i = 0; i < len; i++) { |
if (ASCII_HYPH != word[i] && |
if (ASCII_HYPH == word[i] || |
! isgraph((unsigned char)word[i])) { |
isgraph((unsigned char)word[i])) |
p->buf[p->col++] = word[i]; |
encode1(p, word[i]); |
continue; |
|
} |
|
|
|
if (TERMFONT_UNDER == f) |
|
p->buf[p->col++] = '_'; |
|
else if (ASCII_HYPH == word[i]) |
|
p->buf[p->col++] = '-'; |
|
else |
else |
p->buf[p->col++] = word[i]; |
p->buf[p->col++] = word[i]; |
|
|
p->buf[p->col++] = 8; |
|
p->buf[p->col++] = word[i]; |
|
} |
} |
} |
} |
|
|