X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=8059b1656c11587a12d412bea31462b33cba266f;hb=866590521609ba35606e53990e381bdc2adf742f;hp=fe2b9221fe4011e11cddf7a0f3977a7ecc01c2ad;hpb=fe2ba95b3d81127b98a5dc6fa0341a90beabd1a0;p=st.git diff --git a/st.c b/st.c index fe2b922..8059b16 100644 --- a/st.c +++ b/st.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,10 @@ #include #include #include +#include +#include +#define Glyph Glyph_ +#define Font Font_ #if defined(__linux) #include @@ -36,8 +41,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,15 +53,15 @@ #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 */ +/* macros */ +#define CLEANMASK(mask) (mask & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask)) #define SERRNO strerror(errno) #define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MAX(a, b) ((a) < (b) ? (b) : (a)) @@ -67,8 +72,8 @@ #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) #define IS_SET(flag) (term.mode & (flag)) #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) -#define X2COL(x) (((x) - BORDER)/xw.cw) -#define Y2ROW(y) (((y) - BORDER)/xw.ch) + +#define VT102ID "\033[?6c" enum glyph_attribute { ATTR_NULL = 0, @@ -91,8 +96,8 @@ enum cursor_movement { enum cursor_state { CURSOR_DEFAULT = 0, - CURSOR_HIDE = 1, - CURSOR_WRAPNEXT = 2 + CURSOR_WRAPNEXT = 1, + CURSOR_ORIGIN = 2 }; enum glyph_state { @@ -109,7 +114,9 @@ enum term_mode { MODE_MOUSEBTN = 32, MODE_MOUSEMOTION = 64, MODE_MOUSE = 32|64, - MODE_REVERSE = 128 + MODE_REVERSE = 128, + MODE_KBDLOCK = 256, + MODE_HIDE = 512 }; enum escape_state { @@ -118,6 +125,7 @@ enum escape_state { ESC_STR = 4, /* DSC, OSC, PM, APC */ ESC_ALTCHARSET = 8, ESC_STR_END = 16, /* a final string was encountered */ + ESC_TEST = 32, /* Enter in test mode */ }; enum window_state { @@ -177,9 +185,9 @@ typedef struct { typedef struct { int row; /* nb row */ int col; /* nb col */ - Line* line; /* screen */ - Line* alt; /* alternate screen */ - bool* dirty; /* dirtyness of lines */ + 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 */ @@ -194,18 +202,20 @@ typedef struct { Colormap cmap; Window win; XdbeBackBuffer buf; - Atom xembed; + Atom xembed, wmdeletewin; 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 { @@ -214,13 +224,14 @@ typedef struct { char s[ESC_BUF_SIZ]; } Key; - /* TODO: use better name for vars... */ typedef struct { int mode; int bx, by; int ex, ey; - struct {int x, y;} b, e; + struct { + int x, y; + } b, e; char *clip; Atom xtarget; bool alt; @@ -228,29 +239,51 @@ typedef struct { struct timeval tclick2; } Selection; +typedef union { + int i; + unsigned int ui; + float f; + const void *v; +} Arg; + +typedef struct { + unsigned int mod; + KeySym keysym; + void (*func)(const Arg *); + const Arg arg; +} Shortcut; + +/* function definitions used in config.h */ +static void xzoom(const Arg *); + +/* Config.h for applying patches and the configuration. */ #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*, ...); +static void die(const char *, ...); static void draw(void); static void redraw(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); @@ -268,16 +301,17 @@ static void tdeleteline(int); static void tinsertblank(int); static void tinsertblankline(int); static void tmoveto(int, int); +static void tmoveato(int x, int y); 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); static void tscrolldown(int, int); static void tsetattr(int*, int); -static void tsetchar(char*); +static void tsetchar(char *, Glyph *, int, int); static void tsetscroll(int, int); static void tswapscreen(void); static void tsetdirt(int, int); @@ -286,27 +320,28 @@ 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 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 *); static void visibility(XEvent *); static void unmap(XEvent *); -static char* kmap(KeySym, uint); +static char *kmap(KeySym, uint); static void kpress(XEvent *); static void cmessage(XEvent *); +static void cresize(int width, int height); static void resize(XEvent *); static void focus(XEvent *); static void brelease(XEvent *); @@ -327,8 +362,10 @@ static int utf8encode(long *, char *); static int utf8size(char *); static int isfullutf8(char *, int); +static ssize_t xwrite(int, char *, size_t); static void *xmalloc(size_t); static void *xrealloc(void *, size_t); +static void *xcalloc(size_t nmemb, size_t size); static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, @@ -357,24 +394,55 @@ static int cmdfd; static pid_t pid; static Selection sel; static int iofd = -1; -static char **opt_cmd = NULL; -static char *opt_io = NULL; +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; + +static char *usedfont = NULL; +static int usedfontsize = 0; + +ssize_t +xwrite(int fd, char *s, size_t len) { + size_t aux = len; + + while(len > 0) { + ssize_t r = write(fd, s, len); + if(r < 0) + return r; + len -= r; + s += r; + } + return aux; +} void * xmalloc(size_t len) { void *p = malloc(len); + if(!p) - die("Out of memory"); + die("Out of memory\n"); + return p; } void * xrealloc(void *p, size_t len) { if((p = realloc(p, len)) == NULL) - die("Out of memory"); + 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; } @@ -397,8 +465,10 @@ utf8decode(char *s, long *u) { } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */ *u = c & (B2|B1|B0); n = 3; - } else + } else { goto invalid; + } + for(i = n, ++s; i > 0; --i, ++rtn, ++s) { c = *s; if((c & (B7|B6)) != B7) /* 10xxxxxx */ @@ -406,14 +476,18 @@ utf8decode(char *s, long *u) { *u <<= 6; *u |= c & (B5|B4|B3|B2|B1|B0); } + if((n == 1 && *u < 0x80) || (n == 2 && *u < 0x800) || (n == 3 && *u < 0x10000) || - (*u >= 0xD800 && *u <= 0xDFFF)) + (*u >= 0xD800 && *u <= 0xDFFF)) { goto invalid; + } + return rtn; invalid: *u = 0xFFFD; + return rtn; } @@ -423,7 +497,7 @@ utf8encode(long *u, char *s) { ulong uc; int i, n; - sp = (uchar*) s; + sp = (uchar *)s; uc = *u; if(uc < 0x80) { *sp = uc; /* 0xxxxxxx */ @@ -440,14 +514,17 @@ utf8encode(long *u, char *s) { } else { goto invalid; } + for(i=n,++sp; i>0; --i,++sp) *sp = ((uc >> 6*(i-1)) & (B5|B4|B3|B2|B1|B0)) | B7; /* 10xxxxxx */ + return n+1; invalid: /* U+FFFD */ *s++ = '\xEF'; *s++ = '\xBF'; *s = '\xBD'; + return 3; } @@ -457,38 +534,40 @@ int isfullutf8(char *s, int b) { uchar *c1, *c2, *c3; - c1 = (uchar *) s; - c2 = (uchar *) ++s; - c3 = (uchar *) ++s; - if(b < 1) + c1 = (uchar *)s; + c2 = (uchar *)++s; + c3 = (uchar *)++s; + if(b < 1) { return 0; - else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) + } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) { return 0; - else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) && + } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) && ((b == 1) || - ((b == 2) && (*c2&(B7|B6)) == B7))) + ((b == 2) && (*c2&(B7|B6)) == B7))) { return 0; - else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) && + } else if((*c1&(B7|B6|B5|B4|B3)) == (B7|B6|B5|B4) && ((b == 1) || ((b == 2) && (*c2&(B7|B6)) == B7) || - ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) + ((b == 3) && (*c2&(B7|B6)) == B7 && (*c3&(B7|B6)) == B7))) { return 0; - else + } else { return 1; + } } int utf8size(char *s) { uchar c = *s; - if(~c&B7) + if(~c&B7) { return 1; - else if((c&(B7|B6|B5)) == (B7|B6)) + } else if((c&(B7|B6|B5)) == (B7|B6)) { return 2; - else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) + } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { return 3; - else + } else { return 4; + } } void @@ -503,15 +582,36 @@ selinit(void) { sel.xtarget = XA_STRING; } +static int +x2col(int x) { + x -= borderpx; + x /= xw.cw; + + return LIMIT(x, 0, term.col-1); +} + +static int +y2row(int y) { + y -= borderpx; + y /= xw.ch; + + return LIMIT(y, 0, term.row-1); +} + static inline bool selected(int x, int y) { + int bx, ex; + if(sel.ey == y && sel.by == y) { - int bx = MIN(sel.bx, sel.ex); - int ex = MAX(sel.bx, sel.ex); + bx = MIN(sel.bx, sel.ex); + ex = MAX(sel.bx, sel.ex); return BETWEEN(x, bx, ex); } - return ((sel.b.y < y&&y < sel.e.y) || (y==sel.e.y && x<=sel.e.x)) - || (y==sel.b.y && x>=sel.b.x && (x<=sel.e.x || sel.b.y!=sel.e.y)); + + return ((sel.b.y < y && y < sel.e.y) + || (y == sel.e.y && x <= sel.e.x)) + || (y == sel.b.y && x >= sel.b.x + && (x <= sel.e.x || sel.b.y != sel.e.y)); } void @@ -519,8 +619,9 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { if(b) *b = e->xbutton.button; - *x = X2COL(e->xbutton.x); - *y = Y2ROW(e->xbutton.y); + *x = x2col(e->xbutton.x); + *y = y2row(e->xbutton.y); + sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex; sel.b.y = MIN(sel.by, sel.ey); sel.e.x = sel.by < sel.ey ? sel.ex : sel.bx; @@ -529,8 +630,8 @@ getbuttoninfo(XEvent *e, int *b, int *x, int *y) { void mousereport(XEvent *e) { - int x = X2COL(e->xbutton.x); - int y = Y2ROW(e->xbutton.y); + int x = x2col(e->xbutton.x); + int y = y2row(e->xbutton.y); int button = e->xbutton.button; int state = e->xbutton.state; char buf[] = { '\033', '[', 'M', 0, 32+x+1, 32+y+1 }; @@ -563,40 +664,53 @@ mousereport(XEvent *e) { void bpress(XEvent *e) { - if(IS_SET(MODE_MOUSE)) + if(IS_SET(MODE_MOUSE)) { mousereport(e); - else if(e->xbutton.button == Button1) { - if(sel.bx != -1) + } else if(e->xbutton.button == Button1) { + 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); + sel.ex = sel.bx = x2col(e->xbutton.x); + sel.ey = sel.by = y2row(e->xbutton.y); + } else if(e->xbutton.button == Button4) { + ttywrite("\031", 1); + } else if(e->xbutton.button == Button5) { + ttywrite("\005", 1); } } void selcopy(void) { - char *str, *ptr; - int x, y, bufsize, is_selected = 0; + char *str, *ptr, *p; + int x, y, bufsize, is_selected = 0, size; + Glyph *gp, *last; - if(sel.bx == -1) + if(sel.bx == -1) { str = NULL; - - else { + } else { bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; 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; - } - } + gp = &term.line[y][0]; + last = gp + term.col; + + while(--last >= gp && !(last->state & GLYPH_SET)) + /* nothing */; + for(x = 0; gp <= last; x++, ++gp) { + 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'; @@ -630,8 +744,9 @@ selnotify(XEvent *e) { } void -selpaste() { - XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime); +selpaste(void) { + XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, + xw.win, CurrentTime); } void selclear(XEvent *e) { @@ -639,14 +754,13 @@ void selclear(XEvent *e) { return; sel.bx = -1; tsetdirt(sel.b.y, sel.e.y); - draw(); } void selrequest(XEvent *e) { XSelectionRequestEvent *xsre; XSelectionEvent xev; - Atom xa_targets; + Atom xa_targets, string; xsre = (XSelectionRequestEvent *) e; xev.type = SelectionNotify; @@ -660,7 +774,7 @@ selrequest(XEvent *e) { xa_targets = XInternAtom(xw.dpy, "TARGETS", 0); if(xsre->target == xa_targets) { /* respond with the supported type */ - Atom string = sel.xtarget; + string = sel.xtarget; XChangeProperty(xsre->display, xsre->requestor, xsre->property, XA_ATOM, 32, PropModeReplace, (uchar *) &string, 1); @@ -689,68 +803,76 @@ xsetsel(char *str) { clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime); - - XFlush(xw.dpy); } void brelease(XEvent *e) { + struct timeval now; + if(IS_SET(MODE_MOUSE)) { mousereport(e); return; } - if(e->xbutton.button == Button2) + + if(e->xbutton.button == Button2) { selpaste(); - else if(e->xbutton.button == Button1) { + } 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; gettimeofday(&now, NULL); - if(TIMEDIFF(now, sel.tclick2) <= TRIPLECLICK_TIMEOUT) { + if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) { /* triple click on the line */ sel.b.x = sel.bx = 0; sel.e.x = sel.ex = term.col; sel.b.y = sel.e.y = sel.ey; selcopy(); - } else if(TIMEDIFF(now, sel.tclick1) <= DOUBLECLICK_TIMEOUT) { + } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) { /* double click to select word */ sel.bx = sel.ex; while(sel.bx > 0 && term.line[sel.ey][sel.bx-1].state & GLYPH_SET && - term.line[sel.ey][sel.bx-1].c[0] != ' ') sel.bx--; + term.line[sel.ey][sel.bx-1].c[0] != ' ') { + sel.bx--; + } sel.b.x = sel.bx; while(sel.ex < term.col-1 && term.line[sel.ey][sel.ex+1].state & GLYPH_SET && - term.line[sel.ey][sel.ex+1].c[0] != ' ') sel.ex++; + term.line[sel.ey][sel.ex+1].c[0] != ' ') { + sel.ex++; + } sel.e.x = sel.ex; sel.b.y = sel.e.y = sel.ey; selcopy(); } - } else + } else { selcopy(); + } } + memcpy(&sel.tclick2, &sel.tclick1, sizeof(struct timeval)); gettimeofday(&sel.tclick1, NULL); - draw(); } void bmotion(XEvent *e) { + int starty, endy, oldey, oldex; + if(IS_SET(MODE_MOUSE)) { mousereport(e); return; } + if(sel.mode) { - int oldey = sel.ey, oldex = sel.ex; + oldey = sel.ey; + oldex = sel.ex; getbuttoninfo(e, NULL, &sel.ex, &sel.ey); if(oldey != sel.ey || oldex != sel.ex) { - int starty = MIN(oldey, sel.ey); - int endy = MAX(oldey, sel.ey); + starty = MIN(oldey, sel.ey); + endy = MAX(oldey, sel.ey); tsetdirt(starty, endy); - draw(); } } } @@ -769,14 +891,33 @@ void execsh(void) { char **args; char *envshell = getenv("SHELL"); + const struct passwd *pass = getpwuid(getuid()); + char buf[sizeof(long) * 8 + 1]; unsetenv("COLUMNS"); unsetenv("LINES"); unsetenv("TERMCAP"); - DEFAULT(envshell, SHELL); - putenv("TERM="TNAME); - args = opt_cmd ? opt_cmd : (char*[]){envshell, "-i", NULL}; + if(pass) { + setenv("LOGNAME", pass->pw_name, 1); + setenv("USER", pass->pw_name, 1); + setenv("SHELL", pass->pw_shell, 0); + setenv("HOME", pass->pw_dir, 0); + } + + snprintf(buf, sizeof(buf), "%lu", xw.win); + setenv("WINDOWID", buf, 1); + + 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); + setenv("TERM", termname, 1); + args = opt_cmd ? opt_cmd : (char *[]){envshell, "-i", NULL}; execvp(args[0], args); exit(EXIT_FAILURE); } @@ -784,20 +925,23 @@ execsh(void) { void sigchld(int a) { int stat = 0; + if(waitpid(pid, &stat, 0) < 0) die("Waiting for pid %hd failed: %s\n", pid, SERRNO); - if(WIFEXITED(stat)) + + if(WIFEXITED(stat)) { exit(WEXITSTATUS(stat)); - else + } else { exit(EXIT_FAILURE); + } } void ttynew(void) { int m, s; + struct winsize w = {term.row, term.col, 0, 0}; /* seems to work fine on linux, openbsd and freebsd */ - struct winsize w = {term.row, term.col, 0, 0}; if(openpty(&m, &s, NULL, NULL, &w) < 0) die("openpty failed: %s\n", SERRNO); @@ -821,13 +965,12 @@ ttynew(void) { cmdfd = m; signal(SIGCHLD, sigchld); 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)); - } + iofd = (!strcmp(opt_io, "-")) ? + STDOUT_FILENO : + open(opt_io, O_WRONLY | O_CREAT, 0666); + if(iofd < 0) { + fprintf(stderr, "Error opening %s:%s\n", + opt_io, strerror(errno)); } } } @@ -836,6 +979,7 @@ ttynew(void) { void dump(char c) { static int col; + fprintf(stderr, " %02x '%c' ", c, isprint(c)?c:'.'); if(++col % 10 == 0) fprintf(stderr, "\n"); @@ -861,8 +1005,8 @@ ttyread(void) { while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) { charsize = utf8decode(ptr, &utf8c); utf8encode(&utf8c, s); - tputc(s); - ptr += charsize; + tputc(s, charsize); + ptr += charsize; buflen -= charsize; } @@ -877,20 +1021,19 @@ 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); } void -tsetdirt(int top, int bot) -{ +tsetdirt(int top, int bot) { int i; LIMIT(top, 0, term.row-1); @@ -901,8 +1044,7 @@ tsetdirt(int top, int bot) } void -tfulldirt(void) -{ +tfulldirt(void) { tsetdirt(0, term.row-1); } @@ -910,33 +1052,41 @@ void tcursor(int mode) { static TCursor c; - if(mode == CURSOR_SAVE) + if(mode == CURSOR_SAVE) { c = term.c; - else if(mode == CURSOR_LOAD) - term.c = c, tmoveto(c.x, c.y); + } else if(mode == CURSOR_LOAD) { + term.c = c; + tmoveto(c.x, c.y); + } } void treset(void) { - unsigned i; + uint i; + term.c = (TCursor){{ .mode = ATTR_NULL, - .fg = DefaultFG, - .bg = DefaultBG + .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) + for(i = tabspaces; i < term.col; i += tabspaces) term.tabs[i] = 1; - term.top = 0, term.bot = term.row - 1; + term.top = 0; + term.bot = term.row - 1; term.mode = MODE_WRAP; + tclearregion(0, 0, term.col-1, term.row-1); + tmoveto(0, 0); + tcursor(CURSOR_SAVE); } void tnew(int col, int row) { /* set screen size */ - term.row = row, term.col = col; + term.row = row; + term.col = col; term.line = xmalloc(term.row * sizeof(Line)); term.alt = xmalloc(term.row * sizeof(Line)); term.dirty = xmalloc(term.row * sizeof(*term.dirty)); @@ -954,7 +1104,8 @@ tnew(int col, int row) { void tswapscreen(void) { - Line* tmp = term.line; + Line *tmp = term.line; + term.line = term.alt; term.alt = tmp; term.mode ^= MODE_ALTSCREEN; @@ -1028,10 +1179,12 @@ selscroll(int orig, int n) { void tnewline(int first_col) { int y = term.c.y; - if(y == term.bot) + + if(y == term.bot) { tscrollup(term.top, 1); - else + } else { y++; + } tmoveto(first_col ? 0 : term.c.x, y); } @@ -1049,31 +1202,68 @@ csiparse(void) { csiescseq.arg[csiescseq.narg] *= 10; csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */; } - if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) + if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) { csiescseq.narg++, p++; - else { + } else { csiescseq.mode = *p; csiescseq.narg++; + return; } } } +/* for absolute user moves, when decom is set */ +void +tmoveato(int x, int y) { + tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0)); +} + void tmoveto(int x, int y) { + int miny, maxy; + + if(term.c.state & CURSOR_ORIGIN) { + miny = term.top; + maxy = term.bot; + } else { + miny = 0; + maxy = term.row - 1; + } LIMIT(x, 0, term.col-1); - LIMIT(y, 0, term.row-1); + LIMIT(y, miny, maxy); term.c.state &= ~CURSOR_WRAPNEXT; term.c.x = x; term.c.y = 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; +tsetchar(char *c, Glyph *attr, int x, int y) { + static 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 - ~ */ + }; + + /* + * The table is proudly stolen from rxvt. + */ + if(attr->mode & ATTR_GFX) { + if(c[0] >= 0x41 && c[0] <= 0x7e + && vt100_0[c[0] - 0x41]) { + c = vt100_0[c[0] - 0x41]; + } + } + + term.dirty[y] = 1; + term.line[y][x] = *attr; + memcpy(term.line[y][x].c, c, UTF_SIZ); + term.line[y][x].state |= GLYPH_SET; } void @@ -1109,7 +1299,9 @@ tdeletechar(int n) { tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); return; } - memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph)); + + memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], + size * sizeof(Glyph)); tclearregion(term.col-n, term.c.y, term.col-1, term.c.y); } @@ -1125,7 +1317,9 @@ tinsertblank(int n) { tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); return; } - memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], size * sizeof(Glyph)); + + memmove(&term.line[term.c.y][dst], &term.line[term.c.y][src], + size * sizeof(Glyph)); tclearregion(src, term.c.y, dst - 1, term.c.y); } @@ -1154,8 +1348,8 @@ tsetattr(int *attr, int l) { case 0: term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE | ATTR_BOLD \ | ATTR_ITALIC | ATTR_BLINK); - term.c.attr.fg = DefaultFG; - term.c.attr.bg = DefaultBG; + term.c.attr.fg = defaultfg; + term.c.attr.bg = defaultbg; break; case 1: term.c.attr.mode |= ATTR_BOLD; @@ -1191,42 +1385,55 @@ tsetattr(int *attr, int l) { case 38: if(i + 2 < l && attr[i + 1] == 5) { i += 2; - if(BETWEEN(attr[i], 0, 255)) + if(BETWEEN(attr[i], 0, 255)) { term.c.attr.fg = attr[i]; - else - fprintf(stderr, "erresc: bad fgcolor %d\n", attr[i]); + } else { + fprintf(stderr, + "erresc: bad fgcolor %d\n", + attr[i]); + } + } else { + fprintf(stderr, + "erresc(38): gfx attr %d unknown\n", + attr[i]); } - else - fprintf(stderr, "erresc(38): gfx attr %d unknown\n", attr[i]); break; case 39: - term.c.attr.fg = DefaultFG; + term.c.attr.fg = defaultfg; break; case 48: if(i + 2 < l && attr[i + 1] == 5) { i += 2; - if(BETWEEN(attr[i], 0, 255)) + if(BETWEEN(attr[i], 0, 255)) { term.c.attr.bg = attr[i]; - else - fprintf(stderr, "erresc: bad bgcolor %d\n", attr[i]); + } else { + fprintf(stderr, + "erresc: bad bgcolor %d\n", + attr[i]); + } + } else { + fprintf(stderr, + "erresc(48): gfx attr %d unknown\n", + attr[i]); } - else - fprintf(stderr, "erresc(48): gfx attr %d unknown\n", attr[i]); break; case 49: - term.c.attr.bg = DefaultBG; + term.c.attr.bg = defaultbg; break; default: - if(BETWEEN(attr[i], 30, 37)) + if(BETWEEN(attr[i], 30, 37)) { term.c.attr.fg = attr[i] - 30; - else if(BETWEEN(attr[i], 40, 47)) + } else if(BETWEEN(attr[i], 40, 47)) { term.c.attr.bg = attr[i] - 40; - else if(BETWEEN(attr[i], 90, 97)) + } else if(BETWEEN(attr[i], 90, 97)) { term.c.attr.fg = attr[i] - 90 + 8; - else if(BETWEEN(attr[i], 100, 107)) + } else if(BETWEEN(attr[i], 100, 107)) { term.c.attr.bg = attr[i] - 100 + 8; - else - fprintf(stderr, "erresc(default): gfx attr %d unknown\n", attr[i]), csidump(); + } else { + fprintf(stderr, + "erresc(default): gfx attr %d unknown\n", + attr[i]), csidump(); + } break; } } @@ -1256,25 +1463,35 @@ 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: - MODBIT(term.mode, set, MODE_WRAP); + case 6: /* DECOM -- Origin */ + MODBIT(term.c.state, set, CURSOR_ORIGIN); + tmoveato(0, 0); break; - case 20: - MODBIT(term.mode, set, MODE_CRLF); + case 7: /* DECAWM -- Auto wrap */ + MODBIT(term.mode, set, MODE_WRAP); break; + case 0: /* Error (IGNORED) */ + case 2: /* DECANM -- ANSI/VT52 (IGNORED) */ + case 3: /* DECCOLM -- Column (IGNORED) */ + case 4: /* DECSCLM -- Scroll (IGNORED) */ + case 8: /* DECARM -- Auto repeat (IGNORED) */ + case 18: /* DECPFF -- Printer feed (IGNORED) */ + case 19: /* DECPEX -- Printer extent (IGNORED) */ + case 42: /* DECNRCM -- National characters (IGNORED) */ case 12: /* att610 -- Start blinking cursor (IGNORED) */ break; - case 25: - MODBIT(term.c.state, !set, CURSOR_HIDE); + case 25: /* DECTCEM -- Text Cursor Enable Mode */ + MODBIT(term.mode, !set, MODE_HIDE); break; case 1000: /* 1000,1002: enable xterm mouse report */ MODBIT(term.mode, set, MODE_MOUSEBTN); @@ -1284,15 +1501,15 @@ tsetmode(bool priv, bool set, int *args, int narg) { break; case 1049: /* = 1047 and 1048 */ case 47: - case 1047: - if(IS_SET(MODE_ALTSCREEN)) + case 1047: { + bool alt = IS_SET(MODE_ALTSCREEN) != 0; + if(alt) tclearregion(0, 0, term.col-1, term.row-1); - if((set && !IS_SET(MODE_ALTSCREEN)) || - (!set && IS_SET(MODE_ALTSCREEN))) { - tswapscreen(); - } + if(set ^ alt) /* set is always 1 or 0 */ + tswapscreen(); if(*args != 1049) break; + } /* pass through */ case 1048: tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); @@ -1305,9 +1522,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", @@ -1334,16 +1561,20 @@ csihandle(void) { tinsertblank(csiescseq.arg[0]); break; case 'A': /* CUU -- Cursor Up */ - case 'e': DEFAULT(csiescseq.arg[0], 1); tmoveto(term.c.x, term.c.y-csiescseq.arg[0]); break; case 'B': /* CUD -- Cursor Down */ + case 'e': /* VPR --Cursor Down */ DEFAULT(csiescseq.arg[0], 1); tmoveto(term.c.x, term.c.y+csiescseq.arg[0]); break; + case 'c': /* DA -- Device Attributes */ + if(csiescseq.arg[0] == 0) + ttywrite(VT102ID, sizeof(VT102ID) - 1); + break; case 'C': /* CUF -- Cursor Forward */ - case 'a': + case 'a': /* HPR -- Cursor Forward */ DEFAULT(csiescseq.arg[0], 1); tmoveto(term.c.x+csiescseq.arg[0], term.c.y); break; @@ -1380,7 +1611,7 @@ csihandle(void) { case 'f': /* HVP */ DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[1], 1); - tmoveto(csiescseq.arg[1]-1, csiescseq.arg[0]-1); + tmoveato(csiescseq.arg[1]-1, csiescseq.arg[0]-1); break; case 'I': /* CHT -- Cursor Forward Tabulation tab stops */ DEFAULT(csiescseq.arg[0], 1); @@ -1454,7 +1685,7 @@ csihandle(void) { break; case 'd': /* VPA -- Move to */ DEFAULT(csiescseq.arg[0], 1); - tmoveto(term.c.x, csiescseq.arg[0]-1); + tmoveato(term.c.x, csiescseq.arg[0]-1); break; case 'h': /* SM -- Set terminal mode */ tsetmode(csiescseq.priv, 1, csiescseq.arg, csiescseq.narg); @@ -1463,13 +1694,13 @@ csihandle(void) { tsetattr(csiescseq.arg, csiescseq.narg); break; case 'r': /* DECSTBM -- Set Scrolling Region */ - if(csiescseq.priv) + if(csiescseq.priv) { goto unknown; - else { + } else { DEFAULT(csiescseq.arg[0], 1); DEFAULT(csiescseq.arg[1], term.row); tsetscroll(csiescseq.arg[0]-1, csiescseq.arg[1]-1); - tmoveto(0, 0); + tmoveato(0, 0); } break; case 's': /* DECSC -- Save cursor position (ANSI.SYS) */ @@ -1484,14 +1715,22 @@ csihandle(void) { void csidump(void) { int i; + uint c; + printf("ESC["); for(i = 0; i < csiescseq.len; i++) { - uint c = csiescseq.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); + c = csiescseq.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'); } @@ -1562,14 +1801,22 @@ strparse(void) { void strdump(void) { int i; + uint c; + printf("ESC%c", strescseq.type); for(i = 0; i < strescseq.len; i++) { - uint c = strescseq.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); + c = strescseq.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); + } } printf("ESC\\\n"); } @@ -1581,7 +1828,7 @@ strreset(void) { void tputtab(bool forward) { - unsigned x = term.c.x; + uint x = term.c.x; if(forward) { if(x == term.col) @@ -1598,56 +1845,137 @@ tputtab(bool forward) { } void -tputc(char *c) { - char ascii = *c; +tputc(char *c, int len) { + uchar ascii = *c; + bool control = ascii < '\x20' || ascii == 0177; - if(iofd != -1) - write(iofd, c, 1); + if(iofd != -1) { + if (xwrite(iofd, c, len) < 0) { + fprintf(stderr, "Error writting in %s:%s\n", + opt_io, strerror(errno)); + close(iofd); + iofd = -1; + } + } + /* + * STR sequences must be checked before anything else + * because it can use some control codes as part of the sequence. + */ + if(term.esc & ESC_STR) { + switch(ascii) { + case '\033': + term.esc = ESC_START | ESC_STR_END; + break; + case '\a': /* backwards compatibility to xterm */ + term.esc = 0; + strhandle(); + break; + default: + strescseq.buf[strescseq.len++] = ascii; + if(strescseq.len+1 >= STR_BUF_SIZ) { + term.esc = 0; + strhandle(); + } + } + return; + } - if(term.esc & ESC_START) { + /* + * Actions of control codes must be performed as soon they arrive + * because they can be embedded inside a control sequence, and + * they must not cause conflicts with sequences. + */ + if(control) { + switch(ascii) { + case '\t': /* HT */ + tputtab(1); + return; + case '\b': /* BS */ + tmoveto(term.c.x-1, term.c.y); + return; + case '\r': /* CR */ + tmoveto(0, term.c.y); + return; + case '\f': /* LF */ + case '\v': /* VT */ + case '\n': /* LF */ + /* go to first col if the mode is set */ + tnewline(IS_SET(MODE_CRLF)); + return; + case '\a': /* BEL */ + if(!(xw.state & WIN_FOCUSED)) + xseturgency(1); + return; + case '\033': /* ESC */ + csireset(); + term.esc = ESC_START; + return; + case '\016': /* SO */ + term.c.attr.mode |= ATTR_GFX; + return; + case '\017': /* SI */ + term.c.attr.mode &= ~ATTR_GFX; + return; + case '\032': /* SUB */ + case '\030': /* CAN */ + csireset(); + return; + case '\005': /* ENQ (IGNORED) */ + case '\000': /* NUL (IGNORED) */ + case '\021': /* XON (IGNORED) */ + case '\023': /* XOFF (IGNORED) */ + case 0177: /* DEL (IGNORED) */ + return; + } + } else if(term.esc & ESC_START) { if(term.esc & ESC_CSI) { csiescseq.buf[csiescseq.len++] = ascii; - if(BETWEEN(ascii, 0x40, 0x7E) || csiescseq.len >= ESC_BUF_SIZ) { + if(BETWEEN(ascii, 0x40, 0x7E) + || csiescseq.len >= ESC_BUF_SIZ) { term.esc = 0; csiparse(), csihandle(); } - } else if(term.esc & ESC_STR) { - switch(ascii) { - case '\033': - term.esc = ESC_START | ESC_STR_END; - break; - case '\a': /* backwards compatibility to xterm */ - term.esc = 0; - strhandle(); - break; - default: - strescseq.buf[strescseq.len++] = ascii; - if(strescseq.len+1 >= STR_BUF_SIZ) { - term.esc = 0; - strhandle(); - } - } } else if(term.esc & ESC_STR_END) { term.esc = 0; if(ascii == '\\') 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); } term.esc = 0; + } else if(term.esc & ESC_TEST) { + if(ascii == '8') { /* DEC screen alignment test. */ + char E[UTF_SIZ] = "E"; + int x, y; + + for(x = 0; x < term.col; ++x) { + for(y = 0; y < term.row; ++y) + tsetchar(E, &term.c.attr, x, y); + } + } + term.esc = 0; } else { switch(ascii) { case '[': term.esc |= ESC_CSI; break; + case '#': + term.esc |= ESC_TEST; + break; case 'P': /* DCS -- Device Control String */ case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ @@ -1657,14 +1985,20 @@ tputc(char *c) { 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) + if(term.c.y == term.bot) { tscrollup(term.top, 1); - else + } else { tmoveto(term.c.x, term.c.y+1); + } term.esc = 0; break; case 'E': /* NEL -- Next line */ @@ -1676,10 +2010,15 @@ tputc(char *c) { term.esc = 0; break; case 'M': /* RI -- Reverse index */ - if(term.c.y == term.top) + if(term.c.y == term.top) { tscrolldown(term.top, 1); - else + } else { tmoveto(term.c.x, term.c.y-1); + } + term.esc = 0; + break; + case 'Z': /* DECID -- Identify Terminal */ + ttywrite(VT102ID, sizeof(VT102ID) - 1); term.esc = 0; break; case 'c': /* RIS -- Reset to inital state */ @@ -1708,47 +2047,30 @@ tputc(char *c) { break; default: fprintf(stderr, "erresc: unknown sequence ESC 0x%02X '%c'\n", - (uchar) 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; - 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(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT) - tnewline(1); /* always go to first col */ - tsetchar(c); - if(term.c.x+1 < term.col) - tmoveto(term.c.x+1, term.c.y); - else - term.c.state |= CURSOR_WRAPNEXT; - } + /* + * All characters which forms part of a sequence are not + * printed + */ + return; } + /* + * Display control codes only if we are in graphic mode + */ + if(control && !(term.c.attr.mode & ATTR_GFX)) + return; + if(sel.bx != -1 && BETWEEN(term.c.y, sel.by, sel.ey)) + sel.bx = -1; + if(IS_SET(MODE_WRAP) && term.c.state & CURSOR_WRAPNEXT) + tnewline(1); /* always go to first col */ + tsetchar(c, &term.c.attr, term.c.x, term.c.y); + if(term.c.x+1 < term.col) + tmoveto(term.c.x+1, term.c.y); + else + term.c.state |= CURSOR_WRAPNEXT; } int @@ -1757,6 +2079,7 @@ tresize(int col, int row) { int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); int slide = term.c.y - row + 1; + bool *bp; if(col < 1 || row < 1) return 0; @@ -1799,87 +2122,98 @@ 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; + 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) + for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces) *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); + term.col = col; + term.row = row; /* reset scrolling region */ tsetscroll(0, row-1); + /* make use of the LIMIT in tmoveto */ + tmoveto(term.c.x, term.c.y); return (slide > 0); } 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*borderpx + col * xw.cw); + xw.th = MAX(1, 2*borderpx + 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], + borderpx + col1 * xw.cw, + borderpx + 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 xhints(void) { - XClassHint class = {opt_class ? opt_class : TNAME, TNAME}; + XClassHint class = {opt_class ? opt_class : termname, termname}; XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints *sizeh = NULL; @@ -1890,8 +2224,8 @@ xhints(void) { sizeh->width = xw.w; sizeh->height_inc = xw.ch; sizeh->width_inc = xw.cw; - sizeh->base_height = 2*BORDER; - sizeh->base_width = 2*BORDER; + sizeh->base_height = 2*borderpx; + sizeh->base_width = 2*borderpx; } else { sizeh->flags = PMaxSize | PMinSize; sizeh->min_width = sizeh->max_width = xw.fw; @@ -1902,54 +2236,93 @@ xhints(void) { XFree(sizeh); } -XFontSet -xinitfont(char *fontstr) { - XFontSet set; - char *def, **missing; - int n; +int +xloadfont(Font *f, FcPattern *pattern) { + FcPattern *match; + FcResult result; - 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); + if(!match) + return 1; + if(!(f->xft_set = XftFontOpenPattern(xw.dpy, match))) { + FcPatternDestroy(match); + return 1; } - return set; + + f->ascent = f->xft_set->ascent; + f->descent = f->xft_set->descent; + f->lbearing = 0; + f->rbearing = f->xft_set->max_advance_width; + + f->height = f->xft_set->height; + f->width = f->lbearing + f->rbearing; + + return 0; } void -xgetfontinfo(XFontSet set, int *ascent, int *descent, short *lbearing, short *rbearing) { - XFontStruct **xfonts; - char **font_names; - int i, n; +xloadfonts(char *fontstr, int fontsize) { + FcPattern *pattern; + FcResult result; + double fontval; + + if(fontstr[0] == '-') { + pattern = XftXlfdParse(fontstr, False, False); + } else { + pattern = FcNameParse((FcChar8 *)fontstr); + } + + if(!pattern) + die("st: can't open font %s\n", fontstr); - *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++; + if(fontsize > 0) { + FcPatternDel(pattern, FC_PIXEL_SIZE); + FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); + usedfontsize = fontsize; + } else { + result = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval); + if(result == FcResultMatch) { + usedfontsize = (int)fontval; + } else { + /* + * Default font size is 12, if none given. This is to + * have a known usedfontsize value. + */ + FcPatternAddDouble(pattern, FC_PIXEL_SIZE, 12); + usedfontsize = 12; + } } + + if(xloadfont(&dc.font, pattern)) + die("st: can't open font %s\n", fontstr); + + /* Setting character width and height. */ + xw.cw = dc.font.width; + xw.ch = dc.font.height; + + FcPatternDel(pattern, FC_WEIGHT); + FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); + if(xloadfont(&dc.bfont, pattern)) + die("st: can't open font %s\n", fontstr); + + FcPatternDel(pattern, FC_SLANT); + FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); + if(xloadfont(&dc.ibfont, pattern)) + die("st: can't open font %s\n", fontstr); + + FcPatternDel(pattern, FC_WEIGHT); + if(xloadfont(&dc.ifont, pattern)) + die("st: can't open font %s\n", fontstr); + + FcPatternDestroy(pattern); } 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); - - 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); +xzoom(const Arg *arg) +{ + xloadfonts(usedfont, usedfontsize + arg->i); + cresize(0, 0); + draw(); } void @@ -1957,18 +2330,16 @@ 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(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; + usedfont = (opt_font == NULL)? font : opt_font; + xloadfonts(usedfont, 0); /* colors */ xw.cmap = XDefaultColormap(xw.dpy, xw.scr); @@ -1987,14 +2358,14 @@ xinit(void) { xw.w = xw.fw; } else { /* window - default size */ - xw.h = 2*BORDER + term.row * xw.ch; - xw.w = 2*BORDER + term.col * xw.cw; + xw.h = 2*borderpx + term.row * xw.ch; + xw.w = 2*borderpx + term.col * xw.cw; xw.fx = 0; xw.fy = 0; } - 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 @@ -2004,12 +2375,18 @@ xinit(void) { 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); @@ -2027,6 +2404,8 @@ xinit(void) { &(XColor){.red = 0x0000, .green = 0x0000, .blue = 0x0000}); xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); + xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False); + XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); xresettitle(); XMapWindow(xw.dpy, xw.win); @@ -2036,62 +2415,99 @@ 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; - } - - if(base.mode & ATTR_REVERSE) - temp = fg, fg = bg, bg = temp; + int winx = borderpx + x * xw.cw, winy = borderpx + 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_BOLD) { - fg += 8; - fontset = dc.bfont.set; + if(BETWEEN(base.fg, 0, 7)) { + /* basic system colors */ + fg = &dc.xft_col[base.fg + 8]; + } else if(BETWEEN(base.fg, 16, 195)) { + /* 256 colors */ + fg = &dc.xft_col[base.fg + 36]; + } else if(BETWEEN(base.fg, 232, 251)) { + /* greyscale */ + fg = &dc.xft_col[base.fg + 4]; + } + /* + * Those ranges will not be brightened: + * 8 - 15 – bright system colors + * 196 - 231 – highest 256 color cube + * 252 - 255 – brightest colors in greyscale + */ + 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) && (base.mode & ATTR_BOLD)) + 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); + if(base.mode & ATTR_REVERSE) + temp = fg, fg = bg, bg = temp; - if(base.mode & ATTR_UNDERLINE) - XDrawLine(xw.dpy, xw.buf, dc.gc, winx, winy+1, winx+width-1, winy+1); -} + XftTextExtentsUtf8(xw.dpy, font->xft_set, (FcChar8 *)s, bytelen, + &extents); + width = extents.xOff; -/* copy buffer pixmap to screen pixmap */ -void -xcopy() { - XdbeSwapInfo swpinfo[1] = {{xw.win, XdbeCopied}}; - XdbeSwapBuffers(xw.dpy, swpinfo, 1); + /* Intelligent cleaning up of the borders. */ + if(x == 0) { + xclear(0, (y == 0)? 0 : winy, borderpx, + winy + xw.ch + (y == term.row-1)? xw.h : 0); + } + if(x + charlen >= term.col-1) { + xclear(winx + width, (y == 0)? 0 : winy, xw.w, + (y == term.row-1)? xw.h : (winy + xw.ch)); + } + if(y == 0) + xclear(winx, 0, winx + width, borderpx); + if(y == term.row-1) + xclear(winx, winy + xw.ch, winx + width, xw.h); + + 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 + font->ascent + 1, + width, 1); + } } void xdrawcursor(void) { - static int oldx = 0; - static int oldy = 0; + static int oldx = 0, oldy = 0; int sl; - Glyph g = {{' '}, ATTR_NULL, DefaultBG, DefaultCS, 0}; + Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs, 0}; LIMIT(oldx, 0, term.col-1); LIMIT(oldy, 0, term.row-1); @@ -2102,26 +2518,24 @@ xdrawcursor(void) { /* remove the old cursor */ if(term.line[oldy][oldx].state & GLYPH_SET) { 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(); + xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, + oldy, 1, sl); + } else { + xtermclear(oldx, oldy, oldx, oldy); + } /* draw the new one */ - if(!(term.c.state & CURSOR_HIDE)) { + if(!(IS_SET(MODE_HIDE))) { if(!(xw.state & WIN_FOCUSED)) - g.bg = DefaultUCS; + g.bg = defaultucs; if(IS_SET(MODE_REVERSE)) - g.mode |= ATTR_REVERSE, g.fg = DefaultCS, g.bg = DefaultFG; + 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(); } void @@ -2132,16 +2546,19 @@ xresettitle(void) { void redraw(void) { struct timespec tv = {0, REDRAW_TIMEOUT * 1000}; + 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 @@ -2149,9 +2566,9 @@ drawregion(int x1, int y1, int x2, int y2) { int ic, ib, x, y, ox, sl; Glyph base, new; char buf[DRAW_BUF_SIZ]; - bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN); + bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN) != 0; - if((sel.alt && !alt) || (!sel.alt && alt)) + if((sel.alt != 0) ^ alt) ena_sel = 0; if(!(xw.state & WIN_VISIBLE)) return; @@ -2159,7 +2576,8 @@ 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; @@ -2167,8 +2585,9 @@ drawregion(int x1, int y1, int x2, int y2) { new = term.line[y][x]; if(ena_sel && *(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)) { + if(ib > 0 && (!(new.state & GLYPH_SET) + || ATTRCMP(base, new) + || ib >= DRAW_BUF_SIZ-UTF_SIZ)) { xdraws(buf, base, ox, y, ic, ib); ic = ib = 0; } @@ -2192,21 +2611,23 @@ drawregion(int x1, int y1, int x2, int y2) { void expose(XEvent *ev) { XExposeEvent *e = &ev->xexpose; + if(xw.state & WIN_REDRAW) { if(!e->count) xw.state &= ~WIN_REDRAW; } - xcopy(); } void visibility(XEvent *ev) { XVisibilityEvent *e = &ev->xvisibility; - if(e->state == VisibilityFullyObscured) + + if(e->state == VisibilityFullyObscured) { xw.state &= ~WIN_VISIBLE; - else if(!(xw.state & WIN_VISIBLE)) + } else if(!(xw.state & WIN_VISIBLE)) { /* need a full redraw for next Expose, not just a buf copy */ xw.state |= WIN_VISIBLE | WIN_REDRAW; + } } void @@ -2217,6 +2638,7 @@ unmap(XEvent *ev) { void xseturgency(int add) { XWMHints *h = XGetWMHints(xw.dpy, xw.win); + h->flags = add ? (h->flags | XUrgencyHint) : (h->flags & ~XUrgencyHint); XSetWMHints(xw.dpy, xw.win, h); XFree(h); @@ -2225,21 +2647,28 @@ xseturgency(int add) { void focus(XEvent *ev) { if(ev->type == FocusIn) { + XSetICFocus(xw.xic); xw.state |= WIN_FOCUSED; xseturgency(0); - } else + } else { + XUnsetICFocus(xw.xic); xw.state &= ~WIN_FOCUSED; - draw(); + } } char* kmap(KeySym k, uint state) { int i; + uint mask; + state &= ~Mod2Mask; for(i = 0; i < LEN(key); i++) { - uint mask = key[i].mask; - if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state))) + mask = key[i].mask; + + if(key[i].k == k && ((state & mask) == mask + || (mask == XK_NO_MOD && !state))) { return (char*)key[i].s; + } } return NULL; } @@ -2248,29 +2677,41 @@ void kpress(XEvent *ev) { XKeyEvent *e = &ev->xkey; KeySym ksym; - char buf[32]; - char *customkey; - int len; - int meta; - int shift; + char buf[32], *customkey; + int len, meta, shift, i; 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); - /* 1. custom keys from config.h */ - if((customkey = kmap(ksym, e->state))) + /* 1. shortcuts */ + for(i = 0; i < LEN(shortcuts); i++) { + if((ksym == shortcuts[i].keysym) + && (CLEANMASK(shortcuts[i].mod) == \ + CLEANMASK(e->state)) + && shortcuts[i].func) { + shortcuts[i].func(&(shortcuts[i].arg)); + } + } + + /* 2. custom keys from config.h */ + if((customkey = kmap(ksym, e->state))) { ttywrite(customkey, strlen(customkey)); /* 2. hardcoded (overrides X lookup) */ - else + } else { switch(ksym) { case XK_Up: case XK_Down: case XK_Left: case XK_Right: /* XXX: shift up/down doesn't work */ - sprintf(buf, "\033%c%c", IS_SET(MODE_APPKEYPAD) ? 'O' : '[', (shift ? "dacb":"DACB")[ksym - XK_Left]); + sprintf(buf, "\033%c%c", + IS_SET(MODE_APPKEYPAD) ? 'O' : '[', + (shift ? "dacb":"DACB")[ksym - XK_Left]); ttywrite(buf, 3); break; case XK_Insert: @@ -2278,10 +2719,14 @@ kpress(XEvent *ev) { selpaste(); break; case XK_Return: - if(IS_SET(MODE_CRLF)) + if(meta) + ttywrite("\033", 1); + + if(IS_SET(MODE_CRLF)) { ttywrite("\r\n", 2); - else + } else { ttywrite("\r", 1); + } break; /* 3. X lookup */ default: @@ -2292,6 +2737,7 @@ kpress(XEvent *ev) { } break; } + } } void @@ -2305,101 +2751,111 @@ cmessage(XEvent *e) { } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { xw.state &= ~WIN_FOCUSED; } - draw(); + } else if(e->xclient.data.l[0] == xw.wmdeletewin) { + /* Send SIGHUP to shell */ + kill(pid, SIGHUP); + exit(EXIT_SUCCESS); } } void -resize(XEvent *e) { +cresize(int width, int height) +{ int col, row; - if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) - return; + if(width != 0) + xw.w = width; + if(height != 0) + xw.h = height; - xw.w = e->xconfigure.width; - xw.h = e->xconfigure.height; - col = (xw.w - 2*BORDER) / xw.cw; - row = (xw.h - 2*BORDER) / xw.ch; - if(col == term.col && row == term.row) - return; - if(tresize(col, row)) - draw(); + col = (xw.w - 2*borderpx) / xw.cw; + row = (xw.h - 2*borderpx) / xw.ch; + + tresize(col, row); xresize(col, row); - ttyresize(col, row); + ttyresize(); } -bool -last_draw_too_old(void) { - struct timeval now; - gettimeofday(&now, NULL); - return TIMEDIFF(now, xw.lastdraw) >= DRAW_TIMEOUT/1000; +void +resize(XEvent *e) { + if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) + return; + + cresize(e->xconfigure.width, e->xconfigure.height); } 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); - if(XFilterEvent(&ev, xw.win)) + if(XFilterEvent(&ev, None)) continue; 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; @@ -2421,17 +2877,30 @@ 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; } } - run: +run: setlocale(LC_CTYPE, ""); + XSetLocaleModifiers(""); tnew(80, 24); - ttynew(); xinit(); + ttynew(); selinit(); run(); return 0;