X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=833805f32fb44bbe7fedbe694c3bfcd6f35d0c99;hb=4d794b3479cc586de7796d9b060b2eb469a6500d;hp=264fc84aabd9aaef890d555c9cb99ef8f434c236;hpb=53937e045aba6cdefd9e8e81556b306976691747;p=st.git diff --git a/st.c b/st.c index 264fc84..833805f 100644 --- a/st.c +++ b/st.c @@ -37,15 +37,12 @@ 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; +#include "config.h" -typedef struct { - KeySym k; - char s[ESCSIZ]; -} Key; +typedef int Color; typedef struct { char c; /* character code */ @@ -98,8 +95,6 @@ typedef struct { int cw; /* char width */ } XWindow; -#include "config.h" - /* Drawing Context */ typedef struct { unsigned long col[LEN(colorname)]; @@ -154,7 +149,6 @@ void xdrawc(int, int, Glyph); void xinit(void); void xscroll(void); - /* Globals */ DC dc; XWindow xw; @@ -201,7 +195,6 @@ sigchld(int a) { exit(EXIT_FAILURE); } - void ttynew(void) { int m, s; @@ -328,21 +321,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 +468,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 +495,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 +521,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 +530,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,13 +589,18 @@ tsetscroll(int t, int b) { term.bot = b; } - void -eschandle(void) { - /* escdump(); */ +eschandle(void) { switch(escseq.pre) { + default: + goto unknown_seq; case '[': switch(escseq.mode) { + default: + unknown_seq: + fprintf(stderr, "erresc: unknown sequence\n"); + escdump(); + break; case '@': /* Insert blank char */ DEFAULT(escseq.arg[0], 1); tinsertblank(escseq.arg[0]); @@ -712,15 +718,13 @@ eschandle(void) { void escdump(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) { + 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); } @@ -842,7 +846,6 @@ xgetcol(const char *s) { return color.pixel; } - void xclear(int x1, int y1, int x2, int y2) { XClearArea(xw.dis, xw.win, @@ -851,7 +854,6 @@ xclear(int x1, int y1, int x2, int y2) { False); } - void xscroll(void) { int srcy = (term.top+1) * xw.ch; @@ -863,9 +865,6 @@ xscroll(void) { xclear(0, term.bot, term.col-1, term.bot); } - - - void xinit(void) { XGCValues values; @@ -959,14 +958,15 @@ 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; @@ -974,29 +974,24 @@ draw(int redraw_all) { if(redraw_all) XClearWindow(xw.dis, xw.win); + /* XXX: drawing could be optimised */ for(y = 0; y < term.row; y++) { 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)) { + if(redraw_all || changed) { term.line[y][x].state &= ~CRupdate; - xdrawc(x, y, term.line[y][x]); + if(set) + xdrawc(x, y, term.line[y][x]); + else + xclear(x, y, x, y); } } } xcursor(CSdraw); } -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(XKeyEvent *e) { KeySym ksym; @@ -1009,7 +1004,7 @@ kpress(XKeyEvent *e) { meta = e->state & Mod1Mask; shift = e->state & ShiftMask; len = XLookupString(e, buf, sizeof(buf), &ksym, NULL); - if(skmap = kmap(ksym)) + if(skmap = key[ksym]) ttywrite(skmap, strlen(skmap)); else if(len > 0) { buf[sizeof(buf)-1] = '\0';