From 3e2caf5802dc06dd38a2541d18d172995d0f276b Mon Sep 17 00:00:00 2001 From: james Date: Tue, 26 Feb 2008 16:53:24 +0000 Subject: [PATCH] *** empty log message *** --- src/vt102.c | 218 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 134 insertions(+), 84 deletions(-) diff --git a/src/vt102.c b/src/vt102.c index f378c16..4778887 100644 --- a/src/vt102.c +++ b/src/vt102.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.38 2008/02/26 16:53:24 james + * *** empty log message *** + * * Revision 1.37 2008/02/24 12:22:53 james * *** empty log message *** * @@ -285,6 +288,30 @@ ESC+B //static char terminal_reply[]={033,0133,077,066,0143}; static char terminal_reply[] = { 'v', 't', '1', '0', '2' }; +#define TABLE_LENGTH 128 + +/* number of aditional chars after \033 ... to complete the escape if it's fixed length*/ +int vt102_cmd_length[TABLE_LENGTH]={ +['(']=1, +[')']=1, +['+']=1, +['*']=1, +['%']=1, +['#']=1, +['Y']=2, +}; + +/* method for determining end if if's not fixed length, -ve numbers from #defines, +ve are literals */ +#define CSI_ENDER -1 +int vt102_cmd_termination[TABLE_LENGTH]={ +[']']=7, +['[']=CSI_ENDER, +}; + + + + + static inline int safe_ch (int c) { @@ -307,30 +334,11 @@ csi_ender (int c) return 0; } -static inline int -scs_starter (int c) -{ - switch (c) - { - case '(': - case ')': - case '+': - case '*': - case '%': - return 1; - } - return 0; -} -static inline int -csi_starter (int c) + +/*Stay or enter command acquision and exit after n more chars*/ +void redispatch_with_more(VT102_parser *p,int n) { - switch (c) - { - case '[': - return 1; - } - return 0; } static inline int @@ -954,11 +962,13 @@ vt102_scs (Context * c, int g, int s) } void -vt102_parse_esc (Context * c, int ch) +vt102_parse_esc (Context * c) { VT102 *v = c->v; - switch (ch) - { + VT102_parser *p=&v->parser; + +/*If you edit this switch don't forget to edit the length and termination tables*/ +switch(p->cmd_buf[0]) { case 'A': vt102_cursor_relative (v, 0, -1); break; @@ -1010,9 +1020,9 @@ vt102_parse_esc (Context * c, int ch) vt102_cursor_relative (v, 0, -1); } break; - case 'Y': - v->parser.in_dca++; - v->parser.dca_ptr = 0; + + case 'Y': + vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040); break; case 'Z': if (c->t) @@ -1020,6 +1030,23 @@ vt102_parse_esc (Context * c, int ch) c->t->xmit (c->t, terminal_reply, sizeof (terminal_reply)); } break; + case '#': + { + switch(p->cmd_buf[1]) { + case '8':/*DECALN*/ + { + int i; + crt_erase (&v->crt, v->screen_start, v->screen_end, 1, CRT_NORMAL_COLOR); + for (i=0;iscreen_end);++i) + v->crt.screen[i].chr='E'; + } + 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; @@ -1036,12 +1063,22 @@ vt102_parse_esc (Context * c, int ch) case '>': v->application_keypad_mode = 0; break; - case ']': - v->parser.ignore_until_bell++; + 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__, ch, safe_ch (ch)); + __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0])); ; } @@ -1338,9 +1375,10 @@ vt102_status_line (VT102 * v, char *str) void vt102_parser_reset (VT102_parser * p) { - p->in_csi = 0; + p->in_cmd = 0; + p->cmd_more_bytes=0; + p->cmd_termination=0; p->in_escape = 0; - p->ignore_until_bell = 0; } @@ -1368,6 +1406,27 @@ vt102_reset_state (VT102 * v) vt102_reset_tabs (v); } +static void pre_parse_cmd(int ch,VT102_parser *p) +{ +if (ch>TABLE_LENGTH) return; +if (ch<0) return; + +p->cmd_more_bytes=0; +p->in_cmd=0; + +p->cmd_termination=vt102_cmd_termination[ch]; +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; +} +} void vt102_parse_char (Context * c, int ch) @@ -1375,9 +1434,9 @@ vt102_parse_char (Context * c, int ch) VT102 *v = c->v; VT102_parser *p = &v->parser; -#if 0 - log_f (c->l, "char %3d %c pc %d %d %d %2d %2d %d", ch, safe_ch (ch), - p->ignore_until_bell, p->in_escape, p->in_csi, v->pos.x, v->pos.y, +#if 1 + log_f (c->l, "char %3d %c ie=%d ic=%d cmb=%d ct=%d %2d %2d %d", ch, safe_ch (ch), + p->in_escape, p->in_cmd, p->cmd_more_bytes,p->cmd_termination, v->pos.x, v->pos.y, v->pending_wrap); #endif @@ -1390,67 +1449,58 @@ vt102_parse_char (Context * c, int ch) #endif - if (ch == SYM_CHAR_RESET) - { - vt102_reset_state (v); - } - else if (p->in_dca) - { - p->dca_buf[p->dca_ptr++] = ch; +#if 0 if (p->dca_ptr == 2) { - vt102_cursor_absolute (v, p->dca_buf[0] - 040, p->dca_buf[1] - 040); p->in_dca = 0; } - } - else if (p->ignore_until_bell) +#endif + if (ch == SYM_CHAR_RESET) { - if (ch == 7) - p->ignore_until_bell = 0; + vt102_reset_state (v); } - else if (p->in_csi) + else if (p->in_cmd) { - p->csi_buf[p->csi_ptr++] = ch; - if (csi_ender (ch) || (p->csi_ptr == VT102_CSI_LEN)) - { - if (csi_starter (p->csi_buf[0])) - { - vt102_parse_csi (c, p->csi_buf, p->csi_ptr); - } - else if (scs_starter (p->csi_buf[0])) - { - vt102_scs (c, p->csi_buf[0], p->csi_buf[1]); - } - else - { - log_f (c->l, - "<%s:%d no dispatcher for sequence starting \\033 \\%03o (ESC %c)>", - __FILE__, __LINE__, p->csi_buf[0], - safe_ch (p->csi_buf[0])); - } - p->in_csi = 0; - } + p->cmd_buf[p->cmd_ptr++] = ch; + 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; + } } else if (p->in_escape) { - if (csi_starter (ch) || scs_starter (ch)) - { - p->csi_ptr = 0; - p->csi_buf[p->csi_ptr++] = ch; - p->in_csi++; - p->in_escape = 0; - } - else - { - p->in_escape = 0; - vt102_parse_esc (c, ch); - } + + 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); } else if (ch == 0x9b) /*One byte CSI */ { - p->csi_ptr = 0; - p->csi_buf[p->csi_ptr++] = '['; - p->in_csi++; + p->cmd_ptr = 0; + p->cmd_buf[p->cmd_ptr++] = '['; + + pre_parse_cmd(ch,p); } else { -- 2.30.2