/*
* $Log$
+ * 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 ***
*
CTRL-O
-ESC7
-ESC8
-ESCH
-ESCM
-ESC>
*/
}
static inline int
-csi_starter (int c)
+scs_starter (int c)
{
switch (c)
{
- case '[':
case '(':
case ')':
return 1;
return 0;
}
+static inline int
+csi_starter (int c)
+{
+ switch (c)
+ {
+ case '[':
+ return 1;
+ }
+ return 0;
+}
+
static inline int
in_margins (VT102 * v, CRT_Pos p)
{
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] = 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 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)
+{
+/*Ignoring charsets*/
+}
+
void
vt102_parse_esc (VT102 * v, int c)
{
vt102_restore_state (v);
break;
case '=':
- v->application_keypad_mode=1;
+ v->application_keypad_mode = 1;
break;
case '>':
- v->application_keypad_mode=0;
+ v->application_keypad_mode = 0;
break;
default:
#if 0
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)
+vt102_parse_char (VT102 * v, int c,TTY *tty)
{
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);
p->in_csi++;
p->in_escape = 0;
}
+ else if (scs_starter(c)) {
+ p->in_scs=c;
+ p->in_escape = 0;
+ }
else
{
p->in_escape = 0;
vt102_parse_esc (v, c);
}
}
+ else if (p->in_scs) {
+ vt102_scs(v,p->in_scs,c);
+ p->in_scs=0;
+ }
else
{
/*EOT*/ case 4:
break;
/*ENQ*/ case 5:
- tty_write (v->tty, "vt102", 5);
+ tty_write (tty, "vt102", 5);
break;
/*ACK*/ case 6:
/*BEL*/ case 7:
vt102_cursor_carriage_return (v);
break;
/*SO*/ case 14:
+ /*select G1*/
+ /*Ignoring charsets*/
+ break;
/*SI*/ case 15:
+ /*select G0*/
+ /*Ignoring charsets*/
+ break;
/*DLE*/ case 16:
/*DC1 */ case 17:
/*DC2 */ case 18:
v->crt.screen[CRT_ADDR_POS (&v->pos)].chr = c;
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 (v);
}
}
vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
}
-vt102_parse(VT102 *v,char *buf,int len)
+vt102_parse (VT102 * v, char *buf, int len,TTY *t)
{
-while (len--)
- vt102_parse_char(v,*(buf++));
+ while (len--)
+ vt102_parse_char (v, *(buf++),t);
}
p->in_csi = 0;
p->in_escape = 0;
p->csi_ptr = 0;
+ p->in_scs=0;
}
void
-vt102_send (VT102 * v, uint8_t key)
+vt102_send (VT102 * v, uint8_t key,TTY *tty)
{
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);
+ tty_write (tty, &key, 1);
return;
}
/*LF*/ case 10:
/*VT*/ case 11:
/*FF*/ case 12:
- tty_write (v->t, &key, 1);
+ tty_write (tty, &key, 1);
break;
/*CR*/ case 13:
- tty_write (v->t, &key, 1);
+ tty_write (tty, &key, 1);
if (v->modes[VT102_MODE_NEWLINE_MODE])
{
c = 10;
- tty_write (v->t, &c, 1);
+ tty_write (tty, &c, 1);
}
break;
/*SO*/ case 14:
/*CAN*/ case 24:
/*EM*/ case 25:
/*SUB*/ case 26:
- tty_write (v->t, &key, 1);
+ tty_write (tty, &key, 1);
break;
/*ESC*/ case 27:
/*FS*/ case 28:
/*RS*/ case 30:
/*US*/ case 31:
/*DEL*/ case 127:
- tty_write (v->t, &key, 1);
+ tty_write (tty, &key, 1);
break;
case KEY_UP:
case KEY_DOWN:
case KEY_RIGHT:
case KEY_LEFT:
+ case KEY_HOME:
+ case KEY_MIDDLE:
+ case KEY_END:
+
if (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) };
+ tty_write (tty, &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) };
+ tty_write (tty, &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:
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));
+ uint8_t buf[] = { 033, 'O', 'a' + (key - KEY_154) };
+ tty_write (tty, &buf, sizeof (buf));
}
else
{
- c = ',';
- tty_write (v->t, &c, 1);
- }
- break;
- case KEY_PERIOD:
- if (v->application_keypad_mode)
- {
- uint8_t buf[] = { 033, 'O', 'n' };
- tty_write (v->t, &key, 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'
+ };
+
+ tty_write (tty, &kpoff[key], 1);
}
break;
case KEY_ENTER:
if (v->application_keypad_mode)
{
uint8_t buf[] = { 033, 'O', 'M' };
- tty_write (v->t, &key, sizeof (buf));
+ tty_write (tty, &buf, sizeof (buf));
}
else
{
c = 13;
- tty_write (v->t, &c, 1);
+ tty_write (tty, &c, 1);
if (v->modes[VT102_MODE_NEWLINE_MODE])
{
c = 10;
- tty_write (v->t, &c, 1);
+ tty_write (tty, &c, 1);
}
}
break;
case KEY_PF4:
{
uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
- tty_write (v->t, &key, sizeof (buf));
+ tty_write (tty, &buf, sizeof (buf));
+ }
+ break;
+ case KEY_INSERT:
+ case KEY_DELETE:
+ case KEY_PGUP:
+ case KEY_PGDN:
+ {
+ uint8_t buf[] = { 033, '[', '0' + (key - KEY_180), '~' };
+ tty_write (tty, &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;
+ v->application_keypad_mode = 0;
v->current_line = v->pos;
v->pending_wrap = 0;
}
-int vt102_dispatch(VT102 *v)
+int
+vt102_dispatch (VT102 * v,TTY *tty)
{
-char buf[1024];
-int red;
+ char buf[1024];
+ int red;
-red=tty_read(v->t,buf,sizeof(buf));
-if (red<0) return -1;
-if (!red) return 0;
+ red = tty_read (tty, buf, sizeof (buf));
-vt102_parse(v,buf,red);
+ if (red < 0)
+ return -1;
+ if (!red)
+ return 0;
+
+
+ vt102_parse (v, buf, red,tty);
-return 0;
+ return 0;
}
-VT102 *vt102_new(TTY *t)
+VT102 *
+vt102_new (void)
{
-VT102 *v;
+ VT102 *v;
-v=(VT102 *) malloc(sizeof(VT102));
+ v = (VT102 *) malloc (sizeof (VT102));
-vt102_reset(v);
+ vt102_reset (v);
-v->tty=t;
-return v;
+ return v;
}
-void vt102_free(VT102 *v)
+void
+vt102_free (VT102 * v)
{
-free(v);
+ free (v);
}
~ianmdlvl / sympathy.git / blobdiff