X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=b7dfd559ab211369fa866304735910f225ae8170;hb=c084c06b402de4fe995734a2c89cae26ff7c9064;hp=72e57c8f73a868fc7871429b3ed22ddd17b21bcb;hpb=907cb8bfa69926616639f9a19127117b37326029;p=st.git diff --git a/st.c b/st.c index 72e57c8..b7dfd55 100644 --- a/st.c +++ b/st.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -13,17 +14,17 @@ #include #include #include +#include #include #include +#include #include #include #include #include #include #include - -#include -#include +#include #if defined(__linux) #include @@ -34,7 +35,7 @@ #endif #define USAGE \ - "st " VERSION " (c) 2010-2011 st engineers\n" \ + "st " VERSION " (c) 2010-2012 st engineers\n" \ "usage: st [-t title] [-c class] [-w windowid] [-v] [-e command...]\n" /* XEMBED messages */ @@ -50,6 +51,9 @@ #define XK_NO_MOD UINT_MAX #define XK_ANY_MOD 0 +#define SELECT_TIMEOUT (20*1000) /* 20 ms */ +#define DRAW_TIMEOUT (20*1000) /* 20 ms */ + #define SERRNO strerror(errno) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) < (b) ? (b) : (a)) @@ -63,26 +67,75 @@ #define X2COL(x) (((x) - BORDER)/xw.cw) #define Y2ROW(y) (((y) - BORDER)/xw.ch) -/* Attribute, Cursor, Character state, Terminal mode, Screen draw mode */ -enum { ATTR_NULL=0 , ATTR_REVERSE=1 , ATTR_UNDERLINE=2, ATTR_BOLD=4, ATTR_GFX=8 }; -enum { CURSOR_UP, CURSOR_DOWN, CURSOR_LEFT, CURSOR_RIGHT, - CURSOR_SAVE, CURSOR_LOAD }; -enum { CURSOR_DEFAULT = 0, CURSOR_HIDE = 1, CURSOR_WRAPNEXT = 2 }; -enum { GLYPH_SET=1, GLYPH_DIRTY=2 }; -enum { MODE_WRAP=1, MODE_INSERT=2, MODE_APPKEYPAD=4, MODE_ALTSCREEN=8, - MODE_CRLF=16, MODE_MOUSEBTN=32, MODE_MOUSEMOTION=64, MODE_MOUSE=32|64, MODE_REVERSE=128 }; -enum { ESC_START=1, ESC_CSI=2, ESC_OSC=4, ESC_TITLE=8, ESC_ALTCHARSET=16 }; -enum { WIN_VISIBLE=1, WIN_REDRAW=2, WIN_FOCUSED=4 }; +enum glyph_attribute { + ATTR_NULL = 0, + ATTR_REVERSE = 1, + ATTR_UNDERLINE = 2, + ATTR_BOLD = 4, + ATTR_GFX = 8, +}; + +enum cursor_movement { + CURSOR_UP, + CURSOR_DOWN, + CURSOR_LEFT, + CURSOR_RIGHT, + CURSOR_SAVE, + CURSOR_LOAD +}; + +enum cursor_state { + CURSOR_DEFAULT = 0, + CURSOR_HIDE = 1, + CURSOR_WRAPNEXT = 2 +}; +enum glyph_state { + GLYPH_SET = 1, + GLYPH_DIRTY = 2 +}; + +enum term_mode { + MODE_WRAP = 1, + MODE_INSERT = 2, + MODE_APPKEYPAD = 4, + MODE_ALTSCREEN = 8, + MODE_CRLF = 16, + MODE_MOUSEBTN = 32, + MODE_MOUSEMOTION = 64, + MODE_MOUSE = 32|64, + MODE_REVERSE = 128 +}; + +enum escape_state { + ESC_START = 1, + ESC_CSI = 2, + ESC_OSC = 4, + ESC_TITLE = 8, + ESC_ALTCHARSET = 16 +}; + +enum window_state { + WIN_VISIBLE = 1, + WIN_REDRAW = 2, + WIN_FOCUSED = 4 +}; + +/* bit macro */ #undef B0 enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 }; +typedef unsigned char uchar; +typedef unsigned int uint; +typedef unsigned long ulong; +typedef unsigned short ushort; + typedef struct { char c[UTF_SIZ]; /* character code */ - char mode; /* attribute flags */ - int fg; /* foreground */ - int bg; /* background */ - char state; /* state flags */ + uchar mode; /* attribute flags */ + ushort fg; /* foreground */ + ushort bg; /* background */ + uchar state; /* state flags */ } Glyph; typedef Glyph* Line; @@ -111,6 +164,7 @@ typedef struct { int col; /* nb col */ Line* line; /* screen */ Line* alt; /* alternate screen */ + bool* dirty; /* dirtyness of lines */ TCursor c; /* cursor */ int top; /* top scroll limit */ int bot; /* bottom scroll limit */ @@ -118,6 +172,7 @@ typedef struct { int esc; /* escape state flags */ char title[ESC_TITLE_SIZ]; int titlelen; + bool *tabs; } Term; /* Purely graphic info */ @@ -125,38 +180,25 @@ typedef struct { Display* dpy; Colormap cmap; Window win; - Pixmap buf; + XdbeBackBuffer buf; Atom xembed; XIM xim; XIC xic; int scr; int w; /* window width */ int h; /* window height */ - int bufw; /* pixmap width */ - int bufh; /* pixmap height */ int ch; /* char height */ int cw; /* char width */ char state; /* focus, redraw, visible */ + struct timeval lastdraw; } XWindow; typedef struct { KeySym k; - unsigned int mask; + uint mask; char s[ESC_BUF_SIZ]; } Key; -/* Drawing Context */ -typedef struct { - unsigned long col[256]; - GC gc; - struct { - int ascent; - int descent; - short lbearing; - short rbearing; - XFontSet set; - } font, bfont; -} DC; /* TODO: use better name for vars... */ typedef struct { @@ -172,12 +214,26 @@ typedef struct { #include "config.h" +/* Drawing Context */ +typedef struct { + ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)]; + GC gc; + struct { + int ascent; + int descent; + short lbearing; + short rbearing; + XFontSet set; + } font, bfont; +} DC; + static void die(const char*, ...); static void draw(void); static void drawregion(int, int, int, int); static void execsh(void); static void sigchld(int); static void run(void); +static bool last_draw_too_old(void); static void csidump(void); static void csihandle(void); @@ -203,6 +259,8 @@ static void tsetattr(int*, int); static void tsetchar(char*); static void tsetscroll(int, int); static void tswapscreen(void); +static void tsetdirt(int, int); +static void tfulldirt(void); static void ttynew(void); static void ttyread(void); @@ -212,6 +270,7 @@ static void ttywrite(const char *, size_t); static void xdraws(char *, Glyph, int, int, int, int); static void xhints(void); static void xclear(int, int, int, int); +static void xcopy(); static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); @@ -222,7 +281,7 @@ static void xresize(int, int); static void expose(XEvent *); static void visibility(XEvent *); static void unmap(XEvent *); -static char* kmap(KeySym, unsigned int state); +static char* kmap(KeySym, uint); static void kpress(XEvent *); static void cmessage(XEvent *); static void resize(XEvent *); @@ -234,7 +293,7 @@ static void selnotify(XEvent *); static void selrequest(XEvent *); static void selinit(void); -static inline int selected(int, int); +static inline bool selected(int, int); static void selcopy(void); static void selpaste(); static void selscroll(int, int); @@ -275,31 +334,31 @@ static char *opt_class = NULL; int utf8decode(char *s, long *u) { - unsigned char c; + uchar c; int i, n, rtn; rtn = 1; c = *s; - if(~c&B7) { /* 0xxxxxxx */ + if(~c & B7) { /* 0xxxxxxx */ *u = c; return rtn; - } else if((c&(B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */ + } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */ *u = c&(B4|B3|B2|B1|B0); n = 1; - } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */ + } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */ *u = c&(B3|B2|B1|B0); n = 2; - } else if((c&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */ - *u = c&(B2|B1|B0); + } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */ + *u = c & (B2|B1|B0); n = 3; } else goto invalid; - for(i=n,++s; i>0; --i,++rtn,++s) { + for(i = n, ++s; i > 0; --i, ++rtn, ++s) { c = *s; - if((c&(B7|B6)) != B7) /* 10xxxxxx */ + if((c & (B7|B6)) != B7) /* 10xxxxxx */ goto invalid; *u <<= 6; - *u |= c&(B5|B4|B3|B2|B1|B0); + *u |= c & (B5|B4|B3|B2|B1|B0); } if((n == 1 && *u < 0x80) || (n == 2 && *u < 0x800) || @@ -314,11 +373,11 @@ invalid: int utf8encode(long *u, char *s) { - unsigned char *sp; - unsigned long uc; + uchar *sp; + ulong uc; int i, n; - sp = (unsigned char*) s; + sp = (uchar*) s; uc = *u; if(uc < 0x80) { *sp = uc; /* 0xxxxxxx */ @@ -350,11 +409,11 @@ invalid: UTF-8 otherwise return 0 */ int isfullutf8(char *s, int b) { - unsigned char *c1, *c2, *c3; + uchar *c1, *c2, *c3; - c1 = (unsigned char *) s; - c2 = (unsigned char *) ++s; - c3 = (unsigned char *) ++s; + c1 = (uchar *) s; + c2 = (uchar *) ++s; + c3 = (uchar *) ++s; if(b < 1) return 0; else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) @@ -374,7 +433,7 @@ isfullutf8(char *s, int b) { int utf8size(char *s) { - unsigned char c = *s; + uchar c = *s; if(~c&B7) return 1; @@ -388,8 +447,8 @@ utf8size(char *s) { void selinit(void) { - sel.tclick1.tv_sec = 0; - sel.tclick1.tv_usec = 0; + memset(&sel.tclick1, 0, sizeof(sel.tclick1)); + memset(&sel.tclick2, 0, sizeof(sel.tclick2)); sel.mode = 0; sel.bx = -1; sel.clip = NULL; @@ -398,7 +457,7 @@ selinit(void) { sel.xtarget = XA_STRING; } -static inline int +static inline bool selected(int x, int y) { if(sel.ey == y && sel.by == y) { int bx = MIN(sel.bx, sel.ex); @@ -461,6 +520,8 @@ bpress(XEvent *e) { if(IS_SET(MODE_MOUSE)) mousereport(e); else if(e->xbutton.button == Button1) { + if(sel.bx != -1) + tsetdirt(sel.b.y, sel.e.y); sel.mode = 1; sel.ex = sel.bx = X2COL(e->xbutton.x); sel.ey = sel.by = Y2ROW(e->xbutton.y); @@ -470,21 +531,28 @@ bpress(XEvent *e) { void selcopy(void) { char *str, *ptr; - int x, y, sz, sl, ls = 0; + int x, y, bufsize, is_selected = 0; if(sel.bx == -1) str = NULL; + else { - sz = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; - ptr = str = malloc(sz); + bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; + ptr = str = malloc(bufsize); + + /* append every set & selected glyph to the selection */ for(y = 0; y < term.row; y++) { - for(x = 0; x < term.col; x++) - if(term.line[y][x].state & GLYPH_SET && (ls = selected(x, y))) { - sl = utf8size(term.line[y][x].c); - memcpy(ptr, term.line[y][x].c, sl); - ptr += sl; + for(x = 0; x < term.col; x++) { + is_selected = selected(x, y); + if((term.line[y][x].state & GLYPH_SET) && is_selected) { + int size = utf8size(term.line[y][x].c); + memcpy(ptr, term.line[y][x].c, size); + ptr += size; } - if(ls && y < sel.e.y) + } + + /* \n at the end of every selected line except for the last one */ + if(is_selected && y < sel.e.y) *ptr++ = '\n'; } *ptr = 0; @@ -494,9 +562,9 @@ selcopy(void) { void selnotify(XEvent *e) { - unsigned long nitems, ofs, rem; + ulong nitems, ofs, rem; int format; - unsigned char *data; + uchar *data; Atom type; ofs = 0; @@ -540,12 +608,12 @@ selrequest(XEvent *e) { Atom string = sel.xtarget; XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32, PropModeReplace, - (unsigned char *) &string, 1); + (uchar *) &string, 1); xev.property = xsre->property; - } else if(xsre->target == sel.xtarget) { + } else if(xsre->target == sel.xtarget && sel.clip != NULL) { XChangeProperty(xsre->display, xsre->requestor, xsre->property, xsre->target, 8, PropModeReplace, - (unsigned char *) sel.clip, strlen(sel.clip)); + (uchar *) sel.clip, strlen(sel.clip)); xev.property = xsre->property; } @@ -581,6 +649,7 @@ brelease(XEvent *e) { else if(e->xbutton.button == Button1) { sel.mode = 0; getbuttoninfo(e, NULL, &sel.ex, &sel.ey); + term.dirty[sel.ey] = 1; if(sel.bx == sel.ex && sel.by == sel.ey) { struct timeval now; sel.bx = -1; @@ -625,7 +694,8 @@ bmotion(XEvent *e) { if(oldey != sel.ey || oldex != sel.ex) { int starty = MIN(oldey, sel.ey); int endy = MAX(oldey, sel.ey); - drawregion(0, (starty > 0 ? starty : 0), term.col, (endy < term.row ? endy+1 : term.row)); + tsetdirt(starty, endy); + draw(); } } } @@ -645,7 +715,7 @@ execsh(void) { char **args; char *envshell = getenv("SHELL"); - DEFAULT(envshell, "sh"); + DEFAULT(envshell, SHELL); putenv("TERM="TNAME); args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; execvp(args[0], args); @@ -749,6 +819,24 @@ ttyresize(int x, int y) { } void +tsetdirt(int top, int bot) +{ + int i; + + LIMIT(top, 0, term.row-1); + LIMIT(bot, 0, term.row-1); + + for(i = top; i <= bot; i++) + term.dirty[i] = 1; +} + +void +tfulldirt(void) +{ + tsetdirt(0, term.row-1); +} + +void tcursor(int mode) { static TCursor c; @@ -760,12 +848,16 @@ tcursor(int mode) { void treset(void) { + unsigned i; term.c = (TCursor){{ .mode = ATTR_NULL, .fg = DefaultFG, .bg = DefaultBG }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; - + + memset(term.tabs, 0, term.col * sizeof(*term.tabs)); + for (i = TAB; i < term.col; i += TAB) + 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); @@ -777,10 +869,15 @@ tnew(int col, int row) { term.row = row, term.col = col; term.line = malloc(term.row * sizeof(Line)); term.alt = malloc(term.row * sizeof(Line)); + term.dirty = malloc(term.row * sizeof(*term.dirty)); + term.tabs = malloc(term.col * sizeof(*term.tabs)); + for(row = 0; row < term.row; row++) { term.line[row] = malloc(term.col * sizeof(Glyph)); term.alt [row] = malloc(term.col * sizeof(Glyph)); + term.dirty[row] = 0; } + memset(term.tabs, 0, term.col * sizeof(*term.tabs)); /* setup screen */ treset(); } @@ -791,6 +888,7 @@ tswapscreen(void) { term.line = term.alt; term.alt = tmp; term.mode ^= MODE_ALTSCREEN; + tfulldirt(); } void @@ -806,6 +904,9 @@ tscrolldown(int orig, int n) { temp = term.line[i]; term.line[i] = term.line[i-n]; term.line[i-n] = temp; + + term.dirty[i] = 1; + term.dirty[i-n] = 1; } selscroll(orig, n); @@ -823,6 +924,9 @@ tscrollup(int orig, int n) { temp = term.line[i]; term.line[i] = term.line[i+n]; term.line[i+n] = temp; + + term.dirty[i] = 1; + term.dirty[i+n] = 1; } selscroll(orig, -n); @@ -896,6 +1000,7 @@ tmoveto(int x, int y) { void tsetchar(char *c) { + 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); term.line[term.c.y][term.c.x].state |= GLYPH_SET; @@ -915,9 +1020,11 @@ tclearregion(int x1, int y1, int x2, int y2) { LIMIT(y1, 0, term.row-1); LIMIT(y2, 0, term.row-1); - for(y = y1; y <= y2; y++) + for(y = y1; y <= y2; y++) { + term.dirty[y] = 1; for(x = x1; x <= x2; x++) term.line[y][x].state = 0; + } } void @@ -925,6 +1032,8 @@ tdeletechar(int n) { int src = term.c.x + n; int dst = term.c.x; int size = term.col - src; + + term.dirty[term.c.y] = 1; if(src >= term.col) { tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); @@ -940,6 +1049,8 @@ tinsertblank(int n) { int dst = src + n; int size = term.col - dst; + term.dirty[term.c.y] = 1; + if(dst >= term.col) { tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); return; @@ -1092,6 +1203,18 @@ csihandle(void) { DEFAULT(escseq.arg[0], 1); tmoveto(0, term.c.y-escseq.arg[0]); break; + case 'g': /* TBC -- Tabulation clear */ + switch (escseq.arg[0]) { + case 0: /* clear current tab stop */ + term.tabs[term.c.x] = 0; + break; + case 3: /* clear all the tabs */ + memset(term.tabs, 0, term.col * sizeof(*term.tabs)); + break; + default: + goto unknown; + } + break; case 'G': /* CHA -- Move to */ case '`': /* XXX: HPA -- same? */ DEFAULT(escseq.arg[0], 1); @@ -1103,7 +1226,6 @@ csihandle(void) { DEFAULT(escseq.arg[1], 1); tmoveto(escseq.arg[1]-1, escseq.arg[0]-1); break; - /* XXX: (CSI n I) CHT -- Cursor Forward Tabulation tab stops */ case 'J': /* ED -- Clear screen */ sel.bx = -1; switch(escseq.arg[0]) { @@ -1299,12 +1421,15 @@ csihandle(void) { void csidump(void) { int i; - printf("ESC [ %s", escseq.priv ? "? " : ""); - if(escseq.narg) - for(i = 0; i < escseq.narg; i++) - printf("%d ", escseq.arg[i]); - if(escseq.mode) - putchar(escseq.mode); + printf("ESC["); + for(i = 0; i < escseq.len; i++) { + uint c = escseq.buf[i] & 0xff; + if(isprint(c)) putchar(c); + else if(c == '\n') printf("(\\n)"); + else if(c == '\r') printf("(\\r)"); + else if(c == 0x1b) printf("(\\e)"); + else printf("(%02x)", c); + } putchar('\n'); } @@ -1315,8 +1440,11 @@ csireset(void) { void tputtab(void) { - int space = TAB - term.c.x % TAB; - tmoveto(term.c.x + space, term.c.y); + unsigned x; + + for (x = term.c.x + 1; x < term.col && !term.tabs[x]; ++x) + /* nothing */ ; + tmoveto(x, term.c.y); } void @@ -1377,6 +1505,10 @@ tputc(char *c) { tnewline(1); /* always go to first col */ term.esc = 0; break; + case 'H': /* HTS -- Horizontal tab stop */ + term.tabs[term.c.x] = 1; + term.esc = 0; + break; case 'M': /* RI -- Reverse index */ if(term.c.y == term.top) tscrolldown(term.top, 1); @@ -1406,12 +1538,13 @@ tputc(char *c) { break; default: fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", - (unsigned char) ascii, isprint(ascii)?ascii:'.'); + (uchar) ascii, isprint(ascii)?ascii:'.'); term.esc = 0; } } } else { - if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1; + if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) + sel.bx = -1; switch(ascii) { case '\t': tputtab(); @@ -1479,9 +1612,12 @@ tresize(int col, int row) { /* resize to new height */ term.line = realloc(term.line, row * sizeof(Line)); term.alt = realloc(term.alt, row * sizeof(Line)); + term.dirty = realloc(term.dirty, row * sizeof(*term.dirty)); + term.tabs = realloc(term.tabs, col * sizeof(*term.tabs)); /* resize each row to new width, zero-pad if needed */ for(i = 0; i < minrow; i++) { + term.dirty[i] = 1; term.line[i] = realloc(term.line[i], col * sizeof(Glyph)); term.alt[i] = realloc(term.alt[i], col * sizeof(Glyph)); for(x = mincol; x < col; x++) { @@ -1492,65 +1628,54 @@ tresize(int col, int row) { /* allocate any new rows */ for(/* i == minrow */; i < row; i++) { + term.dirty[i] = 1; term.line[i] = calloc(col, sizeof(Glyph)); term.alt [i] = calloc(col, sizeof(Glyph)); } - + if (col > term.col) { + bool *bp = term.tabs + term.col; + + memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); + while (--bp > term.tabs && !*bp) + /* nothing */ ; + for (bp += TAB; bp < term.tabs + col; bp += TAB) + *bp = 1; + } /* update terminal size */ term.col = col, term.row = row; /* make use of the LIMIT in tmoveto */ tmoveto(term.c.x, term.c.y); /* reset scrolling region */ tsetscroll(0, row-1); + return (slide > 0); } void xresize(int col, int row) { - Pixmap newbuf; - int oldw, oldh; - - oldw = xw.bufw; - oldh = xw.bufh; - xw.bufw = MAX(1, col * xw.cw); - xw.bufh = MAX(1, row * xw.ch); - newbuf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr)); - XCopyArea(xw.dpy, xw.buf, newbuf, dc.gc, 0, 0, xw.bufw, xw.bufh, 0, 0); - XFreePixmap(xw.dpy, xw.buf); - XSetForeground(xw.dpy, dc.gc, dc.col[DefaultBG]); - if(xw.bufw > oldw) - XFillRectangle(xw.dpy, newbuf, dc.gc, oldw, 0, - xw.bufw-oldw, MIN(xw.bufh, oldh)); - else if(xw.bufw < oldw && (BORDER > 0 || xw.w > xw.bufw)) - XClearArea(xw.dpy, xw.win, BORDER+xw.bufw, BORDER, - xw.w-xw.bufh-BORDER, BORDER+MIN(xw.bufh, oldh), - False); - if(xw.bufh > oldh) - XFillRectangle(xw.dpy, newbuf, dc.gc, 0, oldh, - xw.bufw, xw.bufh-oldh); - else if(xw.bufh < oldh && (BORDER > 0 || xw.h > xw.bufh)) - XClearArea(xw.dpy, xw.win, BORDER, BORDER+xw.bufh, - xw.w-2*BORDER, xw.h-xw.bufh-BORDER, - False); - xw.buf = newbuf; + xw.w = MAX(1, 2*BORDER + col * xw.cw); + xw.h = MAX(1, 2*BORDER + row * xw.ch); } void xloadcols(void) { int i, r, g, b; XColor color; - unsigned long white = WhitePixel(xw.dpy, xw.scr); + ulong white = WhitePixel(xw.dpy, xw.scr); + /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */ for(i = 0; i < LEN(colorname); i++) { + if(!colorname[i]) + continue; if(!XAllocNamedColor(xw.dpy, xw.cmap, colorname[i], &color, &color)) { dc.col[i] = white; fprintf(stderr, "Could not allocate color '%s'\n", colorname[i]); } else dc.col[i] = color.pixel; } - - /* same colors as xterm */ - for(r = 0; r < 6; r++) + + /* load colors [16-255] ; same colors as xterm */ + for(i = 16, r = 0; r < 6; r++) for(g = 0; g < 6; g++) for(b = 0; b < 6; b++) { color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; @@ -1578,7 +1703,7 @@ void xclear(int x1, int y1, int x2, int y2) { XSetForeground(xw.dpy, dc.gc, dc.col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG]); XFillRectangle(xw.dpy, xw.buf, dc.gc, - x1 * xw.cw, y1 * xw.ch, + BORDER + x1 * xw.cw, BORDER + y1 * xw.ch, (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); } @@ -1664,10 +1789,8 @@ xinit(void) { xloadcols(); /* window - default size */ - xw.bufh = term.row * xw.ch; - xw.bufw = term.col * xw.cw; - xw.h = xw.bufh + 2*BORDER; - xw.w = xw.bufw + 2*BORDER; + xw.h = 2*BORDER + term.row * xw.ch; + xw.w = 2*BORDER + term.col * xw.cw; attrs.background_pixel = dc.col[DefaultBG]; attrs.border_pixel = dc.col[DefaultBG]; @@ -1685,7 +1808,7 @@ xinit(void) { CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, &attrs); - xw.buf = XCreatePixmap(xw.dpy, xw.win, xw.bufw, xw.bufh, XDefaultDepth(xw.dpy, xw.scr)); + xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied); /* input methods */ @@ -1713,27 +1836,33 @@ xinit(void) { void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { - unsigned long xfg = dc.col[base.fg], xbg = dc.col[base.bg], temp; - int winx = x*xw.cw, winy = y*xw.ch + dc.font.ascent, width = charlen*xw.cw; + int fg = base.fg, bg = base.bg, temp; + int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch + dc.font.ascent, width = charlen*xw.cw; + XFontSet fontset = dc.font.set; int i; /* only switch default fg/bg if term is in RV mode */ if(IS_SET(MODE_REVERSE)) { - if(base.fg == DefaultFG) - xfg = dc.col[DefaultBG]; - if(base.bg == DefaultBG) - xbg = dc.col[DefaultFG]; + if(fg == DefaultFG) + fg = DefaultBG; + if(bg == DefaultBG) + bg = DefaultFG; } if(base.mode & ATTR_REVERSE) - temp = xfg, xfg = xbg, xbg = temp; + temp = fg, fg = bg, bg = temp; + + if(base.mode & ATTR_BOLD) { + fg += 8; + fontset = dc.bfont.set; + } - XSetBackground(xw.dpy, dc.gc, xbg); - XSetForeground(xw.dpy, dc.gc, xfg); + 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[(unsigned int)s[i] % 256]; + char c = gfx[(uint)s[i] % 256]; if(c) s[i] = c; else if(s[i] > 0x5f) @@ -1741,13 +1870,20 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { } } - XmbDrawImageString(xw.dpy, xw.buf, base.mode & ATTR_BOLD ? dc.bfont.set : dc.font.set, - dc.gc, winx, winy, s, bytelen); + XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen); if(base.mode & ATTR_UNDERLINE) XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1); } +/* copy buffer pixmap to screen pixmap */ +void +xcopy() { + XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}}; + XdbeSwapBuffers(xw.dpy, swpinfo, 1); + +} + void xdrawcursor(void) { static int oldx = 0; @@ -1767,20 +1903,30 @@ xdrawcursor(void) { xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl); } else xclear(oldx, oldy, oldx, oldy); - + + xcopy(oldx, oldy, 1, 1); + /* draw the new one */ - if(!(term.c.state & CURSOR_HIDE) && (xw.state & WIN_FOCUSED)) { - sl = utf8size(g.c); + if(!(term.c.state & CURSOR_HIDE)) { + if(!(xw.state & WIN_FOCUSED)) + g.bg = DefaultUCS; + if(IS_SET(MODE_REVERSE)) g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG; + + sl = utf8size(g.c); xdraws(g.c, g, term.c.x, term.c.y, 1, sl); oldx = term.c.x, oldy = term.c.y; } + + xcopy(term.c.x, term.c.y, 1, 1); } void draw() { drawregion(0, 0, term.col, term.row); + xcopy(); + gettimeofday(&xw.lastdraw, NULL); } void @@ -1792,8 +1938,11 @@ drawregion(int x1, int y1, int x2, int y2) { if(!(xw.state & WIN_VISIBLE)) return; - xclear(x1, y1, x2-1, y2-1); for(y = y1; y < y2; y++) { + if(!term.dirty[y]) + continue; + xclear(0, y, term.col, y); + term.dirty[y] = 0; base = term.line[y][0]; ic = ib = ox = 0; for(x = x1; x < x2; x++) { @@ -1801,7 +1950,7 @@ drawregion(int x1, int y1, int x2, int y2) { if(sel.bx != -1 && *(new.c) && selected(x, y)) new.mode ^= ATTR_REVERSE; if(ib > 0 && (!(new.state & GLYPH_SET) || ATTRCMP(base, new) || - ib >= DRAW_BUF_SIZ-UTF_SIZ)) { + ib >= DRAW_BUF_SIZ-UTF_SIZ)) { xdraws(buf, base, ox, y, ic, ib); ic = ib = 0; } @@ -1820,20 +1969,16 @@ drawregion(int x1, int y1, int x2, int y2) { xdraws(buf, base, ox, y, ic, ib); } xdrawcursor(); - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.bufw, xw.bufh, BORDER, BORDER); } void expose(XEvent *ev) { XExposeEvent *e = &ev->xexpose; if(xw.state & WIN_REDRAW) { - if(!e->count) { + if(!e->count) xw.state &= ~WIN_REDRAW; - draw(); - } - } else - XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, e->x-BORDER, e->y-BORDER, - e->width, e->height, e->x, e->y); + } + xcopy(); } void @@ -1870,11 +2015,11 @@ focus(XEvent *ev) { } char* -kmap(KeySym k, unsigned int state) { +kmap(KeySym k, uint state) { int i; state &= ~Mod2Mask; for(i = 0; i < LEN(key); i++) { - unsigned int mask = key[i].mask; + uint mask = key[i].mask; if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state))) return (char*)key[i].s; } @@ -1965,25 +2110,42 @@ resize(XEvent *e) { xresize(col, row); } +bool +last_draw_too_old(void) { + struct timeval now; + gettimeofday(&now, NULL); + return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000; +} + void run(void) { XEvent ev; fd_set rfd; int xfd = XConnectionNumber(xw.dpy); - + struct timeval timeout = {0}; + bool stuff_to_print = 0; + for(;;) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); - if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, NULL) < 0) { + timeout.tv_sec = 0; + timeout.tv_usec = SELECT_TIMEOUT; + if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) { if(errno == EINTR) continue; die("select failed: %s\n", SERRNO); } if(FD_ISSET(cmdfd, &rfd)) { ttyread(); + stuff_to_print = 1; + } + + if(stuff_to_print && last_draw_too_old()) { + stuff_to_print = 0; draw(); } + while(XPending(xw.dpy)) { XNextEvent(xw.dpy, &ev); if(XFilterEvent(&ev, xw.win)) @@ -2009,7 +2171,7 @@ main(int argc, char *argv[]) { case 'w': if(++i < argc) opt_embed = argv[i]; break; - case 'e': + case 'e': /* eat every remaining arguments */ if(++i < argc) opt_cmd = &argv[i]; goto run;