X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=st.c;h=ced72ff8ba4b32193726d9084422133569712910;hb=ebb6e03201ce0e5a00be7cff2e365ad3d6cb7195;hp=50090a471e49bdde0663ac1b4221fb2e68df1ccc;hpb=678eff6e1882a888deda5e4e429df42c39b604fe;p=st.git diff --git a/st.c b/st.c index 50090a4..ced72ff 100644 --- a/st.c +++ b/st.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -26,6 +28,7 @@ #include #include #include +#include #include "arg.h" @@ -52,6 +55,7 @@ char *argv0; #define XEMBED_FOCUS_OUT 5 /* Arbitrary sizes */ +#define UTF_INVALID 0xFFFD #define UTF_SIZ 4 #define ESC_BUF_SIZ (128*UTF_SIZ) #define ESC_ARG_SIZ 16 @@ -75,6 +79,14 @@ char *argv0; #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) #define IS_SET(flag) ((term.mode & (flag)) != 0) #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) +#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x)) + +#define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b)) +#define IS_TRUECOL(x) (1 << 24 & (x)) +#define TRUERED(x) (((x) & 0xff0000) >> 8) +#define TRUEGREEN(x) (((x) & 0xff00)) +#define TRUEBLUE(x) (((x) & 0xff) << 8) + #define VT102ID "\033[?6c" @@ -87,6 +99,8 @@ enum glyph_attribute { ATTR_ITALIC = 16, ATTR_BLINK = 32, ATTR_WRAP = 64, + ATTR_WIDE = 128, + ATTR_WDUMMY = 256, }; enum cursor_movement { @@ -97,33 +111,49 @@ enum cursor_movement { enum cursor_state { CURSOR_DEFAULT = 0, CURSOR_WRAPNEXT = 1, - CURSOR_ORIGIN = 2 + CURSOR_ORIGIN = 2 }; enum term_mode { - MODE_WRAP = 1, + MODE_WRAP = 1, MODE_INSERT = 2, MODE_APPKEYPAD = 4, MODE_ALTSCREEN = 8, - MODE_CRLF = 16, + MODE_CRLF = 16, MODE_MOUSEBTN = 32, MODE_MOUSEMOTION = 64, - MODE_MOUSE = 32|64, MODE_REVERSE = 128, MODE_KBDLOCK = 256, - MODE_HIDE = 512, - MODE_ECHO = 1024, - MODE_APPCURSOR = 2048, + MODE_HIDE = 512, + MODE_ECHO = 1024, + MODE_APPCURSOR = 2048, MODE_MOUSESGR = 4096, - MODE_8BIT = 8192, - MODE_BLINK = 16384, - MODE_FBLINK = 32768, + MODE_8BIT = 8192, + MODE_BLINK = 16384, + MODE_FBLINK = 32768, + MODE_FOCUS = 65536, + MODE_MOUSEX10 = 131072, + MODE_MOUSEMANY = 262144, + MODE_BRCKTPASTE = 524288, + MODE_PRINT = 1048576, + MODE_MOUSE = MODE_MOUSEBTN|MODE_MOUSEMOTION|MODE_MOUSEX10\ + |MODE_MOUSEMANY, +}; + +enum charset { + CS_GRAPHIC0, + CS_GRAPHIC1, + CS_UK, + CS_USA, + CS_MULTI, + CS_GER, + CS_FIN }; enum escape_state { ESC_START = 1, - ESC_CSI = 2, - ESC_STR = 4, /* DSC, OSC, PM, APC */ + ESC_CSI = 2, + 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 */ @@ -145,26 +175,22 @@ enum selection_snap { SNAP_LINE = 2 }; -/* bit macro */ -#undef B0 -enum { B0=1, B1=2, B2=4, B3=8, B4=16, B5=32, B6=64, B7=128 }; - typedef unsigned char uchar; typedef unsigned int uint; typedef unsigned long ulong; typedef unsigned short ushort; typedef struct { - char c[UTF_SIZ]; /* character code */ - uchar mode; /* attribute flags */ - ushort fg; /* foreground */ - ushort bg; /* background */ + char c[UTF_SIZ]; /* character code */ + ushort mode; /* attribute flags */ + uint32_t fg; /* foreground */ + uint32_t bg; /* background */ } Glyph; typedef Glyph *Line; typedef struct { - Glyph attr; /* current char attributes */ + Glyph attr; /* current char attributes */ int x; int y; char state; @@ -174,36 +200,39 @@ typedef struct { /* ESC '[' [[ [] [;]] ] */ typedef struct { char buf[ESC_BUF_SIZ]; /* raw string */ - int len; /* raw string length */ + int len; /* raw string length */ char priv; int arg[ESC_ARG_SIZ]; - int narg; /* nb of args */ + int narg; /* nb of args */ char mode; } CSIEscape; /* STR Escape sequence structs */ /* ESC type [[ [] [;]] ] ESC '\' */ typedef struct { - char type; /* ESC type ... */ + char type; /* ESC type ... */ char buf[STR_BUF_SIZ]; /* raw string */ - int len; /* raw string length */ + int len; /* raw string length */ char *args[STR_ARG_SIZ]; - int narg; /* nb of args */ + int narg; /* nb of args */ } STREscape; /* Internal representation of the screen */ typedef struct { - int row; /* nb row */ - int col; /* nb col */ - Line *line; /* screen */ - Line *alt; /* alternate screen */ - bool *dirty; /* dirtyness of lines */ - TCursor c; /* cursor */ - int top; /* top scroll limit */ - int bot; /* bottom scroll limit */ - int mode; /* terminal mode flags */ - int esc; /* escape state flags */ - bool numlock; /* lock numbers in keyboard */ + int row; /* nb row */ + int col; /* nb col */ + Line *line; /* screen */ + Line *alt; /* alternate screen */ + bool *dirty; /* dirtyness of lines */ + TCursor c; /* cursor */ + int top; /* top scroll limit */ + int bot; /* bottom scroll limit */ + int mode; /* terminal mode flags */ + int esc; /* escape state flags */ + char trantbl[4]; /* charset table translation */ + int charset; /* current charset */ + int icharset; /* selected charset for sequence */ + bool numlock; /* lock numbers in keyboard */ bool *tabs; } Term; @@ -213,11 +242,12 @@ typedef struct { Colourmap cmap; Window win; Drawable buf; - Atom xembed, wmdeletewin; + Atom xembed, wmdeletewin, netwmname, netwmpid; XIM xim; XIC xic; Draw draw; Visual *vis; + XSetWindowAttributes attrs; int scr; bool isfixed; /* is fixed geometry? */ int fx, fy, fw, fh; /* fixed geometry */ @@ -229,31 +259,36 @@ typedef struct { } XWindow; typedef struct { - int b; + uint b; uint mask; - char s[ESC_BUF_SIZ]; + char *s; } Mousekey; typedef struct { KeySym k; uint mask; - char s[ESC_BUF_SIZ]; + char *s; /* three valued logic variables: 0 indifferent, 1 on, -1 off */ - signed char appkey; /* application keypad */ - signed char appcursor; /* application cursor */ - signed char crlf; /* crlf mode */ + signed char appkey; /* application keypad */ + signed char appcursor; /* application cursor */ + signed char crlf; /* crlf mode */ } Key; -/* TODO: use better name for vars... */ typedef struct { int mode; int type; int snap; - int bx, by; - int ex, ey; + /* + * Selection variables: + * nb – normalized coordinates of the beginning of the selection + * ne – normalized coordinates of the end of the selection + * ob – original coordinates of the beginning of the selection + * oe – original coordinates of the end of the selection + */ struct { int x, y; - } b, e; + } nb, ne, ob, oe; + char *clip; Atom xtarget; bool alt; @@ -280,6 +315,9 @@ static void clippaste(const Arg *); static void numlock(const Arg *); static void selpaste(const Arg *); static void xzoom(const Arg *); +static void printsel(const Arg *); +static void printscreen(const Arg *) ; +static void toggleprinter(const Arg *); /* Config.h for applying patches and the configuration. */ #include "config.h" @@ -322,6 +360,10 @@ static void strparse(void); static void strreset(void); static int tattrset(int); +static void tprinter(char *s, size_t len); +static void tdumpsel(void); +static void tdumpline(int); +static void tdump(void); static void tclearregion(int, int, int, int); static void tcursor(int); static void tdeletechar(int); @@ -347,11 +389,14 @@ static void tsetdirtattr(int); static void tsetmode(bool, bool, int *, int); static void tfulldirt(void); static void techo(char *, int); - +static int32_t tdefcolor(int *, int *, int); +static void tselcs(void); +static void tdeftran(char); static inline bool match(uint, uint); static void ttynew(void); static void ttyread(void); static void ttyresize(void); +static void ttysend(char *, size_t); static void ttywrite(const char *, size_t); static void xdraws(char *, Glyph, int, int, int, int); @@ -362,12 +407,15 @@ static void xinit(void); static void xloadcols(void); static int xsetcolorname(int, const char *); static int xloadfont(Font *, FcPattern *); -static void xloadfonts(char *, int); +static void xloadfonts(char *, double); +static int xloadfontset(Font *); static void xsettitle(char *); static void xresettitle(void); +static void xsetpointermotion(int); static void xseturgency(int); static void xsetsel(char*); static void xtermclear(int, int, int, int); +static void xunloadfont(Font *f); static void xunloadfonts(void); static void xresize(int, int); @@ -388,20 +436,24 @@ static void selclear(XEvent *); static void selrequest(XEvent *); static void selinit(void); +static void selsort(void); static inline bool selected(int, int); +static char *getsel(void); static void selcopy(void); static void selscroll(int, int); static void selsnap(int, int *, int *, int); -static int utf8decode(char *, long *); -static int utf8encode(long *, char *); -static int utf8size(char *); -static int isfullutf8(char *, int); +static size_t utf8decode(char *, long *, size_t); +static long utf8decodebyte(char, size_t *); +static size_t utf8encode(long, char *, size_t); +static char utf8encodebyte(long, size_t); +static size_t utf8len(char *); +static size_t utf8validate(long *, size_t); static ssize_t xwrite(int, char *, size_t); static void *xmalloc(size_t); static void *xrealloc(void *, size_t); -static void *xcalloc(size_t, size_t); +static char *xstrdup(char *s); static void (*handler[LASTEvent])(XEvent *) = { [KeyPress] = kpress, @@ -429,16 +481,22 @@ static STREscape strescseq; static int cmdfd; static pid_t pid; static Selection sel; -static int iofd = -1; +static int iofd = STDOUT_FILENO; 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 int oldbutton = 3; /* button event on startup: 3 = release */ static char *usedfont = NULL; -static int usedfontsize = 0; +static double usedfontsize = 0; + +static uchar utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0}; +static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; +static long utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; +static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; /* Font Ring Cache */ enum { @@ -450,17 +508,12 @@ enum { typedef struct { XftFont *font; - long c; int flags; } Fontcache; -/* - * Fontcache is a ring buffer, with frccur as current position and frclen as - * the current length of used elements. - */ - -static Fontcache frc[1024]; -static int frccur = -1, frclen = 0; +/* Fontcache is an array now. A new font will be appended to the array. */ +static Fontcache frc[16]; +static int frclen = 0; ssize_t xwrite(int fd, char *s, size_t len) { @@ -494,146 +547,87 @@ xrealloc(void *p, size_t len) { return p; } -void * -xcalloc(size_t nmemb, size_t size) { - void *p = calloc(nmemb, size); +char * +xstrdup(char *s) { + char *p = strdup(s); - if(!p) + if (!p) die("Out of memory\n"); return p; } -int -utf8decode(char *s, long *u) { - uchar c; - int i, n, rtn; - - rtn = 1; - c = *s; - if(~c & B7) { /* 0xxxxxxx */ - *u = c; - return rtn; - } else if((c & (B7|B6|B5)) == (B7|B6)) { /* 110xxxxx */ - *u = c&(B4|B3|B2|B1|B0); - n = 1; - } else if((c & (B7|B6|B5|B4)) == (B7|B6|B5)) { /* 1110xxxx */ - *u = c&(B3|B2|B1|B0); - n = 2; - } else if((c & (B7|B6|B5|B4|B3)) == (B7|B6|B5|B4)) { /* 11110xxx */ - *u = c & (B2|B1|B0); - n = 3; - } else { - goto invalid; - } - - for(i = n, ++s; i > 0; --i, ++rtn, ++s) { - c = *s; - if((c & (B7|B6)) != B7) /* 10xxxxxx */ - goto invalid; - *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)) { - goto invalid; - } - - return rtn; -invalid: - *u = 0xFFFD; - - return rtn; -} +size_t +utf8decode(char *c, long *u, size_t clen) { + size_t i, j, len, type; + long udecoded; -int -utf8encode(long *u, char *s) { - uchar *sp; - ulong uc; - int i, n; - - sp = (uchar *)s; - uc = *u; - if(uc < 0x80) { - *sp = uc; /* 0xxxxxxx */ + *u = UTF_INVALID; + if(!clen) + return 0; + udecoded = utf8decodebyte(c[0], &len); + if(!BETWEEN(len, 1, UTF_SIZ)) return 1; - } else if(*u < 0x800) { - *sp = (uc >> 6) | (B7|B6); /* 110xxxxx */ - n = 1; - } else if(uc < 0x10000) { - *sp = (uc >> 12) | (B7|B6|B5); /* 1110xxxx */ - n = 2; - } else if(uc <= 0x10FFFF) { - *sp = (uc >> 18) | (B7|B6|B5|B4); /* 11110xxx */ - n = 3; - } else { - goto invalid; + for(i = 1, j = 1; i < clen && j < len; ++i, ++j) { + udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); + if(type != 0) + return j; } + if(j < len) + return 0; + *u = udecoded; + utf8validate(u, len); + return len; +} - 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; +long +utf8decodebyte(char c, size_t *i) { + for(*i = 0; *i < LEN(utfmask); ++(*i)) + if(((uchar)c & utfmask[*i]) == utfbyte[*i]) + return (uchar)c & ~utfmask[*i]; + return 0; } -/* use this if your buffer is less than UTF_SIZ, it returns 1 if you can decode - UTF-8 otherwise return 0 */ -int -isfullutf8(char *s, int b) { - uchar *c1, *c2, *c3; +size_t +utf8encode(long u, char *c, size_t clen) { + size_t len, i; - c1 = (uchar *)s; - c2 = (uchar *)++s; - c3 = (uchar *)++s; - if(b < 1) { + len = utf8validate(&u, 0); + if(clen < len) return 0; - } else if((*c1&(B7|B6|B5)) == (B7|B6) && b == 1) { - return 0; - } else if((*c1&(B7|B6|B5|B4)) == (B7|B6|B5) && - ((b == 1) || - ((b == 2) && (*c2&(B7|B6)) == B7))) { - return 0; - } 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))) { - return 0; - } else { - return 1; + for(i = len - 1; i != 0; --i) { + c[i] = utf8encodebyte(u, 0); + u >>= 6; } + c[0] = utf8encodebyte(u, len); + return len; } -int -utf8size(char *s) { - uchar c = *s; +char +utf8encodebyte(long u, size_t i) { + return utfbyte[i] | (u & ~utfmask[i]); +} - if(~c&B7) { - return 1; - } else if((c&(B7|B6|B5)) == (B7|B6)) { - return 2; - } else if((c&(B7|B6|B5|B4)) == (B7|B6|B5)) { - return 3; - } else { - return 4; - } +size_t +utf8len(char *c) { + return utf8decode(c, &(long){0}, UTF_SIZ); } -void +size_t +utf8validate(long *u, size_t i) { + if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) + *u = UTF_INVALID; + for(i = 1; *u > utfmax[i]; ++i) + ; + return i; +} + +static void selinit(void) { memset(&sel.tclick1, 0, sizeof(sel.tclick1)); memset(&sel.tclick2, 0, sizeof(sel.tclick2)); sel.mode = 0; - sel.bx = -1; + sel.ob.x = -1; sel.clip = NULL; sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); if(sel.xtarget == None) @@ -656,25 +650,33 @@ y2row(int y) { return LIMIT(y, 0, term.row-1); } +static void +selsort(void) { + if(sel.ob.y == sel.oe.y) { + sel.nb.x = MIN(sel.ob.x, sel.oe.x); + sel.ne.x = MAX(sel.ob.x, sel.oe.x); + } else { + sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x; + sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x; + } + sel.nb.y = MIN(sel.ob.y, sel.oe.y); + sel.ne.y = MAX(sel.ob.y, sel.oe.y); +} + static inline bool selected(int x, int y) { - int bx, ex; - - if(sel.ey == y && sel.by == y) { - bx = MIN(sel.bx, sel.ex); - ex = MAX(sel.bx, sel.ex); - - return BETWEEN(x, bx, ex); - } + if(sel.ne.y == y && sel.nb.y == y) + return BETWEEN(x, sel.nb.x, sel.ne.x); if(sel.type == SEL_RECTANGULAR) { - return ((sel.b.y <= y && y <= sel.e.y) - && (sel.b.x <= x && x <= sel.e.x)); + return ((sel.nb.y <= y && y <= sel.ne.y) + && (sel.nb.x <= x && x <= sel.ne.x)); } - 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.nb.y < y && y < sel.ne.y) + || (y == sel.ne.y && x <= sel.ne.x)) + || (y == sel.nb.y && x >= sel.nb.x + && (x <= sel.ne.x || sel.nb.y != sel.ne.y)); } void @@ -707,8 +709,13 @@ selsnap(int mode, int *x, int *y, int direction) { } } + if(term.line[*y][*x+direction].mode & ATTR_WDUMMY) { + *x += direction; + continue; + } + if(strchr(worddelimiters, - term.line[*y][*x + direction].c[0])) { + term.line[*y][*x+direction].c[0])) { break; } @@ -760,22 +767,18 @@ getbuttoninfo(XEvent *e) { sel.alt = IS_SET(MODE_ALTSCREEN); - sel.ex = x2col(e->xbutton.x); - sel.ey = y2row(e->xbutton.y); + sel.oe.x = x2col(e->xbutton.x); + sel.oe.y = y2row(e->xbutton.y); - if (sel.by < sel.ey - || (sel.by == sel.ey && sel.bx < sel.ex)) { - selsnap(sel.snap, &sel.bx, &sel.by, -1); - selsnap(sel.snap, &sel.ex, &sel.ey, +1); + if(sel.ob.y < sel.oe.y + || (sel.ob.y == sel.oe.y && sel.ob.x < sel.oe.x)) { + selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1); + selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1); } else { - selsnap(sel.snap, &sel.ex, &sel.ey, -1); - selsnap(sel.snap, &sel.bx, &sel.by, +1); + selsnap(sel.snap, &sel.oe.x, &sel.oe.y, -1); + selsnap(sel.snap, &sel.ob.x, &sel.ob.y, +1); } - - 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; - sel.e.y = MAX(sel.by, sel.ey); + selsort(); sel.type = SEL_REGULAR; for(type = 1; type < LEN(selmasks); ++type) { @@ -792,31 +795,46 @@ mousereport(XEvent *e) { button = e->xbutton.button, state = e->xbutton.state, len; char buf[40]; - static int ob, ox, oy; + static int ox, oy; /* from urxvt */ if(e->xbutton.type == MotionNotify) { - if(!IS_SET(MODE_MOUSEMOTION) || (x == ox && y == oy)) + if(x == ox && y == oy) + return; + if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) + return; + /* MOUSE_MOTION: no reporting if no button is pressed */ + if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3) return; - button = ob + 32; - ox = x, oy = y; - } else if(!IS_SET(MODE_MOUSESGR) - && (e->xbutton.type == ButtonRelease - || button == AnyButton)) { - button = 3; + + button = oldbutton + 32; + ox = x; + oy = y; } else { - button -= Button1; - if(button >= 3) - button += 64 - 3; + if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) { + button = 3; + } else { + button -= Button1; + if(button >= 3) + button += 64 - 3; + } if(e->xbutton.type == ButtonPress) { - ob = button; - ox = x, oy = y; + oldbutton = button; + ox = x; + oy = y; + } else if(e->xbutton.type == ButtonRelease) { + oldbutton = 3; + /* MODE_MOUSEX10: no button release reporting */ + if(IS_SET(MODE_MOUSEX10)) + return; } } - button += (state & ShiftMask ? 4 : 0) - + (state & Mod4Mask ? 8 : 0) - + (state & ControlMask ? 16 : 0); + if(!IS_SET(MODE_MOUSEX10)) { + button += (state & ShiftMask ? 4 : 0) + + (state & Mod4Mask ? 8 : 0) + + (state & ControlMask ? 16 : 0); + } len = 0; if(IS_SET(MODE_MOUSESGR)) { @@ -846,9 +864,7 @@ bpress(XEvent *e) { for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { if(e->xbutton.button == mk->b && match(mk->mask, e->xbutton.state)) { - ttywrite(mk->s, strlen(mk->s)); - if(IS_SET(MODE_ECHO)) - techo(mk->s, strlen(mk->s)); + ttysend(mk->s, strlen(mk->s)); return; } } @@ -857,15 +873,11 @@ bpress(XEvent *e) { gettimeofday(&now, NULL); /* Clear previous selection, logically and visually. */ - if(sel.bx != -1) { - sel.bx = -1; - tsetdirt(sel.b.y, sel.e.y); - draw(); - } + selclear(NULL); sel.mode = 1; sel.type = SEL_REGULAR; - sel.ex = sel.bx = x2col(e->xbutton.x); - sel.ey = sel.by = y2row(e->xbutton.y); + sel.oe.x = sel.ob.x = x2col(e->xbutton.x); + sel.oe.y = sel.ob.y = y2row(e->xbutton.y); /* * If the user clicks below predefined timeouts specific @@ -878,12 +890,9 @@ bpress(XEvent *e) { } else { sel.snap = 0; } - selsnap(sel.snap, &sel.bx, &sel.by, -1); - selsnap(sel.snap, &sel.ex, &sel.ey, +1); - sel.b.x = sel.bx; - sel.b.y = sel.by; - sel.e.x = sel.ex; - sel.e.y = sel.ey; + selsnap(sel.snap, &sel.ob.x, &sel.ob.y, -1); + selsnap(sel.snap, &sel.oe.x, &sel.oe.y, +1); + selsort(); /* * Draw selection, unless it's regular and we don't want to @@ -891,40 +900,40 @@ bpress(XEvent *e) { */ if(sel.snap != 0) { sel.mode++; - tsetdirt(sel.b.y, sel.e.y); - draw(); + tsetdirt(sel.nb.y, sel.ne.y); } sel.tclick2 = sel.tclick1; sel.tclick1 = now; } } -void -selcopy(void) { +char * +getsel(void) { char *str, *ptr; int x, y, bufsize, size, i, ex; Glyph *gp, *last; - if(sel.bx == -1) { + if(sel.ob.x == -1) { str = NULL; } else { - bufsize = (term.col+1) * (sel.e.y-sel.b.y+1) * UTF_SIZ; + bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; ptr = str = xmalloc(bufsize); /* append every set & selected glyph to the selection */ - for(y = sel.b.y; y < sel.e.y + 1; y++) { + for(y = sel.nb.y; y < sel.ne.y + 1; y++) { gp = &term.line[y][0]; - last = gp + term.col; + last = &gp[term.col-1]; - while(--last >= gp && !(selected(last - gp, y) && \ - strcmp(last->c, " ") != 0)) - /* nothing */; + while(last >= gp && !(selected(last - gp, y) && + strcmp(last->c, " ") != 0)) { + --last; + } for(x = 0; gp <= last; x++, ++gp) { - if(!selected(x, y)) + if(!selected(x, y) || (gp->mode & ATTR_WDUMMY)) continue; - size = utf8size(gp->c); + size = utf8len(gp->c); memcpy(ptr, gp->c, size); ptr += size; } @@ -938,27 +947,32 @@ selcopy(void) { * st. * FIXME: Fix the computer world. */ - if(y < sel.e.y && !((gp-1)->mode & ATTR_WRAP)) + if(y < sel.ne.y && x > 0 && !((gp-1)->mode & ATTR_WRAP)) *ptr++ = '\n'; /* * If the last selected line expands in the selection * after the visible text '\n' is appended. */ - if(y == sel.e.y) { + if(y == sel.ne.y) { i = term.col; while(--i > 0 && term.line[y][i].c[0] == ' ') /* nothing */; - ex = sel.e.x; - if(sel.b.y == sel.e.y && sel.e.x < sel.b.x) - ex = sel.b.x; + ex = sel.ne.x; + if(sel.nb.y == sel.ne.y && sel.ne.x < sel.nb.x) + ex = sel.nb.x; if(i < ex) *ptr++ = '\n'; } } *ptr = 0; } - xsetsel(str); + return str; +} + +void +selcopy(void) { + xsetsel(getsel()); } void @@ -990,7 +1004,11 @@ selnotify(XEvent *e) { *repl++ = '\r'; } - ttywrite((const char *)data, nitems * format / 8); + if(IS_SET(MODE_BRCKTPASTE)) + ttywrite("\033[200~", 6); + ttysend((char *)data, nitems * format / 8); + if(IS_SET(MODE_BRCKTPASTE)) + ttywrite("\033[201~", 6); XFree(data); /* number of 32-bit chunks returned */ ofs += nitems * format / 32; @@ -1014,10 +1032,10 @@ clippaste(const Arg *dummy) { void selclear(XEvent *e) { - if(sel.bx == -1) + if(sel.ob.x == -1) return; - sel.bx = -1; - tsetdirt(sel.b.y, sel.e.y); + sel.ob.x = -1; + tsetdirt(sel.nb.y, sel.ne.y); } void @@ -1080,13 +1098,13 @@ brelease(XEvent *e) { selpaste(NULL); } else if(e->xbutton.button == Button1) { if(sel.mode < 2) { - sel.bx = -1; + selclear(NULL); } else { getbuttoninfo(e); selcopy(); } sel.mode = 0; - term.dirty[sel.ey] = 1; + tsetdirt(sel.nb.y, sel.ne.y); } } @@ -1103,15 +1121,14 @@ bmotion(XEvent *e) { return; sel.mode++; - oldey = sel.ey; - oldex = sel.ex; - oldsby = sel.b.y; - oldsey = sel.e.y; + oldey = sel.oe.y; + oldex = sel.oe.x; + oldsby = sel.nb.y; + oldsey = sel.ne.y; getbuttoninfo(e); - if(oldey != sel.ey || oldex != sel.ex) { - tsetdirt(MIN(sel.b.y, oldsby), MAX(sel.e.y, oldsey)); - } + if(oldey != sel.oe.y || oldex != sel.oe.x) + tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); } void @@ -1164,7 +1181,7 @@ sigchld(int a) { int stat = 0; if(waitpid(pid, &stat, 0) < 0) - die("Waiting for pid %hd failed: %s\n", pid, SERRNO); + die("Waiting for pid %hd failed: %s\n", pid, SERRNO); if(WIFEXITED(stat)) { exit(WEXITSTATUS(stat)); @@ -1202,6 +1219,7 @@ ttynew(void) { cmdfd = m; signal(SIGCHLD, sigchld); if(opt_io) { + term.mode |= MODE_PRINT; iofd = (!strcmp(opt_io, "-")) ? STDOUT_FILENO : open(opt_io, O_WRONLY | O_CREAT, 0666); @@ -1229,7 +1247,7 @@ ttyread(void) { char *ptr; char s[UTF_SIZ]; int charsize; /* size of utf8 char in bytes */ - long utf8c; + long unicodep; int ret; /* append read bytes to unprocessed bytes */ @@ -1239,9 +1257,8 @@ ttyread(void) { /* process every complete utf8 char */ buflen += ret; ptr = buf; - while(buflen >= UTF_SIZ || isfullutf8(ptr,buflen)) { - charsize = utf8decode(ptr, &utf8c); - utf8encode(&utf8c, s); + while((charsize = utf8decode(ptr, &unicodep, buflen))) { + utf8encode(unicodep, s, UTF_SIZ); tputc(s, charsize); ptr += charsize; buflen -= charsize; @@ -1258,6 +1275,13 @@ ttywrite(const char *s, size_t n) { } void +ttysend(char *s, size_t n) { + ttywrite(s, n); + if(IS_SET(MODE_ECHO)) + techo(s, n); +} + +void ttyresize(void) { struct winsize w; @@ -1315,13 +1339,14 @@ tfulldirt(void) { void tcursor(int mode) { - static TCursor c; + static TCursor c[2]; + bool alt = IS_SET(MODE_ALTSCREEN); if(mode == CURSOR_SAVE) { - c = term.c; + c[alt] = term.c; } else if(mode == CURSOR_LOAD) { - term.c = c; - tmoveto(c.x, c.y); + term.c = c[alt]; + tmoveto(c[alt].x, c[alt].y); } } @@ -1341,6 +1366,8 @@ treset(void) { term.top = 0; term.bot = term.row - 1; term.mode = MODE_WRAP; + memset(term.trantbl, sizeof(term.trantbl), CS_USA); + term.charset = 0; tclearregion(0, 0, term.col-1, term.row-1); tmoveto(0, 0); @@ -1349,7 +1376,7 @@ treset(void) { void tnew(int col, int row) { - memset(&term, 0, sizeof(Term)); + term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; tresize(col, row); term.numlock = 1; @@ -1409,31 +1436,30 @@ tscrollup(int orig, int n) { void selscroll(int orig, int n) { - if(sel.bx == -1) + if(sel.ob.x == -1) return; - if(BETWEEN(sel.by, orig, term.bot) || BETWEEN(sel.ey, orig, term.bot)) { - if((sel.by += n) > term.bot || (sel.ey += n) < term.top) { - sel.bx = -1; + if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) { + if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) { + selclear(NULL); return; } if(sel.type == SEL_RECTANGULAR) { - if(sel.by < term.top) - sel.by = term.top; - if(sel.ey > term.bot) - sel.ey = term.bot; + if(sel.ob.y < term.top) + sel.ob.y = term.top; + if(sel.oe.y > term.bot) + sel.oe.y = term.bot; } else { - if(sel.by < term.top) { - sel.by = term.top; - sel.bx = 0; + if(sel.ob.y < term.top) { + sel.ob.y = term.top; + sel.ob.x = 0; } - if(sel.ey > term.bot) { - sel.ey = term.bot; - sel.ex = term.col; + if(sel.oe.y > term.bot) { + sel.oe.y = term.bot; + sel.oe.x = term.col; } } - sel.b.y = sel.by, sel.b.x = sel.bx; - sel.e.y = sel.ey, sel.e.x = sel.ex; + selsort(); } } @@ -1524,6 +1550,16 @@ tsetchar(char *c, Glyph *attr, int x, int y) { } } + if(term.line[y][x].mode & ATTR_WIDE) { + if(x+1 < term.col) { + term.line[y][x+1].c[0] = ' '; + term.line[y][x+1].mode &= ~ATTR_WDUMMY; + } + } else if(term.line[y][x].mode & ATTR_WDUMMY) { + term.line[y][x-1].c[0] = ' '; + term.line[y][x-1].mode &= ~ATTR_WIDE; + } + term.dirty[y] = 1; term.line[y][x] = *attr; memcpy(term.line[y][x].c, c, UTF_SIZ); @@ -1606,9 +1642,58 @@ tdeleteline(int n) { tscrollup(term.c.y, n); } +int32_t +tdefcolor(int *attr, int *npar, int l) { + int32_t idx = -1; + uint r, g, b; + + switch (attr[*npar + 1]) { + case 2: /* direct colour in RGB space */ + if (*npar + 4 >= l) { + fprintf(stderr, + "erresc(38): Incorrect number of parameters (%d)\n", + *npar); + break; + } + r = attr[*npar + 2]; + g = attr[*npar + 3]; + b = attr[*npar + 4]; + *npar += 4; + if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255)) + fprintf(stderr, "erresc: bad rgb color (%d,%d,%d)\n", + r, g, b); + else + idx = TRUECOLOR(r, g, b); + break; + case 5: /* indexed colour */ + if (*npar + 2 >= l) { + fprintf(stderr, + "erresc(38): Incorrect number of parameters (%d)\n", + *npar); + break; + } + *npar += 2; + if(!BETWEEN(attr[*npar], 0, 255)) + fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]); + else + idx = attr[*npar]; + break; + case 0: /* implemented defined (only foreground) */ + case 1: /* transparent */ + case 3: /* direct colour in CMY space */ + case 4: /* direct colour in CMYK space */ + default: + fprintf(stderr, + "erresc(38): gfx attr %d unknown\n", attr[*npar]); + } + + return idx; +} + void tsetattr(int *attr, int l) { int i; + int32_t idx; for(i = 0; i < l; i++) { switch(attr[i]) { @@ -1653,39 +1738,15 @@ tsetattr(int *attr, int l) { term.c.attr.mode &= ~ATTR_REVERSE; break; case 38: - if(i + 2 < l && attr[i + 1] == 5) { - i += 2; - 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(38): gfx attr %d unknown\n", - attr[i]); - } + if ((idx = tdefcolor(attr, &i, l)) >= 0) + term.c.attr.fg = idx; break; case 39: term.c.attr.fg = defaultfg; break; case 48: - if(i + 2 < l && attr[i + 1] == 5) { - i += 2; - 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(48): gfx attr %d unknown\n", - attr[i]); - } + if ((idx = tdefcolor(attr, &i, l)) >= 0) + term.c.attr.bg = idx; break; case 49: term.c.attr.bg = defaultbg; @@ -1764,32 +1825,47 @@ tsetmode(bool priv, bool set, int *args, int narg) { case 25: /* DECTCEM -- Text Cursor Enable Mode */ MODBIT(term.mode, !set, MODE_HIDE); break; - case 1000: /* 1000,1002: enable xterm mouse report */ + case 9: /* X10 mouse compatibility mode */ + xsetpointermotion(0); + MODBIT(term.mode, 0, MODE_MOUSE); + MODBIT(term.mode, set, MODE_MOUSEX10); + break; + case 1000: /* 1000: report button press */ + xsetpointermotion(0); + MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEBTN); - MODBIT(term.mode, 0, MODE_MOUSEMOTION); break; - case 1002: + case 1002: /* 1002: report motion on button press */ + xsetpointermotion(0); + MODBIT(term.mode, 0, MODE_MOUSE); MODBIT(term.mode, set, MODE_MOUSEMOTION); - MODBIT(term.mode, 0, MODE_MOUSEBTN); break; - case 1006: + case 1003: /* 1003: enable all mouse motions */ + xsetpointermotion(set); + MODBIT(term.mode, 0, MODE_MOUSE); + MODBIT(term.mode, set, MODE_MOUSEMANY); + break; + case 1004: /* 1004: send focus events to tty */ + MODBIT(term.mode, set, MODE_FOCUS); + break; + case 1006: /* 1006: extended reporting mode */ MODBIT(term.mode, set, MODE_MOUSESGR); break; case 1034: MODBIT(term.mode, set, MODE_8BIT); break; - case 1049: /* = 1047 and 1048 */ - case 47: + case 1049: /* swap screen & set/restore cursor as xterm */ + tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); + case 47: /* swap screen */ case 1047: if (!allowaltscreen) break; - alt = IS_SET(MODE_ALTSCREEN); if(alt) { tclearregion(0, 0, term.col-1, term.row-1); } - if(set ^ alt) /* set is always 1 or 0 */ + if(set ^ alt) /* set is always 1 or 0 */ tswapscreen(); if(*args != 1049) break; @@ -1797,6 +1873,18 @@ tsetmode(bool priv, bool set, int *args, int narg) { case 1048: tcursor((set) ? CURSOR_SAVE : CURSOR_LOAD); break; + case 2004: /* 2004: bracketed paste mode */ + MODBIT(term.mode, set, MODE_BRCKTPASTE); + break; + /* Not implemented mouse modes. See comments there. */ + case 1001: /* mouse highlight mode; can hang the + terminal by design when implemented. */ + case 1005: /* UTF-8 mouse mode; will confuse + applications not supporting UTF-8 + and luit. */ + case 1015: /* urxvt mangled mouse mode; incompatible + and can be mistaken for other control + codes. */ default: fprintf(stderr, "erresc: unknown private set/reset mode %d\n", @@ -1828,11 +1916,12 @@ tsetmode(bool priv, bool set, int *args, int narg) { } } } -#undef MODBIT - void csihandle(void) { + char buf[40]; + int len; + switch(csiescseq.mode) { default: unknown: @@ -1853,6 +1942,25 @@ csihandle(void) { DEFAULT(csiescseq.arg[0], 1); tmoveto(term.c.x, term.c.y+csiescseq.arg[0]); break; + case 'i': /* MC -- Media Copy */ + switch(csiescseq.arg[0]) { + case 0: + tdump(); + break; + case 1: + tdumpline(term.c.y); + break; + case 2: + tdumpsel(); + break; + case 4: + term.mode &= ~MODE_PRINT; + break; + case 5: + term.mode |= MODE_PRINT; + break; + } + break; case 'c': /* DA -- Device Attributes */ if(csiescseq.arg[0] == 0) ttywrite(VT102ID, sizeof(VT102ID) - 1); @@ -1903,7 +2011,7 @@ csihandle(void) { tputtab(1); break; case 'J': /* ED -- Clear screen */ - sel.bx = -1; + selclear(NULL); switch(csiescseq.arg[0]) { case 0: /* below */ tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); @@ -1981,6 +2089,13 @@ csihandle(void) { case 'm': /* SGR -- Terminal attribute (color) */ tsetattr(csiescseq.arg, csiescseq.narg); break; + case 'n': /* DSR – Device Status Report (cursor position) */ + if (csiescseq.arg[0] == 6) { + len = snprintf(buf, sizeof(buf),"\033[%i;%iR", + term.c.y+1, term.c.x+1); + ttywrite(buf, len); + break; + } case 'r': /* DECSTBM -- Set Scrolling Region */ if(csiescseq.priv) { goto unknown; @@ -2031,20 +2146,21 @@ csireset(void) { void strhandle(void) { char *p = NULL; - int i, j, narg; + int j, narg, par; strparse(); narg = strescseq.narg; + par = atoi(strescseq.args[0]); switch(strescseq.type) { case ']': /* OSC -- Operating System Command */ - switch(i = atoi(strescseq.args[0])) { + switch(par) { case 0: case 1: case 2: if(narg > 1) xsettitle(strescseq.args[1]); - break; + return; case 4: /* color set */ if(narg < 3) break; @@ -2061,25 +2177,20 @@ strhandle(void) { */ redraw(0); } - break; - default: - fprintf(stderr, "erresc: unknown str "); - strdump(); - break; + return; } break; case 'k': /* old title set compatibility */ xsettitle(strescseq.args[0]); - break; + return; case 'P': /* DSC -- Device Control String */ case '_': /* APC -- Application Program Command */ case '^': /* PM -- Privacy Message */ - default: - fprintf(stderr, "erresc: unknown str "); - strdump(); - /* die(""); */ - break; + return; } + + fprintf(stderr, "erresc: unknown str "); + strdump(); } void @@ -2123,6 +2234,65 @@ strreset(void) { } void +tprinter(char *s, size_t len) { + if(iofd != -1 && xwrite(iofd, s, len) < 0) { + fprintf(stderr, "Error writing in %s:%s\n", + opt_io, strerror(errno)); + close(iofd); + iofd = -1; + } +} + +void +toggleprinter(const Arg *arg) { + term.mode ^= MODE_PRINT; +} + +void +printscreen(const Arg *arg) { + tdump(); +} + +void +printsel(const Arg *arg) { + tdumpsel(); +} + +void +tdumpsel(void) +{ + char *ptr; + + if((ptr = getsel())) { + tprinter(ptr, strlen(ptr)); + free(ptr); + } +} + +void +tdumpline(int n) { + Glyph *bp, *end; + + bp = &term.line[n][0]; + end = &bp[term.col-1]; + while(end > bp && !strcmp(" ", end->c)) + --end; + if(bp != end || strcmp(bp->c, " ")) { + for( ;bp <= end; ++bp) + tprinter(bp->c, strlen(bp->c)); + } + tprinter("\n", 1); +} + +void +tdump(void) { + int i; + + for(i = 0; i < term.row; ++i) + tdumpline(i); +} + +void tputtab(bool forward) { uint x = term.c.x; @@ -2145,10 +2315,10 @@ techo(char *buf, int len) { for(; len > 0; buf++, len--) { char c = *buf; - if(c == '\033') { /* escape */ + if(c == '\033') { /* escape */ tputc("^", 1); tputc("[", 1); - } else if(c < '\x20') { /* control code */ + } else if(c < '\x20') { /* control code */ if(c != '\n' && c != '\r' && c != '\t') { c |= '\x40'; tputc("^", 1); @@ -2163,19 +2333,49 @@ techo(char *buf, int len) { } void +tdeftran(char ascii) { + char c, (*bp)[2]; + static char tbl[][2] = { + {'0', CS_GRAPHIC0}, {'1', CS_GRAPHIC1}, {'A', CS_UK}, + {'B', CS_USA}, {'<', CS_MULTI}, {'K', CS_GER}, + {'5', CS_FIN}, {'C', CS_FIN}, + {0, 0} + }; + + for (bp = &tbl[0]; (c = (*bp)[0]) && c != ascii; ++bp) + /* nothing */; + + if (c == 0) + fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii); + else + term.trantbl[term.icharset] = (*bp)[1]; +} + +void +tselcs(void) { + if (term.trantbl[term.charset] == CS_GRAPHIC0) + term.c.attr.mode |= ATTR_GFX; + else + term.c.attr.mode &= ~ATTR_GFX; +} + +void tputc(char *c, int len) { uchar ascii = *c; bool control = ascii < '\x20' || ascii == 0177; + long unicodep; + int width; - if(iofd != -1) { - if(xwrite(iofd, c, len) < 0) { - fprintf(stderr, "Error writing in %s:%s\n", - opt_io, strerror(errno)); - close(iofd); - iofd = -1; - } + if(len == 1) { + width = 1; + } else { + utf8decode(c, &unicodep, UTF_SIZ); + width = wcwidth(unicodep); } + if(IS_SET(MODE_PRINT)) + tprinter(c, len); + /* * STR sequences must be checked before anything else * because it can use some control codes as part of the sequence. @@ -2219,47 +2419,48 @@ tputc(char *c, int len) { */ if(control) { switch(ascii) { - case '\t': /* HT */ + case '\t': /* HT */ tputtab(1); return; - case '\b': /* BS */ + case '\b': /* BS */ tmoveto(term.c.x-1, term.c.y); return; - case '\r': /* CR */ + case '\r': /* CR */ tmoveto(0, term.c.y); return; - case '\f': /* LF */ - case '\v': /* VT */ - case '\n': /* LF */ + 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 */ + case '\a': /* BEL */ if(!(xw.state & WIN_FOCUSED)) xseturgency(1); + if (bellvolume) + XBell(xw.dpy, bellvolume); return; - case '\033': /* ESC */ + case '\033': /* ESC */ csireset(); term.esc = ESC_START; return; - case '\016': /* SO */ - case '\017': /* SI */ - /* - * Different charsets are hard to handle. Applications - * should use the right alt charset escapes for the - * only reason they still exist: line drawing. The - * rest is incompatible history st should not support. - */ + case '\016': /* SO */ + term.charset = 0; + tselcs(); + return; + case '\017': /* SI */ + term.charset = 1; + tselcs(); return; - case '\032': /* SUB */ - case '\030': /* CAN */ + 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) */ + 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) { @@ -2277,22 +2478,8 @@ tputc(char *c, int len) { if(ascii == '\\') strhandle(); } else if(term.esc & ESC_ALTCHARSET) { - switch(ascii) { - case '0': /* Line drawing set */ - term.c.attr.mode |= ATTR_GFX; - break; - 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); - } + tdeftran(ascii); + tselcs(); term.esc = 0; } else if(term.esc & ESC_TEST) { if(ascii == '8') { /* DEC screen alignment test. */ @@ -2323,13 +2510,12 @@ tputc(char *c, int len) { term.esc |= ESC_STR; break; case '(': /* set primary charset G0 */ + case ')': /* set secondary charset G1 */ + case '*': /* set tertiary charset G2 */ + case '+': /* set quaternary charset G3 */ + term.icharset = ascii - '('; 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); @@ -2362,6 +2548,7 @@ tputc(char *c, int len) { treset(); term.esc = 0; xresettitle(); + xloadcols(); break; case '=': /* DECPAM -- Application keypad */ term.mode |= MODE_APPKEYPAD; @@ -2399,8 +2586,8 @@ tputc(char *c, int len) { */ 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(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) + selclear(NULL); if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { term.line[term.c.y][term.c.x].mode |= ATTR_WRAP; tnewline(1); @@ -2412,9 +2599,20 @@ tputc(char *c, int len) { (term.col - term.c.x - 1) * sizeof(Glyph)); } + if(term.c.x+width > term.col) + tnewline(1); + 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); + + if(width == 2) { + term.line[term.c.y][term.c.x].mode |= ATTR_WIDE; + if(term.c.x+1 < term.col) { + term.line[term.c.y][term.c.x+1].c[0] = '\0'; + term.line[term.c.y][term.c.x+1].mode = ATTR_WDUMMY; + } + } + if(term.c.x+width < term.col) { + tmoveto(term.c.x+width, term.c.y); } else { term.c.state |= CURSOR_WRAPNEXT; } @@ -2468,8 +2666,8 @@ tresize(int col, int row) { /* allocate any new rows */ for(/* i == minrow */; i < row; i++) { term.dirty[i] = 1; - term.line[i] = xcalloc(col, sizeof(Glyph)); - term.alt [i] = xcalloc(col, sizeof(Glyph)); + term.line[i] = xmalloc(col * sizeof(Glyph)); + term.alt[i] = xmalloc(col * sizeof(Glyph)); } if(col > term.col) { bp = term.tabs + term.col; @@ -2523,6 +2721,13 @@ void xloadcols(void) { int i, r, g, b; XRenderColor color = { .alpha = 0xffff }; + static bool loaded; + Colour *cp; + + if(loaded) { + for (cp = dc.col; cp < dc.col + LEN(dc.col); ++cp) + XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); + } /* load colors [0-15] colors and [256-LEN(colorname)[ (config.h) */ for(i = 0; i < LEN(colorname); i++) { @@ -2555,6 +2760,7 @@ xloadcols(void) { die("Could not allocate color %d\n", i); } } + loaded = true; } int @@ -2630,7 +2836,8 @@ xhints(void) { sizeh->min_height = sizeh->max_height = xw.fh; } - XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, &class); + XSetWMProperties(xw.dpy, xw.win, NULL, NULL, NULL, 0, sizeh, &wm, + &class); XFree(sizeh); } @@ -2643,16 +2850,12 @@ xloadfont(Font *f, FcPattern *pattern) { if(!match) return 1; - if(!(f->set = FcFontSort(0, match, FcTrue, 0, &result))) { - FcPatternDestroy(match); - return 1; - } - if(!(f->match = XftFontOpenPattern(xw.dpy, match))) { FcPatternDestroy(match); return 1; } + f->set = NULL; f->pattern = FcPatternDuplicate(pattern); f->ascent = f->match->ascent; @@ -2667,9 +2870,9 @@ xloadfont(Font *f, FcPattern *pattern) { } void -xloadfonts(char *fontstr, int fontsize) { +xloadfonts(char *fontstr, double fontsize) { FcPattern *pattern; - FcResult result; + FcResult r_sz, r_psz; double fontval; if(fontstr[0] == '-') { @@ -2683,12 +2886,16 @@ xloadfonts(char *fontstr, int fontsize) { if(fontsize > 0) { FcPatternDel(pattern, FC_PIXEL_SIZE); + FcPatternDel(pattern, FC_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; + r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval); + r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval); + if(r_psz == FcResultMatch) { + usedfontsize = fontval; + } else if(r_sz == FcResultMatch) { + usedfontsize = -1; } else { /* * Default font size is 12, if none given. This is to @@ -2705,9 +2912,15 @@ xloadfonts(char *fontstr, int fontsize) { if(xloadfont(&dc.font, pattern)) die("st: can't open font %s\n", fontstr); + if(usedfontsize < 0) { + FcPatternGetDouble(dc.font.match->pattern, + FC_PIXEL_SIZE, 0, &fontval); + usedfontsize = fontval; + } + /* Setting character width and height. */ - xw.cw = dc.font.width; - xw.ch = dc.font.height; + xw.cw = CEIL(dc.font.width * cwscale); + xw.ch = CEIL(dc.font.height * chscale); FcPatternDel(pattern, FC_SLANT); FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); @@ -2727,34 +2940,37 @@ xloadfonts(char *fontstr, int fontsize) { FcPatternDestroy(pattern); } +int +xloadfontset(Font *f) { + FcResult result; + + if(!(f->set = FcFontSort(0, f->pattern, FcTrue, 0, &result))) + return 1; + return 0; +} + +void +xunloadfont(Font *f) { + XftFontClose(xw.dpy, f->match); + FcPatternDestroy(f->pattern); + if(f->set) + FcFontSetDestroy(f->set); +} + void xunloadfonts(void) { - int i, ip; + int i; - /* - * Free the loaded fonts in the font cache. This is done backwards - * from the frccur. - */ - for(i = 0, ip = frccur; i < frclen; i++, ip--) { - if(ip < 0) - ip = LEN(frc) - 1; - XftFontClose(xw.dpy, frc[ip].font); + /* Free the loaded fonts in the font cache. */ + for(i = 0; i < frclen; i++) { + XftFontClose(xw.dpy, frc[i].font); } - frccur = -1; frclen = 0; - XftFontClose(xw.dpy, dc.font.match); - FcPatternDestroy(dc.font.pattern); - FcFontSetDestroy(dc.font.set); - XftFontClose(xw.dpy, dc.bfont.match); - FcPatternDestroy(dc.bfont.pattern); - FcFontSetDestroy(dc.bfont.set); - XftFontClose(xw.dpy, dc.ifont.match); - FcPatternDestroy(dc.ifont.pattern); - FcFontSetDestroy(dc.ifont.set); - XftFontClose(xw.dpy, dc.ibfont.match); - FcPatternDestroy(dc.ibfont.pattern); - FcFontSetDestroy(dc.ibfont.set); + xunloadfont(&dc.font); + xunloadfont(&dc.bfont); + xunloadfont(&dc.ifont); + xunloadfont(&dc.ibfont); } void @@ -2767,11 +2983,11 @@ xzoom(const Arg *arg) { void xinit(void) { - XSetWindowAttributes attrs; XGCValues gcvalues; Cursor cursor; Window parent; int sw, sh; + pid_t thispid = getpid(); if(!(xw.dpy = XOpenDisplay(NULL))) die("Can't open display\n"); @@ -2809,22 +3025,20 @@ xinit(void) { } /* Events */ - attrs.background_pixel = dc.col[defaultbg].pixel; - attrs.border_pixel = dc.col[defaultbg].pixel; - attrs.bit_gravity = NorthWestGravity; - attrs.event_mask = FocusChangeMask | KeyPressMask + xw.attrs.background_pixel = dc.col[defaultbg].pixel; + xw.attrs.border_pixel = dc.col[defaultbg].pixel; + xw.attrs.bit_gravity = NorthWestGravity; + xw.attrs.event_mask = FocusChangeMask | KeyPressMask | ExposureMask | VisibilityChangeMask | StructureNotifyMask | ButtonMotionMask | ButtonPressMask | ButtonReleaseMask; - attrs.colormap = xw.cmap; + xw.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, - xw.vis, - CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask - | CWColormap, - &attrs); + xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity + | CWEventMask | CWColormap, &xw.attrs); memset(&gcvalues, 0, sizeof(gcvalues)); gcvalues.graphics_exposures = False; @@ -2839,7 +3053,7 @@ xinit(void) { xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); /* input methods */ - if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { + if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { XSetLocaleModifiers("@im=local"); if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { XSetLocaleModifiers("@im="); @@ -2865,30 +3079,36 @@ xinit(void) { xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False); xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False); + xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False); XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1); + xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False); + XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32, + PropModeReplace, (unsigned char *)&thispid, 1); + xresettitle(); XMapWindow(xw.dpy, xw.win); xhints(); - XSync(xw.dpy, 0); + XSync(xw.dpy, False); } void xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, width = charlen * xw.cw, xp, i; - int frp, frcflags; + int frcflags; int u8fl, u8fblen, u8cblen, doesexist; char *u8c, *u8fs; - long u8char; + long unicodep; Font *font = &dc.font; FcResult fcres; FcPattern *fcpattern, *fontpattern; FcFontSet *fcsets[] = { NULL }; FcCharSet *fccharset; - Colour *fg, *bg, *temp, revfg, revbg; + Colour *fg, *bg, *temp, revfg, revbg, truefg, truebg; XRenderColor colfg, colbg; Rectangle r; + int oneatatime; frcflags = FRC_NORMAL; @@ -2906,8 +3126,28 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { if(base.fg == defaultfg) base.fg = defaultunderline; } - fg = &dc.col[base.fg]; - bg = &dc.col[base.bg]; + + if(IS_TRUECOL(base.fg)) { + colfg.alpha = 0xffff; + colfg.red = TRUERED(base.fg); + colfg.green = TRUEGREEN(base.fg); + colfg.blue = TRUEBLUE(base.fg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &truefg); + fg = &truefg; + } else { + fg = &dc.col[base.fg]; + } + + if(IS_TRUECOL(base.bg)) { + colbg.alpha = 0xffff; + colbg.green = TRUEGREEN(base.bg); + colbg.red = TRUERED(base.bg); + colbg.blue = TRUEBLUE(base.bg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &truebg); + bg = &truebg; + } else { + bg = &dc.col[base.bg]; + } if(base.mode & ATTR_BOLD) { if(BETWEEN(base.fg, 0, 7)) { @@ -2922,9 +3162,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { } /* * Those ranges will not be brightened: - * 8 - 15 – bright system colors - * 196 - 231 – highest 256 color cube - * 252 - 255 – brightest colors in greyscale + * 8 - 15 – bright system colors + * 196 - 231 – highest 256 color cube + * 252 - 255 – brightest colors in greyscale */ font = &dc.bfont; frcflags = FRC_BOLD; @@ -2938,7 +3178,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { colfg.green = ~fg->color.green; colfg.blue = ~fg->color.blue; colfg.alpha = fg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, &revfg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colfg, + &revfg); fg = &revfg; } @@ -2949,7 +3190,8 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { colbg.green = ~bg->color.green; colbg.blue = ~bg->color.blue; colbg.alpha = bg->color.alpha; - XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, &revbg); + XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &colbg, + &revbg); bg = &revbg; } } @@ -2987,7 +3229,6 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { r.width = width; XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); - fcsets[0] = font->set; for(xp = winx; bytelen > 0;) { /* * Search for the range in the to be printed string of glyphs @@ -2998,15 +3239,16 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { u8fs = s; u8fblen = 0; u8fl = 0; + oneatatime = font->width != xw.cw; for(;;) { u8c = s; - u8cblen = utf8decode(s, &u8char); + u8cblen = utf8decode(s, &unicodep, UTF_SIZ); s += u8cblen; bytelen -= u8cblen; - doesexist = XftCharIndex(xw.dpy, font->match, u8char); - if(!doesexist || bytelen <= 0) { - if(bytelen <= 0) { + doesexist = XftCharExists(xw.dpy, font->match, unicodep); + if(oneatatime || !doesexist || bytelen <= 0) { + if(oneatatime || bytelen <= 0) { if(doesexist) { u8fl++; u8fblen += u8cblen; @@ -3019,7 +3261,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { winy + font->ascent, (FcChar8 *)u8fs, u8fblen); - xp += font->width * u8fl; + xp += xw.cw * u8fl; } break; @@ -3028,32 +3270,37 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { u8fl++; u8fblen += u8cblen; } - if(doesexist) + if(doesexist) { + if(oneatatime) + continue; break; + } - frp = frccur; /* Search the font cache. */ - for(i = 0; i < frclen; i++, frp--) { - if(frp <= 0) - frp = LEN(frc) - 1; - - if(frc[frp].c == u8char - && frc[frp].flags == frcflags) { + for(i = 0; i < frclen; i++) { + if(XftCharExists(xw.dpy, frc[i].font, unicodep) + && frc[i].flags == frcflags) { break; } } /* Nothing was found. */ if(i >= frclen) { + if(!font->set) + xloadfontset(font); + fcsets[0] = font->set; + /* * Nothing was found in the cache. Now use * some dozen of Fontconfig calls to get the * font for one single character. + * + * Xft and fontconfig are design failures. */ fcpattern = FcPatternDuplicate(font->pattern); fccharset = FcCharSetCreate(); - FcCharSetAddChar(fccharset, u8char); + FcCharSetAddChar(fccharset, unicodep); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); FcPatternAddBool(fcpattern, FC_SCALABLE, @@ -3069,34 +3316,36 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { /* * Overwrite or create the new cache entry. */ - frccur++; - frclen++; - if(frccur >= LEN(frc)) - frccur = 0; - if(frclen > LEN(frc)) { - frclen = LEN(frc); - XftFontClose(xw.dpy, frc[frccur].font); + if(frclen >= LEN(frc)) { + frclen = LEN(frc) - 1; + XftFontClose(xw.dpy, frc[frclen].font); } - frc[frccur].font = XftFontOpenPattern(xw.dpy, + frc[frclen].font = XftFontOpenPattern(xw.dpy, fontpattern); - frc[frccur].c = u8char; - frc[frccur].flags = frcflags; + frc[frclen].flags = frcflags; + + i = frclen; + frclen++; FcPatternDestroy(fcpattern); FcCharSetDestroy(fccharset); - - frp = frccur; } - XftDrawStringUtf8(xw.draw, fg, frc[frp].font, - xp, winy + frc[frp].font->ascent, + XftDrawStringUtf8(xw.draw, fg, frc[i].font, + xp, winy + frc[i].font->ascent, (FcChar8 *)u8c, u8cblen); - xp += font->width; + xp += xw.cw * wcwidth(unicodep); } /* + * This is how the loop above actually should be. Why does the + * application have to care about font details? + * + * I have to repeat: Xft and Fontconfig are design failures. + */ + /* XftDrawStringUtf8(xw.draw, fg, font->set, winx, winy + font->ascent, (FcChar8 *)s, bytelen); */ @@ -3113,18 +3362,27 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { void xdrawcursor(void) { static int oldx = 0, oldy = 0; - int sl; + int sl, width, curx; Glyph g = {{' '}, ATTR_NULL, defaultbg, defaultcs}; LIMIT(oldx, 0, term.col-1); LIMIT(oldy, 0, term.row-1); + curx = term.c.x; + + /* adjust position if in dummy */ + if(term.line[oldy][oldx].mode & ATTR_WDUMMY) + oldx--; + if(term.line[term.c.y][curx].mode & ATTR_WDUMMY) + curx--; + memcpy(g.c, term.line[term.c.y][term.c.x].c, UTF_SIZ); /* remove the old cursor */ - sl = utf8size(term.line[oldy][oldx].c); + sl = utf8len(term.line[oldy][oldx].c); + width = (term.line[oldy][oldx].mode & ATTR_WIDE)? 2 : 1; xdraws(term.line[oldy][oldx].c, term.line[oldy][oldx], oldx, - oldy, 1, sl); + oldy, width, sl); /* draw the new one */ if(!(IS_SET(MODE_HIDE))) { @@ -3135,27 +3393,29 @@ xdrawcursor(void) { g.bg = defaultfg; } - sl = utf8size(g.c); - xdraws(g.c, g, term.c.x, term.c.y, 1, sl); + sl = utf8len(g.c); + width = (term.line[term.c.y][curx].mode & ATTR_WIDE)\ + ? 2 : 1; + xdraws(g.c, g, term.c.x, term.c.y, width, sl); } else { XftDrawRect(xw.draw, &dc.col[defaultcs], - borderpx + term.c.x * xw.cw, + borderpx + curx * xw.cw, borderpx + term.c.y * xw.ch, xw.cw - 1, 1); XftDrawRect(xw.draw, &dc.col[defaultcs], - borderpx + term.c.x * xw.cw, + borderpx + curx * xw.cw, borderpx + term.c.y * xw.ch, 1, xw.ch - 1); XftDrawRect(xw.draw, &dc.col[defaultcs], - borderpx + (term.c.x + 1) * xw.cw - 1, + borderpx + (curx + 1) * xw.cw - 1, borderpx + term.c.y * xw.ch, 1, xw.ch - 1); XftDrawRect(xw.draw, &dc.col[defaultcs], - borderpx + term.c.x * xw.cw, + borderpx + curx * xw.cw, borderpx + (term.c.y + 1) * xw.ch - 1, xw.cw, 1); } - oldx = term.c.x, oldy = term.c.y; + oldx = curx, oldy = term.c.y; } } @@ -3167,6 +3427,8 @@ xsettitle(char *p) { Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, &prop); XSetWMName(xw.dpy, xw.win, &prop); + XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname); + XFree(prop.value); } void @@ -3178,7 +3440,6 @@ void redraw(int timeout) { struct timespec tv = {0, timeout * 1000}; - tfulldirt(); draw(); if(timeout > 0) { @@ -3202,7 +3463,8 @@ 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; + bool ena_sel = sel.ob.x != -1; + long unicodep; if(sel.alt ^ IS_SET(MODE_ALTSCREEN)) ena_sel = 0; @@ -3220,6 +3482,8 @@ drawregion(int x1, int y1, int x2, int y2) { ic = ib = ox = 0; for(x = x1; x < x2; x++) { new = term.line[y][x]; + if(new.mode == ATTR_WDUMMY) + continue; if(ena_sel && selected(x, y)) new.mode ^= ATTR_REVERSE; if(ib > 0 && (ATTRCMP(base, new) @@ -3232,10 +3496,10 @@ drawregion(int x1, int y1, int x2, int y2) { base = new; } - sl = utf8size(new.c); + sl = utf8decode(new.c, &unicodep, UTF_SIZ); memcpy(buf+ib, new.c, sl); ib += sl; - ++ic; + ic += (new.mode & ATTR_WIDE)? 2 : 1; } if(ib > 0) xdraws(buf, base, ox, y, ic, ib); @@ -3272,6 +3536,12 @@ unmap(XEvent *ev) { } void +xsetpointermotion(int set) { + MODBIT(xw.attrs.event_mask, set, PointerMotionMask); + XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); +} + +void xseturgency(int add) { XWMHints *h = XGetWMHints(xw.dpy, xw.win); @@ -3291,23 +3561,19 @@ focus(XEvent *ev) { XSetICFocus(xw.xic); xw.state |= WIN_FOCUSED; xseturgency(0); + if(IS_SET(MODE_FOCUS)) + ttywrite("\033[I", 3); } else { XUnsetICFocus(xw.xic); xw.state &= ~WIN_FOCUSED; + if(IS_SET(MODE_FOCUS)) + ttywrite("\033[O", 3); } } -inline bool +static inline bool match(uint mask, uint state) { - state &= ~(ignoremod); - - if(mask == XK_NO_MOD && state) - return false; - if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state) - return false; - if((state & mask) != state) - return false; - return true; + return mask == XK_ANY_MOD || mask == (state & ~ignoremod); } void @@ -3317,7 +3583,6 @@ numlock(const Arg *dummy) { char* kmap(KeySym k, uint state) { - uint mask; Key *kp; int i; @@ -3332,33 +3597,22 @@ kmap(KeySym k, uint state) { } for(kp = key; kp < key + LEN(key); kp++) { - mask = kp->mask; - if(kp->k != k) continue; - if(!match(mask, state)) + if(!match(kp->mask, state)) continue; - if(kp->appkey > 0) { - if(!IS_SET(MODE_APPKEYPAD)) - continue; - if(term.numlock && kp->appkey == 2) - continue; - } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { + if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0) + continue; + if(term.numlock && kp->appkey == 2) continue; - } - if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || - (kp->appcursor > 0 - && !IS_SET(MODE_APPCURSOR))) { + if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0) continue; - } - if((kp->crlf < 0 && IS_SET(MODE_CRLF)) || - (kp->crlf > 0 && !IS_SET(MODE_CRLF))) { + if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0) continue; - } return kp->s; } @@ -3370,8 +3624,8 @@ void kpress(XEvent *ev) { XKeyEvent *e = &ev->xkey; KeySym ksym; - char xstr[31], buf[32], *customkey, *cp = buf; - int len, ret; + char buf[32], *customkey; + int len; long c; Status status; Shortcut *bp; @@ -3379,8 +3633,7 @@ kpress(XEvent *ev) { if(IS_SET(MODE_KBDLOCK)) return; - len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status); - e->state &= ~Mod2Mask; + len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); /* 1. shortcuts */ for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { if(ksym == bp->keysym && match(bp->mod, e->state)) { @@ -3391,33 +3644,26 @@ kpress(XEvent *ev) { /* 2. custom keys from config.h */ if((customkey = kmap(ksym, e->state))) { - len = strlen(customkey); - memcpy(buf, customkey, len); - /* 3. hardcoded (overrides X lookup) */ - } else { - if(len == 0) - return; + ttysend(customkey, strlen(customkey)); + return; + } - if(len == 1 && e->state & Mod1Mask) { - if(IS_SET(MODE_8BIT)) { - if(*xstr < 0177) { - c = *xstr | B7; - ret = utf8encode(&c, cp); - cp += ret; - len = 0; - } - } else { - *cp++ = '\033'; + /* 3. composed string from input method */ + if(len == 0) + return; + if(len == 1 && e->state & Mod1Mask) { + if(IS_SET(MODE_8BIT)) { + if(*buf < 0177) { + c = *buf | 0x80; + len = utf8encode(c, buf, UTF_SIZ); } + } else { + buf[1] = buf[0]; + buf[0] = '\033'; + len = 2; } - - memcpy(cp, xstr, len); - len = cp - buf + len; } - - ttywrite(buf, len); - if(IS_SET(MODE_ECHO)) - techo(buf, len); + ttysend(buf, len); } @@ -3469,14 +3715,34 @@ resize(XEvent *e) { void run(void) { XEvent ev; + int w = xw.w, h = xw.h; fd_set rfd; int xfd = XConnectionNumber(xw.dpy), xev, blinkset = 0, dodraw = 0; struct timeval drawtimeout, *tv = NULL, now, last, lastblink; - gettimeofday(&lastblink, NULL); + /* Waiting for window mapping */ + while(1) { + XNextEvent(xw.dpy, &ev); + if(ev.type == ConfigureNotify) { + w = ev.xconfigure.width; + h = ev.xconfigure.height; + } else if(ev.type == MapNotify) { + break; + } + } + + ttynew(); + if(!xw.isfixed) + cresize(w, h); + else + cresize(xw.fw, xw.fh); + gettimeofday(&last, NULL); + lastblink = last; for(xev = actionfps;;) { + long deltatime; + FD_ZERO(&rfd); FD_SET(cmdfd, &rfd); FD_SET(xfd, &rfd); @@ -3490,8 +3756,8 @@ run(void) { ttyread(); if(blinktimeout) { blinkset = tattrset(ATTR_BLINK); - if(!blinkset && term.mode & ATTR_BLINK) - term.mode &= ~(MODE_BLINK); + if(!blinkset) + MODBIT(term.mode, 0, MODE_BLINK); } } @@ -3507,11 +3773,12 @@ run(void) { if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { tsetdirtattr(ATTR_BLINK); term.mode ^= MODE_BLINK; - gettimeofday(&lastblink, NULL); + lastblink = now; dodraw = 1; } - if(TIMEDIFF(now, last) \ - > (xev? (1000/xfps) : (1000/actionfps))) { + deltatime = TIMEDIFF(now, last); + if(deltatime > (xev? (1000/xfps) : (1000/actionfps)) + || deltatime < 0) { dodraw = 1; last = now; } @@ -3560,6 +3827,7 @@ int main(int argc, char *argv[]) { int bitm, xr, yr; uint wr, hr; + char *titles; xw.fw = xw.fh = xw.fx = xw.fy = 0; xw.isfixed = False; @@ -3573,8 +3841,13 @@ main(int argc, char *argv[]) { break; case 'e': /* eat all remaining arguments */ - if(argc > 1) + if(argc > 1) { opt_cmd = &argv[1]; + if(argv[1] != NULL && opt_title == NULL) { + titles = xstrdup(argv[1]); + opt_title = basename(titles); + } + } goto run; case 'f': opt_font = EARGF(usage()); @@ -3591,7 +3864,7 @@ main(int argc, char *argv[]) { xw.fh = (int)hr; if(bitm & XNegative && xw.fx == 0) xw.fx = -1; - if(bitm & XNegative && xw.fy == 0) + if(bitm & YNegative && xw.fy == 0) xw.fy = -1; if(xw.fh != 0 && xw.fw != 0) @@ -3616,10 +3889,7 @@ run: XSetLocaleModifiers(""); tnew(80, 24); xinit(); - ttynew(); selinit(); - if(xw.isfixed) - cresize(xw.h, xw.w); run(); return 0;