/*
* $Log$
+ * Revision 1.7 2008/02/06 20:26:57 james
+ * *** empty log message ***
+ *
* Revision 1.6 2008/02/06 17:53:28 james
* *** empty log message ***
*
{
CRT_Pos p;
int o;
- int hidden_cursor=0;
-
-
-
+ int hidden_cursor = 0;
for (p.y = 0; p.y < CRT_ROWS; ++p.y)
{
continue;
if (crt_ca_cmp (a->crt.screen[o], c->screen[o]))
{
- ansi_showhide_cursor (a, 1);
+ ansi_showhide_cursor (a, 1);
a->crt.screen[o] = c->screen[o];
ansi_move (a, p);
}
- if ((CRT_COLS>a->size.x) || (CRT_ROWS>a->size.y)) {
- char msg[]="Window is too small";
- p.x=0;
- p.y=0;
+ if ((CRT_COLS > a->size.x) || (CRT_ROWS > a->size.y))
+ {
+ char msg[] = "Window is too small";
+ p.x = 0;
+ p.y = 0;
+
+ ansi_showhide_cursor (a, 1);
+ ansi_set_attr (a, CRT_ATTR_REVERSE);
+ ansi_move (a, p);
+
+ ansi_write (a, msg, sizeof (msg));
+ a->pos.x = ANSI_INVAL;
+ }
- ansi_showhide_cursor (a, 1);
- ansi_set_attr (a, CRT_ATTR_REVERSE);
- ansi_move(a,p);
-
- ansi_write (a, msg, sizeof(msg));
- a->pos.x = ANSI_INVAL;
- }
-
- if ((c->pos.x>=a->size.x)
- || (c->pos.y>=a->size.y)) {
- ansi_showhide_cursor (a, 1);
- return;
- }
+ if ((c->pos.x >= a->size.x) || (c->pos.y >= a->size.y))
+ {
+ ansi_showhide_cursor (a, 1);
+ return;
+ }
a->crt.pos = c->pos;
ansi_move (a, a->crt.pos);
ansi_cls (a);
ansi_draw (a, &a->crt);
}
+
+void ansi_parse_char(ANSI *a,int c,VT102 *v)
+{
+vt102_send(v,c);
+}
+
+void ansi_parse(ANSI *a,char *buf,int len,VT102 *v)
+{
+while (len--)
+ansi_parse_char(a,*(buf++),v);
+}
+
+int ansi_dispatch(ANSI *a,VT102 *v)
+{
+char buf[1024];
+int red;
+
+red=read(a.fd,buf,sizeof(buf));
+if (red<0) return -1;
+if (!red) return -1;
+
+ansi_parse(a,buf,red,v);
+
+return 0;
+}
+int
/*
* $Log$
+ * Revision 1.6 2008/02/06 20:26:58 james
+ * *** empty log message ***
+ *
* Revision 1.5 2008/02/06 17:53:28 james
* *** empty log message ***
*
#include "project.h"
struct termios old = { 0 };
-static int had_winch=0;
+static int had_winch = 0;
-static void quit (int not)
+static void
+quit (int not)
{
tcsetattr (0, TCSANOW, &old);
exit (1);
}
-static void winch (int not)
+static void
+winch (int not)
{
had_winch++;
}
testy (void)
{
struct termios raw = { 0 };
- VT102 v = { 0 };
ANSI a = { 0 };
fd_set rfd;
int fd;
char c;
+ TTY *y;
+ VT102 *v;
signal (SIGINT, quit);
-{
-struct sigaction sa={0};
+ {
+ struct sigaction sa = { 0 };
+
+ sa.sa_handler = winch;
+ sa.sa_flags = SA_RESTART;
+ sigaction (SIGWINCH, &sa, NULL);
+ }
-sa.sa_handler=winch;
-sa.sa_flags=SA_RESTART;
-sigaction(SIGWINCH,&sa,NULL);
-}
-
tcgetattr (0, &old);
tcgetattr (0, &raw);
cfmakeraw (&raw);
tcsetattr (0, TCSANOW, &raw);
- a.fd = 1;
-
- vt102_reset (&v);
+ a.fd = 0;
ansi_reset (&a);
- fd = open_fd_to_bash ();
+ t=tty_new_test();
+ v=vt102_new(t);
FD_ZERO (&rfd);
-
-
for (;;)
{
- struct timeval tv={0,100000};
+ struct timeval tv = { 0, 100000 };
- FD_SET (fd, &rfd);
- FD_SET (0, &rfd);
- if (select (fd + 1, &rfd, NULL, NULL, &tv)<0) continue;
+ FD_SET (t->fd, &rfd);
+ FD_SET (a.fd, &rfd);
+ if (select (t->fd + 1, &rfd, NULL, NULL, &tv) < 0)
+ continue;
- if (FD_ISSET (0, &rfd))
+ if (FD_ISSET (a.fd, &rfd))
{
- if ((read (0, &c, 1) <= 0) || (c == 3))
- break;
-
- write (fd, &c, 1);
+ if (ansi_dispatch(&a,v)) break;
}
- if (FD_ISSET (fd, &rfd))
+
+ if (FD_ISSET (t->fd, &rfd)) {
+ if (vt102_dispatch (v)) break;
+ }
+
+ if (had_winch)
{
- if ((read (fd, &c, 1) <= 0))
- break;
- //write (1, &c, 1);
- vt102_parse_char (&v, c);
+ had_winch = 0;
+ ansi_getsize (&a);
+ ansi_reset (&a);
ansi_draw (&a, &v.crt);
}
- if (had_winch) {
- had_winch=0;
- ansi_getsize(&a);
- ansi_reset(&a);
- ansi_draw (&a, &v.crt);
- }
}
tcsetattr (0, TCSANOW, &old);
printf ("QUAT\n");
void ansi_cls(ANSI *a);
void ansi_draw(ANSI *a, CRT *c);
void ansi_reset(ANSI *a);
+void ansi_parse_char(ANSI *a, int c, VT102 *v);
+void ansi_parse(ANSI *a, char *buf, int len, VT102 *v);
+int ansi_dispatch(ANSI *a, VT102 *v);
/* crt.c */
void crt_erase(CRT *c, CRT_Pos s, CRT_Pos e, int ea);
void crt_cls(CRT *c);
int open_fd_to_bash(void);
/* version.c */
/* vt102.c */
-int vt102_inmargins(VT102 *v, CRT_Pos p);
+void vt102_log_line(VT102 *v, int line);
void vt102_clip_cursor(VT102 *v, CRT_Pos tl, CRT_Pos br);
void vt102_cursor_normalize(VT102 *v);
+void vt102_cursor_carriage_return(VT102 *v);
void vt102_cursor_advance_line(VT102 *v);
void vt102_cursor_advance(VT102 *v);
+void vt102_do_pending_wrap(VT102 *v);
void vt102_cursor_retard(VT102 *v);
void vt102_reset_tabs(VT102 *v);
void vt102_cursor_advance_tab(VT102 *v);
void vt102_insert_into_line(VT102 *v, CRT_Pos p);
void vt102_change_mode(VT102 *v, int private, char *ns, int set);
void vt102_parse_mode_string(VT102 *v, char *buf, int len);
+void vt102_change_attr(VT102 *v, char *na);
+void vt102_parse_attr_string(VT102 *v, char *buf, int len);
+void vt102_save_state(VT102 *v);
+void vt102_restore_state(VT102 *v);
void vt102_parse_esc(VT102 *v, int c);
void vt102_parse_csi(VT102 *v, char *buf, int len);
void vt102_status_line(VT102 *v, char *str);
void vt102_parse_char(VT102 *v, int c);
+int vt102_parse(VT102 *v, char *buf, int len);
void vt102_parser_reset(VT102_parser *p);
+void vt102_send(VT102 *v, uint8_t key);
void vt102_reset(VT102 *v);
+int vt102_dispatch(VT102 *v);
+VT102 *vt102_new(TTY *t);
+void vt102_free(VT102 *v);
/*
* $Log$
+ * Revision 1.11 2008/02/06 20:26:58 james
+ * *** empty log message ***
+ *
* Revision 1.10 2008/02/06 17:53:28 james
* *** empty log message ***
*
CRT_Pos e = { VT102_COLS - 1, line };
CRT_Pos p = { 0, line };
- if (!log)
- log=fopen("log","a+");
+ if (!log)
+ log = fopen ("log", "a+");
+
+ if (!log)
+ return;
- if (!log) return;
-
for (; e.x > 0; --e.x)
{
v->pos = v->top_margin;
vt102_cursor_normalize (v);
v->pending_wrap = 0;
-
+
}
vt102_cursor_absolute (VT102 * v, int x, int y)
v->attr &= ~CRT_ATTR_REVERSE;
break;
default:
- ;
+ ;
#if 0
fprintf (stderr, "unhandled SGR %d\n", a);
#endif
vt102_change_attr (v, &num[o]);
}
-void vt102_save_state(VT102 *v)
+void
+vt102_save_state (VT102 * v)
{
-v->saved.pos=v->pos;
-v->saved.attr=v->attr;
-v->saved.origin_mode=v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE];
+ v->saved.pos = v->pos;
+ v->saved.attr = v->attr;
+ v->saved.origin_mode = v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE];
}
-void vt102_restore_state(VT102 *v)
+void
+vt102_restore_state (VT102 * v)
{
-v->pos=v->saved.pos;
-v->attr=v->saved.attr;
-v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE]=v->saved.origin_mode;
-vt102_cursor_normalize(v);
-v->pending_wrap = 0;
+ v->pos = v->saved.pos;
+ v->attr = v->saved.attr;
+ v->private_modes[VT102_PRIVATE_MODE_ORIGIN_MODE] = v->saved.origin_mode;
+ vt102_cursor_normalize (v);
+ v->pending_wrap = 0;
}
void
{
switch (c)
{
-case 'E':
- if(v->pos.y==v->bottom_margin.y) {
- vt102_log_line (v, v->pos.y);
- crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
- } else {
- vt102_cursor_relative(v,0,1);
- }
- break;
-case 'H':
- v->tabs[v->pos.x]++;
- break;
-case 'M':
- if(v->pos.y==v->top_margin.y) {
- crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1);
- } else {
- vt102_cursor_relative(v,0,-1);
- }
- break;
-case '7':
- vt102_save_state(v);
- break;
-case '8':
- vt102_restore_state(v);
- break;
-#if 0
+ case 'E':
+ if (v->pos.y == v->bottom_margin.y)
+ {
+ vt102_log_line (v, v->pos.y);
+ crt_scroll_up (&v->crt, v->top_margin, v->bottom_margin, 1);
+ }
+ else
+ {
+ vt102_cursor_relative (v, 0, 1);
+ }
+ break;
+ case 'H':
+ v->tabs[v->pos.x]++;
+ break;
+ case 'M':
+ if (v->pos.y == v->top_margin.y)
+ {
+ crt_scroll_down (&v->crt, v->top_margin, v->bottom_margin, 1);
+ }
+ else
+ {
+ vt102_cursor_relative (v, 0, -1);
+ }
+ break;
+ case '7':
+ vt102_save_state (v);
+ break;
+ case '8':
+ vt102_restore_state (v);
+ break;
case '=':
+ v->application_keypad_mode=1;
+ break;
case '>':
- {
- char s[] = { 033, c };
-/*Horrid hack for the moment in testing change the key mode of the upstream te*/
- write (1, s, 2);
- }
+ v->application_keypad_mode=0;
break;
-#endif
default:
#if 0
fprintf (stderr, "unhandled ESC \\033 \\%03o (ESC %c)\n", c,
(c < 32) ? '?' : c);
#endif
- ;
+ ;
}
}
void
case 'D':
vt102_cursor_relative (v, -narg, 0);
break;
- case 'E':
+ case 'E':
vt102_cursor_relative (v, 0, narg);
vt102_cursor_carriage_return (v);
- break;
- case 'F':
+ break;
+ case 'F':
vt102_cursor_relative (v, 0, -narg);
vt102_cursor_carriage_return (v);
- break;
- case 'G':
- vt102_cursor_absolute (v, narg-1, v->pos.y);
- break;
+ break;
+ case 'G':
+ vt102_cursor_absolute (v, narg - 1, v->pos.y);
+ break;
case 'H':
- case 'f':
+ case 'f':
{
int x, y;
vt102_cursor_home (v);
break;
- case 's':
- v->saved.pos=v->pos;
- break;
- case 'u':
- v->pos=v->saved.pos;
- vt102_cursor_normalize(v);
- v->pending_wrap = 0;
- break;
+ case 's':
+ v->saved.pos = v->pos;
+ break;
+ case 'u':
+ v->pos = v->saved.pos;
+ vt102_cursor_normalize (v);
+ v->pending_wrap = 0;
+ break;
default:
#if 0
fprintf (stderr, "unhandled CSI \\033%s\n", buf, buf[0]);
#endif
- ;
+ ;
}
break;
default:
#if 0
fprintf (stderr, "unhandled CSI \\033%s\n", buf, buf[0]);
#endif
- ;
+ ;
}
/*STX*/ case 2:
/*ETX*/ case 3:
/*EOT*/ case 4:
- break;
+ break;
/*ENQ*/ case 5:
- /*FIXME: Should send ack*/
- break;
+ tty_write (v->tty, "vt102", 5);
+ break;
/*ACK*/ case 6:
/*BEL*/ case 7:
break;
}
v->crt.pos = v->pos;
- v->crt.hide_cursor=v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0:1;
+ v->crt.hide_cursor =
+ v->private_modes[VT102_PRIVATE_MODE_SHOW_CURSOR] ? 0 : 1;
if (v->current_line.y != v->pos.y)
{
vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
}
+vt102_parse(VT102 *v,char *buf,int len)
+{
+while (len--)
+ vt102_parse_char(v,*(buf++));
+}
+
+
void
vt102_parser_reset (VT102_parser * p)
{
p->csi_ptr = 0;
}
+
+void
+vt102_send (VT102 * v, uint8_t key)
+{
+ uint8_t c;
+ if ((key > 31) || (key < 127))
+ {
+ tty_write (v->t, &key, 1);
+ return;
+ }
+
+ switch (key)
+ {
+ /*NUL*/ case 0:
+ /*SOH*/ case 1:
+ /*STX*/ case 2:
+ /*ETX*/ case 3:
+ /*EOT*/ case 4:
+ /*ENQ*/ case 5:
+ /*ACK*/ case 6:
+ /*BEL*/ case 7:
+ /*BS*/ case 8:
+ /*HT*/ case 9:
+ /*LF*/ case 10:
+ /*VT*/ case 11:
+ /*FF*/ case 12:
+ tty_write (v->t, &key, 1);
+ break;
+ /*CR*/ case 13:
+ tty_write (v->t, &key, 1);
+ if (v->modes[VT102_MODE_NEWLINE_MODE])
+ {
+ c = 10;
+ tty_write (v->t, &c, 1);
+ }
+ break;
+ /*SO*/ case 14:
+ /*SI*/ case 15:
+ /*DLE*/ case 16:
+ /*DC1 */ case 17:
+ /*DC2 */ case 18:
+ /*DC3 */ case 19:
+ /*DC4 */ case 20:
+ /*NAK*/ case 21:
+ /*SYN*/ case 22:
+ /*ETB*/ case 23:
+ /*CAN*/ case 24:
+ /*EM*/ case 25:
+ /*SUB*/ case 26:
+ tty_write (v->t, &key, 1);
+ break;
+ /*ESC*/ case 27:
+ /*FS*/ case 28:
+ /*GS*/ case 29:
+ /*RS*/ case 30:
+ /*US*/ case 31:
+ /*DEL*/ case 127:
+ tty_write (v->t, &key, 1);
+ break;
+
+ case KEY_UP:
+ case KEY_DOWN:
+ case KEY_RIGHT:
+ case KEY_LEFT:
+ if (v->private_modes[VT102_PRIVATE_MODE_CURSOR_MODE])
+ {
+ uint8_t buf[] = { 033, '[', 'A' + (key - KEY_UP) };
+ tty_write (v->t, &key, sizeof (buf));
+ }
+ else
+ {
+ uint8_t buf[] = { 033, '[', 'O' + (key - KEY_UP) };
+ tty_write (v->t, &key, sizeof (buf));
+ }
+ break;
+ case KEY_0:
+ case KEY_1:
+ case KEY_2:
+ case KEY_3:
+ case KEY_4:
+ case KEY_5:
+ case KEY_6:
+ case KEY_7:
+ case KEY_8:
+ 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));
+ }
+ 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);
+ }
+ break;
+ case KEY_ENTER:
+ if (v->application_keypad_mode)
+ {
+ uint8_t buf[] = { 033, 'O', 'M' };
+ tty_write (v->t, &key, sizeof (buf));
+ }
+ else
+ {
+ c = 13;
+ tty_write (v->t, &c, 1);
+ if (v->modes[VT102_MODE_NEWLINE_MODE])
+ {
+ c = 10;
+ tty_write (v->t, &c, 1);
+ }
+ }
+ break;
+ case KEY_PF1:
+ case KEY_PF2:
+ case KEY_PF3:
+ case KEY_PF4:
+ {
+ uint8_t buf[] = { 033, 'O', 'P' + (key - KEY_PF1) };
+ tty_write (v->t, &key, sizeof (buf));
+ }
+ break;
+
+ }
+
+}
+
void
vt102_reset (VT102 * v)
{
crt_cls (&v->crt);
+ v->application_keypad_mode=0;
v->current_line = v->pos;
v->pending_wrap = 0;
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->modes[VT102_MODE_LOCAL_ECHO_OFF] = 1;
vt102_cursor_home (v);
vt102_reset_tabs (v);
v->current_line = v->pos;
- vt102_save_state(v);
+ vt102_save_state (v);
-#if 0
+ vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
+
+}
+
+int vt102_dispatch(VT102 *v)
{
-char buf[3];
-int i;
- for (i=0;i<200;++i) {
- sprintf(buf,"%3d",i);
- vt102_parse_char (v,buf[0]);
- vt102_parse_char (v,buf[1]);
- vt102_parse_char (v,buf[2]);
- vt102_parse_char (v,13);
- vt102_parse_char (v,27);
- vt102_parse_char (v,'M');
- }
- vt102_parse_char(v,'f');
- vt102_parse_char (v,13);
- for (i=0;i<23;++i) {
- vt102_parse_char (v,27);
- vt102_parse_char (v,'M');
- }
- vt102_parse_char(v,'b');
- vt102_parse_char (v,13);
+char buf[1024];
+int red;
+
+red=tty_read(v->t,buf,sizeof(buf));
+if (red<0) return -1;
+if (!red) return 0;
+
+vt102_parse(v,buf,red);
+
+return 0;
}
-#endif
+VT102 *vt102_new(TTY *t)
+{
+VT102 *v;
- vt102_status_line (v, "VT102 foo bar baz I'm the urban spaceman baby");
+v=(VT102 *) malloc(sizeof(VT102));
+
+vt102_reset(v);
+
+v->tty=t;
+return v;
+}
+
+void vt102_free(VT102 *v)
+{
+free(v);
}
~ianmdlvl / sympathy.git / commitdiff