/*
* $Log$
+ * 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 ***
*
}
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 p = { 0, line };
+ char logbuf[VT102_COLS + 1];
- 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 = ' ';
+ if (ch > 126)
+ ch = ' ';
+ logbuf[p.x] = ch;
}
- fputc ('\n', log);
+ logbuf[p.x] = 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
}
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 */
if (((v->pos.y == v->bottom_margin.y) || (v->pos.y == v->screen_end.y)) &&
(couldscroll))
{
- vt102_log_line (v, v->pos.y);
+ 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);
return;
}
void
-vt102_cursor_advance (VT102 * v)
+vt102_cursor_advance (Context * c)
{
+ VT102 *v = c->v;
if (v->pos.x < v->bottom_margin.x)
{
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];
v->pos.x = 0;
}
- vt102_cursor_advance_line (v);
+ vt102_cursor_advance_line (c);
}
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->private_modes[m] = 0;
#if 0
fprintf (stderr, "APPLICATION CURSOR MODE %d wanted %d\n",
- v->private_modes[m],set);
+ v->private_modes[m], set);
#endif
break;
case VT102_PRIVATE_MODE_ORIGIN_MODE:
{
case 0:
v->attr = CRT_ATTR_NORMAL;
+ v->color = CRT_COLOR_NORMAL;
break;
case 1:
v->attr |= CRT_ATTR_BOLD;
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
{
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];
}
{
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_scs(VT102 *c,int g,int s)
+void
+vt102_scs (Context * c, int g, int s)
{
/*Ignoring charsets*/
}
void
-vt102_parse_esc (VT102 * v, int c)
+vt102_parse_esc (Context * c, int ch)
{
- switch (c)
+ VT102 *v = c->v;
+ switch (ch)
{
case 'E':
if (v->pos.y == v->bottom_margin.y)
{
- vt102_log_line (v, v->pos.y);
+ 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);
}
else
break;
default:
#if 0
- fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", c,
- (c < 32) ? '?' : c);
+ fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", ch,
+ (ch < 32) ? '?' : ch);
#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];
&& (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);
+ }
}
break;
while (i--)
{
ca->attr = CRT_ATTR_REVERSE;
+ ca->color = CRT_COLOR_NORMAL;
ca->chr = *str;
if (*str)
str++;
void
-vt102_parse_char (VT102 * v, int c,TTY *tty)
+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);
#endif
if (p->in_csi)
{
- p->csi_buf[p->csi_ptr++] = c;
- if (csi_ender (c) || (p->csi_ptr == VT102_CSI_LEN))
+ p->csi_buf[p->csi_ptr++] = ch;
+ if (csi_ender (ch) || (p->csi_ptr == VT102_CSI_LEN))
{
- vt102_parse_csi (v, p->csi_buf, p->csi_ptr);
+ vt102_parse_csi (c, p->csi_buf, p->csi_ptr);
p->in_csi = 0;
}
}
else if (p->in_escape)
{
- if (csi_starter (c))
+ if (csi_starter (ch))
{
p->csi_ptr = 0;
- p->csi_buf[p->csi_ptr++] = c;
+ p->csi_buf[p->csi_ptr++] = ch;
p->in_csi++;
p->in_escape = 0;
}
- else if (scs_starter(c)) {
- p->in_scs=c;
- p->in_escape = 0;
- }
+ else if (scs_starter (ch))
+ {
+ p->in_scs = ch;
+ p->in_escape = 0;
+ }
else
{
p->in_escape = 0;
- vt102_parse_esc (v, c);
+ vt102_parse_esc (c, ch);
}
}
- else if (p->in_scs) {
- vt102_scs(v,p->in_scs,c);
- p->in_scs=0;
- }
+ else if (p->in_scs)
+ {
+ vt102_scs (c, p->in_scs, ch);
+ p->in_scs = 0;
+ }
else
{
- switch (c)
+ switch (ch)
{
/*NUL*/ case 0:
/*SOH*/ case 1:
/*EOT*/ case 4:
break;
/*ENQ*/ case 5:
- tty_write (tty, "vt102", 5);
+ c->t->xmit (c->t, "vt102", 5);
break;
/*ACK*/ case 6:
/*BEL*/ case 7:
break;
/*BS*/ case 8:
- vt102_cursor_retard (v);
+ vt102_cursor_retard (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*/
- /*Ignoring charsets*/
- break;
+ /*select G1 */
+ /*Ignoring charsets */
+ break;
/*SI*/ case 15:
- /*select G0*/
- /*Ignoring charsets*/
- break;
+ /*select G0 */
+ /*Ignoring charsets */
+ break;
/*DLE*/ case 16:
/*DC1 */ case 17:
/*DC2 */ case 18:
/*DEL*/ case 127:
break;
/*regular character */ default:
- vt102_do_pending_wrap (v);
+ vt102_do_pending_wrap (c);
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)].chr = ch;
v->crt.screen[CRT_ADDR_POS (&v->pos)].attr = v->attr;
- vt102_cursor_advance (v);
+ v->crt.screen[CRT_ADDR_POS (&v->pos)].color = v->color;
+ vt102_cursor_advance (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");
}
-vt102_parse (VT102 * v, char *buf, int len,TTY *t)
+vt102_parse (Context * c, char *buf, int len)
{
while (len--)
- vt102_parse_char (v, *(buf++),t);
+ vt102_parse_char (c, *(buf++));
}
p->in_csi = 0;
p->in_escape = 0;
p->csi_ptr = 0;
- p->in_scs=0;
+ p->in_scs = 0;
}
void
-vt102_send (VT102 * v, uint8_t key,TTY *tty)
+vt102_send (Context * c, uint8_t key)
{
- uint8_t c;
+ uint8_t ch;
+
+ if (!c->t)
+ return;
+
#if 0
fprintf (stderr, "vts: %d(%c)\n", key, (key > 31) ? key : ' ');
#endif
if ((key > 31) && (key < 127))
{
- tty_write (tty, &key, 1);
+ c->t->xmit (c->t, &key, 1);
return;
}
/*LF*/ case 10:
/*VT*/ case 11:
/*FF*/ case 12:
- tty_write (tty, &key, 1);
+ c->t->xmit (c->t, &key, 1);
break;
/*CR*/ case 13:
- tty_write (tty, &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 (tty, &c, 1);
+ ch = 10;
+ c->t->xmit (c->t, &ch, 1);
}
break;
/*SO*/ case 14:
/*CAN*/ case 24:
/*EM*/ case 25:
/*SUB*/ case 26:
- tty_write (tty, &key, 1);
+ c->t->xmit (c->t, &key, 1);
break;
/*ESC*/ case 27:
/*FS*/ case 28:
/*RS*/ case 30:
/*US*/ case 31:
/*DEL*/ case 127:
- tty_write (tty, &key, 1);
+ c->t->xmit (c->t, &key, 1);
break;
case KEY_UP:
case KEY_MIDDLE:
case KEY_END:
- if (v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
+ if (c->v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
{
uint8_t buf[] = { 033, 'O', 'A' + (key - KEY_UP) };
- tty_write (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
else
{
uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
- tty_write (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
break;
case KEY_STAR:
case KEY_7:
case KEY_8:
case KEY_9:
- if (v->application_keypad_mode)
+ if (c->v->application_keypad_mode)
{
uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
- tty_write (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
else
{
[KEY_9] = '9'
};
- tty_write (tty, &kpoff[key], 1);
+ 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 (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
else
{
- c = 13;
- tty_write (tty, &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 (tty, &c, 1);
+ ch = 10;
+ c->t->xmit (c->t, &ch, 1);
}
}
break;
case KEY_PF4:
{
uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
- tty_write (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
break;
case KEY_INSERT:
case KEY_PGDN:
{
uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
- tty_write (tty, &buf, sizeof (buf));
+ c->t->xmit (c->t, &buf, sizeof (buf));
}
break;
}
vt102_parser_reset (p);
crt_cls (&v->crt);
+ v->attr = CRT_ATTR_NORMAL;
+ v->color = CRT_COLOR_NORMAL;
v->application_keypad_mode = 0;
}
int
-vt102_dispatch (VT102 * v,TTY *tty)
+vt102_dispatch (Context * c)
{
char buf[1024];
int red;
- red = tty_read (tty, buf, sizeof (buf));
+ red = c->t->recv (c->t, buf, sizeof (buf));
if (red < 0)
return -1;
return 0;
- vt102_parse (v, buf, red,tty);
+ vt102_parse (c, buf, red);
+
+ return 0;
+}
+
+
+int
+vt102_dispatch_one (Context * c)
+{
+ char buf;
+ int red;
+
+ red = c->t->recv (c->t, &buf, sizeof (buf));
+
+ if (red < 0)
+ return -1;
+ if (!red)
+ return 0;
+
+ vt102_parse_char (c, buf);
return 0;
}
~ianmdlvl / sympathy.git / blobdiff