MODE_MOUSEBTN = 32,
MODE_MOUSEMOTION = 64,
MODE_MOUSE = 32|64,
- MODE_REVERSE = 128
+ MODE_REVERSE = 128,
+ MODE_KBDLOCK = 256
};
enum escape_state {
XftDraw *xft_draw;
Visual *vis;
int scr;
- Bool isfixed; /* is fixed geometry? */
+ bool isfixed; /* is fixed geometry? */
int fx, fy, fw, fh; /* fixed geometry */
int tw, th; /* tty width and height */
int w; /* window width */
static void tnew(int, int);
static void tnewline(int);
static void tputtab(bool);
-static void tputc(char*);
+static void tputc(char*, int);
static void treset(void);
static int tresize(int, int);
static void tscrollup(int, int);
static void ttynew(void);
static void ttyread(void);
-static void ttyresize(int, int);
+static void ttyresize(void);
static void ttywrite(const char *, size_t);
static void xdraws(char *, Glyph, int, int, int, int);
while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) {
charsize = utf8decode(ptr, &utf8c);
utf8encode(&utf8c, s);
- tputc(s);
+ tputc(s, charsize);
ptr += charsize;
buflen -= charsize;
}
}
void
-ttyresize(int x, int y) {
+ttyresize(void) {
struct winsize w;
w.ws_row = term.row;
void
treset(void) {
- unsigned i;
+ uint i;
term.c = (TCursor){{
.mode = ATTR_NULL,
.fg = DefaultFG,
term.tabs[i] = 1;
term.top = 0, term.bot = term.row - 1;
term.mode = MODE_WRAP;
+
tclearregion(0, 0, term.col-1, term.row-1);
}
void
tsetchar(char *c) {
+ /*
+ * The table is proudly stolen from rxvt.
+ */
+ if(term.c.attr.mode & ATTR_GFX) {
+ char *vt100_0[62] = { /* 0x41 - 0x7e */
+ "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
+ 0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
+ 0, 0, 0, 0, 0, 0, 0, " ", /* X - _ */
+ "◆", "▒", "␉", "␌", "␍", "␊", "°", "±", /* ` - g */
+ "", "␋", "┘", "┐", "┌", "└", "┼", "⎺", /* h - o */
+ "⎻", "─", "⎼", "⎽", "├", "┤", "┴", "┬", /* p - w */
+ "│", "≤", "≥", "π", "≠", "£", "·", /* x - ~ */
+ };
+
+ if(c[0] >= 0x41 && c[0] <= 0x7e
+ && vt100_0[c[0] - 0x41]) {
+ c = vt100_0[c[0] - 0x41];
+ }
+ }
+
term.dirty[term.c.y] = 1;
term.line[term.c.y][term.c.x] = term.c.attr;
memcpy(term.line[term.c.y][term.c.x].c, c, UTF_SIZ);
for(lim = args + narg; args < lim; ++args) {
if(priv) {
switch(*args) {
- case 1:
+ break;
+ case 1: /* DECCKM -- Cursor key */
MODBIT(term.mode, set, MODE_APPKEYPAD);
break;
case 5: /* DECSCNM -- Reverve video */
if(mode != term.mode)
redraw();
break;
- case 7:
+ case 6: /* XXX: DECOM -- Origin */
+ break;
+ case 7: /* DECAWM -- Auto wrap */
MODBIT(term.mode, set, MODE_WRAP);
break;
- case 20:
- MODBIT(term.mode, set, MODE_CRLF);
+ case 8: /* XXX: DECARM -- Auto repeat */
break;
+ case 0: /* Error (IGNORED) */
case 12: /* att610 -- Start blinking cursor (IGNORED) */
break;
case 25:
tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD);
break;
default:
+ /* case 2: DECANM -- ANSI/VT52 (NOT SUPPOURTED) */
+ /* case 3: DECCOLM -- Column (NOT SUPPORTED) */
+ /* case 4: DECSCLM -- Scroll (NOT SUPPORTED) */
+ /* case 18: DECPFF -- Printer feed (NOT SUPPORTED) */
+ /* case 19: DECPEX -- Printer extent (NOT SUPPORTED) */
+ /* case 42: DECNRCM -- National characters (NOT SUPPORTED) */
fprintf(stderr,
"erresc: unknown private set/reset mode %d\n",
*args);
}
} else {
switch(*args) {
- case 4:
+ case 0: /* Error (IGNORED) */
+ break;
+ case 2: /* KAM -- keyboard action */
+ MODBIT(term.mode, set, MODE_KBDLOCK);
+ break;
+ case 4: /* IRM -- Insertion-replacement */
MODBIT(term.mode, set, MODE_INSERT);
break;
+ case 12: /* XXX: SRM -- Send/Receive */
+ break;
+ case 20: /* LNM -- Linefeed/new line */
+ MODBIT(term.mode, set, MODE_CRLF);
+ break;
default:
fprintf(stderr,
"erresc: unknown set/reset mode %d\n",
void
tputtab(bool forward) {
- unsigned x = term.c.x;
+ uint x = term.c.x;
if(forward) {
if(x == term.col)
}
void
-tputc(char *c) {
- char ascii = *c;
+tputc(char *c, int len) {
+ uchar ascii = *c;
if(iofd != -1)
- write(iofd, c, 1);
+ write(iofd, c, len);
+
+ switch(ascii) {
+ case '\t':
+ tputtab(1);
+ return;
+ case '\b':
+ tmoveto(term.c.x-1, term.c.y);
+ return;
+ case '\r':
+ tmoveto(0, term.c.y);
+ return;
+ case '\f':
+ case '\v':
+ case '\n':
+ /* go to first col if the mode is set */
+ tnewline(IS_SET(MODE_CRLF));
+ return;
+ case '\a':
+ if(!(xw.state & WIN_FOCUSED))
+ xseturgency(1);
+ return;
+ case '\033':
+ csireset();
+ term.esc = ESC_START;
+ return;
+ }
if(term.esc & ESC_START) {
if(term.esc & ESC_CSI) {
strhandle();
} else if(term.esc & ESC_ALTCHARSET) {
switch(ascii) {
- case '0': /* Line drawing crap */
+ case '0': /* Line drawing set */
term.c.attr.mode |= ATTR_GFX;
break;
- case 'B': /* Back to regular text */
+ case 'B': /* USASCII */
term.c.attr.mode &= ~ATTR_GFX;
break;
+ case 'A': /* UK (IGNORED) */
+ case '<': /* multinational charset (IGNORED) */
+ case '5': /* Finnish (IGNORED) */
+ case 'C': /* Finnish (IGNORED) */
+ case 'K': /* German (IGNORED) */
+ break;
default:
fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii);
}
strescseq.type = ascii;
term.esc |= ESC_STR;
break;
- case '(':
+ case '(': /* set primary charset G0 */
term.esc |= ESC_ALTCHARSET;
break;
+ case ')': /* set secondary charset G1 (IGNORED) */
+ case '*': /* set tertiary charset G2 (IGNORED) */
+ case '+': /* set quaternary charset G3 (IGNORED) */
+ term.esc = 0;
+ break;
case 'D': /* IND -- Linefeed */
if(term.c.y == term.bot)
tscrollup(term.top, 1);
case 'c': /* RIS -- Reset to inital state */
treset();
term.esc = 0;
+ xclear(0, 0, xw.w, xw.h);
xresettitle();
break;
case '=': /* DECPAM -- Application keypad */
} else {
if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey))
sel.bx = -1;
- switch(ascii) {
- case '\0': /* padding character, do nothing */
- break;
- case '\t':
- tputtab(1);
- break;
- case '\b':
- tmoveto(term.c.x-1, term.c.y);
- break;
- case '\r':
- tmoveto(0, term.c.y);
- break;
- case '\f':
- case '\v':
- case '\n':
- /* go to first col if the mode is set */
- tnewline(IS_SET(MODE_CRLF));
- break;
- case '\a':
- if(!(xw.state & WIN_FOCUSED))
- xseturgency(1);
- break;
- case '\033':
- csireset();
- term.esc = ESC_START;
- break;
- default:
+ if(ascii >= '\020' || term.c.attr.mode & ATTR_GFX) {
if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT)
tnewline(1); /* always go to first col */
tsetchar(c);
int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw;
Font *font = &dc.font;
XGlyphInfo extents;
- int i;
/* only switch default fg/bg if term is in RV mode */
if(IS_SET(MODE_REVERSE)) {
XSetBackground(xw.dpy, dc.gc, dc.col[bg]);
XSetForeground(xw.dpy, dc.gc, dc.col[fg]);
- if(base.mode & ATTR_GFX) {
- for(i = 0; i < bytelen; i++) {
- char c = gfx[(uint)s[i] % 256];
- if(c)
- s[i] = c;
- else if(s[i] > 0x5f)
- s[i] -= 0x5f;
- }
- }
-
XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, &extents);
width = extents.xOff;
XftDrawRect(xw.xft_draw, &dc.xft_col[bg], winx, winy - font->ascent, width, xw.ch);
int shift;
Status status;
+ if (IS_SET(MODE_KBDLOCK))
+ return;
meta = e->state & Mod1Mask;
shift = e->state & ShiftMask;
len = XmbLookupString(xw.xic, e, buf, sizeof(buf), &ksym, &status);
xclear(0, 0, xw.w, xw.h);
tresize(col, row);
xresize(col, row);
- ttyresize(col, row);
+ ttyresize();
}
void
int
main(int argc, char *argv[]) {
int i, bitm, xr, yr;
- unsigned int wr, hr;
+ uint wr, hr;
xw.fw = xw.fh = xw.fx = xw.fy = 0;
xw.isfixed = False;
Got questions, comments, patches, etc.? Contact Jason Woofenden