rfivet/uemacs
1
0
Fork 0
mirror of https://github.com/rfivet/uemacs.git synced 2024-12-20 16:22:38 -05:00
Code Releases Activity

Fix vtputc() and simplify show_line by using it again

Browse Source 
This re-introduces vtputc() as the way to show characters, which
reinstates the control character handing, and simplifies show_line() in
the process.

vtputc now takes an "int" that is either a unicode character or a signed
char (so negative values in the range [-1, -128] are considered to be
the same as [128, 255]).  This allows us to use it regardless of what
the source of data is.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2012-07-11 11:23:32 -07:00
parent 0a8b429059
commit 1edeced67c
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
display.c
View File

@ -164,10 +164,17 @@ void vtmove(int row, int col)
* This routine only puts printing characters into the virtual * This routine only puts printing characters into the virtual
* terminal buffers. Only column overflow is checked. * terminal buffers. Only column overflow is checked.
*/ */
static void vtputc(unsigned char c) static void vtputc(int c)
{ {
struct video *vp; /* ptr to line being updated */ struct video *vp; /* ptr to line being updated */
/* In case somebody passes us a signed char.. */
if (c < 0) {
c += 256;
if (c < 0)
return;
}
vp = vscreen[vtrow]; vp = vscreen[vtrow];
if (vtcol >= term.t_ncol) { if (vtcol >= term.t_ncol) {
@ -436,32 +443,11 @@ static int reframe(struct window *wp)
static void show_line(struct line *lp) static void show_line(struct line *lp)
{ {
unsigned i = 0, len = llength(lp); unsigned i = 0, len = llength(lp);
struct video *vp;
vp = vscreen[vtrow];
while (i < len) { while (i < len) {
unicode_t c; unicode_t c;
int n; i += utf8_to_unicode(lp->l_text, i, len, &c);
vtputc(c);
if (vtcol >= term.t_ncol) {
vp->v_text[term.t_ncol - 1] = '$';
return;
}
n = utf8_to_unicode(lp->l_text, i, len, &c);
/*
* Change tabs into spaces, and don't increment
* the text source until we hit tabmask
*/
++vtcol;
if (c == '\t') {
c = ' ';
if (vtcol & tabmask)
n = 0;
}
if (vtcol > 0)
vp->v_text[vtcol-1] = c;
i += n;
} }
} }