X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fvt102.c;h=a879999359a729720987ca7921296d094df93929;hb=95d068f1b4e8100d6501944eda3bd9ff73460514;hp=000ef7bfe52f6ce9f5999d7c99e37121f4000a5b;hpb=8095a5479e25be2d5948eadc59c49e92f0ab948f;p=sympathy.git diff --git a/src/vt102.c b/src/vt102.c index 000ef7b..a879999 100644 --- a/src/vt102.c +++ b/src/vt102.c @@ -10,6 +10,108 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * Revision 1.45 2008/02/27 01:31:14 james + * *** empty log message *** + * + * Revision 1.44 2008/02/27 00:54:16 james + * *** empty log message *** + * + * Revision 1.43 2008/02/27 00:27:22 james + * *** empty log message *** + * + * Revision 1.42 2008/02/26 23:56:12 james + * *** empty log message *** + * + * Revision 1.41 2008/02/26 23:23:17 james + * *** empty log message *** + * + * Revision 1.40 2008/02/26 19:00:59 james + * *** empty log message *** + * + * 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 *** + * + * Revision 1.37 2008/02/24 12:22:53 james + * *** empty log message *** + * + * Revision 1.36 2008/02/24 12:22:42 james + * *** empty log message *** + * + * Revision 1.35 2008/02/24 00:42:53 james + * *** empty log message *** + * + * Revision 1.34 2008/02/23 11:48:37 james + * *** empty log message *** + * + * Revision 1.33 2008/02/22 23:39:27 james + * *** empty log message *** + * + * Revision 1.32 2008/02/22 19:12:05 james + * *** empty log message *** + * + * Revision 1.31 2008/02/22 17:07:00 james + * *** empty log message *** + * + * Revision 1.30 2008/02/22 14:51:54 james + * *** empty log message *** + * + * Revision 1.29 2008/02/15 03:32:07 james + * *** empty log message *** + * + * Revision 1.28 2008/02/14 10:34:30 james + * *** empty log message *** + * + * Revision 1.27 2008/02/14 02:46:45 james + * *** empty log message *** + * + * Revision 1.26 2008/02/14 01:55:57 james + * *** empty log message *** + * + * Revision 1.25 2008/02/13 16:57:29 james + * *** empty log message *** + * + * Revision 1.24 2008/02/13 09:12:21 james + * *** empty log message *** + * + * Revision 1.23 2008/02/07 13:26:35 james + * *** empty log message *** + * + * Revision 1.22 2008/02/07 13:22:51 james + * *** empty log message *** + * + * Revision 1.21 2008/02/07 12:21:16 james + * *** empty log message *** + * + * Revision 1.20 2008/02/07 12:16:04 james + * *** empty log message *** + * + * Revision 1.19 2008/02/07 11:27:02 james + * *** empty log message *** + * + * Revision 1.18 2008/02/07 01:59:25 james + * *** empty log message *** + * + * Revision 1.17 2008/02/07 01:58:28 james + * *** empty log message *** + * + * Revision 1.16 2008/02/07 01:57:46 james + * *** empty log message *** + * + * Revision 1.15 2008/02/07 00:43:27 james + * *** empty log message *** + * + * Revision 1.14 2008/02/07 00:40:23 james + * *** empty log message *** + * + * Revision 1.13 2008/02/07 00:39:59 james + * *** empty log message *** + * + * Revision 1.12 2008/02/07 00:39:13 james + * *** empty log message *** + * * Revision 1.11 2008/02/06 20:26:58 james * *** empty log message *** * @@ -48,6 +150,8 @@ static char rcsid[] = "$Id$"; /* Termcap he say: +VT102: + vt102|dec vt102:\ :mi:\ :al=\E[L:dc=\E[P:dl=\E[M:ei=\E[4l:im=\E[4h:tc=vt100: @@ -138,17 +242,107 @@ ESC)0 CTRL-O -ESC7 -ESC8 -ESCH -ESCM -ESC> +ANSI: + + + +ansi|ansi/pc-term compatible with color:\ + :u6=\E[%i%d;%dR:u7=\E[6n:u9=\E[c:tc=ecma+color:\ + :tc=klone+sgr:tc=ansi-m: +ansi-m|ansi-mono|ANSI X3.64-1979 terminal with ANSI.SYS compatible attributes:\ + :5i:\ + :AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:DO=\E[%dB:IC=\E[%d@:\ + :LE=\E[%dD:RI=\E[%dC:SF=\E[%dS:SR=\E[%dT:UP=\E[%dA:\ + :cb=\E[1K:ch=\E[%i%dG:ct=\E[2g:cv=\E[%i%dd:ec=\E[%dX:ei=:\ + :im=:kB=\E[Z:kI=\E[L:kb=^H:kd=\E[B:kl=\E[D:kr=\E[C:ku=\E[A:\ + :nw=\r\E[S:pf=\E[4i:po=\E[5i:s0=\E(B:s1=\E)B:s2=\E*B:\ + :s3=\E+B:ta=\E[I:tc=pcansi-m: +pcansi-m|pcansi-mono|ibm-pc terminal programs claiming to be ansi (mono mode):\ + :am:bs:mi:ms:\ + :co#80:it#8:li#24:\ + :al=\E[L:bl=^G:bt=\E[Z:cd=\E[J:ce=\E[K:cl=\E[H\E[J:\ + :cm=\E[%i%d;%dH:cr=^M:ct=\E[2g:dc=\E[P:dl=\E[M:do=\E[B:\ + :ho=\E[H:kb=^H:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\ + :le=\E[D:nd=\E[C:sf=^J:st=\EH:ta=^I:up=\E[A:\ + :tc=klone+sgr-dumb: +klone+sgr-dumb|attribute control for ansi.sys displays (no ESC [ 11 m):\ + :as=\E[12m:mb=\E[5m:md=\E[1m:me=\E[0;10m:mk=\E[8m:\ + :mr=\E[7m:se=\E[m:so=\E[7m:ue=\E[m:us=\E[4m:tc=klone+acs: +klone+acs|alternate character set for ansi.sys displays:\ + :ac=+\020,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376:\ + :ae=\E[10m:as=\E[11m: +ecma+color|color control for ECMA-48-compatible terminals:\ + :Co#8:NC#3:pa#64:\ + :AB=\E[4%dm:AF=\E[3%dm:op=\E[39;49m: + + +Ignoreing ones in the VT102 spec + +ESC[%d@ +ESC[I +ESC[....R +ESC[%dS +ESC[%dT +ESC[X +ESC[Z + +ESC[c +*ESC[%db +ESC[....d +ESC[....f +ESC[2g +ESC[4i +ESC[5i +ESC[6n + +ESC(B +ESC)B +ESC*B +ESC+B + */ #include "project.h" +#include "syslog.h" + +#define TABLE_LENGTH 128 +#undef DEBUG + + +static char terminal_id[] = "vt102"; +/* 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) +{ + if (c < 32) + return ' '; + if (c > 126) + return ' '; + return c; +} static inline int csi_ender (int c) @@ -157,22 +351,24 @@ csi_ender (int c) return 1; if ((c >= 'A') && (c <= 'Z')) return 1; + if ((c == '@')) + return 1; return 0; } static inline int -csi_starter (int c) +ctrl_chr (int ch, int term) { - switch (c) - { - case '[': - case '(': - case ')': - return 1; - } + if ((term > 0) && (ch == term)) + return 0; + if (ch == 033) + return 0; + if ((ch > 0) && (ch < 040)) + return 1; return 0; } + static inline int in_margins (VT102 * v, CRT_Pos p) { @@ -190,35 +386,44 @@ in_margins (VT102 * v, CRT_Pos p) } void -vt102_log_line (VT102 * v, int line) +vt102_log_line (Context * c, int line) { - static FILE *log; - CRT_Pos e = { VT102_COLS - 1, line }; + CRT_Pos e = { c->v->current_width - 1, line }; CRT_Pos p = { 0, line }; + char logbuf[4 * (VT102_MAX_COLS + 1)], *logptr = logbuf; - if (!log) - log = fopen ("log", "a+"); - - if (!log) + if (!c->l) return; for (; e.x > 0; --e.x) { - if (v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ') + if (c->v->crt.screen[CRT_ADDR_POS (&e)].chr != ' ') break; } for (; p.x <= e.x; ++p.x) { - int c = v->crt.screen[CRT_ADDR_POS (&p)].chr; - if (c < 32) - c = ' '; - if (c > 126) - c = ' '; - fputc (c, log); + int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr; + if (ch < 32) + ch = ' '; + logptr += utf8_encode (logptr, ch); } - fputc ('\n', log); + *logptr = 0; + + c->l->log (c->l, logbuf); +} + +/*Called for every upward scroll with same args*/ +void +vt102_history (Context * c, CRT_Pos t, CRT_Pos b) +{ +/*Only log if it scrolls off the top*/ + if (t.y) + return; + + t.x = 0; + history_add (c->h, &(c->v->crt.screen[CRT_ADDR_POS (&t)])); } void @@ -260,8 +465,9 @@ vt102_cursor_carriage_return (VT102 * v) } void -vt102_cursor_advance_line (VT102 * v) +vt102_cursor_advance_line (Context * c) { + VT102 *v = c->v; int couldscroll = in_margins (v, v->pos); /*have wraped off end of last line in scrolling region */ @@ -269,34 +475,47 @@ vt102_cursor_advance_line (VT102 * v) if (((v->pos.y == v->bottom_margin.y) || (v->pos.y == v->screen_end.y)) && (couldscroll)) { - vt102_log_line (v, v->pos.y); - crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1); + vt102_log_line (c, v->pos.y); + + vt102_history (c, v->top_margin, v->bottom_margin); + + crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1, v->color); return; } - v->pos.y++; + if (v->pos.y != v->screen_end.y) + v->pos.y++; v->pending_wrap = 0; } void -vt102_cursor_advance (VT102 * v) +vt102_cursor_retreat_line (Context * c) { + VT102 *v = c->v; + int couldscroll = in_margins (v, v->pos); - if (v->pos.x < v->bottom_margin.x) +/*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)) { -/*Normal advance*/ - v->pos.x++; - v->pending_wrap = 0; + vt102_log_line (c, v->pos.y); + + crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1, v->color); return; } - v->pending_wrap++; + + if (v->pos.y != v->screen_start.y) + v->pos.y--; + v->pending_wrap = 0; } void -vt102_do_pending_wrap (VT102 * v) +vt102_do_pending_wrap (Context * c) { + VT102 *v = c->v; int couldscroll = in_margins (v, v->pos); int autowrap = v->private_modes[VT102_PRIVATE_MODE_AUTO_WRAP]; @@ -325,15 +544,35 @@ vt102_do_pending_wrap (VT102 * v) v->pos.x = 0; } - vt102_cursor_advance_line (v); + vt102_cursor_advance_line (c); +} + +void +vt102_cursor_advance (Context * c) +{ + VT102 *v = c->v; + + if (v->pos.x < v->bottom_margin.x) + { +/*Normal advance*/ + v->pos.x++; + v->pending_wrap = 0; + return; + } + v->pending_wrap++; + if (!c->v->xn_glitch) + vt102_do_pending_wrap (c); } + void -vt102_cursor_retard (VT102 * v) +vt102_cursor_retreat (VT102 * v) { if (v->pos.x != v->top_margin.x) - v->pos.x--; + { + v->pos.x--; + } v->pending_wrap = 0; } @@ -345,7 +584,7 @@ vt102_reset_tabs (VT102 * v) memset (v->tabs, 0, sizeof (v->tabs)); - for (i = 0; i < VT102_COLS; i += 8) + for (i = 0; i < VT102_MAX_COLS; i += 8) { v->tabs[i]++; } @@ -364,6 +603,20 @@ vt102_cursor_advance_tab (VT102 * v) v->pending_wrap = 0; } +void +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; + } + v->pending_wrap = 0; +} + vt102_cursor_home (VT102 * v) { v->pos = v->top_margin; @@ -377,7 +630,7 @@ 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.x; + v->pos.y = y + v->top_margin.y; } else { @@ -432,8 +685,9 @@ vt102_insert_into_line (VT102 * v, CRT_Pos p) &v->crt.screen[CRT_ADDR_POS (&p)], sizeof (CRT_CA) * n); } - v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].chr = ' '; - v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].attr = CRT_ATTR_NORMAL; + v->crt.screen[CRT_ADDR_POS (&p)].chr = ' '; + v->crt.screen[CRT_ADDR_POS (&p)].attr = CRT_ATTR_NORMAL; + v->crt.screen[CRT_ADDR_POS (&p)].color = CRT_COLOR_NORMAL; } @@ -463,8 +717,33 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set) 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); +#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_width = + v-> + private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 : + VT102_COLS_80; + + v->crt.width = v->current_width; + v->screen_end.x = v->current_width - 1; + v->top_margin = v->screen_start; + v->bottom_margin = v->screen_end; + vt102_cursor_home (v); + crt_cls (&v->crt); + + break; } @@ -545,6 +824,7 @@ vt102_change_attr (VT102 * v, char *na) { case 0: v->attr = CRT_ATTR_NORMAL; + v->color = CRT_COLOR_NORMAL; break; case 1: v->attr |= CRT_ATTR_BOLD; @@ -571,6 +851,69 @@ vt102_change_attr (VT102 * v, char *na) 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 @@ -625,6 +968,7 @@ vt102_save_state (VT102 * v) { v->saved.pos = v->pos; v->saved.attr = v->attr; + v->saved.color = v->color; v->saved.origin_mode = v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE]; } @@ -633,68 +977,99 @@ vt102_restore_state (VT102 * v) { v->pos = v->saved.pos; v->attr = v->saved.attr; + v->color = v->saved.color; v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE] = v->saved.origin_mode; vt102_cursor_normalize (v); v->pending_wrap = 0; } void -vt102_parse_esc (VT102 * v, int c) +vt102_regular_char (Context * c, VT102 * v, uint32_t ch) { - switch (c) + + + vt102_do_pending_wrap (c); + + + if (v->modes[VT102_MODE_INSERT]) + vt102_insert_into_line (v, v->pos); + + v->last_reg_char = ch; + + + if (ch < VT102_CHARSET_SIZE) { - case 'E': - if (v->pos.y == v->bottom_margin.y) - { - vt102_log_line (v, v->pos.y); - crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1); - } - else + int cs; + if ((cs = vt102_charset_c0[ch])) { - vt102_cursor_relative (v, 0, 1); - } - break; - case 'H': - v->tabs[v->pos.x]++; - break; - case 'M': - if (v->pos.y == v->top_margin.y) - { - crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1); + ch = cs; } - else + else if ((cs = charset_from_csid[v->g[v->cs]][ch])) { - vt102_cursor_relative (v, 0, -1); + 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; + vt102_cursor_advance (c); + +} + +vt102_send_id (Context * c, char *buf) +{ + + if (c->t) + { + int l = strlen (buf); + c->t->xmit (c->t, buf, l); + } +} + +void +vt102_scs (Context * c, int g, int s) +{ + VT102 *v = c->v; + int cs = VT102_CSID_US; + + + switch (s) + { + case 'A': + cs = VT102_CSID_UK; break; - case '7': - vt102_save_state (v); + case '1': + case '2': + case 'B': + cs = VT102_CSID_US; break; - case '8': - vt102_restore_state (v); + case '0': + cs = VT102_CSID_GL; break; - case '=': - v->application_keypad_mode=1; + } + + switch (g) + { + case '(': + v->g[0] = cs; break; - case '>': - v->application_keypad_mode=0; + case ')': + v->g[1] = cs; break; - default: -#if 0 - fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", c, - (c < 32) ? '?' : c); -#endif - ; } + } + void -vt102_parse_csi (VT102 * v, char *buf, int len) +vt102_parse_csi (Context * c, char *buf, int len) { char last; char *ptr; char *arg = buf + 1; int narg; + VT102 *v = c->v; + buf[len] = 0; last = buf[len - 1]; @@ -716,12 +1091,18 @@ vt102_parse_csi (VT102 * v, char *buf, int len) 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; @@ -755,49 +1136,56 @@ vt102_parse_csi (VT102 * v, char *buf, int len) 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->pos, v->screen_end, 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); + 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 = { VT102_COLS - 1, v->pos.y }; + CRT_Pos le = { v->current_width - 1, v->pos.y }; if (len == 2) narg = 0; /*Different default */ switch (narg) { case 0: - crt_erase (&v->crt, v->pos, le, 1); + crt_erase (&v->crt, v->pos, le, 1, v->color); break; case 1: - crt_erase (&v->crt, ls, v->pos, 1); + crt_erase (&v->crt, ls, v->pos, 1, v->color); break; case 2: - crt_erase (&v->crt, ls, le, 1); + crt_erase (&v->crt, ls, le, 1, v->color); break; } } break; - case 'P': - while (narg--) - vt102_delete_from_line (v, v->pos); - 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); + crt_scroll_down (&v->crt, v->pos, v->bottom_margin, 1, + v->color); } break; @@ -806,10 +1194,60 @@ vt102_parse_csi (VT102 * v, char *buf, int len) && (v->pos.y <= v->bottom_margin.y)) { while (narg--) - crt_scroll_up (&v->crt, v->pos, v->bottom_margin, 0); + { + 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': + 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 */ @@ -819,20 +1257,49 @@ vt102_parse_csi (VT102 * v, char *buf, int len) 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': //Printer commands + //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': //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; @@ -863,110 +1330,449 @@ vt102_parse_csi (VT102 * v, char *buf, int len) vt102_cursor_normalize (v); v->pending_wrap = 0; break; + case 'y': //Invoke confidence test + break; + case 'z': //request terminal parameters + break; default: -#if 0 - fprintf (stderr, "unhandled CSI \\033%s\n", buf, buf[0]); -#endif + log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__, + buf); + ; } break; default: -#if 0 - fprintf (stderr, "unhandled CSI \\033%s\n", buf, buf[0]); -#endif + log_f (c->l, "<%s:%d unhandled sequence: \\033%s>", __FILE__, + __LINE__, buf); ; } +} + +void +vt102_parse_esc (Context * c) +{ + VT102 *v = c->v; + VT102_parser *p = &v->parser; + +#ifdef DEBUG + p->cmd_buf[p->cmd_ptr] = 0; + log_f (c->l, "%s >", v->pos.x, + v->pos.y, v->pending_wrap, + !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_width - 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 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 (v); + + + 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': + /*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); + 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 + log_f (c->l, "", v->pos.x, v->pos.y, + v->pending_wrap); +#endif } void vt102_status_line (VT102 * v, char *str) { - int i = VT102_COLS; + int i = v->current_width - 1; CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)]; - while (i--) + for (i = 0; i < v->current_width; ++i) { ca->attr = CRT_ATTR_REVERSE; - ca->chr = *str; + 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++; + } + +} + + +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; + + v->application_keypad_mode = 0; + + v->current_width = VT102_COLS_80; + v->crt.width = v->current_width; + v->screen_end.x = v->current_width - 1; + + v->top_margin = v->screen_start; + v->bottom_margin = v->screen_end; + + memset (v->modes, 0, VT102_NMODES); + memset (v->private_modes, 0, VT102_NMODES); + + 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->private_modes[VT102_PRIVATE_MODE_VT52] = 1; + v->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1; + + vt102_reset_tabs (v); + + v->g[0] = v->g[1] = VT102_CSID_US; + v->cs = 0; } +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 (VT102 * v, int c) +vt102_parse_char (Context * c, int ch) { + VT102 *v = c->v; VT102_parser *p = &v->parser; #if 0 - fprintf (stderr, "char %c pc %d %d %d %d %d\n", (c < 32) ? 32 : c, c, - p->in_csi, p->in_escape, v->pos.x, v->pos.y); + log_f (c->l, "char %3d %c ie=%d ic=%d cmb=%d ct=%3d %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 - if (p->in_csi) + +/* Turn anything non-ascii into '?' */ +#if 0 + if ((ch != SYM_CHAR_RESET) && (ch != 0xb9) && (ch > 127)) { - p->csi_buf[p->csi_ptr++] = c; - if (csi_ender (c) || (p->csi_ptr == VT102_CSI_LEN)) - { - vt102_parse_csi (v, p->csi_buf, p->csi_ptr); - p->in_csi = 0; - } + ch = '?'; + } +#endif + + +#if 0 + if (p->dca_ptr == 2) + { + p->in_dca = 0; } - else if (p->in_escape) +#endif + if (ch == SYM_CHAR_RESET) { - if (csi_starter (c)) + vt102_reset_state (v); + } + 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->csi_ptr = 0; - p->csi_buf[p->csi_ptr++] = c; - p->in_csi++; - p->in_escape = 0; + p->cmd_more_bytes--; + + + if (!p->cmd_more_bytes == 1) + p->in_cmd = 0; } - else + + switch (p->cmd_termination) { - p->in_escape = 0; - vt102_parse_esc (v, c); + 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; + } + } + 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); + } + 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, + "pos.x, v->pos.y, v->pending_wrap, ch, ch, safe_ch (ch)); + +#endif - switch (c) + switch (ch) { +#if 0 /*NUL*/ case 0: /*SOH*/ case 1: /*STX*/ case 2: /*ETX*/ case 3: /*EOT*/ case 4: break; +#endif /*ENQ*/ case 5: - tty_write (v->tty, "vt102", 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_retard (v); + vt102_cursor_retreat (c->v); break; /*HT*/ case 9: - vt102_cursor_advance_tab (v); + vt102_cursor_advance_tab (c->v); break; /*LF*/ case 10: /*VT*/ case 11: /*FF*/ case 12: - vt102_cursor_advance_line (v); + 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: @@ -979,25 +1785,27 @@ vt102_parse_char (VT102 * v, int c) /*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_do_pending_wrap (v); - - if (v->modes[VT102_MODE_INSERT]) - vt102_insert_into_line (v, v->pos); - - v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = c; - v->crt.screen[CRT_ADDR_POS (&v->pos)].attr = v->attr; - vt102_cursor_advance (v); + vt102_regular_char (c, v, ch); } + +#ifdef DEBUG + if (ch != 27) + log_f (c->l, "", v->pos.x, v->pos.y, + v->pending_wrap); +#endif } v->crt.pos = v->pos; @@ -1006,36 +1814,28 @@ vt102_parse_char (VT102 * v, int c) if (v->current_line.y != v->pos.y) { - vt102_log_line (v, v->current_line.y); + vt102_log_line (c, v->current_line.y); v->current_line = v->pos; } - vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby"); + if (c->d) + cmd_show_status (c->d, c); } -vt102_parse(VT102 *v,char *buf,int len) -{ -while (len--) - vt102_parse_char(v,*(buf++)); -} - - void -vt102_parser_reset (VT102_parser * p) +vt102_send (Context * c, uint8_t key) { - p->in_csi = 0; - p->in_escape = 0; - p->csi_ptr = 0; -} + uint8_t ch; + if (!c->t) + return; -void -vt102_send (VT102 * v, uint8_t key) -{ - uint8_t c; - if ((key > 31) || (key < 127)) +#if 0 + fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' '); +#endif + if ((key > 31) && (key < 127)) { - tty_write (v->t, &key, 1); + c->t->xmit (c->t, &key, 1); return; } @@ -1054,14 +1854,14 @@ vt102_send (VT102 * v, uint8_t key) /*LF*/ case 10: /*VT*/ case 11: /*FF*/ case 12: - tty_write (v->t, &key, 1); + c->t->xmit (c->t, &key, 1); break; /*CR*/ case 13: - tty_write (v->t, &key, 1); - if (v->modes[VT102_MODE_NEWLINE_MODE]) + c->t->xmit (c->t, &key, 1); + if (c->v->modes[VT102_MODE_NEWLINE_MODE]) { - c = 10; - tty_write (v->t, &c, 1); + ch = 10; + c->t->xmit (c->t, &ch, 1); } break; /*SO*/ case 14: @@ -1077,7 +1877,7 @@ vt102_send (VT102 * v, uint8_t key) /*CAN*/ case 24: /*EM*/ case 25: /*SUB*/ case 26: - tty_write (v->t, &key, 1); + c->t->xmit (c->t, &key, 1); break; /*ESC*/ case 27: /*FS*/ case 28: @@ -1085,24 +1885,33 @@ vt102_send (VT102 * v, uint8_t key) /*RS*/ case 30: /*US*/ case 31: /*DEL*/ case 127: - tty_write (v->t, &key, 1); + c->t->xmit (c->t, &key, 1); break; case KEY_UP: case KEY_DOWN: case KEY_RIGHT: case KEY_LEFT: - if (v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE]) + case KEY_HOME: + case KEY_MIDDLE: + case KEY_END: + + if (c->v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE]) { - uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) }; - tty_write (v->t, &key, sizeof (buf)); + uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) }; + c->t->xmit (c->t, &buf, sizeof (buf)); } else { - uint8_t buf[] = { 033, '[', 'O' + (key - KEY_UP) }; - tty_write (v->t, &key, sizeof (buf)); + 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: @@ -1113,67 +1922,49 @@ vt102_send (VT102 * v, uint8_t key) case KEY_7: case KEY_8: case KEY_9: - if (v->application_keypad_mode) - { - uint8_t buf[] = { 033, 'O', 'p' + (key - KEY_0) }; - tty_write (v->t, &key, sizeof (buf)); - } - else - { - c = '0' + (key - KEY_0); - tty_write (v->t, &c, 1); - } - break; - case KEY_MINUS: - if (v->application_keypad_mode) - { - uint8_t buf[] = { 033, 'O', 'm' }; - tty_write (v->t, &key, sizeof (buf)); - } - else - { - c = '-'; - tty_write (v->t, &c, 1); - } - break; - case KEY_COMMA: - if (v->application_keypad_mode) - { - uint8_t buf[] = { 033, 'O', 'l' }; - tty_write (v->t, &key, sizeof (buf)); - } - else - { - c = ','; - tty_write (v->t, &c, 1); - } - break; - case KEY_PERIOD: - if (v->application_keypad_mode) + if (c->v->application_keypad_mode) { - uint8_t buf[] = { 033, 'O', 'n' }; - tty_write (v->t, &key, sizeof (buf)); + uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) }; + c->t->xmit (c->t, &buf, sizeof (buf)); } else { - c = '.'; - tty_write (v->t, &c, 1); + 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 (v->application_keypad_mode) + if (c->v->application_keypad_mode) { uint8_t buf[] = { 033, 'O', 'M' }; - tty_write (v->t, &key, sizeof (buf)); + c->t->xmit (c->t, &buf, sizeof (buf)); } else { - c = 13; - tty_write (v->t, &c, 1); - if (v->modes[VT102_MODE_NEWLINE_MODE]) + ch = 13; + c->t->xmit (c->t, &ch, 1); + if (c->v->modes[VT102_MODE_NEWLINE_MODE]) { - c = 10; - tty_write (v->t, &c, 1); + ch = 10; + c->t->xmit (c->t, &ch, 1); } } break; @@ -1183,10 +1974,18 @@ vt102_send (VT102 * v, uint8_t key) case KEY_PF4: { uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) }; - tty_write (v->t, &key, sizeof (buf)); + 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; - } } @@ -1196,69 +1995,63 @@ vt102_reset (VT102 * v) { VT102_parser *p = &v->parser; - vt102_parser_reset (p); - crt_cls (&v->crt); - - - v->application_keypad_mode=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->current_width = VT102_COLS_80; + v->crt.width = v->current_width; + v->screen_end.x = v->current_width - 1; v->screen_end.y = VT102_ROWS - 1; - v->top_margin = v->screen_start; - v->bottom_margin = v->screen_end; - - memset (v->modes, 0, VT102_NMODES); - memset (v->private_modes, 0, VT102_NMODES); - - 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; - vt102_cursor_home (v); + vt102_status_line (v, ""); + vt102_reset_tabs (v); v->current_line = v->pos; - vt102_save_state (v); + vt102_parser_reset (p); + vt102_reset_state (v); - vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby"); + vt102_save_state (v); + v->last_reg_char = ' '; } -int vt102_dispatch(VT102 *v) +VT102 * +vt102_new (int width) { -char buf[1024]; -int red; - -red=tty_read(v->t,buf,sizeof(buf)); -if (red<0) return -1; -if (!red) return 0; + VT102 *v; -vt102_parse(v,buf,red); + v = (VT102 *) malloc (sizeof (VT102)); -return 0; -} + v->xn_glitch = 1; -VT102 *vt102_new(TTY *t) -{ -VT102 *v; + vt102_reset (v); -v=(VT102 *) malloc(sizeof(VT102)); - -vt102_reset(v); + if (width) { + v->current_width =width; + v->crt.width = v->current_width; + v->screen_end.x = v->current_width - 1; + v->top_margin = v->screen_start; + v->bottom_margin = v->screen_end; + vt102_cursor_home (v); + } -v->tty=t; + return v; +} -return v; +void +vt102_set_ansi (VT102 * v, int ansi) +{ + v->xn_glitch = ansi ? 0 : 1; } -void vt102_free(VT102 *v) +void +vt102_free (VT102 * v) { -free(v); + free (v); }