X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=17a070910c199741e07561223ae2459362d27f9d;hb=f2dff29a16ef0eb1a0b680cdd753471ba406e4f5;hp=3940bbddad4f4c7894add413c21d5b0a79b85fe3;hpb=d5f4554431f82424af40600ed6835672ab8e44ae;p=st.git diff --git a/st.c b/st.c index 3940bbd..17a0709 100644 --- a/st.c +++ b/st.c @@ -1,8 +1,9 @@ /* See LICENSE for licence details. */ -#define _XOPEN_SOURCE +#define _XOPEN_SOURCE 600 #include #include #include +#include #include #include #include @@ -24,6 +25,7 @@ /* Arbitrary sizes */ #define ESCSIZ 256 #define ESCARG 16 +#define MAXDRAWBUF 1024 #define SERRNO strerror(errno) #define MIN(a, b) ((a) < (b) ? (a) : (b)) @@ -32,22 +34,18 @@ #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, TMaltcharset }; +enum { TMwrap=1, TMinsert=2 }; enum { SCupdate, SCredraw }; typedef int Color; typedef struct { - KeySym k; - char s[ESCSIZ]; -} Key; - -typedef struct { char c; /* character code */ char mode; /* attribute flags */ Color fg; /* foreground */ @@ -98,6 +96,11 @@ typedef struct { int cw; /* char width */ } XWindow; +typedef struct { + KeySym k; + char s[ESCSIZ]; +} Key; + #include "config.h" /* Drawing Context */ @@ -107,62 +110,88 @@ typedef struct { GC gc; } DC; -void die(const char *errstr, ...); -void draw(int); -void execsh(void); -void sigchld(int); -char* kmap(KeySym); -void kpress(XKeyEvent *); -void resize(XEvent *); -void run(void); - -int escaddc(char); -int escfinal(char); -void escdump(void); -void eschandle(void); -void escparse(void); -void escreset(void); - -void tclearregion(int, int, int, int); -void tcpos(int); -void tcursor(int); -void tdeletechar(int); -void tdeleteline(int); -void tdump(void); -void tinsertblank(int); -void tinsertblankline(int); -void tmoveto(int, int); -void tnew(int, int); -void tnewline(void); -void tputc(char); -void tputs(char*, int); -void tresize(int, int); -void tscroll(void); -void tsetattr(int*, int); -void tsetchar(char); -void tsetscroll(int, int); - -void ttynew(void); -void ttyread(void); -void ttyresize(int, int); -void ttywrite(char *, size_t); - -unsigned long xgetcol(const char *); -void xclear(int, int, int, int); -void xcursor(int); -void xdrawc(int, int, Glyph); -void xinit(void); -void xscroll(void); - +static void die(const char *errstr, ...); +static void draw(int); +static void execsh(void); +static void sigchld(int); +static void run(void); + +static int escaddc(char); +static int escfinal(char); +static void escdump(void); +static void eschandle(void); +static void escparse(void); +static void escreset(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 Escseq 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, ...) { @@ -201,7 +230,6 @@ sigchld(int a) { exit(EXIT_FAILURE); } - void ttynew(void) { int m, s; @@ -261,7 +289,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); } @@ -328,21 +356,19 @@ 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); } @@ -477,6 +503,13 @@ tinsertblank(int n) { } 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; Line blank; @@ -497,10 +530,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; @@ -522,6 +556,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); } } @@ -529,48 +565,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 @@ -588,9 +624,8 @@ tsetscroll(int t, int b) { term.bot = b; } - void -eschandle(void) { +eschandle(void) { switch(escseq.pre) { default: goto unknown_seq; @@ -786,24 +821,6 @@ tputs(char *s, int len) { } 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; Line *line; @@ -846,7 +863,6 @@ xgetcol(const char *s) { return color.pixel; } - void xclear(int x1, int y1, int x2, int y2) { XClearArea(xw.dis, xw.win, @@ -855,7 +871,6 @@ xclear(int x1, int y1, int x2, int y2) { False); } - void xscroll(void) { int srcy = (term.top+1) * xw.ch; @@ -867,9 +882,6 @@ xscroll(void) { xclear(0, term.bot, term.col-1, term.bot); } - - - void xinit(void) { XGCValues values; @@ -925,6 +937,23 @@ xinit(void) { } 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 }; unsigned long xfg, xbg; @@ -935,18 +964,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 @@ -963,36 +983,47 @@ 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); } -char* +void +expose(XEvent *ev) { + draw(SCredraw); +} + +char * kmap(KeySym k) { int i; for(i = 0; i < LEN(key); i++) @@ -1002,19 +1033,21 @@ kmap(KeySym k) { } void -kpress(XKeyEvent *e) { +kpress(XEvent *ev) { + XKeyEvent *e = &ev->xkey; KeySym ksym; char buf[32]; + char *customkey; int len; int meta; int shift; - char* skmap; meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - if(skmap = kmap(ksym)) - ttywrite(skmap, strlen(skmap)); + + if(customkey = kmap(ksym)) + ttywrite(customkey, strlen(customkey)); else if(len > 0) { buf[sizeof(buf)-1] = '\0'; if(meta && len == 1) @@ -1049,7 +1082,6 @@ resize(XEvent *e) { void run(void) { - int ret; XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dis); @@ -1057,39 +1089,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); + } } }