/*
* $Log$
+ * Revision 1.14 2008/02/07 12:21:16 james
+ * *** empty log message ***
+ *
+ * Revision 1.13 2008/02/07 12:16:04 james
+ * *** empty log message ***
+ *
+ * Revision 1.12 2008/02/07 11:32:41 james
+ * *** empty log message ***
+ *
+ * Revision 1.11 2008/02/07 11:11:14 staffcvs
+ * *** empty log message ***
+ *
+ * Revision 1.10 2008/02/07 01:02:52 james
+ * *** empty log message ***
+ *
+ * Revision 1.9 2008/02/07 00:43:27 james
+ * *** empty log message ***
+ *
* Revision 1.8 2008/02/07 00:39:13 james
* *** empty log message ***
*
}
-int ansi_read(ANSI *a,void *buf,int n)
+int
+ansi_read (ANSI * a, void *buf, int n)
{
-int red;
+ int red;
- set_nonblocking(a->fd);
-red=read(a->fd,buf,n);
+ set_nonblocking (a->fd);
+ red = read (a->fd, buf, n);
-if (!red) return -1;
+ if (!red)
+ return -1;
-if ((red==-1) && (errno==EAGAIN)) {
- return 0;
-}
+ if ((red == -1) && (errno == EAGAIN))
+ {
+ return 0;
+ }
-return red;
+ return red;
}
void
ansi_write (ANSI * a, char *buf, int n)
{
- set_blocking(a->fd);
+ set_blocking (a->fd);
write (a->fd, buf, n);
}
{
ansi_write (a, "\033[0m", 4);
a->attr = CRT_ATTR_NORMAL;
+ a->color = ANSI_INVAL;
+}
+
+void
+ansi_set_color (ANSI * a, int color)
+{
+ int dif;
+ char buf[16];
+ int i;
+ int fg,bg;
+
+ if ((a->color == ANSI_INVAL) || (color!=a->color)) {
+ fg=CRT_COLOR_FG(color);
+ bg=CRT_COLOR_BG(color);
+
+ if (fg & CRT_COLOR_INTENSITY) {
+ fg+=90;
+ } else {
+ fg+=30;
+ }
+
+ if (bg & CRT_COLOR_INTENSITY) {
+ bg+=100;
+ } else {
+ bg+=40;
+ }
+
+ i=sprintf(buf,"\033[%d;%dm",fg,bg);
+#if 0
+ fprintf(stderr,"Color set to %d %d %x\n",fg,bg,color);
+#endif
+
+ ansi_write (a,buf,i);
+ a->color=color;
+ }
}
void
a->attr = attr;
+#if 0
if (attr == CRT_ATTR_NORMAL)
{
ansi_force_attr_normal (a);
return;
}
+#endif
if (dif & CRT_ATTR_UNDERLINE)
{
ca.chr = ' ';
ansi_set_attr (a, ca.attr);
+ ansi_set_color(a,ca.color);
ansi_write (a, &ca.chr, 1);
crt_cls (&a->crt);
ansi_force_attr_normal (a);
+ ansi_set_color(a,CRT_COLOR_NORMAL);
ansi_move (a, p);
ansi_write (a, "\033[2J", 4);
/*different emulators leave cursor in different places after cls differently*/
ansi_showhide_cursor (a, 1);
ansi_set_attr (a, CRT_ATTR_REVERSE);
+ ansi_set_color(a,CRT_MAKE_COLOR(CRT_COLOR_WHITE,CRT_COLOR_RED));
ansi_move (a, p);
ansi_write (a, msg, sizeof (msg));
crt_reset (&a->crt);
ansi_cls (a);
- ansi_write(a,"\033=",2);
+ ansi_write (a, "\033=", 2);
ansi_draw (a, &a->crt);
}
-void ansi_flush_escape(ANSI *a,VT102 *v)
+
+void
+ansi_flush_escape (ANSI * a, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
-int i;
+ ANSI_Parser *p = &a->parser;
+ int i;
-for (i=0;i<p->escape_ptr;++i) {
-vt102_send(v,p->escape_buf[i]);
-}
+ for (i = 0; i < p->escape_ptr; ++i)
+ {
+ vt102_send (v, p->escape_buf[i],t);
+ }
-p->escape_ptr=0;
-p->in_escape=0;
+ p->escape_ptr = 0;
+ p->in_escape = 0;
}
-void ansi_parse_deckey(ANSI *a,VT102 *v)
+void
+ansi_parse_deckey (ANSI * a, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
-if ((p->escape_buf[1]!='[') && (p->escape_buf[1]!='O')) {
- ansi_flush_escape(a,v);
- return;
-}
-
-if ((p->escape_buf[2]>='A') || (p->escape_buf[2]<='Z')){
- vt102_send(v,KEY_UP+(p->escape_buf[2]-'A'));
-}else if ((p->escape_buf[2]>='a') || (p->escape_buf[2]<='z')){
- vt102_send(v,KEY_154+(p->escape_buf[2]-'a'));
-} else {
- ansi_flush_escape(a,v);
- return;
-}
-p->in_escape=0;
-p->escape_ptr=0;
+ ANSI_Parser *p = &a->parser;
+ if ((p->escape_buf[1] != '[') && (p->escape_buf[1] != 'O'))
+ {
+ ansi_flush_escape (a, v,t);
+ return;
+ }
+
+ if ((p->escape_buf[2] >= 'A') || (p->escape_buf[2] <= 'Z'))
+ {
+ vt102_send (v, KEY_UP + (p->escape_buf[2] - 'A'),t);
+ }
+ else if ((p->escape_buf[2] >= 'a') || (p->escape_buf[2] <= 'z'))
+ {
+ vt102_send (v, KEY_154 + (p->escape_buf[2] - 'a'),t);
+ }
+ else
+ {
+ ansi_flush_escape (a, v,t);
+ return;
+ }
+ p->in_escape = 0;
+ p->escape_ptr = 0;
}
-void ansi_parse_ansikey(ANSI *a,VT102 *v)
+void
+ansi_parse_ansikey (ANSI * a, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
+ ANSI_Parser *p = &a->parser;
-if ((p->escape_buf[1]!='[') ||(p->escape_buf[3]!='~')) {
- ansi_flush_escape(a,v);
- return;
-}
-if ((p->escape_buf[2]>='0') || (p->escape_buf[2]<='9')){
- vt102_send(v,KEY_180+(p->escape_buf[2]-'0'));
-} else {
- ansi_flush_escape(a,v);
- return;
-}
+ if ((p->escape_buf[1] != '[') || (p->escape_buf[3] != '~'))
+ {
+ ansi_flush_escape (a, v,t);
+ return;
+ }
+ if ((p->escape_buf[2] >= '0') || (p->escape_buf[2] <= '9'))
+ {
+ vt102_send (v, KEY_180 + (p->escape_buf[2] - '0'),t);
+ }
+ else
+ {
+ ansi_flush_escape (a, v,t);
+ return;
+ }
-p->in_escape=0;
-p->escape_ptr=0;
+ p->in_escape = 0;
+ p->escape_ptr = 0;
}
-void ansi_parse_escape(ANSI *a,VT102 *v)
+void
+ansi_parse_escape (ANSI * a, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
-switch(p->escape_ptr) {
-case 0:
-case 1:
- return;
-case 2:
- switch (p->escape_buf[1]) {
- case '[':
- case 'O':
- break;
- default:
- ansi_flush_escape(a,v);
- }
- break;
-case 3:
- switch(p->escape_buf[1]) {
- case 'O':
- ansi_parse_deckey(a,v);
- break;
- case '[':
- if ((p->escape_buf[2]>='A') &&
- (p->escape_buf[2]<='Z'))
- ansi_parse_deckey(a,v);
- break;
- default:
- ansi_flush_escape(a,v);
- }
- break;
-case 4:
- switch(p->escape_buf[1]) {
- case '[':
- ansi_parse_ansikey(a,v);
- break;
- default:
- ansi_flush_escape(a,v);
- }
- break;
-case 5:
- ansi_flush_escape(a,v);
-}
+ ANSI_Parser *p = &a->parser;
+ switch (p->escape_ptr)
+ {
+ case 0:
+ case 1:
+ return;
+ case 2:
+ switch (p->escape_buf[1])
+ {
+ case '[':
+ case 'O':
+ break;
+ default:
+ ansi_flush_escape (a, v,t);
+ }
+ break;
+ case 3:
+ switch (p->escape_buf[1])
+ {
+ case 'O':
+ ansi_parse_deckey (a, v,t);
+ break;
+ case '[':
+ if ((p->escape_buf[2] >= 'A') && (p->escape_buf[2] <= 'Z'))
+ ansi_parse_deckey (a, v,t);
+ break;
+ default:
+ ansi_flush_escape (a, v,t);
+ }
+ break;
+ case 4:
+ switch (p->escape_buf[1])
+ {
+ case '[':
+ ansi_parse_ansikey (a, v,t);
+ break;
+ default:
+ ansi_flush_escape (a, v,t);
+ }
+ break;
+ case 5:
+ ansi_flush_escape (a, v,t);
+ }
}
-void ansi_check_escape(ANSI *a,VT102 *v)
+void
+ansi_check_escape (ANSI * a, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
- struct timeval now,diff;
- gettimeofday(&now,NULL);
- timersub(&now,&p->last_escape,&diff);
+ ANSI_Parser *p = &a->parser;
+ struct timeval now, diff;
+ gettimeofday (&now, NULL);
+ timersub (&now, &p->last_escape, &diff);
#if 0
-fprintf(stderr,"ie %d tl %d.%06d eb %d\n",
- p->in_escape,diff.tv_sec,diff.tv_usec,p->escape_ptr);
+ fprintf (stderr, "ie %d tl %d.%06d eb %d\n",
+ p->in_escape, diff.tv_sec, diff.tv_usec, p->escape_ptr);
#endif
-if (!p->in_escape) return;
+ if (!p->in_escape)
+ return;
- /*Time up?*/
- if (diff.tv_sec || (diff.tv_usec > ANSI_ESCAPE_TIMEOUT))
- ansi_flush_escape(a,v);
+ /*Time up? */
+ if (diff.tv_sec || (diff.tv_usec > ANSI_ESCAPE_TIMEOUT))
+ ansi_flush_escape (a, v,t);
}
-void ansi_parse_char(ANSI *a,int c,VT102 *v)
+void
+ansi_parse_char (ANSI * a, int c, VT102 * v,TTY *t)
{
-ANSI_Parser *p=&a->parser;
+ ANSI_Parser *p = &a->parser;
/*See if it's time to flush the escape*/
-ansi_check_escape(a,v);
+ ansi_check_escape (a, v,t);
-if (c==033) {
- if (p->in_escape)
- ansi_flush_escape(a,v);
+ if (c == 033)
+ {
+ if (p->in_escape)
+ ansi_flush_escape (a, v,t);
- p->in_escape++;
- p->escape_ptr=0;
- gettimeofday(&p->last_escape,NULL);
-}
+ p->in_escape++;
+ p->escape_ptr = 0;
+ gettimeofday (&p->last_escape, NULL);
+ }
-if (p->in_escape) {
- p->escape_buf[p->escape_ptr++]=c;
- ansi_parse_escape(a,v);
-} else {
- vt102_send(v,c);
-}
+ if (p->in_escape)
+ {
+ p->escape_buf[p->escape_ptr++] = c;
+ ansi_parse_escape (a, v,t);
+ }
+ else
+ {
+ vt102_send (v, c,t);
+ }
}
-void ansi_parse(ANSI *a,char *buf,int len,VT102 *v)
+void
+ansi_parse (ANSI * a, char *buf, int len, VT102 * v,TTY *t)
{
-while (len--)
-ansi_parse_char(a,*(buf++),v);
+ while (len--)
+ ansi_parse_char (a, *(buf++), v,t);
}
-int ansi_dispatch(ANSI *a,VT102 *v)
+int
+ansi_dispatch (ANSI * a, VT102 * v,TTY *t)
{
-char buf[1024];
-int red;
+ char buf[1024];
+ int red;
-ansi_check_escape(a,v);
+ ansi_check_escape (a, v,t);
-red=ansi_read(a,buf,sizeof(buf));
-if (red<=0) return red;
+ red = ansi_read (a, buf, sizeof (buf));
+ if (red <= 0)
+ return red;
+
+#if 0
+ if (*buf == 3)
+ return -1;
+#endif
+
+#if 0
+ if (*buf == 1)
+ return 1;
+#endif
-if (*buf==3) return -1;
-ansi_parse(a,buf,red,v);
+ ansi_parse (a, buf, red, v,t);
-return 0;
+ return 0;
}
~ianmdlvl / sympathy.git / blobdiff