aboutsummaryrefslogtreecommitdiffstats
path: root/src/vt102.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vt102.c')
-rw-r--r--src/vt102.c1937
1 files changed, 918 insertions, 1019 deletions
diff --git a/src/vt102.c b/src/vt102.c
index 5c360ac..66c0b40 100644
--- a/src/vt102.c
+++ b/src/vt102.c
@@ -10,6 +10,9 @@ static char rcsid[] = "$Id$";
/*
* $Log$
+ * Revision 1.54 2008/03/02 10:37:56 james
+ * *** empty log message ***
+ *
* Revision 1.53 2008/02/29 18:33:39 james
* *** empty log message ***
*
@@ -418,11 +421,10 @@ vt102_crt_update (Context * c)
v->crt.hide_cursor =
v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0 : 1;
- if (v->current_line.y != v->pos.y)
- {
- vt102_log_line (c, v->current_line.y);
- v->current_line = v->pos;
- }
+ if (v->current_line.y != v->pos.y) {
+ vt102_log_line (c, v->current_line.y);
+ v->current_line = v->pos;
+ }
if (c->d)
cmd_show_status (c->d, c);
@@ -463,19 +465,17 @@ vt102_log_line (Context * c, int line)
return;
- for (; e.x > 0; --e.x)
- {
- if (c->v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ')
- break;
- }
-
- for (; p.x <= e.x; ++p.x)
- {
- int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr;
- if (ch < 32)
- ch = ' ';
- logptr += utf8_encode (logptr, ch);
- }
+ for (; e.x > 0; --e.x) {
+ if (c->v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ')
+ break;
+ }
+
+ for (; p.x <= e.x; ++p.x) {
+ int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr;
+ if (ch < 32)
+ ch = ' ';
+ logptr += utf8_encode (logptr, ch);
+ }
*logptr = 0;
c->l->log (c->l, logbuf);
@@ -513,14 +513,11 @@ vt102_cursor_normalize (VT102 * v)
{
CRT_Pos *top, *bottom;
- if (v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE])
- {
- vt102_clip_cursor (v, v->top_margin, v->bottom_margin);
- }
- else
- {
- vt102_clip_cursor (v, v->screen_start, v->screen_end);
- }
+ if (v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE]) {
+ vt102_clip_cursor (v, v->top_margin, v->bottom_margin);
+ } else {
+ vt102_clip_cursor (v, v->screen_start, v->screen_end);
+ }
}
@@ -540,15 +537,14 @@ vt102_cursor_advance_line (Context * c)
/*have wraped off end of last line in scrolling region */
/* (|| not necessary, but shuts compiler up */
if (((v->pos.y == v->bottom_margin.y) || (v->pos.y == v->screen_end.y)) &&
- (couldscroll))
- {
- vt102_log_line (c, v->pos.y);
+ (couldscroll)) {
+ vt102_log_line (c, v->pos.y);
- vt102_history (c, v->top_margin, v->bottom_margin);
+ vt102_history (c, v->top_margin, v->bottom_margin);
- crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
- return;
- }
+ crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
+ return;
+ }
if (v->pos.y != v->screen_end.y)
v->pos.y++;
@@ -565,13 +561,12 @@ vt102_cursor_retreat_line (Context * c)
/*have wraped off end of last line in scrolling region */
/* (|| not necessary, but shuts compiler up */
if (((v->pos.y == v->top_margin.y) || (v->pos.y == v->screen_start.y)) &&
- (couldscroll))
- {
- vt102_log_line (c, v->pos.y);
+ (couldscroll)) {
+ vt102_log_line (c, v->pos.y);
- crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
- return;
- }
+ crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
+ return;
+ }
if (v->pos.y != v->screen_start.y)
v->pos.y--;
@@ -602,14 +597,11 @@ vt102_do_pending_wrap (Context * c)
if ((v->pos.y == v->screen_end.y) && (!couldscroll))
return;
- if (couldscroll)
- {
- v->pos.x = v->top_margin.x;
- }
- else
- {
- v->pos.x = 0;
- }
+ if (couldscroll) {
+ v->pos.x = v->top_margin.x;
+ } else {
+ v->pos.x = 0;
+ }
vt102_cursor_advance_line (c);
}
@@ -619,13 +611,12 @@ vt102_cursor_advance (Context * c)
{
VT102 *v = c->v;
- if (v->pos.x < v->bottom_margin.x)
- {
+ if (v->pos.x < v->bottom_margin.x) {
/*Normal advance*/
- v->pos.x++;
- v->pending_wrap = 0;
- return;
- }
+ v->pos.x++;
+ v->pending_wrap = 0;
+ return;
+ }
v->pending_wrap++;
if (!c->v->xn_glitch)
vt102_do_pending_wrap (c);
@@ -636,10 +627,9 @@ vt102_cursor_advance (Context * c)
void
vt102_cursor_retreat (VT102 * v)
{
- if (v->pos.x != v->top_margin.x)
- {
- v->pos.x--;
- }
+ if (v->pos.x != v->top_margin.x) {
+ v->pos.x--;
+ }
v->pending_wrap = 0;
}
@@ -651,22 +641,20 @@ vt102_reset_tabs (VT102 * v)
memset (v->tabs, 0, sizeof (v->tabs));
- for (i = 0; i < VT102_MAX_COLS; i += 8)
- {
- v->tabs[i]++;
- }
+ for (i = 0; i < VT102_MAX_COLS; i += 8) {
+ v->tabs[i]++;
+ }
}
void
vt102_cursor_advance_tab (VT102 * v)
{
if (v->pos.x == v->bottom_margin.x)
return;
- while (v->pos.x < v->bottom_margin.x)
- {
- v->pos.x++;
- if (v->tabs[v->pos.x])
- break;
- }
+ while (v->pos.x < v->bottom_margin.x) {
+ v->pos.x++;
+ if (v->tabs[v->pos.x])
+ break;
+ }
v->pending_wrap = 0;
}
@@ -675,12 +663,11 @@ vt102_cursor_retreat_tab (VT102 * v)
{
if (v->pos.x == v->top_margin.x)
return;
- while (v->pos.x > v->top_margin.x)
- {
- v->pos.x--;
- if (v->tabs[v->pos.x])
- break;
- }
+ while (v->pos.x > v->top_margin.x) {
+ v->pos.x--;
+ if (v->tabs[v->pos.x])
+ break;
+ }
v->pending_wrap = 0;
}
@@ -694,16 +681,13 @@ vt102_cursor_home (VT102 * v)
vt102_cursor_absolute (VT102 * v, int x, int y)
{
- if (v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE])
- {
- v->pos.x = x + v->top_margin.x;
- v->pos.y = y + v->top_margin.y;
- }
- else
- {
- v->pos.x = x;
- v->pos.y = y;
- }
+ if (v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE]) {
+ v->pos.x = x + v->top_margin.x;
+ v->pos.y = y + v->top_margin.y;
+ } else {
+ v->pos.x = x;
+ v->pos.y = y;
+ }
vt102_cursor_normalize (v);
v->pending_wrap = 0;
}
@@ -726,12 +710,11 @@ vt102_delete_from_line (VT102 * v, CRT_Pos p)
if (n < 0)
return;
- if (n)
- {
+ if (n) {
- memmove (&v->crt.screen[CRT_ADDR_POS (&p)],
- &v->crt.screen[CRT_ADDR_POS (&p) + 1], sizeof (CRT_CA) * n);
- }
+ memmove (&v->crt.screen[CRT_ADDR_POS (&p)],
+ &v->crt.screen[CRT_ADDR_POS (&p) + 1], sizeof (CRT_CA) * n);
+ }
v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].chr = ' ';
/*But not attr due to vt102 bug*/
@@ -745,12 +728,11 @@ vt102_insert_into_line (VT102 * v, CRT_Pos p)
if (n < 0)
return;
- if (n)
- {
+ if (n) {
- memmove (&v->crt.screen[CRT_ADDR_POS (&p) + 1],
- &v->crt.screen[CRT_ADDR_POS (&p)], sizeof (CRT_CA) * n);
- }
+ memmove (&v->crt.screen[CRT_ADDR_POS (&p) + 1],
+ &v->crt.screen[CRT_ADDR_POS (&p)], sizeof (CRT_CA) * n);
+ }
v->crt.screen[CRT_ADDR_POS (&p)].chr = ' ';
v->crt.screen[CRT_ADDR_POS (&p)].attr = CRT_ATTR_NORMAL;
@@ -766,50 +748,44 @@ vt102_change_mode (Context * c, int private, char *ns, int set)
int m;
- if (*ns)
- {
- m = atoi (ns);
- }
- else
- {
- m = 1;
- }
+ if (*ns) {
+ m = atoi (ns);
+ } else {
+ m = 1;
+ }
if (m < 0)
return;
if (m >= VT102_NMODES)
return;
- if (private)
- {
- v->private_modes[m] = set;
- switch (m)
- {
- case VT102_PRIVATE_MODE_CURSOR_MODE:
- if (v->application_keypad_mode)
- v->private_modes[m] = 0;
+ if (private) {
+ v->private_modes[m] = set;
+ switch (m) {
+ case VT102_PRIVATE_MODE_CURSOR_MODE:
+ if (v->application_keypad_mode)
+ v->private_modes[m] = 0;
#if 0
- fprintf (stderr, "APPLICATION CURSOR MODE %d wanted %d\n",
- v->private_modes[m], set);
+ fprintf (stderr, "APPLICATION CURSOR MODE %d wanted %d\n",
+ v->private_modes[m], set);
#endif
- break;
- case VT102_PRIVATE_MODE_ORIGIN_MODE:
- vt102_cursor_home (v);
- break;
- case VT102_PRIVATE_MODE_132COLS:
- /* We don't implement 132 col mode - yet */
-
- v->current_size.x =
- v->
- private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 :
- VT102_COLS_80;
+ break;
+ case VT102_PRIVATE_MODE_ORIGIN_MODE:
+ vt102_cursor_home (v);
+ break;
+ case VT102_PRIVATE_MODE_132COLS:
+ /* We don't implement 132 col mode - yet */
- vt102_do_resize (c);
- break;
- }
+ v->current_size.x =
+ v->
+ private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 :
+ VT102_COLS_80;
+ vt102_do_resize (c);
+ break;
}
- else
+
+ } else
v->modes[m] = set;
#if 0
@@ -831,36 +807,33 @@ vt102_parse_mode_string (Context * c, char *buf, int len)
len--;
- if (*buf == '?')
- {
- private++;
- buf++;
- len--;
- }
+ if (*buf == '?') {
+ private++;
+ buf++;
+ len--;
+ }
if (len < 0)
return;
- while (len--)
- {
- if (*buf == ';')
- {
- vt102_change_mode (c, private, &num[o], last == 'h');
- memset (num, 0, sizeof (num));
- o = sizeof (num) - 1;
- buf++;
- continue;
- }
+ while (len--) {
+ if (*buf == ';') {
+ vt102_change_mode (c, private, &num[o], last == 'h');
+ memset (num, 0, sizeof (num));
+ o = sizeof (num) - 1;
+ buf++;
+ continue;
+ }
- num[0] = num[1];
- num[1] = num[2];
- num[2] = *buf;
+ num[0] = num[1];
+ num[1] = num[2];
+ num[2] = *buf;
- if (o)
- o--;
+ if (o)
+ o--;
- buf++;
- }
+ buf++;
+ }
vt102_change_mode (c, private, &num[o], last == 'h');
@@ -873,115 +846,111 @@ vt102_change_attr (VT102 * v, char *na)
int a;
- if (*na)
- {
- a = atoi (na);
- }
- else
- {
- a = 0;
- }
-
- switch (a)
- {
- case 0:
- v->attr = CRT_ATTR_NORMAL;
- v->color = CRT_COLOR_NORMAL;
- break;
- case 1:
- v->attr |= CRT_ATTR_BOLD;
- break;
- case 21:
- case 22:
- v->attr &= ~CRT_ATTR_BOLD;
- break;
- case 4:
- v->attr |= CRT_ATTR_UNDERLINE;
- break;
- case 24:
- v->attr &= ~CRT_ATTR_UNDERLINE;
- break;
- case 5:
- v->attr |= CRT_ATTR_BLINK;
- break;
- case 25:
- v->attr &= ~CRT_ATTR_BLINK;
- break;
- case 7:
- v->attr |= CRT_ATTR_REVERSE;
- break;
- case 27:
- v->attr &= ~CRT_ATTR_REVERSE;
- break;
- case 30:
- case 31:
- case 32:
- case 33:
- case 34:
- case 35:
- case 36:
- case 37:
- v->color &= ~CRT_COLOR_FG_MASK;
- v->color |= ((a - 30) << CRT_COLOR_FG_SHIFT) & CRT_COLOR_FG_MASK;
- break;
- case 90:
- case 91:
- case 92:
- case 93:
- case 94:
- case 95:
- case 96:
- case 97:
- v->color &= ~CRT_COLOR_FG_MASK;
- v->color |=
- (((a -
- 90) | CRT_COLOR_INTENSITY) << CRT_COLOR_FG_SHIFT) &
- CRT_COLOR_FG_MASK;
- break;
- case 39:
- case 99:
- v->color &= ~CRT_COLOR_FG_MASK;
- v->color |=
- (CRT_FGCOLOR_NORMAL << CRT_COLOR_FG_SHIFT) & CRT_COLOR_FG_MASK;
- break;
- case 40:
- case 41:
- case 42:
- case 43:
- case 44:
- case 45:
- case 46:
- case 47:
- v->color &= ~CRT_COLOR_BG_MASK;
- v->color |= ((a - 40) << CRT_COLOR_BG_SHIFT) & CRT_COLOR_BG_MASK;
- break;
- case 100:
- case 101:
- case 102:
- case 103:
- case 104:
- case 105:
- case 106:
- case 107:
- v->color &= ~CRT_COLOR_BG_MASK;
- v->color |=
- (((a -
- 100) | CRT_COLOR_INTENSITY) << CRT_COLOR_BG_SHIFT) &
- CRT_COLOR_BG_MASK;
- break;
- case 49:
- case 109:
- v->color &= ~CRT_COLOR_BG_MASK;
- v->color |=
- (CRT_BGCOLOR_NORMAL << CRT_COLOR_BG_SHIFT) & CRT_COLOR_BG_MASK;
- break;
-
- default:
- ;
+ if (*na) {
+ a = atoi (na);
+ } else {
+ a = 0;
+ }
+
+ switch (a) {
+ case 0:
+ v->attr = CRT_ATTR_NORMAL;
+ v->color = CRT_COLOR_NORMAL;
+ break;
+ case 1:
+ v->attr |= CRT_ATTR_BOLD;
+ break;
+ case 21:
+ case 22:
+ v->attr &= ~CRT_ATTR_BOLD;
+ break;
+ case 4:
+ v->attr |= CRT_ATTR_UNDERLINE;
+ break;
+ case 24:
+ v->attr &= ~CRT_ATTR_UNDERLINE;
+ break;
+ case 5:
+ v->attr |= CRT_ATTR_BLINK;
+ break;
+ case 25:
+ v->attr &= ~CRT_ATTR_BLINK;
+ break;
+ case 7:
+ v->attr |= CRT_ATTR_REVERSE;
+ break;
+ case 27:
+ v->attr &= ~CRT_ATTR_REVERSE;
+ break;
+ case 30:
+ case 31:
+ case 32:
+ case 33:
+ case 34:
+ case 35:
+ case 36:
+ case 37:
+ v->color &= ~CRT_COLOR_FG_MASK;
+ v->color |= ((a - 30) << CRT_COLOR_FG_SHIFT) & CRT_COLOR_FG_MASK;
+ break;
+ case 90:
+ case 91:
+ case 92:
+ case 93:
+ case 94:
+ case 95:
+ case 96:
+ case 97:
+ v->color &= ~CRT_COLOR_FG_MASK;
+ v->color |=
+ (((a -
+ 90) | CRT_COLOR_INTENSITY) << CRT_COLOR_FG_SHIFT) &
+ CRT_COLOR_FG_MASK;
+ break;
+ case 39:
+ case 99:
+ v->color &= ~CRT_COLOR_FG_MASK;
+ v->color |=
+ (CRT_FGCOLOR_NORMAL << CRT_COLOR_FG_SHIFT) & CRT_COLOR_FG_MASK;
+ break;
+ case 40:
+ case 41:
+ case 42:
+ case 43:
+ case 44:
+ case 45:
+ case 46:
+ case 47:
+ v->color &= ~CRT_COLOR_BG_MASK;
+ v->color |= ((a - 40) << CRT_COLOR_BG_SHIFT) & CRT_COLOR_BG_MASK;
+ break;
+ case 100:
+ case 101:
+ case 102:
+ case 103:
+ case 104:
+ case 105:
+ case 106:
+ case 107:
+ v->color &= ~CRT_COLOR_BG_MASK;
+ v->color |=
+ (((a -
+ 100) | CRT_COLOR_INTENSITY) << CRT_COLOR_BG_SHIFT) &
+ CRT_COLOR_BG_MASK;
+ break;
+ case 49:
+ case 109:
+ v->color &= ~CRT_COLOR_BG_MASK;
+ v->color |=
+ (CRT_BGCOLOR_NORMAL << CRT_COLOR_BG_SHIFT) & CRT_COLOR_BG_MASK;
+ break;
+
+ default:
+ ;
#if 0
- fprintf (stderr, "unhandled SGR %d\n", a);
+ fprintf (stderr, "unhandled SGR %d\n", a);
#endif
- }
+ }
}
@@ -1002,26 +971,24 @@ vt102_parse_attr_string (VT102 * v, char *buf, int len)
if (len < 0)
return;
- while (len--)
- {
- if (*buf == ';')
- {
- vt102_change_attr (v, &num[o]);
- memset (num, 0, sizeof (num));
- o = sizeof (num) - 1;
- buf++;
- continue;
- }
+ while (len--) {
+ if (*buf == ';') {
+ vt102_change_attr (v, &num[o]);
+ memset (num, 0, sizeof (num));
+ o = sizeof (num) - 1;
+ buf++;
+ continue;
+ }
- num[0] = num[1];
- num[1] = num[2];
- num[2] = *buf;
+ num[0] = num[1];
+ num[1] = num[2];
+ num[2] = *buf;
- if (o)
- o--;
+ if (o)
+ o--;
- buf++;
- }
+ buf++;
+ }
vt102_change_attr (v, &num[o]);
}
@@ -1059,18 +1026,14 @@ vt102_regular_char (Context * c, VT102 * v, uint32_t ch)
v->last_reg_char = ch;
- if (ch < VT102_CHARSET_SIZE)
- {
- int cs;
- if ((cs = vt102_charset_c0[ch]))
- {
- ch = cs;
- }
- else if ((cs = charset_from_csid[v->g[v->cs]][ch]))
- {
- ch = cs;
- }
+ if (ch < VT102_CHARSET_SIZE) {
+ int cs;
+ if ((cs = vt102_charset_c0[ch])) {
+ ch = cs;
+ } else if ((cs = charset_from_csid[v->g[v->cs]][ch])) {
+ ch = cs;
}
+ }
v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = ch;
v->crt.screen[CRT_ADDR_POS (&v->pos)].attr = v->attr;
v->crt.screen[CRT_ADDR_POS (&v->pos)].color = v->color;
@@ -1081,11 +1044,10 @@ vt102_regular_char (Context * c, VT102 * v, uint32_t ch)
vt102_send_id (Context * c, char *buf)
{
- if (c->t)
- {
- int l = strlen (buf);
- c->t->xmit (c->t, buf, l);
- }
+ if (c->t) {
+ int l = strlen (buf);
+ c->t->xmit (c->t, buf, l);
+ }
}
void
@@ -1095,30 +1057,28 @@ vt102_scs (Context * c, int g, int s)
int cs = VT102_CSID_US;
- switch (s)
- {
- case 'A':
- cs = VT102_CSID_UK;
- break;
- case '1':
- case '2':
- case 'B':
- cs = VT102_CSID_US;
- break;
- case '0':
- cs = VT102_CSID_GL;
- break;
- }
-
- switch (g)
- {
- case '(':
- v->g[0] = cs;
- break;
- case ')':
- v->g[1] = cs;
- break;
- }
+ switch (s) {
+ case 'A':
+ cs = VT102_CSID_UK;
+ break;
+ case '1':
+ case '2':
+ case 'B':
+ cs = VT102_CSID_US;
+ break;
+ case '0':
+ cs = VT102_CSID_GL;
+ break;
+ }
+
+ switch (g) {
+ case '(':
+ v->g[0] = cs;
+ break;
+ case ')':
+ v->g[1] = cs;
+ break;
+ }
}
@@ -1139,279 +1099,258 @@ vt102_parse_csi (Context * c, char *buf, int len)
buf[len - 1] = 0;
#endif
- if (len > 2)
- {
- narg = atoi (arg);
- }
- else
- {
- narg = 1;
- }
+ if (len > 2) {
+ narg = atoi (arg);
+ } else {
+ narg = 1;
+ }
+
+ switch (buf[0]) {
+ case '[':
+ switch (last) {
+ case '@':
+ while (narg--)
+ vt102_insert_into_line (v, v->pos);
+ break;
+ case 'A':
+ vt102_cursor_relative (v, 0, -narg);
+ break;
+ case 'e':
+ case 'B':
+ vt102_cursor_relative (v, 0, narg);
+ break;
+ case 'a':
+ case 'C':
+ vt102_cursor_relative (v, narg, 0);
+ break;
+ case 'D':
+ vt102_cursor_relative (v, -narg, 0);
+ break;
+ case 'E':
+ vt102_cursor_relative (v, 0, narg);
+ vt102_cursor_carriage_return (v);
+ break;
+ case 'F':
+ vt102_cursor_relative (v, 0, -narg);
+ vt102_cursor_carriage_return (v);
+ break;
+ case 'G':
+ vt102_cursor_absolute (v, narg - 1, v->pos.y);
+ break;
+ case 'H':
+ case 'f':
+ {
+ int x, y;
- switch (buf[0])
- {
- case '[':
- switch (last)
- {
- case '@':
- while (narg--)
- vt102_insert_into_line (v, v->pos);
- break;
- case 'A':
- vt102_cursor_relative (v, 0, -narg);
- break;
- case 'e':
- case 'B':
- vt102_cursor_relative (v, 0, narg);
- break;
- case 'a':
- case 'C':
- vt102_cursor_relative (v, narg, 0);
- break;
- case 'D':
- vt102_cursor_relative (v, -narg, 0);
- break;
- case 'E':
- vt102_cursor_relative (v, 0, narg);
- vt102_cursor_carriage_return (v);
- break;
- case 'F':
- vt102_cursor_relative (v, 0, -narg);
- vt102_cursor_carriage_return (v);
- break;
- case 'G':
- vt102_cursor_absolute (v, narg - 1, v->pos.y);
- break;
- case 'H':
- case 'f':
- {
- int x, y;
+ y = narg - 1;
- y = narg - 1;
+ ptr = index (arg, ';');
+ if (ptr)
+ x = atoi (ptr + 1) - 1;
+ else
+ x = 0;
- ptr = index (arg, ';');
- if (ptr)
- x = atoi (ptr + 1) - 1;
- else
- x = 0;
+ vt102_cursor_absolute (v, x, y);
+ }
+ break;
+ case 'I':
+ while (narg--)
+ vt102_cursor_advance_tab (c->v);
+ break;
+ case 'J':
+ if (len == 2)
+ narg = 0; /*Different default */
+ switch (narg) {
+ case 0:
+ crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
+ break;
+ case 1:
+ crt_erase (&v->crt, v->screen_start, v->pos, 1, v->color);
+ break;
+ case 2:
+ crt_erase (&v->crt, v->screen_start, v->screen_end, 1, v->color);
+ break;
+ }
+ break;
+ case 'K':
+ {
+ CRT_Pos ls = { 0, v->pos.y };
+ CRT_Pos le = { v->current_size.x - 1, v->pos.y };
+ if (len == 2)
+ narg = 0; /*Different default */
- vt102_cursor_absolute (v, x, y);
- }
+ switch (narg) {
+ case 0:
+ crt_erase (&v->crt, v->pos, le, 1, v->color);
break;
- case 'I':
- while (narg--)
- vt102_cursor_advance_tab (c->v);
+ case 1:
+ crt_erase (&v->crt, ls, v->pos, 1, v->color);
break;
- case 'J':
- if (len == 2)
- narg = 0; /*Different default */
- switch (narg)
- {
- case 0:
- crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
- break;
- case 1:
- crt_erase (&v->crt, v->screen_start, v->pos, 1, v->color);
- break;
- case 2:
- crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
- v->color);
- break;
- }
- break;
- case 'K':
- {
- CRT_Pos ls = { 0, v->pos.y };
- CRT_Pos le = { v->current_size.x - 1, v->pos.y };
- if (len == 2)
- narg = 0; /*Different default */
-
- switch (narg)
- {
- case 0:
- crt_erase (&v->crt, v->pos, le, 1, v->color);
- break;
- case 1:
- crt_erase (&v->crt, ls, v->pos, 1, v->color);
- break;
- case 2:
- crt_erase (&v->crt, ls, le, 1, v->color);
- break;
- }
- }
+ case 2:
+ crt_erase (&v->crt, ls, le, 1, v->color);
break;
+ }
+ }
+ break;
- case 'L':
- if ((v->pos.y >= v->top_margin.y)
- && (v->pos.y <= v->bottom_margin.y))
- {
- while (narg--)
- crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1,
- v->color);
- }
- break;
+ case 'L':
+ if ((v->pos.y >= v->top_margin.y)
+ && (v->pos.y <= v->bottom_margin.y)) {
+ while (narg--)
+ crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1, v->color);
+ }
+ break;
- case 'M':
- if ((v->pos.y >= v->top_margin.y)
- && (v->pos.y <= v->bottom_margin.y))
- {
- while (narg--)
- {
- vt102_history (c, v->pos, v->bottom_margin);
- crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1,
- v->color);
- }
- }
- break;
- case 'P':
- while (narg--)
- vt102_delete_from_line (v, v->pos);
- break;
- case 'S':
- while (narg--)
- {
- vt102_history (c, v->top_margin, v->bottom_margin);
- crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1,
- v->color);
- }
- break;
- case 'T':
- while (narg--)
- crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,
- v->color);
- break;
- case 'X':
- {
- CRT_Pos end = v->pos;
- if (!narg)
- narg++;
-
- end.x += narg - 1;
- if (end.x > v->bottom_margin.x)
- end.x = v->bottom_margin.x;
-
- crt_erase (&v->crt, v->pos, end, 1, v->color);
- }
- break;
- case 'Z':
- while (narg--)
- vt102_cursor_retreat_tab (c->v);
- break;
- case '`':
- vt102_cursor_absolute (v, narg - 1, v->pos.y);
- break;
- case 'b':
- while (narg--)
- vt102_regular_char (c, v, v->last_reg_char);
- break;
- case 'c':
- /* For some obscure reason some programs seem to send */
- /* CSI [ ? .. c, which we ignore */
- if (buf[1]!='?')
- vt102_send_id (c, "\033[?2c");
- break;
- case 'd':
- vt102_cursor_absolute (v, v->pos.x, narg - 1);
- break;
- case 'g':
- if (len == 2)
- narg = 0; /*Different default */
-
- switch (narg)
- {
- case 0:
- v->tabs[v->pos.x] = 0;
- break;
- case 2: //FIXME: - LA120 says current line only WTF?
- case 3:
- memset (v->tabs, 0, sizeof (v->tabs));
- break;
- }
- break;
+ case 'M':
+ if ((v->pos.y >= v->top_margin.y)
+ && (v->pos.y <= v->bottom_margin.y)) {
+ while (narg--) {
+ vt102_history (c, v->pos, v->bottom_margin);
+ crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1, v->color);
+ }
+ }
+ break;
+ case 'P':
+ while (narg--)
+ vt102_delete_from_line (v, v->pos);
+ break;
+ case 'S':
+ while (narg--) {
+ vt102_history (c, v->top_margin, v->bottom_margin);
+ crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1, v->color);
+ }
+ break;
+ case 'T':
+ while (narg--)
+ crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1,
+ v->color);
+ break;
+ case 'X':
+ {
+ CRT_Pos end = v->pos;
+ if (!narg)
+ narg++;
- case 'i': //Printer commands
- //FIXME
- break;
- case 'h':
- case 'l':
- vt102_parse_mode_string (c, &buf[1], len - 1);
- break;
+ end.x += narg - 1;
+ if (end.x > v->bottom_margin.x)
+ end.x = v->bottom_margin.x;
+ crt_erase (&v->crt, v->pos, end, 1, v->color);
+ }
+ break;
+ case 'Z':
+ while (narg--)
+ vt102_cursor_retreat_tab (c->v);
+ break;
+ case '`':
+ vt102_cursor_absolute (v, narg - 1, v->pos.y);
+ break;
+ case 'b':
+ while (narg--)
+ vt102_regular_char (c, v, v->last_reg_char);
+ break;
+ case 'c':
+ /* For some obscure reason some programs seem to send */
+ /* CSI [ ? .. c, which we ignore */
+ if (buf[1] != '?')
+ vt102_send_id (c, "\033[?2c");
+ break;
+ case 'd':
+ vt102_cursor_absolute (v, v->pos.x, narg - 1);
+ break;
+ case 'g':
+ if (len == 2)
+ narg = 0; /*Different default */
- case 'm':
- vt102_parse_attr_string (v, &buf[1], len - 1);
- break;
- case 'n': //Device status report
- switch (buf[1])
- {
- case '5':
- vt102_send_id (c, "\033[0n");
- break;
- case '6':
- if (c->t)
- {
- char buf[16];
- int i;
- i =
- sprintf (buf, "\033[%d;%dR", v->pos.y + 1, v->pos.x + 1);
- c->t->xmit (c->t, buf, i);
- }
- break;
- default:
- //?15n printer status
- log_f (c->l, "<%s:%d unhandled DSR: \\033%s>", __FILE__,
- __LINE__, buf);
- }
- break;
- case 'q': //Load LED on off
- break;
- case 'r':
- v->top_margin = v->screen_start;
- v->bottom_margin = v->screen_end;
-
- if ((len > 2) && (ptr = index (arg, ';')))
- {
- ptr++;
- v->top_margin.y = narg - 1;
- v->bottom_margin.y = atoi (ptr) - 1;
- }
-
- if (v->top_margin.y < v->screen_start.y)
- v->top_margin.y = v->screen_start.y;
- if (v->top_margin.y > v->screen_end.y)
- v->top_margin.y = v->screen_end.y;
- if (v->bottom_margin.y < v->screen_start.y)
- v->bottom_margin.y = v->screen_start.y;
- if (v->bottom_margin.y > v->screen_end.y)
- v->bottom_margin.y = v->screen_end.y;
-
- vt102_cursor_home (v);
- break;
- case 's':
- v->saved.pos = v->pos;
- break;
- case 'u':
- v->pos = v->saved.pos;
- vt102_cursor_normalize (v);
- v->pending_wrap = 0;
- break;
- case 'y': //Invoke confidence test
- break;
- case 'z': //request terminal parameters
- break;
+ switch (narg) {
+ case 0:
+ v->tabs[v->pos.x] = 0;
+ break;
+ case 2: //FIXME: - LA120 says current line only WTF?
+ case 3:
+ memset (v->tabs, 0, sizeof (v->tabs));
+ break;
+ }
+ break;
- default:
- log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__,
- buf);
+ case 'i': //Printer commands
+ //FIXME
+ break;
+ case 'h':
+ case 'l':
+ vt102_parse_mode_string (c, &buf[1], len - 1);
+ break;
- ;
+
+ case 'm':
+ vt102_parse_attr_string (v, &buf[1], len - 1);
+ break;
+ case 'n': //Device status report
+ switch (buf[1]) {
+ case '5':
+ vt102_send_id (c, "\033[0n");
+ break;
+ case '6':
+ if (c->t) {
+ char buf[16];
+ int i;
+ i = sprintf (buf, "\033[%d;%dR", v->pos.y + 1, v->pos.x + 1);
+ c->t->xmit (c->t, buf, i);
}
+ break;
+ default:
+ //?15n printer status
+ log_f (c->l, "<%s:%d unhandled DSR: \\033%s>", __FILE__,
+ __LINE__, buf);
+ }
break;
+ case 'q': //Load LED on off
+ break;
+ case 'r':
+ v->top_margin = v->screen_start;
+ v->bottom_margin = v->screen_end;
+
+ if ((len > 2) && (ptr = index (arg, ';'))) {
+ ptr++;
+ v->top_margin.y = narg - 1;
+ v->bottom_margin.y = atoi (ptr) - 1;
+ }
+
+ if (v->top_margin.y < v->screen_start.y)
+ v->top_margin.y = v->screen_start.y;
+ if (v->top_margin.y > v->screen_end.y)
+ v->top_margin.y = v->screen_end.y;
+ if (v->bottom_margin.y < v->screen_start.y)
+ v->bottom_margin.y = v->screen_start.y;
+ if (v->bottom_margin.y > v->screen_end.y)
+ v->bottom_margin.y = v->screen_end.y;
+
+ vt102_cursor_home (v);
+ break;
+ case 's':
+ v->saved.pos = v->pos;
+ break;
+ case 'u':
+ v->pos = v->saved.pos;
+ vt102_cursor_normalize (v);
+ v->pending_wrap = 0;
+ break;
+ case 'y': //Invoke confidence test
+ break;
+ case 'z': //request terminal parameters
+ break;
+
default:
- log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__,
- __LINE__, buf);
+ log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__, buf);
+
;
}
+ break;
+ default:
+ log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__,
+ __LINE__, buf);
+ ;
+ }
@@ -1430,107 +1369,62 @@ vt102_parse_esc (Context * c)
!v->private_modes[VT102_PRIVATE_MODE_VT52], p->cmd_buf);
#endif
- if (!v->private_modes[VT102_PRIVATE_MODE_VT52])
- {
- int ate = 1;
-
- switch (p->cmd_buf[0])
- {
- case 'A':
- vt102_cursor_relative (v, 0, -1);
- break;
- case 'B':
- vt102_cursor_relative (v, 0, 1);
- break;
- case 'C':
- vt102_cursor_relative (v, 1, 0);
- break;
- case 'D':
- vt102_cursor_relative (v, -1, 0);
- break;
- case 'F':
- v->cs = 1;
- v->g[1] = VT102_CSID_VT52;
- break;
- case 'G':
- v->cs = 0;
- v->g[0] = VT102_CSID_US;
- break;
- case 'H':
- vt102_cursor_absolute (v, 0, 0);
- break;
- case 'I':
- vt102_cursor_retreat_line (c);
- break;
- case 'J':
- crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
- break;
- case 'K':
- {
- CRT_Pos le = { v->current_size.x - 1, v->pos.y };
- crt_erase (&v->crt, v->pos, le, 1, v->color);
- }
- break;
- case 'Y':
- vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040);
- break;
- case 'V': //Print current line
- break;
- case 'W': //Printer on
- break;
- case 'X': //printer off
- break;
- case ']': //print screen
- break;
- case 'Z': //ID
- vt102_send_id (c, "\033/K");
- break;
- case '^': //Autoprint on
- break;
- case '_': //Autoprint off
- break;
- case '=':
- v->application_keypad_mode = 1;
- break;
- case '>':
- v->application_keypad_mode = 0;
- break;
- default:
- ate = 0;
- }
- if (ate)
- return;
- }
-
+ if (!v->private_modes[VT102_PRIVATE_MODE_VT52]) {
+ int ate = 1;
-/*If you edit this switch don't forget to edit the length and termination tables*/
- switch (p->cmd_buf[0])
- {
+ switch (p->cmd_buf[0]) {
+ case 'A':
+ vt102_cursor_relative (v, 0, -1);
+ break;
+ case 'B':
+ vt102_cursor_relative (v, 0, 1);
+ break;
+ case 'C':
+ vt102_cursor_relative (v, 1, 0);
+ break;
case 'D':
- vt102_cursor_advance_line (c);
+ vt102_cursor_relative (v, -1, 0);
break;
-
- case 'E':
- vt102_cursor_advance_line (c);
- v->pos.x = v->top_margin.x;
- vt102_cursor_normalize (v);
- v->pending_wrap = 0;
+ case 'F':
+ v->cs = 1;
+ v->g[1] = VT102_CSID_VT52;
+ break;
+ case 'G':
+ v->cs = 0;
+ v->g[0] = VT102_CSID_US;
break;
case 'H':
- v->tabs[v->pos.x]++;
+ vt102_cursor_absolute (v, 0, 0);
break;
- case 'M':
+ case 'I':
vt102_cursor_retreat_line (c);
break;
- case 'N': //select G2 for one char
+ case 'J':
+ crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color);
break;
- case 'O': //select G3 for one char
+ case 'K':
+ {
+ CRT_Pos le = { v->current_size.x - 1, v->pos.y };
+ crt_erase (&v->crt, v->pos, le, 1, v->color);
+ }
break;
- case 'Z':
- vt102_send_id (c, terminal_id);
+ case 'Y':
+ vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040);
break;
- case 'c':
- vt102_reset (c);
+ case 'V': //Print current line
+ break;
+ case 'W': //Printer on
+ break;
+ case 'X': //printer off
+ break;
+ case ']': //print screen
+ break;
+ case 'Z': //ID
+ vt102_send_id (c, "\033/K");
+ break;
+ case '^': //Autoprint on
+ break;
+ case '_': //Autoprint off
break;
case '=':
v->application_keypad_mode = 1;
@@ -1538,62 +1432,102 @@ vt102_parse_esc (Context * c)
case '>':
v->application_keypad_mode = 0;
break;
+ default:
+ ate = 0;
+ }
+ if (ate)
+ return;
+ }
- case '#':
- switch (p->cmd_buf[1])
- {
- case '3': //top of double height line
- case '4': //bottom of double height line
- case '5': //single width line
- case '6': //double width line
- break;
- case '8':
- /*DECALN*/
- {
- int i;
- crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
- CRT_COLOR_NORMAL);
- for (i = 0; i < CRT_ADDR_POS (&v->screen_end); ++i)
- v->crt.screen[i].chr = 'E';
- }
- break;
- default:
-
- log_f (c->l,
- "<%s:%d unhandled ESC: \\033 \\043 \\%03o (ESC # %c)>",
- __FILE__, __LINE__, p->cmd_buf[1], safe_ch (p->cmd_buf[1]));
-
- }
- break;
- case '<':
- /*Set ansi mode - ignored */
- break;
- case '7':
- vt102_save_state (v);
+/*If you edit this switch don't forget to edit the length and termination tables*/
+ switch (p->cmd_buf[0]) {
+ case 'D':
+ vt102_cursor_advance_line (c);
+ break;
+
+ case 'E':
+ vt102_cursor_advance_line (c);
+ v->pos.x = v->top_margin.x;
+ vt102_cursor_normalize (v);
+ v->pending_wrap = 0;
+ break;
+ case 'H':
+ v->tabs[v->pos.x]++;
+ break;
+ case 'M':
+ vt102_cursor_retreat_line (c);
+ break;
+ case 'N': //select G2 for one char
+ break;
+ case 'O': //select G3 for one char
+ break;
+ case 'Z':
+ vt102_send_id (c, terminal_id);
+ break;
+ case 'c':
+ vt102_reset (c);
+ break;
+ case '=':
+ v->application_keypad_mode = 1;
+ break;
+ case '>':
+ v->application_keypad_mode = 0;
+ break;
+
+ case '#':
+ switch (p->cmd_buf[1]) {
+ case '3': //top of double height line
+ case '4': //bottom of double height line
+ case '5': //single width line
+ case '6': //double width line
break;
case '8':
- vt102_restore_state (v);
- break;
- case ']': /*Set various titles */
- //FIXME:
- break;
- case '[':
- vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr);
- break;
- case '(': /*Charsets */
- case ')':
- case '+':
- case '*':
- case '%':
- vt102_scs (c, p->cmd_buf[0], p->cmd_buf[1]);
+ /*DECALN*/ {
+ int i;
+ crt_erase (&v->crt, v->screen_start, v->screen_end, 1,
+ CRT_COLOR_NORMAL);
+ for (i = 0; i < CRT_ADDR_POS (&v->screen_end); ++i)
+ v->crt.screen[i].chr = 'E';
+ }
break;
default:
- log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,
- __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0]));
- ;
+ log_f (c->l,
+ "<%s:%d unhandled ESC: \\033 \\043 \\%03o (ESC # %c)>",
+ __FILE__, __LINE__, p->cmd_buf[1], safe_ch (p->cmd_buf[1]));
+
}
+ break;
+ case '<':
+ /*Set ansi mode - ignored */
+ break;
+
+ case '7':
+ vt102_save_state (v);
+ break;
+ case '8':
+ vt102_restore_state (v);
+ break;
+ case ']': /*Set various titles */
+ //FIXME:
+ break;
+ case '[':
+ vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr);
+ break;
+ case '(': /*Charsets */
+ case ')':
+ case '+':
+ case '*':
+ case '%':
+ vt102_scs (c, p->cmd_buf[0], p->cmd_buf[1]);
+ break;
+ default:
+ log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__,
+ __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0]));
+
+ ;
+ }
p->cmd_buf[p->cmd_ptr] = 0;
#ifdef DEBUG
@@ -1608,23 +1542,21 @@ vt102_status_line (VT102 * v, char *str)
int i;
CRT_CA *ca = &v->crt.screen[CRT_ADDR (v->current_size.y, 0)];
- for (i = 0; i < v->current_size.x; ++i)
- {
- ca->attr = CRT_ATTR_REVERSE;
- ca->color = CRT_COLOR_NORMAL;
- ca->chr = *str ? *str : ' ';
- if (*str)
- str++;
- ca++;
- }
-
- for (; i < VT102_MAX_COLS; ++i)
- {
- ca->attr = CRT_ATTR_NORMAL;
- ca->color = CRT_COLOR_NORMAL;
- ca->chr = ' ';
- ca++;
- }
+ for (i = 0; i < v->current_size.x; ++i) {
+ ca->attr = CRT_ATTR_REVERSE;
+ ca->color = CRT_COLOR_NORMAL;
+ ca->chr = *str ? *str : ' ';
+ if (*str)
+ str++;
+ ca++;
+ }
+
+ for (; i < VT102_MAX_COLS; ++i) {
+ ca->attr = CRT_ATTR_NORMAL;
+ ca->color = CRT_COLOR_NORMAL;
+ ca->chr = ' ';
+ ca++;
+ }
}
@@ -1681,19 +1613,17 @@ pre_parse_cmd (int ch, VT102_parser * p)
p->in_cmd = 0;
p->cmd_termination = vt102_cmd_termination[ch];
- if (p->cmd_termination)
- {
- p->in_cmd++;
- return;
- }
+ if (p->cmd_termination) {
+ p->in_cmd++;
+ return;
+ }
p->cmd_more_bytes = vt102_cmd_length[ch];
- if (p->cmd_more_bytes)
- {
- p->in_cmd++;
- return;
- }
+ if (p->cmd_more_bytes) {
+ p->in_cmd++;
+ return;
+ }
}
void
@@ -1710,214 +1640,115 @@ vt102_parse_char (Context * c, int ch)
/* Turn anything non-ascii into '?' */
#if 0
- if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127))
- {
- ch = '?';
- }
+ if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127)) {
+ ch = '?';
+ }
#endif
#if 0
- if (p->dca_ptr == 2)
- {
- p->in_dca = 0;
- }
+ if (p->dca_ptr == 2) {
+ p->in_dca = 0;
+ }
#endif
- if (ch == SYM_CHAR_RESET)
- {
- vt102_reset_state (c);
- }
- else if (p->in_cmd && !ctrl_chr (ch, p->cmd_termination))
- {
- p->cmd_buf[p->cmd_ptr++] = ch;
- if (p->cmd_ptr == VT102_CMD_LEN)
- p->in_cmd = 0;
- if (p->cmd_more_bytes)
- {
- p->cmd_more_bytes--;
-
+ if (ch == SYM_CHAR_RESET) {
+ vt102_reset_state (c);
+ } else if (p->in_cmd && !ctrl_chr (ch, p->cmd_termination)) {
+ p->cmd_buf[p->cmd_ptr++] = ch;
+ if (p->cmd_ptr == VT102_CMD_LEN)
+ p->in_cmd = 0;
+ if (p->cmd_more_bytes) {
+ p->cmd_more_bytes--;
- if (!p->cmd_more_bytes == 1)
- p->in_cmd = 0;
- }
-
- switch (p->cmd_termination)
- {
- case 0:
- break;
- default:
- if (p->cmd_termination == ch)
- p->in_cmd = 0;
- break;
- case CSI_ENDER:
- if (csi_ender (ch))
- p->in_cmd = 0;
- break;
- }
- if (!p->in_cmd)
- {
- vt102_parse_esc (c);
- p->cmd_more_bytes = 0;
- p->cmd_termination = 0;
- }
+ if (!p->cmd_more_bytes == 1)
+ p->in_cmd = 0;
}
- else if (p->in_escape && !ctrl_chr (ch, 0))
- {
- p->cmd_ptr = 0;
- p->cmd_buf[p->cmd_ptr++] = ch;
- p->in_escape = 0;
-
- pre_parse_cmd (ch, p);
- if (!p->in_cmd)
- vt102_parse_esc (c);
+ switch (p->cmd_termination) {
+ case 0:
+ break;
+ default:
+ if (p->cmd_termination == ch)
+ p->in_cmd = 0;
+ break;
+ case CSI_ENDER:
+ if (csi_ender (ch))
+ p->in_cmd = 0;
+ break;
}
- else if (ch == 0x9b) /*One byte CSI */
- {
- p->cmd_ptr = 0;
- p->cmd_buf[p->cmd_ptr++] = '[';
- pre_parse_cmd (ch, p);
+ if (!p->in_cmd) {
+ vt102_parse_esc (c);
+ p->cmd_more_bytes = 0;
+ p->cmd_termination = 0;
}
- else
- {
-#ifdef DEBUG
- if (ch != 27)
- log_f (c->l,
- "<chr in x=%3d y=%2d aw=%d \\%03o %3d %c",
- v->pos.x, v->pos.y, v->pending_wrap, ch, ch, safe_ch (ch));
+ } else if (p->in_escape && !ctrl_chr (ch, 0)) {
+ p->cmd_ptr = 0;
+ p->cmd_buf[p->cmd_ptr++] = ch;
+ p->in_escape = 0;
-#endif
+ pre_parse_cmd (ch, p);
- switch (ch)
- {
-#if 0
- /*NUL*/ case 0:
- /*SOH*/ case 1:
- /*STX*/ case 2:
- /*ETX*/ case 3:
- /*EOT*/ case 4:
- break;
-#endif
- /*ENQ*/ case 5:
- vt102_send_id (c, terminal_id);
- break;
-#if 0
- /*ACK*/ case 6:
- break;
-#endif
- /*BEL*/ case 7:
- //FIXME beep
- break;
- /*BS*/ case 8:
- vt102_cursor_retreat (c->v);
- break;
- /*HT*/ case 9:
- vt102_cursor_advance_tab (c->v);
- break;
- /*LF*/ case 10:
- /*VT*/ case 11:
- /*FF*/ case 12:
- vt102_cursor_advance_line (c);
- if (!v->modes[VT102_MODE_NEWLINE_MODE])
- break;
- /*CR*/ case 13:
- vt102_cursor_carriage_return (v);
- break;
- /*SO*/ case 14:
- /*select G1 */
- v->cs = 1;
- break;
- /*SI*/ case 15:
- /*select G0 */
- v->cs = 0;
- break;
-#if 0
- /*DLE*/ case 16:
- /*DC1 */ case 17:
- /*DC2 */ case 18:
- /*DC3 */ case 19:
- /*DC4 */ case 20:
- /*NAK*/ case 21:
- /*SYN*/ case 22:
- /*ETB*/ case 23:
- /*CAN*/ case 24:
- /*EM*/ case 25:
- /*SUB*/ case 26:
- break;
-#endif
- /*ESC*/ case 27:
- p->in_escape++;
- return;
-#if 0
- /*FS*/ case 28:
- /*GS*/ case 29:
- /*RS*/ case 30:
- /*US*/ case 31:
- /*DEL*/ case 127:
- break;
-#endif
- /*regular character */ default:
- vt102_regular_char (c, v, ch);
- }
+ if (!p->in_cmd)
+ vt102_parse_esc (c);
+ } else if (ch == 0x9b) { /*One byte CSI */
+ p->cmd_ptr = 0;
+ p->cmd_buf[p->cmd_ptr++] = '[';
+ pre_parse_cmd (ch, p);
+ } else {
#ifdef DEBUG
- if (ch != 27)
- log_f (c->l, "<chr out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
- v->pending_wrap);
-#endif
- }
+ if (ch != 27)
+ log_f (c->l,
+ "<chr in x=%3d y=%2d aw=%d \\%03o %3d %c",
+ v->pos.x, v->pos.y, v->pending_wrap, ch, ch, safe_ch (ch));
- vt102_crt_update (c);
-
-
-}
-
-void
-vt102_send (Context * c, uint8_t key)
-{
- uint8_t ch;
-
- if (!c->t)
- return;
-
-#if 0
- fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' ');
#endif
- if ((key > 31) && (key < 127))
- {
- c->t->xmit (c->t, &key, 1);
- return;
- }
- switch (key)
- {
+ switch (ch) {
+#if 0
/*NUL*/ case 0:
/*SOH*/ case 1:
/*STX*/ case 2:
/*ETX*/ case 3:
/*EOT*/ case 4:
+ break;
+#endif
/*ENQ*/ case 5:
+ vt102_send_id (c, terminal_id);
+ break;
+#if 0
/*ACK*/ case 6:
+ break;
+#endif
/*BEL*/ case 7:
+ //FIXME beep
+ break;
/*BS*/ case 8:
+ vt102_cursor_retreat (c->v);
+ break;
/*HT*/ case 9:
+ vt102_cursor_advance_tab (c->v);
+ break;
/*LF*/ case 10:
/*VT*/ case 11:
/*FF*/ case 12:
- c->t->xmit (c->t, &key, 1);
- break;
+ vt102_cursor_advance_line (c);
+ if (!v->modes[VT102_MODE_NEWLINE_MODE])
+ break;
/*CR*/ case 13:
- c->t->xmit (c->t, &key, 1);
- if (c->v->modes[VT102_MODE_NEWLINE_MODE])
- {
- ch = 10;
- c->t->xmit (c->t, &ch, 1);
- }
+ vt102_cursor_carriage_return (v);
break;
/*SO*/ case 14:
+ /*select G1 */
+ v->cs = 1;
+ break;
/*SI*/ case 15:
+ /*select G0 */
+ v->cs = 0;
+ break;
+#if 0
/*DLE*/ case 16:
/*DC1 */ case 17:
/*DC2 */ case 18:
@@ -1929,116 +1760,187 @@ vt102_send (Context * c, uint8_t key)
/*CAN*/ case 24:
/*EM*/ case 25:
/*SUB*/ case 26:
- c->t->xmit (c->t, &key, 1);
break;
+#endif
/*ESC*/ case 27:
+ p->in_escape++;
+ return;
+#if 0
/*FS*/ case 28:
/*GS*/ case 29:
/*RS*/ case 30:
/*US*/ case 31:
/*DEL*/ case 127:
- c->t->xmit (c->t, &key, 1);
break;
+#endif
+ /*regular character */ default:
+ vt102_regular_char (c, v, ch);
+ }
- case KEY_UP:
- case KEY_DOWN:
- case KEY_RIGHT:
- case KEY_LEFT:
- case KEY_HOME:
- case KEY_MIDDLE:
- case KEY_END:
+#ifdef DEBUG
+ if (ch != 27)
+ log_f (c->l, "<chr out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
+ v->pending_wrap);
+#endif
+ }
- if (c->v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
- {
- uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) };
- c->t->xmit (c->t, &buf, sizeof (buf));
- }
- else
- {
- uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
- c->t->xmit (c->t, &buf, sizeof (buf));
- }
- break;
- case KEY_STAR:
- case KEY_PLUS:
- case KEY_COMMA:
- case KEY_PERIOD:
- case KEY_DIVIDE:
- case KEY_0:
- case KEY_1:
- case KEY_2:
- case KEY_3:
- case KEY_4:
- case KEY_5:
- case KEY_6:
- case KEY_7:
- case KEY_8:
- case KEY_9:
- if (c->v->application_keypad_mode)
- {
- uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
- c->t->xmit (c->t, &buf, sizeof (buf));
- }
- else
- {
- static char kpoff[KEY_NUM] = {
- [KEY_STAR] = '*',
- [KEY_PLUS] = '+',
- [KEY_COMMA] = ',',
- [KEY_MINUS] = '-',
- [KEY_PERIOD] = '.',
- [KEY_DIVIDE] = '/',
- [KEY_0] = '0',
- [KEY_1] = '1',
- [KEY_2] = '2',
- [KEY_3] = '3',
- [KEY_4] = '4',
- [KEY_5] = '5',
- [KEY_6] = '6',
- [KEY_7] = '7',
- [KEY_8] = '8',
- [KEY_9] = '9'
- };
-
- c->t->xmit (c->t, &kpoff[key], 1);
- }
- break;
- case KEY_ENTER:
- if (c->v->application_keypad_mode)
- {
- uint8_t buf[] = { 033, 'O', 'M' };
- c->t->xmit (c->t, &buf, sizeof (buf));
- }
- else
- {
- ch = 13;
- c->t->xmit (c->t, &ch, 1);
- if (c->v->modes[VT102_MODE_NEWLINE_MODE])
- {
- ch = 10;
- c->t->xmit (c->t, &ch, 1);
- }
- }
- break;
- case KEY_PF1:
- case KEY_PF2:
- case KEY_PF3:
- case KEY_PF4:
- {
- uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
- c->t->xmit (c->t, &buf, sizeof (buf));
- }
- break;
- case KEY_INSERT:
- case KEY_DELETE:
- case KEY_PGUP:
- case KEY_PGDN:
- {
- uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
- c->t->xmit (c->t, &buf, sizeof (buf));
+ vt102_crt_update (c);
+
+
+}
+
+void
+vt102_send (Context * c, uint8_t key)
+{
+ uint8_t ch;
+
+ if (!c->t)
+ return;
+
+#if 0
+ fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' ');
+#endif
+ if ((key > 31) && (key < 127)) {
+ c->t->xmit (c->t, &key, 1);
+ return;
+ }
+
+ switch (key) {
+ /*NUL*/ case 0:
+ /*SOH*/ case 1:
+ /*STX*/ case 2:
+ /*ETX*/ case 3:
+ /*EOT*/ case 4:
+ /*ENQ*/ case 5:
+ /*ACK*/ case 6:
+ /*BEL*/ case 7:
+ /*BS*/ case 8:
+ /*HT*/ case 9:
+ /*LF*/ case 10:
+ /*VT*/ case 11:
+ /*FF*/ case 12:
+ c->t->xmit (c->t, &key, 1);
+ break;
+ /*CR*/ case 13:
+ c->t->xmit (c->t, &key, 1);
+ if (c->v->modes[VT102_MODE_NEWLINE_MODE]) {
+ ch = 10;
+ c->t->xmit (c->t, &ch, 1);
+ }
+ break;
+ /*SO*/ case 14:
+ /*SI*/ case 15:
+ /*DLE*/ case 16:
+ /*DC1 */ case 17:
+ /*DC2 */ case 18:
+ /*DC3 */ case 19:
+ /*DC4 */ case 20:
+ /*NAK*/ case 21:
+ /*SYN*/ case 22:
+ /*ETB*/ case 23:
+ /*CAN*/ case 24:
+ /*EM*/ case 25:
+ /*SUB*/ case 26:
+ c->t->xmit (c->t, &key, 1);
+ break;
+ /*ESC*/ case 27:
+ /*FS*/ case 28:
+ /*GS*/ case 29:
+ /*RS*/ case 30:
+ /*US*/ case 31:
+ /*DEL*/ case 127:
+ c->t->xmit (c->t, &key, 1);
+ break;
+
+ case KEY_UP:
+ case KEY_DOWN:
+ case KEY_RIGHT:
+ case KEY_LEFT:
+ case KEY_HOME:
+ case KEY_MIDDLE:
+ case KEY_END:
+
+ if (c->v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE]) {
+ uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ } else {
+ uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ }
+ break;
+ case KEY_STAR:
+ case KEY_PLUS:
+ case KEY_COMMA:
+ case KEY_PERIOD:
+ case KEY_DIVIDE:
+ case KEY_0:
+ case KEY_1:
+ case KEY_2:
+ case KEY_3:
+ case KEY_4:
+ case KEY_5:
+ case KEY_6:
+ case KEY_7:
+ case KEY_8:
+ case KEY_9:
+ if (c->v->application_keypad_mode) {
+ uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ } else {
+ static char kpoff[KEY_NUM] = {
+ [KEY_STAR] = '*',
+ [KEY_PLUS] = '+',
+ [KEY_COMMA] = ',',
+ [KEY_MINUS] = '-',
+ [KEY_PERIOD] = '.',
+ [KEY_DIVIDE] = '/',
+ [KEY_0] = '0',
+ [KEY_1] = '1',
+ [KEY_2] = '2',
+ [KEY_3] = '3',
+ [KEY_4] = '4',
+ [KEY_5] = '5',
+ [KEY_6] = '6',
+ [KEY_7] = '7',
+ [KEY_8] = '8',
+ [KEY_9] = '9'
+ };
+
+ c->t->xmit (c->t, &kpoff[key], 1);
+ }
+ break;
+ case KEY_ENTER:
+ if (c->v->application_keypad_mode) {
+ uint8_t buf[] = { 033, 'O', 'M' };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ } else {
+ ch = 13;
+ c->t->xmit (c->t, &ch, 1);
+ if (c->v->modes[VT102_MODE_NEWLINE_MODE]) {
+ ch = 10;
+ c->t->xmit (c->t, &ch, 1);
}
- break;
}
+ break;
+ case KEY_PF1:
+ case KEY_PF2:
+ case KEY_PF3:
+ case KEY_PF4:
+ {
+ uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ }
+ break;
+ case KEY_INSERT:
+ case KEY_DELETE:
+ case KEY_PGUP:
+ case KEY_PGDN:
+ {
+ uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
+ c->t->xmit (c->t, &buf, sizeof (buf));
+ }
+ break;
+ }
}
@@ -2086,26 +1988,23 @@ vt102_new (CRT_Pos * size)
v->xn_glitch = 1;
- if (size)
- {
- v->original_size = *size;
+ if (size) {
+ v->original_size = *size;
- if (v->original_size.x < 1)
- v->original_size.x = 1;
- if (v->original_size.y < 1)
- v->original_size.y = 1;
+ if (v->original_size.x < 1)
+ v->original_size.x = 1;
+ if (v->original_size.y < 1)
+ v->original_size.y = 1;
- if (v->original_size.x > VT102_MAX_COLS)
- v->original_size.x = VT102_MAX_COLS;
- if (v->original_size.y > VT102_MAX_ROWS)
- v->original_size.y = VT102_MAX_ROWS;
+ if (v->original_size.x > VT102_MAX_COLS)
+ v->original_size.x = VT102_MAX_COLS;
+ if (v->original_size.y > VT102_MAX_ROWS)
+ v->original_size.y = VT102_MAX_ROWS;
- }
- else
- {
- v->original_size.x = VT102_COLS_80;
- v->original_size.y = VT102_ROWS_24;
- }
+ } else {
+ v->original_size.x = VT102_COLS_80;
+ v->original_size.y = VT102_ROWS_24;
+ }
return v;
}