From 2d253c926fb7ddf76c9b04dd6076e652a9034c69 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 26 Feb 2008 16:53:24 +0000 Subject: [PATCH] *** empty log message *** --- src/prototypes.h | 10 +- src/vt102.c | 1335 +++++++++++++++++++++++----------------------- src/vt102.h | 18 +- 3 files changed, 688 insertions(+), 675 deletions(-) diff --git a/src/prototypes.h b/src/prototypes.h index a084d32..c2c0a8e 100644 --- a/src/prototypes.h +++ b/src/prototypes.h @@ -14,18 +14,22 @@ extern ANSI *ansi_new_html(FILE *f); /* render.c */ /* version.c */ /* vt102.c */ +extern int vt102_cmd_length[128]; +extern int vt102_cmd_termination[128]; +extern void redispatch_with_more(VT102_parser *p, int n); extern void vt102_log_line(Context *c, int line); extern void vt102_history(Context *c, CRT_Pos t, CRT_Pos b); extern void vt102_clip_cursor(VT102 *v, CRT_Pos tl, CRT_Pos br); extern void vt102_cursor_normalize(VT102 *v); extern void vt102_cursor_carriage_return(VT102 *v); extern void vt102_cursor_advance_line(Context *c); +extern void vt102_cursor_retreat_line(Context *c); extern void vt102_do_pending_wrap(Context *c); extern void vt102_cursor_advance(Context *c); -extern void vt102_cursor_retard(VT102 *v); +extern void vt102_cursor_retreat(VT102 *v); extern void vt102_reset_tabs(VT102 *v); extern void vt102_cursor_advance_tab(VT102 *v); -extern void vt102_cursor_retard_tab(VT102 *v); +extern void vt102_cursor_retreat_tab(VT102 *v); extern int vt102_cursor_home(VT102 *v); extern int vt102_cursor_absolute(VT102 *v, int x, int y); extern int vt102_cursor_relative(VT102 *v, int x, int y); @@ -39,7 +43,7 @@ extern void vt102_save_state(VT102 *v); extern void vt102_restore_state(VT102 *v); extern void vt102_regular_char(Context *c, VT102 *v, int ch); extern void vt102_scs(Context *c, int g, int s); -extern void vt102_parse_esc(Context *c, int ch); +extern void vt102_parse_esc(Context *c); extern void vt102_parse_csi(Context *c, char *buf, int len); extern void vt102_status_line(VT102 *v, char *str); extern void vt102_parser_reset(VT102_parser *p); diff --git a/src/vt102.c b/src/vt102.c index 4778887..8e495e4 100644 --- a/src/vt102.c +++ b/src/vt102.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.39 2008/02/26 16:54:06 james + * *** empty log message *** + * * Revision 1.38 2008/02/26 16:53:24 james * *** empty log message *** * @@ -291,21 +294,21 @@ 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, +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, +int vt102_cmd_termination[TABLE_LENGTH] = { + [']'] = 7, + ['['] = CSI_ENDER, }; @@ -337,7 +340,8 @@ csi_ender (int c) /*Stay or enter command acquision and exit after n more chars*/ -void redispatch_with_more(VT102_parser *p,int n) +void +redispatch_with_more (VT102_parser * p, int n) { } @@ -965,10 +969,11 @@ void vt102_parse_esc (Context * c) { VT102 *v = c->v; - VT102_parser *p=&v->parser; + 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]) { + switch (p->cmd_buf[0]) + { case 'A': vt102_cursor_relative (v, 0, -1); break; @@ -1021,7 +1026,7 @@ switch(p->cmd_buf[0]) { } break; - case 'Y': + case 'Y': vt102_cursor_absolute (v, p->cmd_buf[2] - 040, p->cmd_buf[1] - 040); break; case 'Z': @@ -1031,780 +1036,784 @@ switch(p->cmd_buf[0]) { } 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; + 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; i < CRT_ADDR_POS (&v->screen_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; + /*Set ansi mode - ignored */ + break; case '7': - vt102_save_state (v); - break; + vt102_save_state (v); + break; case '8': - vt102_restore_state (v); - break; + vt102_restore_state (v); + break; case '=': - v->application_keypad_mode = 1; - break; + v->application_keypad_mode = 1; + break; case '>': - v->application_keypad_mode = 0; - break; - case ']': /*Set various titles*/ - //FIXME: - break; + v->application_keypad_mode = 0; + break; + case ']': /*Set various titles */ + //FIXME: + break; case '[': - vt102_parse_csi (c, p->cmd_buf, p->cmd_ptr); - break; - case '(': /*Charsets*/ + 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; + 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])); + log_f (c->l, "<%s:%d unhandled ESC: \\033 \\%03o (ESC %c)>", __FILE__, + __LINE__, p->cmd_buf[0], safe_ch (p->cmd_buf[0])); - ; + ; + } } -} -void -vt102_parse_csi (Context * c, char *buf, int len) -{ - char last; - char *ptr; - char *arg = buf + 1; - int narg; + void vt102_parse_csi (Context * c, char *buf, int len) + { + char last; + char *ptr; + char *arg = buf + 1; + int narg; - VT102 *v = c->v; + VT102 *v = c->v; - buf[len] = 0; + buf[len] = 0; - last = buf[len - 1]; + last = buf[len - 1]; #if 0 - buf[len - 1] = 0; + 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': + switch (buf[0]) + { + case '[': + switch (last) { - int x, y; + 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; + vt102_cursor_absolute (v, x, y); } - break; - case 'K': - { - CRT_Pos ls = { 0, v->pos.y }; - CRT_Pos le = { VT102_COLS - 1, v->pos.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, le, 1, v->color); + crt_erase (&v->crt, v->pos, v->screen_end, 1, v->color); break; case 1: - crt_erase (&v->crt, ls, v->pos, 1, v->color); + crt_erase (&v->crt, v->screen_start, v->pos, 1, v->color); break; case 2: - crt_erase (&v->crt, ls, le, 1, v->color); + crt_erase (&v->crt, v->screen_start, v->screen_end, 1, + v->color); break; } - } - break; - - case 'L': - if ((v->pos.y >= v->top_margin.y) - && (v->pos.y <= v->bottom_margin.y)) + break; + case 'K': { - while (narg--) - crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1, - v->color); - } - break; + CRT_Pos ls = { 0, v->pos.y }; + CRT_Pos le = { VT102_COLS - 1, v->pos.y }; + if (len == 2) + narg = 0; /*Different default */ - case 'M': - if ((v->pos.y >= v->top_margin.y) - && (v->pos.y <= v->bottom_margin.y)) - { - while (narg--) + switch (narg) { - vt102_history (c, v->pos, v->bottom_margin); - crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 1, - v->color); + 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; } } - break; - case 'P': - while (narg--) - vt102_delete_from_line (v, v->pos); - break; - case 'R': - //FIXME: cursor position report - does anything use that? - 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; + break; - 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': - //FIXME: - break; - case 'd': - vt102_cursor_absolute (v, v->pos.x, narg - 1); - break; - case 'g': - if (len == 2) - narg = 0; /*Different default */ + 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; - switch (narg) + 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 'R': + //FIXME: cursor position report - does anything use that? + 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': { - 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; + 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; + 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': + //FIXME: + break; + case 'd': + vt102_cursor_absolute (v, v->pos.x, narg - 1); + break; + case 'g': + if (len == 2) + narg = 0; /*Different default */ - case 'i': //4,5 Turn printer on and off WTF? - //FIXME - break; - case 'h': - case 'l': - vt102_parse_mode_string (v, &buf[1], len - 1); - 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; + case 'i': //4,5 Turn printer on and off WTF? + //FIXME + break; + case 'h': + case 'l': + vt102_parse_mode_string (v, &buf[1], len - 1); + break; - case 'm': - vt102_parse_attr_string (v, &buf[1], len - 1); - break; - case 'n': // 6 request cursor position - //FIXME - 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; - } + case 'm': + vt102_parse_attr_string (v, &buf[1], len - 1); + break; + case 'n': // 6 request cursor position + //FIXME + break; + case 'r': + v->top_margin = v->screen_start; + v->bottom_margin = v->screen_end; - 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; + if ((len > 2) && (ptr = index (arg, ';'))) + { + ptr++; + v->top_margin.y = narg - 1; + v->bottom_margin.y = atoi (ptr) - 1; + } - 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; + 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; - default: - log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__, - buf); + 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; - ; - } - break; - default: - log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__, __LINE__, - buf); - ; - } + default: + 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); + ; + } -} -void -vt102_status_line (VT102 * v, char *str) -{ - int i = VT102_COLS; - CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)]; + } - while (i--) - { - ca->attr = CRT_ATTR_REVERSE; - ca->color = CRT_COLOR_NORMAL; - ca->chr = *str; - if (*str) - str++; - ca++; - } + void vt102_status_line (VT102 * v, char *str) + { + int i = VT102_COLS; + CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)]; -} + while (i--) + { + ca->attr = CRT_ATTR_REVERSE; + ca->color = CRT_COLOR_NORMAL; + ca->chr = *str; + if (*str) + str++; + ca++; + } + } -void -vt102_parser_reset (VT102_parser * p) -{ - p->in_cmd = 0; - p->cmd_more_bytes=0; - p->cmd_termination=0; - p->in_escape = 0; -} + void vt102_parser_reset (VT102_parser * p) + { + p->in_cmd = 0; + p->cmd_more_bytes = 0; + p->cmd_termination = 0; + p->in_escape = 0; + } -void -vt102_reset_state (VT102 * v) -{ - vt102_parser_reset (&v->parser); - v->attr = CRT_ATTR_NORMAL; - v->color = CRT_COLOR_NORMAL; + void vt102_reset_state (VT102 * v) + { + vt102_parser_reset (&v->parser); - v->application_keypad_mode = 0; + v->attr = CRT_ATTR_NORMAL; + v->color = CRT_COLOR_NORMAL; - v->top_margin = v->screen_start; - v->bottom_margin = v->screen_end; + v->application_keypad_mode = 0; - memset (v->modes, 0, VT102_NMODES); - memset (v->private_modes, 0, VT102_NMODES); + v->top_margin = v->screen_start; + v->bottom_margin = v->screen_end; - v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP] = 1; - v->private_modes[VT102_PRIVATE_MODE_AUTO_REPEAT] = 1; - v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] = 1; - v->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1; + memset (v->modes, 0, VT102_NMODES); + memset (v->private_modes, 0, VT102_NMODES); - vt102_reset_tabs (v); -} + v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP] = 1; + v->private_modes[VT102_PRIVATE_MODE_AUTO_REPEAT] = 1; + v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] = 1; + v->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1; -static void pre_parse_cmd(int ch,VT102_parser *p) -{ -if (ch>TABLE_LENGTH) return; -if (ch<0) return; + vt102_reset_tabs (v); + } -p->cmd_more_bytes=0; -p->in_cmd=0; + static void pre_parse_cmd (int ch, VT102_parser * p) + { + if (ch > TABLE_LENGTH) + return; + if (ch < 0) + return; -p->cmd_termination=vt102_cmd_termination[ch]; -if (p->cmd_termination) { - p->in_cmd++; - return; -} + p->cmd_more_bytes = 0; + p->in_cmd = 0; -p->cmd_more_bytes=vt102_cmd_length[ch]; + p->cmd_termination = vt102_cmd_termination[ch]; + if (p->cmd_termination) + { + p->in_cmd++; + return; + } -if (p->cmd_more_bytes) { - p->in_cmd++; - return; -} -} + p->cmd_more_bytes = vt102_cmd_length[ch]; -void -vt102_parse_char (Context * c, int ch) -{ - VT102 *v = c->v; - VT102_parser *p = &v->parser; + if (p->cmd_more_bytes) + { + p->in_cmd++; + return; + } + } + + void vt102_parse_char (Context * c, int ch) + { + VT102 *v = c->v; + VT102_parser *p = &v->parser; #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); + 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 /* 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 (v); - } - else if (p->in_cmd) - { - 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 (ch == SYM_CHAR_RESET) + { + vt102_reset_state (v); + } + else if (p->in_cmd) + { + p->cmd_buf[p->cmd_ptr++] = ch; + if (p->cmd_more_bytes) + p->cmd_more_bytes--; - p->cmd_ptr = 0; - p->cmd_buf[p->cmd_ptr++] = ch; - p->in_escape = 0; - pre_parse_cmd(ch,p); + if (p->cmd_more_bytes == 1) + p->in_cmd = 0; - 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++] = '['; + 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; + } - pre_parse_cmd(ch,p); - } - else - { + if (!p->in_cmd) + { + vt102_parse_esc (c); + p->cmd_more_bytes = 0; + } + } + else if (p->in_escape) + { - switch (ch) - { - /*NUL*/ case 0: - /*SOH*/ case 1: - /*STX*/ case 2: - /*ETX*/ case 3: - /*EOT*/ case 4: - break; - /*ENQ*/ case 5: - if (c->t) - { - c->t->xmit (c->t, "vt102", 5); - } - break; - /*ACK*/ case 6: - /*BEL*/ case 7: - 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]) + 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->cmd_ptr = 0; + p->cmd_buf[p->cmd_ptr++] = '['; + + pre_parse_cmd (ch, p); + } + else + { + + switch (ch) + { + /*NUL*/ case 0: + /*SOH*/ case 1: + /*STX*/ case 2: + /*ETX*/ case 3: + /*EOT*/ case 4: break; - /*CR*/ case 13: - vt102_cursor_carriage_return (v); - break; - /*SO*/ case 14: - /*select G1 */ - /*Ignoring charsets */ - break; - /*SI*/ case 15: - /*select G0 */ - /*Ignoring charsets */ - break; - /*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; - /*ESC*/ case 27: - p->in_escape++; - return; - /*FS*/ case 28: - /*GS*/ case 29: - /*RS*/ case 30: - /*US*/ case 31: - /*DEL*/ case 127: - break; - /*regular character */ default: - vt102_regular_char (c, v, ch); - } - } + /*ENQ*/ case 5: + if (c->t) + { + c->t->xmit (c->t, "vt102", 5); + } + break; + /*ACK*/ case 6: + /*BEL*/ case 7: + 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 */ + /*Ignoring charsets */ + break; + /*SI*/ case 15: + /*select G0 */ + /*Ignoring charsets */ + break; + /*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; + /*ESC*/ case 27: + p->in_escape++; + return; + /*FS*/ case 28: + /*GS*/ case 29: + /*RS*/ case 30: + /*US*/ case 31: + /*DEL*/ case 127: + break; + /*regular character */ default: + vt102_regular_char (c, v, ch); + } + } - v->crt.pos = v->pos; - v->crt.hide_cursor = - v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0 : 1; + v->crt.pos = v->pos; + 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); -} + if (c->d) + cmd_show_status (c->d, c); + } -void -vt102_send (Context * c, uint8_t key) -{ - uint8_t ch; + void vt102_send (Context * c, uint8_t key) + { + uint8_t ch; - if (!c->t) - return; + if (!c->t) + return; #if 0 - fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' '); + fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' '); #endif - if ((key > 31) && (key < 127)) - { - c->t->xmit (c->t, &key, 1); - return; - } + 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; + 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: + 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) + 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', 'a' + (key - KEY_154) }; + uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) }; 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) + break; + case KEY_INSERT: + case KEY_DELETE: + case KEY_PGUP: + case KEY_PGDN: { - uint8_t buf[] = { 033, 'O', 'M' }; + uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' }; 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)); + break; } - break; - } -} + } -void -vt102_reset (VT102 * v) -{ - VT102_parser *p = &v->parser; + void vt102_reset (VT102 * v) + { + VT102_parser *p = &v->parser; - crt_cls (&v->crt); - v->current_line = v->pos; - v->pending_wrap = 0; + crt_cls (&v->crt); + v->current_line = v->pos; + v->pending_wrap = 0; - v->screen_start.x = 0; - v->screen_start.y = 0; - v->screen_end.x = VT102_COLS - 1; - v->screen_end.y = VT102_ROWS - 1; + v->screen_start.x = 0; + v->screen_start.y = 0; + v->screen_end.x = VT102_COLS - 1; + v->screen_end.y = VT102_ROWS - 1; - vt102_cursor_home (v); - vt102_status_line (v, ""); + vt102_cursor_home (v); + vt102_status_line (v, ""); - vt102_reset_tabs (v); - v->current_line = v->pos; + vt102_reset_tabs (v); + v->current_line = v->pos; - vt102_parser_reset (p); - vt102_reset_state (v); + vt102_parser_reset (p); + vt102_reset_state (v); - vt102_save_state (v); + vt102_save_state (v); - v->last_reg_char = ' '; -} + v->last_reg_char = ' '; + } -VT102 * -vt102_new (void) -{ - VT102 *v; + VT102 *vt102_new (void) + { + VT102 *v; - v = (VT102 *) malloc (sizeof (VT102)); + v = (VT102 *) malloc (sizeof (VT102)); - v->xn_glitch = 1; + v->xn_glitch = 1; - vt102_reset (v); + vt102_reset (v); - return v; -} + return v; + } -void -vt102_set_ansi (VT102 * v, int ansi) -{ - v->xn_glitch = ansi ? 0 : 1; -} + void vt102_set_ansi (VT102 * v, int ansi) + { + v->xn_glitch = ansi ? 0 : 1; + } -void -vt102_free (VT102 * v) -{ - free (v); -} + void vt102_free (VT102 * v) + { + free (v); + } diff --git a/src/vt102.h b/src/vt102.h index 2f7867d..2f8d6c1 100644 --- a/src/vt102.h +++ b/src/vt102.h @@ -12,6 +12,9 @@ /* * $Log$ + * Revision 1.17 2008/02/26 16:53:24 james + * *** empty log message *** + * * Revision 1.16 2008/02/24 12:22:42 james * *** empty log message *** * @@ -65,27 +68,24 @@ #ifndef __VT102_H__ #define __VT102_H__ -#define VT102_CSI_LEN 128 +#define VT102_CMD_LEN 128 #define VT102_ROWS 24 #define VT102_COLS 80 #define VT102_STATUS_ROW 24 #define VT102_NMODES 32 -#define VT102_DCA_LEN 16 typedef struct { int in_escape; - int in_csi; - int in_dca; - int ignore_until_bell; + int in_cmd; - int csi_ptr; - char csi_buf[VT102_CSI_LEN]; - int dca_ptr; - char dca_buf[VT102_DCA_LEN]; + int cmd_ptr; + int cmd_more_bytes; + int cmd_termination; + char cmd_buf[VT102_CMD_LEN]; } VT102_parser; typedef struct -- 2.30.2