X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=b4dc5912b371c7e16d0c5740ffc2b7818f5b7025;hb=2752018e27420947a034d50f1ce165bbb76ae1a8;hp=a2f4f46cf8efa442e20a0cf67186974083513428;hpb=dd0b7a077f5184c0eac99955aeb91f3c6a0d9c11;p=st.git diff --git a/st.c b/st.c index a2f4f46..b4dc591 100644 --- a/st.c +++ b/st.c @@ -25,6 +25,10 @@ #include #include #include +#include +#include +#define Glyph Glyph_ +#define Font Font_ #if defined(__linux) #include @@ -36,8 +40,8 @@ #define USAGE \ "st " VERSION " (c) 2010-2012 st engineers\n" \ - "usage: st [-t title] [-c class] [-g geometry]" \ - " [-w windowid] [-v] [-f file] [-e command...]\n" + "usage: st [-v] [-c class] [-f font] [-g geometry] [-o file]" \ + " [-t title] [-w windowid] [-e command ...]\n" /* XEMBED messages */ #define XEMBED_FOCUS_IN 4 @@ -48,13 +52,11 @@ #define ESC_ARG_SIZ 16 #define STR_BUF_SIZ 256 #define STR_ARG_SIZ 16 -#define DRAW_BUF_SIZ 1024 +#define DRAW_BUF_SIZ 20*1024 #define UTF_SIZ 4 #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 REDRAW_TIMEOUT (80*1000) /* 80 ms */ #define SERRNO strerror(errno) @@ -77,6 +79,7 @@ enum glyph_attribute { ATTR_BOLD = 4, ATTR_GFX = 8, ATTR_ITALIC = 16, + ATTR_BLINK = 32, }; enum cursor_movement { @@ -108,7 +111,8 @@ enum term_mode { MODE_MOUSEBTN = 32, MODE_MOUSEMOTION = 64, MODE_MOUSE = 32|64, - MODE_REVERSE = 128 + MODE_REVERSE = 128, + MODE_KBDLOCK = 256 }; enum escape_state { @@ -196,15 +200,17 @@ typedef struct { Atom xembed; XIM xim; XIC xic; + 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 */ int h; /* window height */ int ch; /* char height */ int cw; /* char width */ char state; /* focus, redraw, visible */ - struct timeval lastdraw; } XWindow; typedef struct { @@ -213,7 +219,6 @@ typedef struct { char s[ESC_BUF_SIZ]; } Key; - /* TODO: use better name for vars... */ typedef struct { int mode; @@ -229,17 +234,22 @@ typedef struct { #include "config.h" +/* Font structure */ +typedef struct { + int height; + int width; + int ascent; + int descent; + short lbearing; + short rbearing; + XftFont* xft_set; +} Font; + /* Drawing Context */ typedef struct { - ulong col[LEN(colorname) < 256 ? 256 : LEN(colorname)]; + XftColor xft_col[LEN(colorname) < 256 ? 256 : LEN(colorname)]; GC gc; - struct { - int ascent; - int descent; - short lbearing; - short rbearing; - XFontSet set; - } font, bfont, ifont; + Font font, bfont, ifont, ibfont; } DC; static void die(const char*, ...); @@ -249,7 +259,6 @@ 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); @@ -270,7 +279,7 @@ static void tmoveto(int, int); 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); @@ -285,18 +294,20 @@ static void tfulldirt(void); 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); static void xhints(void); static void xclear(int, int, int, int); -static void xcopy(void); +static void xclearborders(void); static void xdrawcursor(void); static void xinit(void); static void xloadcols(void); +static void xresettitle(void); static void xseturgency(int); static void xsetsel(char*); +static void xtermclear(int, int, int, int); static void xresize(int, int); static void expose(XEvent *); @@ -325,6 +336,11 @@ static int utf8encode(long *, char *); static int utf8size(char *); static int isfullutf8(char *, int); +static void *xmalloc(size_t); +static void *xrealloc(void *, size_t); +static void *xcalloc(size_t nmemb, size_t size); +static char *smstrcat(char *, ...); + static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, [ClientMessage] = cmessage, @@ -351,12 +367,74 @@ static STREscape strescseq; static int cmdfd; static pid_t pid; static Selection sel; -static FILE *fileio; -static char **opt_cmd = NULL; -static char *opt_io = NULL; +static int iofd = -1; +static char **opt_cmd = NULL; +static char *opt_io = NULL; static char *opt_title = NULL; static char *opt_embed = NULL; static char *opt_class = NULL; +static char *opt_font = NULL; + +void * +xmalloc(size_t len) { + void *p = malloc(len); + if(!p) + die("Out of memory\n"); + return p; +} + +void * +xrealloc(void *p, size_t len) { + if((p = realloc(p, len)) == NULL) + die("Out of memory\n"); + return p; +} + +void * +xcalloc(size_t nmemb, size_t size) { + void *p = calloc(nmemb, size); + if(!p) + die("Out of memory\n"); + return p; +} + +char * +smstrcat(char *src, ...) +{ + va_list fmtargs; + char *ret, *p, *v; + int len, slen, flen; + + len = slen = strlen(src); + + va_start(fmtargs, src); + for(;;) { + v = va_arg(fmtargs, char *); + if(v == NULL) + break; + len += strlen(v); + } + va_end(fmtargs); + + p = ret = xmalloc(len+1); + memmove(p, src, slen); + p += slen; + + va_start(fmtargs, src); + for(;;) { + v = va_arg(fmtargs, char *); + if(v == NULL) + break; + flen = strlen(v); + memmove(p, v, flen); + p += flen; + } + va_end(fmtargs); + + ret[len] = '\0'; + + return ret; +} int utf8decode(char *s, long *u) { @@ -546,12 +624,14 @@ bpress(XEvent *e) { if(IS_SET(MODE_MOUSE)) mousereport(e); else if(e->xbutton.button == Button1) { - if(sel.bx != -1) + if(sel.bx != -1) { + sel.bx = -1; tsetdirt(sel.b.y, sel.e.y); + draw(); + } sel.mode = 1; sel.ex = sel.bx = X2COL(e->xbutton.x); sel.ey = sel.by = Y2ROW(e->xbutton.y); - draw(); } } @@ -565,19 +645,22 @@ selcopy(void) { else { bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; - ptr = str = malloc(bufsize); + ptr = str = xmalloc(bufsize); /* append every set & selected glyph to the selection */ for(y = 0; y < term.row; y++) { 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; - } + int size; + char *p; + Glyph *gp = &term.line[y][x]; + + if(!(is_selected = selected(x, y))) + continue; + p = (gp->state & GLYPH_SET) ? gp->c : " "; + size = utf8size(p); + memcpy(ptr, p, size); + ptr += size; } - /* \n at the end of every selected line except for the last one */ if(is_selected && y < sel.e.y) *ptr++ = '\n'; @@ -620,7 +703,6 @@ void selclear(XEvent *e) { return; sel.bx = -1; tsetdirt(sel.b.y, sel.e.y); - draw(); } void @@ -670,8 +752,6 @@ xsetsel(char *str) { clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime); - - XFlush(xw.dpy); } void @@ -714,7 +794,6 @@ brelease(XEvent *e) { } memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval)); gettimeofday(&sel.tclick1, NULL); - draw(); } void @@ -731,7 +810,6 @@ bmotion(XEvent *e) { int starty = MIN(oldey, sel.ey); int endy = MAX(oldey, sel.ey); tsetdirt(starty, endy); - draw(); } } } @@ -755,6 +833,13 @@ execsh(void) { unsetenv("LINES"); unsetenv("TERMCAP"); + signal(SIGCHLD, SIG_DFL); + signal(SIGHUP, SIG_DFL); + signal(SIGINT, SIG_DFL); + signal(SIGQUIT, SIG_DFL); + signal(SIGTERM, SIG_DFL); + signal(SIGALRM, SIG_DFL); + DEFAULT(envshell, SHELL); putenv("TERM="TNAME); args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; @@ -801,9 +886,15 @@ ttynew(void) { close(s); cmdfd = m; signal(SIGCHLD, sigchld); - if(opt_io && !(fileio = fopen(opt_io, "w"))) { - fprintf(stderr, "Error opening %s:%s\n", - opt_io, strerror(errno)); + if(opt_io) { + if(!strcmp(opt_io, "-")) { + iofd = STDOUT_FILENO; + } else { + if((iofd = open(opt_io, O_WRONLY | O_CREAT, 0666)) < 0) { + fprintf(stderr, "Error opening %s:%s\n", + opt_io, strerror(errno)); + } + } } } } @@ -836,7 +927,7 @@ ttyread(void) { while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) { charsize = utf8decode(ptr, &utf8c); utf8encode(&utf8c, s); - tputc(s); + tputc(s, charsize); ptr += charsize; buflen -= charsize; } @@ -852,13 +943,13 @@ ttywrite(const char *s, size_t n) { } void -ttyresize(int x, int y) { +ttyresize(void) { struct winsize w; w.ws_row = term.row; w.ws_col = term.col; - w.ws_xpixel = xw.w; - w.ws_ypixel = xw.h; + w.ws_xpixel = xw.tw; + w.ws_ypixel = xw.th; if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0) fprintf(stderr, "Couldn't set window size: %s\n", SERRNO); } @@ -893,7 +984,7 @@ tcursor(int mode) { void treset(void) { - unsigned i; + uint i; term.c = (TCursor){{ .mode = ATTR_NULL, .fg = DefaultFG, @@ -905,6 +996,7 @@ treset(void) { 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); } @@ -912,14 +1004,14 @@ void tnew(int col, int row) { /* set screen size */ 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)); + term.line = xmalloc(term.row * sizeof(Line)); + term.alt = xmalloc(term.row * sizeof(Line)); + term.dirty = xmalloc(term.row * sizeof(*term.dirty)); + term.tabs = xmalloc(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.line[row] = xmalloc(term.col * sizeof(Glyph)); + term.alt [row] = xmalloc(term.col * sizeof(Glyph)); term.dirty[row] = 0; } memset(term.tabs, 0, term.col * sizeof(*term.tabs)); @@ -1045,6 +1137,27 @@ tmoveto(int x, int y) { 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); @@ -1127,7 +1240,8 @@ tsetattr(int *attr, int l) { for(i = 0; i < l; i++) { switch(attr[i]) { case 0: - term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD); + term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \ + | ATTR_ITALIC | ATTR_BLINK); term.c.attr.fg = DefaultFG; term.c.attr.bg = DefaultBG; break; @@ -1140,9 +1254,13 @@ tsetattr(int *attr, int l) { case 4: term.c.attr.mode |= ATTR_UNDERLINE; break; + case 5: + term.c.attr.mode |= ATTR_BLINK; + break; case 7: term.c.attr.mode |= ATTR_REVERSE; break; + case 21: case 22: term.c.attr.mode &= ~ATTR_BOLD; break; @@ -1152,6 +1270,9 @@ tsetattr(int *attr, int l) { case 24: term.c.attr.mode &= ~ATTR_UNDERLINE; break; + case 25: + term.c.attr.mode &= ~ATTR_BLINK; + break; case 27: term.c.attr.mode &= ~ATTR_REVERSE; break; @@ -1191,7 +1312,7 @@ tsetattr(int *attr, int l) { else if(BETWEEN(attr[i], 90, 97)) term.c.attr.fg = attr[i] - 90 + 8; else if(BETWEEN(attr[i], 100, 107)) - term.c.attr.fg = attr[i] - 100 + 8; + term.c.attr.bg = attr[i] - 100 + 8; else fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump(); break; @@ -1223,21 +1344,24 @@ tsetmode(bool priv, bool set, int *args, int narg) { 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 */ + case 5: /* DECSCNM -- Reverse video */ mode = term.mode; - MODBIT(term.mode,set, MODE_REVERSE); + MODBIT(term.mode, set, MODE_REVERSE); 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: @@ -1265,6 +1389,12 @@ tsetmode(bool priv, bool set, int *args, int narg) { 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); @@ -1272,9 +1402,19 @@ tsetmode(bool priv, bool set, int *args, int narg) { } } 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", @@ -1503,6 +1643,9 @@ strhandle(void) { break; } break; + case 'k': /* old title set compatibility */ + XStoreName(xw.dpy, xw.win, strescseq.buf); + break; case 'P': /* DSC -- Device Control String */ case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ @@ -1545,7 +1688,7 @@ strreset(void) { void tputtab(bool forward) { - unsigned x = term.c.x; + uint x = term.c.x; if(forward) { if(x == term.col) @@ -1562,11 +1705,40 @@ tputtab(bool forward) { } void -tputc(char *c) { - char ascii = *c; +tputc(char *c, int len) { + uchar ascii = *c; - if(fileio) - putc(ascii, fileio); + if(iofd != -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(term.esc & ESC_STR) + break; + + 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) { @@ -1597,12 +1769,18 @@ tputc(char *c) { 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); } @@ -1616,13 +1794,19 @@ tputc(char *c) { case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ case ']': /* OSC -- Operating System Command */ + case 'k': /* old title set compatibility */ strreset(); 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); @@ -1648,6 +1832,8 @@ tputc(char *c) { case 'c': /* RIS -- Reset to inital state */ treset(); term.esc = 0; + xclearborders(); + xresettitle(); break; case '=': /* DECPAM -- Application keypad */ term.mode |= MODE_APPKEYPAD; @@ -1677,31 +1863,7 @@ tputc(char *c) { } else { if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) sel.bx = -1; - switch(ascii) { - 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); @@ -1742,16 +1904,16 @@ 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)); + term.line = xrealloc(term.line, row * sizeof(Line)); + term.alt = xrealloc(term.alt, row * sizeof(Line)); + term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty)); + term.tabs = xrealloc(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)); + term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); + term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); for(x = mincol; x < col; x++) { term.line[i][x].state = 0; term.alt[i][x].state = 0; @@ -1761,8 +1923,8 @@ 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)); + term.line[i] = xcalloc(col, sizeof(Glyph)); + term.alt [i] = xcalloc(col, sizeof(Glyph)); } if(col > term.col) { bool *bp = term.tabs + term.col; @@ -1785,58 +1947,79 @@ tresize(int col, int row) { void xresize(int col, int row) { - xw.w = MAX(1, 2*BORDER + col * xw.cw); - xw.h = MAX(1, 2*BORDER + row * xw.ch); + xw.tw = MAX(1, 2*BORDER + col * xw.cw); + xw.th = MAX(1, 2*BORDER + row * xw.ch); + + XftDrawChange(xw.xft_draw, xw.buf); } void xloadcols(void) { int i, r, g, b; - XColor color; - ulong white = WhitePixel(xw.dpy, xw.scr); + XRenderColor xft_color = { .alpha = 0 }; /* 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; + if(!XftColorAllocName(xw.dpy, xw.vis, xw.cmap, colorname[i], &dc.xft_col[i])) { + die("Could not allocate color '%s'\n", colorname[i]); + } } /* load colors [16-255] ; same colors as xterm */ - for(i = 16, r = 0; r < 6; r++) - for(g = 0; g < 6; g++) + 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; - color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; - color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; - if(!XAllocColor(xw.dpy, xw.cmap, &color)) { - dc.col[i] = white; - fprintf(stderr, "Could not allocate color %d\n", i); - } else - dc.col[i] = color.pixel; + xft_color.red = r == 0 ? 0 : 0x3737 + 0x2828 * r; + xft_color.green = g == 0 ? 0 : 0x3737 + 0x2828 * g; + xft_color.blue = b == 0 ? 0 : 0x3737 + 0x2828 * b; + if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) { + die("Could not allocate color %d\n", i); + } i++; } + } + } for(r = 0; r < 24; r++, i++) { - color.red = color.green = color.blue = 0x0808 + 0x0a0a * r; - if(!XAllocColor(xw.dpy, xw.cmap, &color)) { - dc.col[i] = white; - fprintf(stderr, "Could not allocate color %d\n", i); - } else - dc.col[i] = color.pixel; + xft_color.red = xft_color.green = xft_color.blue = 0x0808 + 0x0a0a * r; + if(!XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &xft_color, &dc.xft_col[i])) { + die("Could not allocate color %d\n", i); + } } } void +xtermclear(int col1, int row1, int col2, int row2) { + XftDrawRect(xw.xft_draw, + &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG], + BORDER + col1 * xw.cw, + BORDER + row1 * xw.ch, + (col2-col1+1) * xw.cw, + (row2-row1+1) * xw.ch); +} + +/* + * Absolute coordinates. + */ +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, - BORDER + x1 * xw.cw, BORDER + y1 * xw.ch, - (x2-x1+1) * xw.cw, (y2-y1+1) * xw.ch); + XftDrawRect(xw.xft_draw, + &dc.xft_col[IS_SET(MODE_REVERSE) ? DefaultFG : DefaultBG], + x1, y1, x2-x1, y2-y1); +} + +void +xclearborders(void) { + /* top and left border */ + xclear(0, 0, BORDER, xw.h); + xclear(0, 0, xw.w, BORDER); + + /* lower and right border */ + xclear(BORDER, xw.th - 1, xw.w, xw.h); + /* Will just draw what hasn't been drawn by the previous call. */ + xclear(xw.tw - 1, BORDER, xw.w, xw.h - xw.th - 2); } void @@ -1864,54 +2047,52 @@ xhints(void) { XFree(sizeh); } -XFontSet -xinitfont(char *fontstr) { - XFontSet set; - char *def, **missing; - int n; +void +xinitfont(Font *f, char *fontstr) { + FcPattern *pattern, *match; + FcResult result; + + pattern = FcNameParse((FcChar8 *)fontstr); + if(!pattern) + die("st: can't open font %s\n", fontstr); - missing = NULL; - set = XCreateFontSet(xw.dpy, fontstr, &missing, &n, &def); - if(missing) { - while(n--) - fprintf(stderr, "st: missing fontset: %s\n", missing[n]); - XFreeStringList(missing); + match = XftFontMatch(xw.dpy, xw.scr, pattern, &result); + FcPatternDestroy(pattern); + if(!match) + die("st: can't open font %s\n", fontstr); + if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) { + FcPatternDestroy(match); + die("st: can't open font %s.\n", fontstr); } - return set; -} -void -xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) { - XFontStruct **xfonts; - char **font_names; - int i, n; + f->ascent = f->xft_set->ascent; + f->descent = f->xft_set->descent; + f->lbearing = 0; + f->rbearing = f->xft_set->max_advance_width; - *ascent = *descent = *lbearing = *rbearing = 0; - n = XFontsOfFontSet(set, &xfonts, &font_names); - for(i = 0; i < n; i++) { - *ascent = MAX(*ascent, (*xfonts)->ascent); - *descent = MAX(*descent, (*xfonts)->descent); - *lbearing = MAX(*lbearing, (*xfonts)->min_bounds.lbearing); - *rbearing = MAX(*rbearing, (*xfonts)->max_bounds.rbearing); - xfonts++; - } + f->height = f->xft_set->height; + f->width = f->lbearing + f->rbearing; } void -initfonts(char *fontstr, char *bfontstr, char *ifontstr) { - if((dc.font.set = xinitfont(fontstr)) == NULL) - die("Can't load font %s\n", fontstr); - if((dc.bfont.set = xinitfont(bfontstr)) == NULL) - die("Can't load bfont %s\n", bfontstr); - if((dc.ifont.set = xinitfont(ifontstr)) == NULL) - die("Can't load ifont %s\n", ifontstr); +initfonts(char *fontstr) { + char *fstr; + + xinitfont(&dc.font, fontstr); + xw.cw = dc.font.width; + xw.ch = dc.font.height; + + fstr = smstrcat(fontstr, ":weight=bold", NULL); + xinitfont(&dc.bfont, fstr); + free(fstr); - xgetfontinfo(dc.font.set, &dc.font.ascent, &dc.font.descent, - &dc.font.lbearing, &dc.font.rbearing); - xgetfontinfo(dc.bfont.set, &dc.bfont.ascent, &dc.bfont.descent, - &dc.bfont.lbearing, &dc.bfont.rbearing); - xgetfontinfo(dc.ifont.set, &dc.ifont.ascent, &dc.ifont.descent, - &dc.ifont.lbearing, &dc.ifont.rbearing); + fstr = smstrcat(fontstr, ":slant=italic,oblique", NULL); + xinitfont(&dc.ifont, fstr); + free(fstr); + + fstr = smstrcat(fontstr, ":weight=bold:slant=italic,oblique", NULL); + xinitfont(&dc.ibfont, fstr); + free(fstr); } void @@ -1919,11 +2100,19 @@ xinit(void) { XSetWindowAttributes attrs; Cursor cursor; Window parent; - int sw, sh; + int sw, sh, major, minor; if(!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); xw.scr = XDefaultScreen(xw.dpy); + xw.vis = XDefaultVisual(xw.dpy, xw.scr); + + /* font */ + initfonts((opt_font != NULL)? opt_font : FONT); + + /* colors */ + xw.cmap = XDefaultColormap(xw.dpy, xw.scr); + xloadcols(); /* adjust fixed window geometry */ if(xw.isfixed) { @@ -1944,35 +2133,29 @@ xinit(void) { xw.fy = 0; } - /* font */ - initfonts(FONT, BOLDFONT, ITALICFONT); - - /* XXX: Assuming same size for bold font */ - xw.cw = dc.font.rbearing - dc.font.lbearing; - xw.ch = dc.font.ascent + dc.font.descent; - - /* colors */ - xw.cmap = XDefaultColormap(xw.dpy, xw.scr); - xloadcols(); - - attrs.background_pixel = dc.col[DefaultBG]; - attrs.border_pixel = dc.col[DefaultBG]; + attrs.background_pixel = dc.xft_col[DefaultBG].pixel; + attrs.border_pixel = dc.xft_col[DefaultBG].pixel; attrs.bit_gravity = NorthWestGravity; attrs.event_mask = FocusChangeMask | KeyPressMask | ExposureMask | VisibilityChangeMask | StructureNotifyMask - | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask - | EnterWindowMask | LeaveWindowMask; + | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; attrs.colormap = xw.cmap; parent = opt_embed ? strtol(opt_embed, NULL, 0) : XRootWindow(xw.dpy, xw.scr); xw.win = XCreateWindow(xw.dpy, parent, xw.fx, xw.fy, xw.w, xw.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput, - XDefaultVisual(xw.dpy, xw.scr), + xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask | CWColormap, &attrs); + + /* double buffering */ + if(!XdbeQueryExtension(xw.dpy, &major, &minor)) + die("Xdbe extension is not present\n"); xw.buf = XdbeAllocateBackBufferName(xw.dpy, xw.win, XdbeCopied); + /* Xft rendering context */ + xw.xft_draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); /* input methods */ xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL); @@ -1991,7 +2174,7 @@ xinit(void) { xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); - XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); + xresettitle(); XMapWindow(xw.dpy, xw.win); xhints(); XSync(xw.dpy, 0); @@ -1999,55 +2182,61 @@ xinit(void) { void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { - 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(fg == DefaultFG) - fg = DefaultBG; - if(bg == DefaultBG) - bg = DefaultFG; - } + int winx = BORDER+x*xw.cw, winy = BORDER+y*xw.ch, + width = charlen*xw.cw; + Font *font = &dc.font; + XGlyphInfo extents; + XftColor *fg = &dc.xft_col[base.fg], *bg = &dc.xft_col[base.bg], + *temp, revfg, revbg; + XRenderColor colfg, colbg; if(base.mode & ATTR_REVERSE) temp = fg, fg = bg, bg = temp; - if(base.mode & ATTR_BOLD) { - fg += 8; - fontset = dc.bfont.set; + fg = &dc.xft_col[base.fg + 8]; + font = &dc.bfont; } - if(base.mode & ATTR_ITALIC) - fontset = dc.ifont.set; - - 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; + font = &dc.ifont; + if(base.mode & (ATTR_ITALIC|ATTR_ITALIC)) + font = &dc.ibfont; + + if(IS_SET(MODE_REVERSE)) { + if(fg == &dc.xft_col[DefaultFG]) { + fg = &dc.xft_col[DefaultBG]; + } else { + colfg.red = ~fg->color.red; + colfg.green = ~fg->color.green; + colfg.blue = ~fg->color.blue; + colfg.alpha = fg->color.alpha; + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); + fg = &revfg; + } + + if(bg == &dc.xft_col[DefaultBG]) { + bg = &dc.xft_col[DefaultFG]; + } else { + colbg.red = ~bg->color.red; + colbg.green = ~bg->color.green; + colbg.blue = ~bg->color.blue; + colbg.alpha = bg->color.alpha; + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg); + bg = &revbg; } } - XmbDrawImageString(xw.dpy, xw.buf, fontset, dc.gc, winx, winy, s, bytelen); + XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, + &extents); + width = extents.xOff; - 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); + XftDrawRect(xw.xft_draw, bg, winx, winy, width, xw.ch); + XftDrawStringUtf8(xw.xft_draw, fg, font->xft_set, winx, + winy + font->ascent, (FcChar8 *)s, bytelen); + if(base.mode & ATTR_UNDERLINE) { + XftDrawRect(xw.xft_draw, fg, winx, winy+1, + width, 1); + } } void @@ -2068,9 +2257,7 @@ xdrawcursor(void) { sl = utf8size(term.line[oldy][oldx].c); xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, oldy, 1, sl); } else - xclear(oldx, oldy, oldx, oldy); - - xcopy(); + xtermclear(oldx, oldy, oldx, oldy); /* draw the new one */ if(!(term.c.state & CURSOR_HIDE)) { @@ -2084,23 +2271,30 @@ xdrawcursor(void) { xdraws(g.c, g, term.c.x, term.c.y, 1, sl); oldx = term.c.x, oldy = term.c.y; } +} - xcopy(); +void +xresettitle(void) { + XStoreName(xw.dpy, xw.win, opt_title ? opt_title : "st"); } void redraw(void) { struct timespec tv = {0, REDRAW_TIMEOUT * 1000}; + + xclearborders(); tfulldirt(); draw(); + XSync(xw.dpy, False); /* necessary for a good tput flash */ nanosleep(&tv, NULL); } void -draw() { +draw(void) { + XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}}; + drawregion(0, 0, term.col, term.row); - xcopy(); - gettimeofday(&xw.lastdraw, NULL); + XdbeSwapBuffers(xw.dpy, swpinfo, 1); } void @@ -2118,7 +2312,7 @@ drawregion(int x1, int y1, int x2, int y2) { for(y = y1; y < y2; y++) { if(!term.dirty[y]) continue; - xclear(0, y, term.col, y); + xtermclear(0, y, term.col, y); term.dirty[y] = 0; base = term.line[y][0]; ic = ib = ox = 0; @@ -2155,7 +2349,6 @@ expose(XEvent *ev) { if(!e->count) xw.state &= ~WIN_REDRAW; } - xcopy(); } void @@ -2188,7 +2381,6 @@ focus(XEvent *ev) { xseturgency(0); } else xw.state &= ~WIN_FOCUSED; - draw(); } char* @@ -2214,6 +2406,8 @@ kpress(XEvent *ev) { 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); @@ -2264,7 +2458,6 @@ cmessage(XEvent *e) { } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { xw.state &= ~WIN_FOCUSED; } - draw(); } } @@ -2281,47 +2474,48 @@ resize(XEvent *e) { row = (xw.h - 2*BORDER) / xw.ch; if(col == term.col && row == term.row) return; - if(tresize(col, row)) - draw(); - xresize(col, row); - ttyresize(col, row); -} -bool -last_draw_too_old(void) { - struct timeval now; - gettimeofday(&now, NULL); - return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000; + tresize(col, row); + xresize(col, row); + xclearborders(); + ttyresize(); } void run(void) { XEvent ev; fd_set rfd; - int xfd = XConnectionNumber(xw.dpy); - struct timeval timeout = {0}; - bool stuff_to_print = 0; + int xfd = XConnectionNumber(xw.dpy), i; + struct timeval drawtimeout, *tv = NULL; - for(;;) { + for(i = 0;; i++) { FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); - timeout.tv_sec = 0; - timeout.tv_usec = SELECT_TIMEOUT; - if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, &timeout) < 0) { + if(select(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv) < 0) { if(errno == EINTR) continue; die("select failed: %s\n", SERRNO); } - if(FD_ISSET(cmdfd, &rfd)) { + + /* + * Stop after a certain number of reads so the user does not + * feel like the system is stuttering. + */ + if(i < 1000 && FD_ISSET(cmdfd, &rfd)) { ttyread(); - stuff_to_print = 1; - } - if(stuff_to_print && last_draw_too_old()) { - stuff_to_print = 0; - draw(); + /* + * Just wait a bit so it isn't disturbing the + * user and the system is able to write something. + */ + drawtimeout.tv_sec = 0; + drawtimeout.tv_usec = 5; + tv = &drawtimeout; + continue; } + i = 0; + tv = NULL; while(XPending(xw.dpy)) { XNextEvent(xw.dpy, &ev); @@ -2330,35 +2524,35 @@ run(void) { if(handler[ev.type]) (handler[ev.type])(&ev); } + + draw(); + XFlush(xw.dpy); } } 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; for(i = 1; i < argc; i++) { switch(argv[i][0] != '-' || argv[i][2] ? -1 : argv[i][1]) { - case 't': - if(++i < argc) opt_title = argv[i]; - break; case 'c': - if(++i < argc) opt_class = argv[i]; - break; - case 'w': - if(++i < argc) opt_embed = argv[i]; - break; - case 'f': - if(++i < argc) opt_io = argv[i]; + if(++i < argc) + opt_class = argv[i]; break; case 'e': /* eat every remaining arguments */ - if(++i < argc) opt_cmd = &argv[i]; + if(++i < argc) + opt_cmd = &argv[i]; goto run; + case 'f': + if(++i < argc) + opt_font = argv[i]; + break; case 'g': if(++i >= argc) break; @@ -2380,9 +2574,21 @@ main(int argc, char *argv[]) { if(xw.fh != 0 && xw.fw != 0) xw.isfixed = True; break; + case 'o': + if(++i < argc) + opt_io = argv[i]; + break; + case 't': + if(++i < argc) + opt_title = argv[i]; + break; case 'v': default: die(USAGE); + case 'w': + if(++i < argc) + opt_embed = argv[i]; + break; } }