From 5d11f03b6f99696f2d9df508cf7000e8f04b332b Mon Sep 17 00:00:00 2001 From: james <> Date: Tue, 26 Feb 2008 23:56:12 +0000 Subject: *** empty log message *** --- src/vt102.c | 325 +++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 180 insertions(+), 145 deletions(-) (limited to 'src/vt102.c') diff --git a/src/vt102.c b/src/vt102.c index 721886b..a22fe69 100644 --- a/src/vt102.c +++ b/src/vt102.c @@ -10,6 +10,9 @@ static char rcsid[] = "$Id$"; /* * $Log$ + * 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 *** * @@ -344,12 +347,16 @@ csi_ender (int c) return 0; } -static inline int ctrl_chr(int ch,int term) +static inline int +ctrl_chr (int ch, int term) { -if ((term>0) && (ch==term)) return 0; -if (ch==033) return 0; -if ((ch>0) && (ch<040)) return 1; -return 0; + if ((term > 0) && (ch == term)) + return 0; + if (ch == 033) + return 0; + if ((ch > 0) && (ch < 040)) + return 1; + return 0; } @@ -555,9 +562,10 @@ 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; } @@ -716,10 +724,13 @@ vt102_change_mode (VT102 * v, int private, char *ns, int set) 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->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->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); @@ -974,12 +985,15 @@ vt102_regular_char (Context * c, VT102 * v, uint32_t ch) if (v->modes[VT102_MODE_INSERT]) vt102_insert_into_line (v, v->pos); - if (ch < VT102_CHARSET_SIZE ){ - int cs=charset_from_csid[v->g[v->cs]][ch]; - v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = cs ?cs:ch; - } else { - v->crt.screen[CRT_ADDR_POS (&v->pos)].chr=ch; - } + if (ch < VT102_CHARSET_SIZE) + { + int cs = charset_from_csid[v->g[v->cs]][ch]; + v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = cs ? cs : ch; + } + else + { + 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); @@ -1000,32 +1014,34 @@ vt102_send_id (Context * c, char *buf) void vt102_scs (Context * c, int g, int s) { -VT102 *v=c->v; -int cs=VT102_CSID_US; + VT102 *v = c->v; + 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 (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 (g) + { + case '(': + v->g[0] = cs; + break; + case ')': + v->g[1] = cs; + break; + } } @@ -1129,7 +1145,7 @@ vt102_parse_csi (Context * c, char *buf, int len) case 'K': { CRT_Pos ls = { 0, v->pos.y }; - CRT_Pos le = { v->current_width -1, v->pos.y }; + CRT_Pos le = { v->current_width - 1, v->pos.y }; if (len == 2) narg = 0; /*Different default */ @@ -1174,9 +1190,6 @@ vt102_parse_csi (Context * c, char *buf, int len) 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--) { @@ -1215,7 +1228,7 @@ vt102_parse_csi (Context * c, char *buf, int len) vt102_regular_char (c, v, v->last_reg_char); break; case 'c': - vt102_send_id (c, terminal_id); + vt102_send_id (c, "\033[?2c"); break; case 'd': vt102_cursor_absolute (v, v->pos.x, narg - 1); @@ -1249,9 +1262,23 @@ vt102_parse_csi (Context * c, char *buf, int len) vt102_parse_attr_string (v, &buf[1], len - 1); break; case 'n': //Device status report - //5 requestion status - // 6 request cursor position FIXME + 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; @@ -1287,6 +1314,8 @@ vt102_parse_csi (Context * c, char *buf, int len) break; case 'y': //Invoke confidence test break; + case 'z': //request terminal parameters + break; default: log_f (c->l, "<%s:%d unhandled CSI: \\033%s>", __FILE__, __LINE__, @@ -1313,79 +1342,81 @@ vt102_parse_esc (Context * c) #if 1 p->cmd_buf[p->cmd_ptr] = 0; - log_f (c->l, "%s >", v->pos.x, v->pos.y,v->pending_wrap, - p->cmd_buf); + 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]) + if (!v->private_modes[VT102_PRIVATE_MODE_VT52]) { - 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/Z"); - 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; -} + 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*/ @@ -1483,31 +1514,33 @@ if(ate) return; } p->cmd_buf[p->cmd_ptr] = 0; - log_f (c->l, "", v->pos.x, v->pos.y,v->pending_wrap); + log_f (c->l, "", v->pos.x, v->pos.y, + v->pending_wrap); } void vt102_status_line (VT102 * v, char *str) { - int i = v->current_width -1; + int i = v->current_width - 1; CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)]; - for (i=0;icurrent_width;++i) + for (i = 0; i < v->current_width; ++i) { ca->attr = CRT_ATTR_REVERSE; ca->color = CRT_COLOR_NORMAL; - ca->chr = *str ? *str:' '; + ca->chr = *str ? *str : ' '; if (*str) str++; ca++; } - - for (;iattr = CRT_ATTR_NORMAL; ca->color = CRT_COLOR_NORMAL; - ca->chr=' '; + ca->chr = ' '; ca++; - } + } } @@ -1532,9 +1565,9 @@ vt102_reset_state (VT102 * v) 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->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; @@ -1545,12 +1578,13 @@ vt102_reset_state (VT102 * 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->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; + v->g[0] = v->g[1] = VT102_CSID_US; + v->cs = 0; } static void @@ -1611,11 +1645,11 @@ vt102_parse_char (Context * c, int ch) { vt102_reset_state (v); } - else if (p->in_cmd && !ctrl_chr(ch,p->cmd_termination)) + 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_ptr == VT102_CMD_LEN) + p->in_cmd = 0; if (p->cmd_more_bytes) { p->cmd_more_bytes--; @@ -1646,7 +1680,7 @@ vt102_parse_char (Context * c, int ch) p->cmd_termination = 0; } } - else if (p->in_escape && !ctrl_chr(ch,0)) + else if (p->in_escape && !ctrl_chr (ch, 0)) { p->cmd_ptr = 0; p->cmd_buf[p->cmd_ptr++] = ch; @@ -1667,10 +1701,10 @@ vt102_parse_char (Context * c, int ch) else { #if 1 -if (ch!=27) - log_f (c->l, - "pos.x, v->pos.y, v->pending_wrap,ch,ch,safe_ch(ch)); + if (ch != 27) + log_f (c->l, + "pos.x, v->pos.y, v->pending_wrap, ch, ch, safe_ch (ch)); #endif @@ -1705,11 +1739,11 @@ if (ch!=27) break; /*SO*/ case 14: /*select G1 */ - v->cs=1; + v->cs = 1; break; /*SI*/ case 15: /*select G0 */ - v->cs=0; + v->cs = 0; break; /*DLE*/ case 16: /*DC1 */ case 17: @@ -1737,8 +1771,9 @@ if (ch!=27) } #if 1 - if (ch!=27) - log_f (c->l, "", v->pos.x, v->pos.y,v->pending_wrap); + if (ch != 27) + log_f (c->l, "", v->pos.x, v->pos.y, + v->pending_wrap); #endif } @@ -1936,9 +1971,9 @@ vt102_reset (VT102 * v) v->screen_start.x = 0; v->screen_start.y = 0; - v->current_width=VT102_COLS_80; - v->crt.width=v->current_width; - v->screen_end.x = v->current_width -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; vt102_cursor_home (v); -- cgit v1.2.3