/*
* $Log$
+ * 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 ***
+ *
* Revision 1.40 2008/02/26 19:00:59 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";
+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] = {
return 0;
}
-
-
-/*Stay or enter command acquision and exit after n more chars*/
-void
-redispatch_with_more (VT102_parser * p, int n)
+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;
}
+
static inline int
in_margins (VT102 * v, CRT_Pos p)
{
void
vt102_log_line (Context * c, int line)
{
- CRT_Pos e = { VT102_COLS - 1, line };
+ CRT_Pos e = { c->v->current_size.x - 1, line };
CRT_Pos p = { 0, line };
- char logbuf[VT102_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);
}
vt102_cursor_retreat (VT102 * v)
{
if (v->pos.x != v->top_margin.x)
- v->pos.x--;
+ {
+ v->pos.x--;
+ }
v->pending_wrap = 0;
}
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]++;
}
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
{
&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;
}
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->top_margin = v->screen_start;
- v->bottom_margin = v->screen_end;
- vt102_cursor_home(v);
- crt_cls (&v->crt);
-
+ case VT102_PRIVATE_MODE_132COLS:
+ /* We don't implement 132 col mode - yet */
+
+ v->current_size.x =
+ v->
+ private_modes[VT102_PRIVATE_MODE_132COLS] ? VT102_COLS_132 :
+ VT102_COLS_80;
+
+ 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);
- break;
+
+ break;
}
}
}
void
-vt102_regular_char (Context * c, VT102 * v, int ch)
+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);
+ 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)
+vt102_send_id (Context * c, char *buf)
{
-
- if (c->t)
- {
- int l=strlen(buf);
- c->t->xmit (c->t, buf,l);
- }
+
+ if (c->t)
+ {
+ int l = strlen (buf);
+ c->t->xmit (c->t, buf, l);
+ }
}
void
vt102_scs (Context * c, int g, int s)
{
-/*Ignoring charsets*/
+ 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 (g)
+ {
+ case '(':
+ v->g[0] = cs;
+ break;
+ case ')':
+ v->g[1] = cs;
+ break;
+ }
+
}
void
case 'K':
{
CRT_Pos ls = { 0, v->pos.y };
- CRT_Pos le = { VT102_COLS - 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 'i': //Printer commands
+ case 'i': //Printer commands
//FIXME
break;
case 'h':
case 'm':
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
+ 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 'q': //Load LED on off
- break;
case 'r':
v->top_margin = v->screen_start;
v->bottom_margin = v->screen_end;
vt102_cursor_normalize (v);
v->pending_wrap = 0;
break;
- case 'y': //Invoke confidence test
- 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
-p->cmd_buf[p->cmd_ptr]=0;
-log_f (c->l, "<cmd in x=%d y=%d <ESC>%s >",v->pos.x,v->pos.y,p->cmd_buf);
+#ifdef DEBUG
+ p->cmd_buf[p->cmd_ptr] = 0;
+ 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 0 //VT52
- 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':
- //Set graphics mode
- break;
- case 'G':
- //Quit graphics mode
- 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 = { VT102_COLS - 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;
+ 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;
+ }
-#endif
/*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 '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;
+ 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':
+ 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 '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 '#':
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 '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*/
{
for (i = 0; i < CRT_ADDR_POS (&v->screen_end); ++i)
v->crt.screen[i].chr = 'E';
}
- break;
+ break;
default:
log_f (c->l,
;
}
-p->cmd_buf[p->cmd_ptr]=0;
-log_f (c->l, "<cmd out x=%d y=%d>",v->pos.x,v->pos.y);
+ p->cmd_buf[p->cmd_ptr] = 0;
+#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 = VT102_COLS;
- 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)];
- while (i--)
+ for (i = 0; i < v->current_size.x; ++i)
{
ca->attr = CRT_ATTR_REVERSE;
ca->color = CRT_COLOR_NORMAL;
- ca->chr = *str;
+ 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++;
+ }
+
}
v->application_keypad_mode = 0;
+ 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--;
+
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->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
{
vt102_reset_state (v);
}
- else if (p->in_cmd)
+ else if (p->in_cmd && !ctrl_chr (ch, p->cmd_termination))
{
p->cmd_buf[p->cmd_ptr++] = ch;
- if (p->cmd_more_bytes) {
- p->cmd_more_bytes--;
+ if (p->cmd_ptr == VT102_CMD_LEN)
+ p->in_cmd = 0;
+ if (p->cmd_more_bytes)
+ {
+ p->cmd_more_bytes--;
- if (!p->cmd_more_bytes == 1)
- p->in_cmd = 0;
- }
+ if (!p->cmd_more_bytes == 1)
+ p->in_cmd = 0;
+ }
switch (p->cmd_termination)
{
p->cmd_termination = 0;
}
}
- else if (p->in_escape)
+ else if (p->in_escape && !ctrl_chr (ch, 0))
{
-
p->cmd_ptr = 0;
p->cmd_buf[p->cmd_ptr++] = ch;
p->in_escape = 0;
}
else
{
+#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);
+ 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 */
- /*Ignoring charsets */
+ v->cs = 1;
break;
/*SI*/ case 15:
/*select G0 */
- /*Ignoring charsets */
+ 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;
- /*regular character */ default:
-#if 1
- 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
+ /*regular character */ default:
vt102_regular_char (c, v, ch);
}
+
+#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->screen_start.x = 0;
v->screen_start.y = 0;
- v->screen_end.x = VT102_COLS - 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, "");
}
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_ROWS)
+ v->original_size.y = VT102_ROWS;
+
+ }
+ else
+ {
+ v->original_size.x = VT102_COLS_80;
+ v->original_size.y = VT102_ROWS;
+ }
+
+ vt102_reset (v);
return v;
}