X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=a84f0e02f75349f971248bc09ff312f58e714652;hb=0981437524b64579cc656f60b0108abdcdf8a0cd;hp=64a37e151f59486594688c3e828a2f06b60ba35b;hpb=ad39f000be87ec16e74c05bdc3fa81ef307b5477;p=st.git diff --git a/st.c b/st.c index 64a37e1..a84f0e0 100644 --- a/st.c +++ b/st.c @@ -1,14 +1,199 @@ /* See LICENSE for licence details. */ -#include "st.h" +#define _XOPEN_SOURCE 600 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define TNAME "xterm" + +/* Arbitrary sizes */ +#define TITLESIZ 256 +#define ESCSIZ 256 +#define ESCARGSIZ 16 +#define MAXDRAWBUF 1024 + +#define SERRNO strerror(errno) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) < (b) ? (b) : (a)) +#define LEN(a) (sizeof(a) / sizeof(a[0])) +#define DEFAULT(a, b) (a) = (a) ? (a) : (b) +#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) +#define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) +#define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) + +/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */ +enum { ATnone=0 , ATreverse=1 , ATunderline=2, ATbold=4 }; +enum { CSup, CSdown, CSright, CSleft, CShide, CSdraw, CSwrap, CSsave, CSload }; +enum { CRset=1, CRupdate=2 }; +enum { TMwrap=1, TMinsert=2, TMtitle=4 }; +enum { ESCin = 1, ESCcsi = 2, ESCosc = 4, ESCtitle = 8 }; +enum { SCupdate, SCredraw }; + +typedef int Color; + +typedef struct { + char c; /* character code */ + char mode; /* attribute flags */ + Color fg; /* foreground */ + Color bg; /* background */ + char state; /* state flag */ +} Glyph; + +typedef Glyph* Line; + +typedef struct { + Glyph attr; /* current char attributes */ + char hidden; + int x; + int y; +} TCursor; + +/* CSI Escape sequence structs */ +/* ESC '[' [[ [] [;]] ] */ +typedef struct { + char buf[ESCSIZ]; /* raw string */ + int len; /* raw string length */ + char priv; + int arg[ESCARGSIZ]; + int narg; /* nb of args */ + char mode; +} CSIEscape; + +/* Internal representation of the screen */ +typedef struct { + int row; /* nb row */ + int col; /* nb col */ + Line* line; /* screen */ + TCursor c; /* cursor */ + int top; /* top scroll limit */ + int bot; /* bottom scroll limit */ + int mode; /* terminal mode */ + int esc; + char title[TITLESIZ]; + int titlelen; +} Term; + +/* Purely graphic info */ +typedef struct { + Display* dis; + Window win; + int scr; + int w; /* window width */ + int h; /* window height */ + int ch; /* char height */ + int cw; /* char width */ +} XWindow; + +typedef struct { + KeySym k; + char s[ESCSIZ]; +} Key; + +#include "config.h" + +/* Drawing Context */ +typedef struct { + unsigned long col[LEN(colorname)]; + XFontStruct* font; + GC gc; +} DC; + +static void die(const char *errstr, ...); +static void draw(int); +static void execsh(void); +static void sigchld(int); +static void run(void); + +static void csidump(void); +static void csihandle(void); +static void csiparse(void); +static void csireset(void); + +static void tclearregion(int, int, int, int); +static void tcpos(int); +static void tcursor(int); +static void tdeletechar(int); +static void tdeleteline(int); +static void tinsertblank(int); +static void tinsertblankline(int); +static void tmoveto(int, int); +static void tnew(int, int); +static void tnewline(void); +static void tputc(char); +static void tputs(char*, int); +static void tresize(int, int); +static void tscroll(void); +static void tsetattr(int*, int); +static void tsetchar(char); +static void tsetscroll(int, int); + +static void ttynew(void); +static void ttyread(void); +static void ttyresize(int, int); +static void ttywrite(const char *, size_t); + +static unsigned long xgetcol(const char *); +static void xclear(int, int, int, int); +static void xcursor(int); +static void xdrawc(int, int, Glyph); +static void xinit(void); +static void xscroll(void); + +static void expose(XEvent *); +static char * kmap(KeySym); +static void kpress(XEvent *); +static void resize(XEvent *); + +static void (*handler[LASTEvent])(XEvent *) = { + [KeyPress] = kpress, + [Expose] = expose, + [ConfigureNotify] = resize +}; /* Globals */ -DC dc; -XWindow xw; -Term term; -Escseq escseq; -int cmdfd; -pid_t pid; -int running; +static DC dc; +static XWindow xw; +static Term term; +static CSIEscape escseq; +static int cmdfd; +static pid_t pid; +static int running; + +#ifdef DEBUG +void +tdump(void) { + int row, col; + Glyph c; + + for(row = 0; row < term.row; row++) { + for(col = 0; col < term.col; col++) { + if(col == term.c.x && row == term.c.y) + putchar('#'); + else { + c = term.line[row][col]; + putchar(c.state & CRset ? c.c : '.'); + } + } + putchar('\n'); + } +} +#endif void die(const char *errstr, ...) { @@ -47,7 +232,6 @@ sigchld(int a) { exit(EXIT_FAILURE); } - void ttynew(void) { int m, s; @@ -87,7 +271,7 @@ ttynew(void) { void dump(char c) { static int col; - fprintf(stderr, " %02x %c ", c, isprint(c)?c:'.'); + fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.'); if(++col % 10 == 0) fprintf(stderr, "\n"); } @@ -107,7 +291,7 @@ ttyread(void) { } void -ttywrite(char *s, size_t n) { +ttywrite(const char *s, size_t n) { if(write(cmdfd, s, n) == -1) die("write error on tty: %s\n", SERRNO); } @@ -123,24 +307,6 @@ ttyresize(int x, int y) { fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); } -int -escfinal(char c) { - if(escseq.len == 1) - switch(c) { - case '[': - case ']': - case '(': - return 0; - case '=': - case '>': - default: - return 1; - } - else if(BETWEEN(c, 0x40, 0x7E)) - return 1; - return 0; -} - void tcpos(int mode) { static int x = 0; @@ -174,62 +340,43 @@ void tscroll(void) { Line temp = term.line[term.top]; int i; - + /* X stuff _before_ the line swapping (results in wrong line index) */ + xscroll(); for(i = term.top; i < term.bot; i++) term.line[i] = term.line[i+1]; memset(temp, 0, sizeof(Glyph) * term.col); term.line[term.bot] = temp; - xscroll(); } void tnewline(void) { int y = term.c.y + 1; - - if(y > term.bot) { + if(y > term.bot) tscroll(), y = term.bot; - } tmoveto(0, y); } -int -escaddc(char c) { - escseq.buf[escseq.len++] = c; - if(escfinal(c) || escseq.len >= ESCSIZ) { - escparse(), eschandle(); - return 0; - } - return 1; -} - void -escparse(void) { +csiparse(void) { /* int noarg = 1; */ char *p = escseq.buf; escseq.narg = 0; - switch(escseq.pre = *p++) { - case '[': /* CSI */ - if(*p == '?') - escseq.priv = 1, p++; - - while(p < escseq.buf+escseq.len) { - while(isdigit(*p)) { - escseq.arg[escseq.narg] *= 10; - escseq.arg[escseq.narg] += *(p++) - '0'/*, noarg = 0 */; - } - if(*p == ';') - escseq.narg++, p++; - else { - escseq.mode = *p; - escseq.narg++; - return; - } + if(*p == '?') + escseq.priv = 1, p++; + + while(p < escseq.buf+escseq.len) { + while(isdigit(*p)) { + escseq.arg[escseq.narg] *= 10; + escseq.arg[escseq.narg] += *p++ - '0'/*, noarg = 0 */; + } + if(*p == ';' && escseq.narg+1 < ESCARGSIZ) + escseq.narg++, p++; + else { + escseq.mode = *p; + escseq.narg++; + return; } - break; - case '(': - /* XXX: graphic character set */ - break; } } @@ -322,6 +469,13 @@ tinsertblank(int n) { tclearregion(src, term.c.y, dst, term.c.y); } +void +tsetlinestate(int n, int state) { + int i; + for(i = 0; i < term.col; i++) + term.line[n][i].state |= state; +} + void tinsertblankline (int n) { int i; @@ -343,10 +497,11 @@ tinsertblankline (int n) { term.line[i-n] = blank; /* blank it */ memset(blank, 0, term.col * sizeof(Glyph)); + tsetlinestate(i, CRupdate); + tsetlinestate(i-n, CRupdate); } } - void tdeleteline(int n) { int i; @@ -368,6 +523,8 @@ tdeleteline(int n) { term.line[i+n] = blank; /* blank it */ memset(blank, 0, term.col * sizeof(Glyph)); + tsetlinestate(i, CRupdate); + tsetlinestate(i-n, CRupdate); } } @@ -375,48 +532,48 @@ void tsetattr(int *attr, int l) { int i; - for(i = 0; i < l; i++) { - switch(attr[i]) { - case 0: - memset(&term.c.attr, 0, sizeof(term.c.attr)); - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; - break; - case 1: - term.c.attr.mode |= ATbold; - break; - case 4: - term.c.attr.mode |= ATunderline; - break; - case 7: - term.c.attr.mode |= ATreverse; - break; - case 8: - term.c.hidden = CShide; - break; - case 22: - term.c.attr.mode &= ~ATbold; - break; - case 24: - term.c.attr.mode &= ~ATunderline; - break; - case 27: - term.c.attr.mode &= ~ATreverse; - break; - case 39: - term.c.attr.fg = DefaultFG; - break; - case 49: - term.c.attr.fg = DefaultBG; - break; - default: - if(BETWEEN(attr[i], 30, 37)) - term.c.attr.fg = attr[i] - 30; - else if(BETWEEN(attr[i], 40, 47)) - term.c.attr.bg = attr[i] - 40; - break; - } + for(i = 0; i < l; i++) { + switch(attr[i]) { + case 0: + memset(&term.c.attr, 0, sizeof(term.c.attr)); + term.c.attr.fg = DefaultFG; + term.c.attr.bg = DefaultBG; + break; + case 1: + term.c.attr.mode |= ATbold; + break; + case 4: + term.c.attr.mode |= ATunderline; + break; + case 7: + term.c.attr.mode |= ATreverse; + break; + case 8: + term.c.hidden = CShide; + break; + case 22: + term.c.attr.mode &= ~ATbold; + break; + case 24: + term.c.attr.mode &= ~ATunderline; + break; + case 27: + term.c.attr.mode &= ~ATreverse; + break; + case 39: + term.c.attr.fg = DefaultFG; + break; + case 49: + term.c.attr.fg = DefaultBG; + break; + default: + if(BETWEEN(attr[i], 30, 37)) + term.c.attr.fg = attr[i] - 30; + else if(BETWEEN(attr[i], 40, 47)) + term.c.attr.bg = attr[i] - 40; + break; } + } } void @@ -434,144 +591,142 @@ tsetscroll(int t, int b) { term.bot = b; } - void -eschandle(void) { - /* escdump(); */ - switch(escseq.pre) { - case '[': - switch(escseq.mode) { - case '@': /* Insert blank char */ - DEFAULT(escseq.arg[0], 1); - tinsertblank(escseq.arg[0]); - break; - case 'A': /* Cursor Up */ - case 'e': - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, term.c.y-escseq.arg[0]); - break; - case 'B': /* Cursor Down */ - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, term.c.y+escseq.arg[0]); - break; - case 'C': /* Cursor Forward */ - case 'a': - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x+escseq.arg[0], term.c.y); - break; - case 'D': /* Cursor Backward */ - DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x-escseq.arg[0], term.c.y); - break; - case 'E': /* Cursor Down and first col */ - DEFAULT(escseq.arg[0], 1); - tmoveto(0, term.c.y+escseq.arg[0]); - break; - case 'F': /* Cursor Up and first col */ - DEFAULT(escseq.arg[0], 1); - tmoveto(0, term.c.y-escseq.arg[0]); +csihandle(void) { + switch(escseq.mode) { + default: + fprintf(stderr, "erresc: unknown sequence\n"); + csidump(); + /* die(""); */ + break; + case '@': /* Insert blank char */ + DEFAULT(escseq.arg[0], 1); + tinsertblank(escseq.arg[0]); + break; + case 'A': /* Cursor Up */ + case 'e': + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, term.c.y-escseq.arg[0]); + break; + case 'B': /* Cursor Down */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, term.c.y+escseq.arg[0]); + break; + case 'C': /* Cursor Forward */ + case 'a': + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x+escseq.arg[0], term.c.y); + break; + case 'D': /* Cursor Backward */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x-escseq.arg[0], term.c.y); + break; + case 'E': /* Cursor Down and first col */ + DEFAULT(escseq.arg[0], 1); + tmoveto(0, term.c.y+escseq.arg[0]); + break; + case 'F': /* Cursor Up and first col */ + DEFAULT(escseq.arg[0], 1); + tmoveto(0, term.c.y-escseq.arg[0]); + break; + case 'G': /* Move to */ + case '`': + DEFAULT(escseq.arg[0], 1); + tmoveto(escseq.arg[0]-1, term.c.y); + break; + case 'H': /* Move to */ + case 'f': + DEFAULT(escseq.arg[0], 1); + DEFAULT(escseq.arg[1], 1); + tmoveto(escseq.arg[1]-1, escseq.arg[0]-1); + break; + case 'J': /* Clear screen */ + switch(escseq.arg[0]) { + case 0: /* below */ + tclearregion(term.c.x, term.c.y, term.col-1, term.row-1); break; - case 'G': /* Move to */ - case '`': - DEFAULT(escseq.arg[0], 1); - tmoveto(escseq.arg[0]-1, term.c.y); + case 1: /* above */ + tclearregion(0, 0, term.c.x, term.c.y); break; - case 'H': /* Move to */ - case 'f': - DEFAULT(escseq.arg[0], 1); - DEFAULT(escseq.arg[1], 1); - tmoveto(escseq.arg[1]-1, escseq.arg[0]-1); + case 2: /* all */ + tclearregion(0, 0, term.col-1, term.row-1); + break; + } + break; + case 'K': /* Clear line */ + switch(escseq.arg[0]) { + case 0: /* right */ + tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); break; - case 'J': /* Clear screen */ - switch(escseq.arg[0]) { - case 0: /* below */ - tclearregion(term.c.x, term.c.y, term.col-1, term.row-1); - break; - case 1: /* above */ - tclearregion(0, 0, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, 0, term.col-1, term.row-1); - break; - } + case 1: /* left */ + tclearregion(0, term.c.y, term.c.x, term.c.y); break; - case 'K': /* Clear line */ - switch(escseq.arg[0]) { - case 0: /* right */ - tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); - break; - case 1: /* left */ - tclearregion(0, term.c.y, term.c.x, term.c.y); - break; - case 2: /* all */ - tclearregion(0, term.c.y, term.col-1, term.c.y); - break; - } - break; - case 'L': /* Insert blank lines */ - DEFAULT(escseq.arg[0], 1); - tinsertblankline(escseq.arg[0]); + case 2: /* all */ + tclearregion(0, term.c.y, term.col-1, term.c.y); break; - case 'l': - if(escseq.priv && escseq.arg[0] == 25) + } + break; + case 'S': + case 'L': /* Insert blank lines */ + DEFAULT(escseq.arg[0], 1); + tinsertblankline(escseq.arg[0]); + break; + case 'l': + if(escseq.priv && escseq.arg[0] == 25) term.c.hidden = 1; - break; - case 'M': /* Delete lines */ - DEFAULT(escseq.arg[0], 1); - tdeleteline(escseq.arg[0]); - break; - case 'P': /* Delete char */ - DEFAULT(escseq.arg[0], 1); - tdeletechar(escseq.arg[0]); - break; - case 'd': /* Move to */ + break; + case 'M': /* Delete lines */ + DEFAULT(escseq.arg[0], 1); + tdeleteline(escseq.arg[0]); + break; + case 'X': + case 'P': /* Delete char */ + DEFAULT(escseq.arg[0], 1); + tdeletechar(escseq.arg[0]); + break; + case 'd': /* Move to */ + DEFAULT(escseq.arg[0], 1); + tmoveto(term.c.x, escseq.arg[0]-1); + break; + case 'h': /* Set terminal mode */ + if(escseq.priv && escseq.arg[0] == 25) + term.c.hidden = 0; + break; + case 'm': /* Terminal attribute (color) */ + tsetattr(escseq.arg, escseq.narg); + break; + case 'r': + if(escseq.priv) + ; + else { DEFAULT(escseq.arg[0], 1); - tmoveto(term.c.x, escseq.arg[0]-1); - break; - case 'h': /* Set terminal mode */ - if(escseq.priv && escseq.arg[0] == 25) - term.c.hidden = 0; - break; - case 'm': /* Terminal attribute (color) */ - tsetattr(escseq.arg, escseq.narg); - break; - case 'r': - if(escseq.priv) - ; - else { - DEFAULT(escseq.arg[0], 1); - DEFAULT(escseq.arg[1], term.row); - tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); - } - break; - case 's': /* Save cursor position */ - tcpos(CSsave); - break; - case 'u': /* Load cursor position */ - tcpos(CSload); - break; + DEFAULT(escseq.arg[1], term.row); + tsetscroll(escseq.arg[0]-1, escseq.arg[1]-1); } break; + case 's': /* Save cursor position */ + tcpos(CSsave); + break; + case 'u': /* Load cursor position */ + tcpos(CSload); + break; } } void -escdump(void) { +csidump(void) { int i; - puts("------"); - printf("rawbuf : %s\n", escseq.buf); - printf("prechar : %c\n", escseq.pre); - printf("private : %c\n", escseq.priv ? '?' : ' '); - printf("narg : %d\n", escseq.narg); - if(escseq.narg) { + printf("ESC [ %s", escseq.priv ? "? " : ""); + if(escseq.narg) for(i = 0; i < escseq.narg; i++) - printf("\targ %d = %d\n", i, escseq.arg[i]); - } - printf("mode : %c\n", escseq.mode); + printf("%d ", escseq.arg[i]); + if(escseq.mode) + putchar(escseq.mode); + putchar('\n'); } void -escreset(void) { +csireset(void) { memset(&escseq, 0, sizeof(escseq)); } @@ -588,21 +743,41 @@ tputtab(void) { void tputc(char c) { - static int inesc = 0; #if 0 dump(c); #endif - /* start of escseq */ - if(c == '\033') - escreset(), inesc = 1; - else if(inesc) { - inesc = escaddc(c); - } /* normal char */ - else switch(c) { - default: - tsetchar(c); - tcursor(CSright); - break; + if(term.esc & ESCin) { + if(term.esc & ESCcsi) { + escseq.buf[escseq.len++] = c; + if(BETWEEN(c, 0x40, 0x7E) || escseq.len >= ESCSIZ) { + term.esc = 0; + csiparse(), csihandle(); + } + } else if (term.esc & ESCosc) { + if(c == ';') { + term.titlelen = 0; + term.esc = ESCin | ESCtitle; + } + } else if(term.esc & ESCtitle) { + if(c == '\a' || term.titlelen+1 >= TITLESIZ) { + term.esc = 0; + term.title[term.titlelen] = '\0'; + XStoreName(xw.dis, xw.win, term.title); + } else { + term.title[term.titlelen++] = c; + } + } else { + switch(c) { + case '[': + term.esc |= ESCcsi; + break; + case ']': + term.esc |= ESCosc; + break; + } + } + } else { + switch(c) { case '\t': tputtab(); break; @@ -618,6 +793,15 @@ tputc(char c) { case '\a': xbell(); break; + case '\033': + csireset(); + term.esc = ESCin; + break; + default: + tsetchar(c); + tcursor(CSright); + break; + } } } @@ -627,24 +811,6 @@ tputs(char *s, int len) { tputc(*s++); } -void -tdump(void) { - int row, col; - Glyph c; - - for(row = 0; row < term.row; row++) { - for(col = 0; col < term.col; col++) { - if(col == term.c.x && row == term.c.y) - putchar('#'); - else { - c = term.line[row][col]; - putchar(c.state & CRset ? c.c : '.'); - } - } - putchar('\n'); - } -} - void tresize(int col, int row) { int i; @@ -688,7 +854,6 @@ xgetcol(const char *s) { return color.pixel; } - void xclear(int x1, int y1, int x2, int y2) { XClearArea(xw.dis, xw.win, @@ -697,7 +862,6 @@ xclear(int x1, int y1, int x2, int y2) { False); } - void xscroll(void) { int srcy = (term.top+1) * xw.ch; @@ -709,9 +873,6 @@ xscroll(void) { xclear(0, term.bot, term.col-1, term.bot); } - - - void xinit(void) { XGCValues values; @@ -725,11 +886,11 @@ xinit(void) { xw.dis = XOpenDisplay(NULL); xw.scr = XDefaultScreen(xw.dis); if(!xw.dis) - die("can not open display"); + die("Can't open display\n"); /* font */ if(!(dc.font = XLoadQueryFont(xw.dis, FONT))) - die("can not find font " FONT); + die("Can't load font %s\n", FONT); xw.cw = dc.font->max_bounds.rbearing - dc.font->min_bounds.lbearing; xw.ch = dc.font->ascent + dc.font->descent + LINESPACE; @@ -766,6 +927,23 @@ xinit(void) { XSync(xw.dis, 0); } +void +xdraws (char *s, Glyph base, int x, int y, int len) { + unsigned long xfg, xbg; + int winx = x*xw.cw, winy = y*xw.ch + dc.font->ascent, width = len*xw.cw; + if(base.mode & ATreverse) + xfg = dc.col[base.bg], xbg = dc.col[base.fg]; + else + xfg = dc.col[base.fg], xbg = dc.col[base.bg]; + + XSetBackground(xw.dis, dc.gc, xbg); + XSetForeground(xw.dis, dc.gc, xfg); + XDrawImageString(xw.dis, xw.win, dc.gc, winx, winy, s, len); + + if(base.mode & ATunderline) + XDrawLine(xw.dis, xw.win, dc.gc, winx, winy+1, winx+width-1, winy+1); +} + void xdrawc(int x, int y, Glyph g) { XRectangle r = { x * xw.cw, y * xw.ch, xw.cw, xw.ch }; @@ -777,18 +955,9 @@ xdrawc(int x, int y, Glyph g) { else xfg = dc.col[g.fg], xbg = dc.col[g.bg]; /* background */ - XSetForeground(xw.dis, dc.gc, xbg); - XFillRectangles(xw.dis, xw.win, dc.gc, &r, 1); - /* string */ + XSetBackground(xw.dis, dc.gc, xbg); XSetForeground(xw.dis, dc.gc, xfg); - XDrawString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &(g.c), 1); - if(g.mode & ATbold) /* XXX: bold hack (draw again at x+1) */ - XDrawString(xw.dis, xw.win, dc.gc, r.x+1, r.y+dc.font->ascent, &(g.c), 1); - /* underline */ - if(g.mode & ATunderline) { - r.y += dc.font->ascent + 1; - XDrawLine(xw.dis, xw.win, dc.gc, r.x, r.y, r.x+r.width-1, r.y); - } + XDrawImageString(xw.dis, xw.win, dc.gc, r.x, r.y+dc.font->ascent, &g.c, 1); } void @@ -805,39 +974,61 @@ xcursor(int mode) { /* remove the old cursor */ if(term.line[oldy][oldx].state & CRset) xdrawc(oldx, oldy, term.line[oldy][oldx]); - else xclear(oldx, oldy, oldx, oldy); /* XXX: maybe a bug */ - if(mode == CSdraw && !term.c.hidden) { + else + xclear(oldx, oldy, oldx, oldy); + /* draw the new one */ + if(mode == CSdraw) { xdrawc(term.c.x, term.c.y, g); oldx = term.c.x, oldy = term.c.y; } } - void draw(int redraw_all) { - int x, y; - int changed, set; - - if(redraw_all) - XClearWindow(xw.dis, xw.win); - /* XXX: drawing could be optimised */ + int i, x, y, ox; + Glyph base, new; + char buf[MAXDRAWBUF]; + for(y = 0; y < term.row; y++) { + base = term.line[y][0]; + i = ox = 0; for(x = 0; x < term.col; x++) { - changed = term.line[y][x].state & CRupdate; - set = term.line[y][x].state & CRset; - if((changed && set) || (redraw_all && set)) { - term.line[y][x].state &= ~CRupdate; - xdrawc(x, y, term.line[y][x]); + new = term.line[y][x]; + if(!ATTRCMP(base, new) && i < MAXDRAWBUF) + buf[i++] = new.c; + else { + xdraws(buf, base, ox, y, i); + buf[0] = new.c; + i = 1; + ox = x; + base = new; } } + xdraws(buf, base, ox, y, i); } xcursor(CSdraw); } void -kpress(XKeyEvent *e) { +expose(XEvent *ev) { + draw(SCredraw); +} + +char * +kmap(KeySym k) { + int i; + for(i = 0; i < LEN(key); i++) + if(key[i].k == k) + return (char*)key[i].s; + return NULL; +} + +void +kpress(XEvent *ev) { + XKeyEvent *e = &ev->xkey; KeySym ksym; char buf[32]; + char *customkey; int len; int meta; int shift; @@ -845,35 +1036,24 @@ kpress(XKeyEvent *e) { meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - if(len > 0) { + + if(customkey = kmap(ksym)) + ttywrite(customkey, strlen(customkey)); + else if(len > 0) { buf[sizeof(buf)-1] = '\0'; if(meta && len == 1) ttywrite("\033", 1); ttywrite(buf, len); - return; - } - switch(ksym) { - default: - fprintf(stderr, "errkey: %d\n", (int)ksym); - break; - case XK_Up: - case XK_Down: - case XK_Left: - case XK_Right: - sprintf(buf, "\033[%c", "DACB"[ksym - XK_Left]); - ttywrite(buf, 3); - break; - case XK_Delete: ttywrite(KEYDELETE, sizeof(KEYDELETE)-1); break; - case XK_Home: ttywrite(KEYHOME, sizeof(KEYHOME)-1); break; - case XK_End: ttywrite(KEYEND, sizeof(KEYEND) -1); break; - case XK_Prior: ttywrite(KEYPREV, sizeof(KEYPREV)-1); break; - case XK_Next: ttywrite(KEYNEXT, sizeof(KEYNEXT)-1); break; - case XK_Insert: - /* XXX: paste X clipboard */ - if(shift) - ; - break; - } + } else + switch(ksym) { + case XK_Insert: + if(shift) + /* XXX: paste X clipboard */; + break; + default: + fprintf(stderr, "errkey: %d\n", (int)ksym); + break; + } } void @@ -891,10 +1071,8 @@ resize(XEvent *e) { } } - void run(void) { - int ret; XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dis); @@ -902,39 +1080,25 @@ run(void) { running = 1; XSelectInput(xw.dis, xw.win, ExposureMask | KeyPressMask | StructureNotifyMask); XResizeWindow(xw.dis, xw.win, xw.w , xw.h); /* fix resize bug in wmii (?) */ - + while(running) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); - XFlush(xw.dis); - ret = select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL); - - if(ret < 0) + if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) == -1) { + if(errno == EINTR) + continue; die("select failed: %s\n", SERRNO); - - if(FD_ISSET(xfd, &rfd)) { - while(XPending(xw.dis)) { - XNextEvent(xw.dis, &ev); - switch (ev.type) { - default: - break; - case KeyPress: - kpress(&ev.xkey); - break; - case Expose: - draw(SCredraw); - break; - case ConfigureNotify: - resize(&ev); - break; - } - } } if(FD_ISSET(cmdfd, &rfd)) { ttyread(); draw(SCupdate); } + while(XPending(xw.dis)) { + XNextEvent(xw.dis, &ev); + if(handler[ev.type]) + (handler[ev.type])(&ev); + } } }