/*
* $Log$
+ * Revision 1.8 2008/02/06 11:49:47 james
+ * *** empty log message ***
+ *
+ * Revision 1.7 2008/02/06 11:30:37 james
+ * *** empty log message ***
+ *
* Revision 1.6 2008/02/05 01:11:46 james
* *** empty log message ***
*
&v->crt.screen[CRT_ADDR_POS (&p) + 1], sizeof (CRT_CA) * n);
}
- v->crt.screen[CRT_ADDR (v->bottom_margin.x, p.y)].chr = ' ';
+ v->crt.screen[CRT_ADDR (p.y, v->bottom_margin.x)].chr = ' ';
/*But not attr due to vt102 bug*/
}
+void
+vt102_insert_into_line (VT102 * v, CRT_Pos p)
+{
+ int n = v->bottom_margin.x - p.x;
+
+ if (n < 0)
+ return;
+
+ if (n)
+ {
+
+ memmove (&v->crt.screen[CRT_ADDR_POS (&p) + 1],
+ &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;
+}
+
+void
+vt102_change_mode (VT102 * v, int private, char *ns, int set)
+{
+ int m;
+
+
+ if (*ns)
+ {
+ m = atoi (ns);
+ }
+ else
+ {
+ m = 1;
+ }
+
+ if (m < 0)
+ return;
+ if (m >= VT102_NMODES)
+ return;
+
+ if (private)
+ v->private_modes[m] = set;
+ else
+ v->modes[m] = set;
+
+ fprintf (stderr, "mode set=%d private=%d num=%d\n", set, private, m);
+}
+
+void
+vt102_parse_mode_string (VT102 * v, char *buf, int len)
+{
+ int private = 0;
+ char last = buf[len - 1];
+ char num[4];
+ int o;
+
+ memset (num, 0, sizeof (num));
+ o = sizeof (num) - 1;
+
+ len--;
+
+ if (*buf == '?')
+ {
+ private++;
+ buf++;
+ len--;
+ }
+
+ if (len < 0)
+ return;
+
+ while (len--)
+ {
+ if (*buf == ';')
+ {
+ vt102_change_mode (v, private, &num[o], last == 'h');
+ memset (num, 0, sizeof (num));
+ o = sizeof (num) - 1;
+ buf++;
+ continue;
+ }
+
+ num[0] = num[1];
+ num[1] = num[2];
+ num[2] = *buf;
+
+ if (o)
+ o--;
+
+ buf++;
+ }
+
+ vt102_change_mode (v, private, &num[o], last == 'h');
+
+}
void
vt102_parse_esc (VT102 * v, int c)
buf[len - 1] = 0;
#endif
- if (len>2)
+ if (len > 2)
{
narg = atoi (arg);
}
vt102_cursor_normalize (v, 0, 0);
break;
case 'J':
- fprintf(stderr,"OCTOPUS %d\n",narg);
+ fprintf (stderr, "OCTOPUS %d\n", narg);
switch (narg)
{
case 1:
{
CRT_Pos ls = { 0, v->pos.y };
CRT_Pos le = { VT102_COLS - 1, v->pos.y };
- if (len==2)
+ if (len == 2)
narg = 0; /*Different default */
switch (narg)
{
case 0:
- fprintf(stderr,"FISH %d %d -> %d %d\n",
- v->pos.x,v->pos.y,
- le.x,le.y);
+ fprintf (stderr, "FISH %d %d -> %d %d\n",
+ v->pos.x, v->pos.y, le.x, le.y);
crt_erase (&v->crt, v->pos, le, 1);
break;
case 1:
- fprintf(stderr,"SOUP %d %d -> %d %d\n",
- ls.x,ls.y,
- v->pos.x,v->pos.y);
+ fprintf (stderr, "SOUP %d %d -> %d %d\n",
+ ls.x, ls.y, v->pos.x, v->pos.y);
crt_erase (&v->crt, ls, v->pos, 1);
break;
case 2:
- fprintf(stderr,"TREE %d %d -> %d %d\n",
- ls.x,ls.y,
- le.x,le.y);
+ fprintf (stderr, "TREE %d %d -> %d %d\n",
+ ls.x, ls.y, le.x, le.y);
crt_erase (&v->crt, ls, le, 1);
break;
}
}
break;
- case 'g':
- case 'h':
- case 'l':
- fprintf (stderr, "C: CSI %s buf[0]=%c\n", buf,buf[0]);
- break;
-
- case 'm':
- //horror of horrors parsing the ;
- break;
- case 'r':
- v->top_margin=v->screen_start;
- v->bottom_margin=v->screen_end;
-
- if ((len>2) && (ptr=index(arg,';'))) {
- ptr++;
- v->top_margin.y=narg-1;
- v->bottom_margin.y=atoi(ptr)-1;
- }
-
- if (v->top_margin.y<v->screen_start.y) v->top_margin.y=v->screen_start.y;
- if (v->top_margin.y>v->screen_end.y) v->top_margin.y=v->screen_end.y;
- if (v->bottom_margin.y<v->screen_start.y) v->bottom_margin.y=v->screen_start.y;
- if (v->bottom_margin.y>v->screen_end.y) v->bottom_margin.y=v->screen_end.y;
-
- fprintf(stderr,"D: %d %d\n",v->top_margin.y,v->bottom_margin.y);
-
- v->pos=v->top_margin;
- break;
+ case 'g':
+ fprintf (stderr, "C: CSI %s buf[0]=%c\n", buf, buf[0]);
+ break;
+
+ case 'h':
+ case 'l':
+ fprintf (stderr, "D: CSI %s buf[0]=%c\n", buf, buf[0]);
+ vt102_parse_mode_string (v, &buf[1], len - 1);
+ break;
+
+ case 'm':
+ //horror of horrors parsing the ;
+ break;
+ case 'r':
+ v->top_margin = v->screen_start;
+ v->bottom_margin = v->screen_end;
+
+ if ((len > 2) && (ptr = index (arg, ';')))
+ {
+ ptr++;
+ v->top_margin.y = narg - 1;
+ v->bottom_margin.y = atoi (ptr) - 1;
+ }
+
+ if (v->top_margin.y < v->screen_start.y)
+ v->top_margin.y = v->screen_start.y;
+ if (v->top_margin.y > v->screen_end.y)
+ v->top_margin.y = v->screen_end.y;
+ if (v->bottom_margin.y < v->screen_start.y)
+ v->bottom_margin.y = v->screen_start.y;
+ if (v->bottom_margin.y > v->screen_end.y)
+ v->bottom_margin.y = v->screen_end.y;
+
+ fprintf (stderr, "D: %d %d\n", v->top_margin.y, v->bottom_margin.y);
+
+ v->pos = v->top_margin;
+ break;
default:
- fprintf (stderr, "A: CSI %s buf[0]=%c\n", buf,buf[0]);
+ fprintf (stderr, "A: CSI %s buf[0]=%c\n", buf, buf[0]);
}
break;
default:
- fprintf (stderr, "B: CSI %s buf[0]=%c\n", buf,buf[0]);
+ fprintf (stderr, "B: CSI %s buf[0]=%c\n", buf, buf[0]);
}
VT102_parser *p = &v->parser;
#if 0
- fprintf (stderr, "%c pc %d %d %d %d %d\n", c, c, p->in_csi, p->in_escape,
- v->pos.x, v->pos.y);
+ fprintf (stderr, "%c pc %d %d %d %d %d\n", (c > 31) ? 32 : c, c,
+ p->in_csi, p->in_escape, v->pos.x, v->pos.y);
#endif
if (p->in_csi)
{
/*ENQ*/ case 5:
/*ACK*/ case 6:
/*BEL*/ case 7:
+ break;
/*BS*/ case 8:
vt102_cursor_motion (v, -1, 0, 1);
break;
/*HT*/ case 9:
- v->pos.x+=8;
- v->pos.x&=~7;
- vt102_cursor_normalize(v,1,1);
+ v->pos.x += 8;
+ v->pos.x &= ~7;
+ vt102_cursor_normalize (v, 1, 1);
break;
/*LF*/ case 10:
/*VT*/ case 11:
/*FF*/ case 12:
vt102_cursor_motion (v, 0, 1, 1);
+ if (v->modes[VT102_MODE_NEWLINE_MODE])
+ v->pos.x = v->top_margin.x;
break;
/*CR*/ case 13:
v->pos.x = v->top_margin.x;
/*DEL*/ case 127:
break;
/*regular character */ default:
+
+ 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)].attr = v->attr;
vt102_cursor_motion (v, 1, 0, 1);
v->pos = v->screen_start;
+ memset(v->modes,0,VT102_NMODES);
+ memset(v->private_modes,0,VT102_NMODES);
+
+ v->modes[VT102_PRIVATE_MODE_AUTO_WRAP]=1;
+ v->modes[VT102_PRIVATE_MODE_AUTO_REPEAT]=1;
+
+
}
~ianmdlvl / sympathy.git / blobdiff