/*
* $Log$
+ * Revision 1.52 2008/02/28 16:57:52 james
+ * *** empty log message ***
+ *
+ * Revision 1.51 2008/02/28 16:37:16 james
+ * *** empty log message ***
+ *
+ * Revision 1.50 2008/02/28 12:12:25 james
+ * *** empty log message ***
+ *
+ * Revision 1.49 2008/02/28 11:27:48 james
+ * *** empty log message ***
+ *
+ * Revision 1.48 2008/02/27 09:42:53 james
+ * *** empty log message ***
+ *
+ * Revision 1.47 2008/02/27 09:42:22 james
+ * *** empty log message ***
+ *
+ * Revision 1.46 2008/02/27 01:31:38 james
+ * *** empty log message ***
+ *
+ * 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 ***
*
#include "project.h"
#include "syslog.h"
-//static char terminal_reply[]={033,0133,077,066,0143};
-
#define TABLE_LENGTH 128
+#undef DEBUG
+
static char terminal_id[] = "vt102";
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;
}
return 1;
}
+void
+vt102_crt_update (Context * c)
+{
+ VT102 *v = c->v;
+
+ 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 (c->d)
+ cmd_show_status (c->d, c);
+}
+
+void
+vt102_do_resize (Context * c)
+{
+
+ VT102 *v = c->v;
+
+ v->crt.size = v->current_size;
+ v->crt.size.y++;
+ v->screen_end = v->current_size;
+ v->screen_end.x--;
+ v->screen_end.y--;
+ v->top_margin = v->screen_start;
+ v->bottom_margin = v->screen_end;
+ vt102_cursor_home (v);
+ crt_cls (&v->crt);
+
+ if (c->t)
+ tty_winch (c->t, v->current_size);
+
+ log_f (c->l, "<size now %dx%d>", v->current_size.x, v->current_size.y);
+ vt102_crt_update (c);
+}
+
+
void
vt102_log_line (Context * c, int line)
{
- CRT_Pos e = { c->v->current_width - 1, line };
+ CRT_Pos e = { c->v->current_size.x - 1, line };
CRT_Pos p = { 0, line };
- char logbuf[VT102_MAX_COLS + 1];
+ char logbuf[4 * (VT102_MAX_COLS + 1)], *logptr = logbuf;
if (!c->l)
return;
int ch = c->v->crt.screen[CRT_ADDR_POS (&p)].chr;
if (ch < 32)
ch = ' ';
- if (ch > 126)
- ch = ' ';
- logbuf[p.x] = ch;
+ logptr += utf8_encode (logptr, ch);
}
- logbuf[p.x] = 0;
+ *logptr = 0;
c->l->log (c->l, logbuf);
}
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;
}
&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 (p.y, v->bottom_margin.x)].color = CRT_COLOR_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;
}
void
-vt102_change_mode (VT102 * v, int private, char *ns, int set)
+vt102_change_mode (Context * c, int private, char *ns, int set)
{
+ VT102 *v = c->v;
int m;
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);
-
+ v->current_size.x =
+ v->
+ private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 :
+ VT102_COLS_80;
+ vt102_do_resize (c);
break;
}
}
void
-vt102_parse_mode_string (VT102 * v, char *buf, int len)
+vt102_parse_mode_string (Context * c, char *buf, int len)
{
+ VT102 *v = c->v;
int private = 0;
char last = buf[len - 1];
char num[4];
{
if (*buf == ';')
{
- vt102_change_mode (v, private, &num[o], last == 'h');
+ vt102_change_mode (c, private, &num[o], last == 'h');
memset (num, 0, sizeof (num));
o = sizeof (num) - 1;
buf++;
buf++;
}
- vt102_change_mode (v, private, &num[o], last == 'h');
+ vt102_change_mode (c, private, &num[o], last == 'h');
}
vt102_regular_char (Context * c, VT102 * v, uint32_t ch)
{
+
vt102_do_pending_wrap (c);
+
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;
- }
+ 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;
+ }
+ }
+ 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);
- v->last_reg_char = ch;
}
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;
-
-
-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;
-}
+ VT102 *v = c->v;
+ int cs = VT102_CSID_US;
-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;
+ }
}
case 'K':
{
CRT_Pos ls = { 0, v->pos.y };
- CRT_Pos le = { v->current_width -1, v->pos.y };
+ CRT_Pos le = { v->current_size.x - 1, v->pos.y };
if (len == 2)
narg = 0; /*Different default */
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_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);
break;
case 'h':
case 'l':
- vt102_parse_mode_string (v, &buf[1], len - 1);
+ vt102_parse_mode_string (c, &buf[1], len - 1);
break;
vt102_parse_attr_string (v, &buf[1], len - 1);
break;
case 'n': //Device status report
- //5 requestion status
- // 6 request cursor position FIXME
- //?15n printer status
+ 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;
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__,
VT102 *v = c->v;
VT102_parser *p = &v->parser;
-#if 1
+#ifdef DEBUG
p->cmd_buf[p->cmd_ptr] = 0;
- log_f (c->l, "<cmd in x=%3d y=%2d aw=%d <ESC>%s >", v->pos.x, v->pos.y,v->pending_wrap,
- p->cmd_buf);
+ log_f (c->l, "<cmd in x=%3d y=%2d aw=%d vt=%d <ESC>%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_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 you edit this switch don't forget to edit the length and termination tables*/
vt102_send_id (c, terminal_id);
break;
case 'c':
- vt102_reset (v);
-
-
+ vt102_reset (c);
break;
case '=':
v->application_keypad_mode = 1;
}
p->cmd_buf[p->cmd_ptr] = 0;
- log_f (c->l, "<cmd out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,v->pending_wrap);
+#ifdef DEBUG
+ log_f (c->l, "<cmd out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,
+ v->pending_wrap);
+#endif
}
void
vt102_status_line (VT102 * v, char *str)
{
- int i = v->current_width -1;
- CRT_CA *ca = &v->crt.screen[CRT_ADDR (VT102_STATUS_ROW, 0)];
+ int i;
+ CRT_CA *ca = &v->crt.screen[CRT_ADDR (v->current_size.y, 0)];
- for (i=0;i<v->current_width;++i)
+ for (i = 0; i < v->current_size.x; ++i)
{
ca->attr = CRT_ATTR_REVERSE;
ca->color = CRT_COLOR_NORMAL;
- ca->chr = *str ? *str:' ';
+ ca->chr = *str ? *str : ' ';
if (*str)
str++;
ca++;
}
-
- for (;i<VT102_MAX_COLS;++i) {
+
+ for (; i < VT102_MAX_COLS; ++i)
+ {
ca->attr = CRT_ATTR_NORMAL;
ca->color = CRT_COLOR_NORMAL;
- ca->chr=' ';
+ ca->chr = ' ';
ca++;
- }
+ }
}
void
-vt102_reset_state (VT102 * v)
+vt102_reset_state (Context * c)
{
+ VT102 *v = c->v;
vt102_parser_reset (&v->parser);
v->attr = CRT_ATTR_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->current_size = v->original_size;
- v->top_margin = v->screen_start;
- v->bottom_margin = v->screen_end;
+ vt102_do_resize (c);
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;
+ v->g[0] = v->g[1] = VT102_CSID_US;
+ v->cs = 0;
}
static void
#endif
if (ch == SYM_CHAR_RESET)
{
- vt102_reset_state (v);
+ vt102_reset_state (c);
}
- 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--;
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;
}
else
{
-#if 1
-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));
+#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));
#endif
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;
/*SO*/ case 14:
/*select G1 */
- v->cs=1;
+ v->cs = 1;
break;
/*SI*/ case 15:
/*select G0 */
- v->cs=0;
+ v->cs = 0;
break;
+#if 0
/*DLE*/ case 16:
/*DC1 */ case 17:
/*DC2 */ case 18:
/*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 1
- if (ch!=27)
- log_f (c->l, "<chr out x=%3d y=%2d aw=%d>", v->pos.x, v->pos.y,v->pending_wrap);
+#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
}
- v->crt.pos = v->pos;
- v->crt.hide_cursor =
- v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0 : 1;
+ vt102_crt_update (c);
- 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);
}
void
}
void
-vt102_reset (VT102 * v)
+vt102_reset (Context * c)
{
+ VT102 *v = c->v;
VT102_parser *p = &v->parser;
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->screen_end.y = VT102_ROWS - 1;
+ v->current_size = v->original_size;
+ v->crt.size = v->current_size;
+ v->crt.size.y++;
+ v->screen_end = v->current_size;
+ v->screen_end.x--;
+ v->screen_end.y--;
vt102_cursor_home (v);
vt102_status_line (v, "");
v->current_line = v->pos;
vt102_parser_reset (p);
- vt102_reset_state (v);
+ vt102_reset_state (c);
vt102_save_state (v);
}
VT102 *
-vt102_new (void)
+vt102_new (CRT_Pos * size)
{
VT102 *v;
v->xn_glitch = 1;
- vt102_reset (v);
+ 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 > 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;
+ }
return v;
}
v->xn_glitch = ansi ? 0 : 1;
}
+void
+vt102_resize (Context * c, CRT_Pos size)
+{
+ log_f (c->l, "<size change to %dx%d requested>", size.x, size.y);
+
+ if (!size.x)
+ size.x = c->v->current_size.x;
+ if (!size.y)
+ size.y = c->v->current_size.y;
+
+ if (size.x < 1)
+ size.x = 1;
+ if (size.y < 1)
+ size.y = 1;
+
+ if (size.x > VT102_MAX_COLS)
+ size.x = VT102_MAX_COLS;
+ if (size.y > VT102_MAX_ROWS)
+ size.y = VT102_MAX_ROWS;
+
+ c->v->current_size = size;
+ vt102_do_resize (c);
+}
+
void
vt102_free (VT102 * v)
{
~ianmdlvl / sympathy.git / blobdiff