version 1.256, 2016/01/07 21:03:54 |
version 1.258, 2016/08/10 11:03:43 |
|
|
/* $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-2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2016 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 160 term_flushln(struct termp *p) |
|
Line 160 term_flushln(struct termp *p) |
|
if (' ' == 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 last printed character. */ |
if (8 == p->buf[j]) { |
if (8 == p->buf[j]) { |
assert(j); |
assert(j); |
vend -= (*p->width)(p, p->buf[j - 1]); |
vend -= (*p->width)(p, p->buf[j - 1]); |
Line 504 term_word(struct termp *p, const char *word) |
|
Line 504 term_word(struct termp *p, const char *word) |
|
} |
} |
} |
} |
/* Trim trailing backspace/blank pair. */ |
/* Trim trailing backspace/blank pair. */ |
if (p->col > 2 && p->buf[p->col - 1] == ' ') |
if (p->col > 2 && |
|
(p->buf[p->col - 1] == ' ' || |
|
p->buf[p->col - 1] == '\t')) |
p->col -= 2; |
p->col -= 2; |
continue; |
continue; |
default: |
default: |
Line 568 encode1(struct termp *p, int c) |
|
Line 570 encode1(struct termp *p, int c) |
|
p->fontq[p->fonti] : TERMFONT_NONE; |
p->fontq[p->fonti] : TERMFONT_NONE; |
|
|
if (p->flags & TERMP_BACKBEFORE) { |
if (p->flags & TERMP_BACKBEFORE) { |
if (p->buf[p->col - 1] == ' ') |
if (p->buf[p->col - 1] == ' ' || p->buf[p->col - 1] == '\t') |
p->col--; |
p->col--; |
else |
else |
p->buf[p->col++] = 8; |
p->buf[p->col++] = 8; |