aboutsummaryrefslogtreecommitdiffstats
path: root/src/ansi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ansi.c')
-rw-r--r--src/ansi.c196
1 files changed, 109 insertions, 87 deletions
diff --git a/src/ansi.c b/src/ansi.c
index d575f62..c501ab9 100644
--- a/src/ansi.c
+++ b/src/ansi.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.16 2008/02/07 13:22:51 james
+ * *** empty log message ***
+ *
* Revision 1.15 2008/02/07 13:19:48 james
* *** empty log message ***
*
@@ -244,32 +247,39 @@ ansi_set_color (ANSI * a, int color)
int dif;
char buf[16];
int i;
- int fg,bg;
+ int fg, bg;
- if ((a->color == ANSI_INVAL) || (color!=a->color)) {
- fg=CRT_COLOR_FG(color);
- bg=CRT_COLOR_BG(color);
+ if ((a->color == ANSI_INVAL) || (color != a->color))
+ {
+ fg = CRT_COLOR_FG (color);
+ bg = CRT_COLOR_BG (color);
- if (fg & CRT_COLOR_INTENSITY) {
- fg+=90;
- } else {
- fg+=30;
- }
+ if (fg & CRT_COLOR_INTENSITY)
+ {
+ fg += 90;
+ }
+ else
+ {
+ fg += 30;
+ }
- if (bg & CRT_COLOR_INTENSITY) {
- bg+=100;
- } else {
- bg+=40;
- }
+ if (bg & CRT_COLOR_INTENSITY)
+ {
+ bg += 100;
+ }
+ else
+ {
+ bg += 40;
+ }
- i=sprintf(buf,"\033[%d;%dm",fg,bg);
+ i = sprintf (buf, "\033[%d;%dm", fg, bg);
#if 0
- fprintf(stderr,"Color set to %d %d %x\n",fg,bg,color);
+ fprintf (stderr, "Color set to %d %d %x\n", fg, bg, color);
#endif
- ansi_write (a,buf,i);
- a->color=color;
- }
+ ansi_write (a, buf, i);
+ a->color = color;
+ }
}
void
@@ -341,7 +351,7 @@ ansi_render (ANSI * a, CRT_CA ca)
ca.chr = ' ';
ansi_set_attr (a, ca.attr);
- ansi_set_color(a,ca.color);
+ ansi_set_color (a, ca.color);
ansi_write (a, &ca.chr, 1);
@@ -363,39 +373,48 @@ ansi_cls (ANSI * a)
crt_cls (&a->crt);
ansi_force_attr_normal (a);
- ansi_set_color(a,CRT_COLOR_NORMAL);
+ ansi_set_color (a, CRT_COLOR_NORMAL);
ansi_move (a, p);
ansi_write (a, "\033[2J", 4);
/*different emulators leave cursor in different places after cls differently*/
a->pos.x = ANSI_INVAL;
}
-int ansi_scroll_up(ANSI *a,CRT_Pos s,CRT_Pos e)
+int
+ansi_scroll_up (ANSI * a, CRT_Pos s, CRT_Pos e)
{
-char buf[16];
-int i;
-if (s.x) return -1;
-if (e.x!=(CRT_COLS-1)) return -1;
-if (s.y) return -1;
-if (s.y>=a->size.y) return -1;
-
-ansi_showhide_cursor (a, 1);
-i=sprintf(buf,"\033[%d;%dr",s.y+1,e.y+1);
-ansi_write(a,buf,i);
-i=sprintf(buf,"\033[%d;%dH",e.y+1,0);
-ansi_write(a,buf,i);
-ansi_write (a, "\033D",2);
-ansi_write(a,"\033[r", 3);
-
-a->pos.x=ANSI_INVAL;
-
-return 0;
+ char buf[16];
+ int i;
+ if (s.x)
+ return -1;
+ if (e.x != (CRT_COLS - 1))
+ return -1;
+ if (s.y)
+ return -1;
+ if (s.y >= a->size.y)
+ return -1;
+
+ ansi_showhide_cursor (a, 1);
+ i = sprintf (buf, "\033[%d;%dr", s.y + 1, e.y + 1);
+ ansi_write (a, buf, i);
+ i = sprintf (buf, "\033[%d;%dH", e.y + 1, 0);
+ ansi_write (a, buf, i);
+ ansi_write (a, "\033D", 2);
+ ansi_write (a, "\033[r", 3);
+
+ s.y = e.y;
+ crt_erase (&a->crt, s, e, 1);
+
+ a->pos.x = ANSI_INVAL;
+
+ return 0;
}
-void ansi_spot_scroll_up(ANSI * a, CRT * c)
+void
+ansi_spot_scroll_up (ANSI * a, CRT * c)
{
-int l,n,p;
+ int l, n, p;
l = c->sh.e.x - c->sh.s.x;
l++;
@@ -407,11 +426,12 @@ int l,n,p;
while (n--)
{
if (memcmp (&c->screen[p], &a->crt.screen[p + CRT_COLS], l))
- return;
+ return;
p += CRT_COLS;
}
- if (ansi_scroll_up(a,c->sh.s,c->sh.e)) return;
+ if (ansi_scroll_up (a, c->sh.s, c->sh.e))
+ return;
n = c->sh.e.y - c->sh.s.y;
p = CRT_ADDR_POS (&c->sh.s);
@@ -422,21 +442,23 @@ int l,n,p;
p += CRT_COLS;
}
-c->sh.dir=0; //FIXME: horrid hack
+ c->sh.dir = 0; //FIXME: horrid hack
}
-void ansi_spot_scroll(ANSI * a, CRT * c)
+void
+ansi_spot_scroll (ANSI * a, CRT * c)
{
- switch(c->sh.dir) {
-case -1:
+ switch (c->sh.dir)
+ {
+ case -1:
/*we only care about up for the moment */
-ansi_spot_scroll_up(a,c);
-break;
-}
+ ansi_spot_scroll_up (a, c);
+ break;
+ }
-return;
+ return;
}
@@ -449,7 +471,7 @@ ansi_draw (ANSI * a, CRT * c)
int o;
int hidden_cursor = 0;
- ansi_spot_scroll(a,c);
+ ansi_spot_scroll (a, c);
for (p.y = 0; p.y < CRT_ROWS; ++p.y)
{
@@ -480,7 +502,7 @@ ansi_draw (ANSI * a, CRT * c)
ansi_showhide_cursor (a, 1);
ansi_set_attr (a, CRT_ATTR_REVERSE);
- ansi_set_color(a,CRT_MAKE_COLOR(CRT_COLOR_WHITE,CRT_COLOR_RED));
+ ansi_set_color (a, CRT_MAKE_COLOR (CRT_COLOR_WHITE, CRT_COLOR_RED));
ansi_move (a, p);
ansi_write (a, msg, sizeof (msg));
@@ -521,14 +543,14 @@ ansi_reset (ANSI * a)
}
void
-ansi_flush_escape (ANSI * a, VT102 * v,TTY *t)
+ansi_flush_escape (ANSI * a, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
int i;
for (i = 0; i < p->escape_ptr; ++i)
{
- vt102_send (v, p->escape_buf[i],t);
+ vt102_send (v, p->escape_buf[i], t);
}
p->escape_ptr = 0;
@@ -536,26 +558,26 @@ ansi_flush_escape (ANSI * a, VT102 * v,TTY *t)
}
void
-ansi_parse_deckey (ANSI * a, VT102 * v,TTY *t)
+ansi_parse_deckey (ANSI * a, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
if ((p->escape_buf[1] != '[') && (p->escape_buf[1] != 'O'))
{
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
return;
}
if ((p->escape_buf[2] >= 'A') || (p->escape_buf[2] <= 'Z'))
{
- vt102_send (v, KEY_UP + (p->escape_buf[2] - 'A'),t);
+ vt102_send (v, KEY_UP + (p->escape_buf[2] - 'A'), t);
}
else if ((p->escape_buf[2] >= 'a') || (p->escape_buf[2] <= 'z'))
{
- vt102_send (v, KEY_154 + (p->escape_buf[2] - 'a'),t);
+ vt102_send (v, KEY_154 + (p->escape_buf[2] - 'a'), t);
}
else
{
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
return;
}
p->in_escape = 0;
@@ -563,22 +585,22 @@ ansi_parse_deckey (ANSI * a, VT102 * v,TTY *t)
}
void
-ansi_parse_ansikey (ANSI * a, VT102 * v,TTY *t)
+ansi_parse_ansikey (ANSI * a, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
if ((p->escape_buf[1] != '[') || (p->escape_buf[3] != '~'))
{
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
return;
}
if ((p->escape_buf[2] >= '0') || (p->escape_buf[2] <= '9'))
{
- vt102_send (v, KEY_180 + (p->escape_buf[2] - '0'),t);
+ vt102_send (v, KEY_180 + (p->escape_buf[2] - '0'), t);
}
else
{
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
return;
}
@@ -589,7 +611,7 @@ ansi_parse_ansikey (ANSI * a, VT102 * v,TTY *t)
void
-ansi_parse_escape (ANSI * a, VT102 * v,TTY *t)
+ansi_parse_escape (ANSI * a, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
switch (p->escape_ptr)
@@ -604,41 +626,41 @@ ansi_parse_escape (ANSI * a, VT102 * v,TTY *t)
case 'O':
break;
default:
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
}
break;
case 3:
switch (p->escape_buf[1])
{
case 'O':
- ansi_parse_deckey (a, v,t);
+ ansi_parse_deckey (a, v, t);
break;
case '[':
if ((p->escape_buf[2] >= 'A') && (p->escape_buf[2] <= 'Z'))
- ansi_parse_deckey (a, v,t);
+ ansi_parse_deckey (a, v, t);
break;
default:
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
}
break;
case 4:
switch (p->escape_buf[1])
{
case '[':
- ansi_parse_ansikey (a, v,t);
+ ansi_parse_ansikey (a, v, t);
break;
default:
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
}
break;
case 5:
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
}
}
void
-ansi_check_escape (ANSI * a, VT102 * v,TTY *t)
+ansi_check_escape (ANSI * a, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
struct timeval now, diff;
@@ -656,24 +678,24 @@ ansi_check_escape (ANSI * a, VT102 * v,TTY *t)
/*Time up? */
if (diff.tv_sec || (diff.tv_usec > ANSI_ESCAPE_TIMEOUT))
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
}
void
-ansi_parse_char (ANSI * a, int c, VT102 * v,TTY *t)
+ansi_parse_char (ANSI * a, int c, VT102 * v, TTY * t)
{
ANSI_Parser *p = &a->parser;
/*See if it's time to flush the escape*/
- ansi_check_escape (a, v,t);
+ ansi_check_escape (a, v, t);
if (c == 033)
{
if (p->in_escape)
- ansi_flush_escape (a, v,t);
+ ansi_flush_escape (a, v, t);
p->in_escape++;
p->escape_ptr = 0;
@@ -683,29 +705,29 @@ ansi_parse_char (ANSI * a, int c, VT102 * v,TTY *t)
if (p->in_escape)
{
p->escape_buf[p->escape_ptr++] = c;
- ansi_parse_escape (a, v,t);
+ ansi_parse_escape (a, v, t);
}
else
{
- vt102_send (v, c,t);
+ vt102_send (v, c, t);
}
}
void
-ansi_parse (ANSI * a, char *buf, int len, VT102 * v,TTY *t)
+ansi_parse (ANSI * a, char *buf, int len, VT102 * v, TTY * t)
{
while (len--)
- ansi_parse_char (a, *(buf++), v,t);
+ ansi_parse_char (a, *(buf++), v, t);
}
int
-ansi_dispatch (ANSI * a, VT102 * v,TTY *t)
+ansi_dispatch (ANSI * a, VT102 * v, TTY * t)
{
char buf[1024];
int red;
- ansi_check_escape (a, v,t);
+ ansi_check_escape (a, v, t);
red = ansi_read (a, buf, sizeof (buf));
@@ -718,12 +740,12 @@ ansi_dispatch (ANSI * a, VT102 * v,TTY *t)
#endif
#if 0
- if (*buf == 1)
- return 1;
+ if (*buf == 1)
+ return 1;
#endif
- ansi_parse (a, buf, red, v,t);
+ ansi_parse (a, buf, red, v, t);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 18:48:21 +0000