rfivet
/
uemacs
mirror of https://github.com/rfivet/uemacs.git
1
0
Fork 0
Code Releases Activity

Refactor vt character output.

This commit is contained in:
Renaud 2019-08-08 15:21:53 +08:00
parent 08b75d677e
commit 52a386ed01
1 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
display.c
View File

@ -190,50 +190,38 @@ 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(int c)
{
struct video *vp; /* ptr to line being updated */
static void sane_vtputc( unicode_t c) {
/* intended to be called by vtputc once sanity check has been done
** only normal printable char should be passed as parameter */
unicode_t *vcp = vscreen[ vtrow]->v_text ; /* ptr to line being updated */
if( vtcol >= term.t_ncol)
vcp[ term.t_ncol - 1] = '$' ;
else if( vtcol >= 0)
vcp[ vtcol] = c ;
vtcol += 1 ;
}
static void vtputc( unicode_t c) {
/* In case somebody passes us a signed char.. */ /* In case somebody passes us a signed char.. */
if (c < 0) { if( c > 0x10FFFF) /* Let's assume this is due to sign extension */
c += 256; c &= 0xFF ;
if (c < 0)
return;
}
vp = vscreen[vtrow]; if( c == '\t')
if (vtcol >= term.t_ncol) {
++vtcol;
vp->v_text[term.t_ncol - 1] = '$';
return;
}
if (c == '\t') {
do { do {
vtputc(' '); sane_vtputc( ' ') ;
} while( ((vtcol + taboff) % tabwidth) != 0) ; } while( ((vtcol + taboff) % tabwidth) != 0) ;
else if( c < 0x20 || c == 0x7F) {
return ; sane_vtputc( '^') ;
} sane_vtputc( c ^ 0x40) ;
} else if( c >= 0x80 && c <= 0xA0) {
if (c < 0x20 || c == 0x7F) {
vtputc('^');
vtputc(c ^ 0x40);
return;
}
if (c >= 0x80 && c <= 0xA0) {
static const char hex[] = "0123456789abcdef"; static const char hex[] = "0123456789abcdef";
vtputc('\\'); sane_vtputc( '\\') ;
vtputc(hex[c >> 4]); sane_vtputc( hex[ c >> 4]) ;
vtputc(hex[c & 15]); sane_vtputc( hex[ c & 15]) ;
return; } else
} sane_vtputc( c) ;
if (vtcol >= 0)
vp->v_text[vtcol] = c;
++vtcol;
} }
static int vtputs( const char *s) { static int vtputs( const char *s) {
@ -251,15 +239,11 @@ static int vtputs( const char *s) {
* Erase from the end of the software cursor to the end of the line on which * Erase from the end of the software cursor to the end of the line on which
* the software cursor is located. * the software cursor is located.
*/ */
static void vteeol(void) static void vteeol( void) {
{ unicode_t *vcp = vscreen[ vtrow]->v_text ;
/* struct video *vp; */
unicode_t *vcp = vscreen[vtrow]->v_text;
/* vp = vscreen[vtrow]; */ while( vtcol < term.t_ncol)
while (vtcol < term.t_ncol) vcp[ vtcol++] = ' ' ;
/* vp->v_text[vtcol++] = ' '; */
vcp[vtcol++] = ' ';
} }
/* /*
@ -1563,7 +1547,7 @@ void echoc( unicode_t c) {
* char *s; string to output * char *s; string to output
*/ */
void echos( char *s) { void echos( char *s) {
char c ; unicode_t c ;
if( disinp) if( disinp)
while( (c = *s++)) { while( (c = *s++)) {