X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=03866f1be16621b3a2a2144705a5ca2f85b80863;hb=13233574ed1ead29bb7e99e71a0665e62c640617;hp=60c07d02c0bf98c26aa9c18613e297427df0401f;hpb=7ab6c92e18d468968811256e808b02309c160a22;p=st.git diff --git a/st.c b/st.c index 60c07d0..03866f1 100644 --- a/st.c +++ b/st.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -58,7 +57,6 @@ char *argv0; #define ESC_ARG_SIZ 16 #define STR_BUF_SIZ ESC_BUF_SIZ #define STR_ARG_SIZ ESC_ARG_SIZ -#define DRAW_BUF_SIZ 20*1024 #define XK_ANY_MOD UINT_MAX #define XK_NO_MOD 0 #define XK_SWITCH_MOD (1<<13) @@ -72,7 +70,7 @@ char *argv0; #define ISCONTROLC0(c) (BETWEEN(c, 0, 0x1f) || (c) == '\177') #define ISCONTROLC1(c) (BETWEEN(c, 0x80, 0x9f)) #define ISCONTROL(c) (ISCONTROLC0(c) || ISCONTROLC1(c)) -#define ISDELIM(u) (BETWEEN(u, 0, 127) && strchr(worddelimiters, u) != NULL) +#define ISDELIM(u) (utf8strchr(worddelimiters, u) != NULL) #define LIMIT(x, a, b) (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x) #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg) #define IS_SET(flag) ((term.mode & (flag)) != 0) @@ -87,18 +85,19 @@ char *argv0; enum glyph_attribute { - ATTR_NULL = 0, - ATTR_BOLD = 1 << 0, - ATTR_FAINT = 1 << 1, - ATTR_ITALIC = 1 << 2, - ATTR_UNDERLINE = 1 << 3, - ATTR_BLINK = 1 << 4, - ATTR_REVERSE = 1 << 5, - ATTR_INVISIBLE = 1 << 6, - ATTR_STRUCK = 1 << 7, - ATTR_WRAP = 1 << 8, - ATTR_WIDE = 1 << 9, - ATTR_WDUMMY = 1 << 10, + ATTR_NULL = 0, + ATTR_BOLD = 1 << 0, + ATTR_FAINT = 1 << 1, + ATTR_ITALIC = 1 << 2, + ATTR_UNDERLINE = 1 << 3, + ATTR_BLINK = 1 << 4, + ATTR_REVERSE = 1 << 5, + ATTR_INVISIBLE = 1 << 6, + ATTR_STRUCK = 1 << 7, + ATTR_WRAP = 1 << 8, + ATTR_WIDE = 1 << 9, + ATTR_WDUMMY = 1 << 10, + ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT, }; enum cursor_movement { @@ -162,6 +161,12 @@ enum window_state { WIN_FOCUSED = 2 }; +enum selection_mode { + SEL_IDLE = 0, + SEL_EMPTY = 1, + SEL_READY = 2 +}; + enum selection_type { SEL_REGULAR = 1, SEL_RECTANGULAR = 2 @@ -177,14 +182,16 @@ typedef unsigned int uint; typedef unsigned long ulong; typedef unsigned short ushort; +typedef uint_least32_t Rune; + typedef XftDraw *Draw; typedef XftColor Color; typedef struct { - long u; /* character code */ + Rune u; /* character code */ ushort mode; /* attribute flags */ - ushort fg; /* foreground */ - ushort bg; /* background */ + uint32_t fg; /* foreground */ + uint32_t bg; /* background */ } Glyph; typedef Glyph *Line; @@ -223,7 +230,8 @@ typedef struct { int col; /* nb col */ Line *line; /* screen */ Line *alt; /* alternate screen */ - bool *dirty; /* dirtyness of lines */ + int *dirty; /* dirtyness of lines */ + XftGlyphFontSpec *specbuf; /* font spec buffer used for rendering */ TCursor c; /* cursor */ int top; /* top scroll limit */ int bot; /* bottom scroll limit */ @@ -232,8 +240,8 @@ typedef struct { char trantbl[4]; /* charset table translation */ int charset; /* current charset */ int icharset; /* selected charset for sequence */ - bool numlock; /* lock numbers in keyboard */ - bool *tabs; + int numlock; /* lock numbers in keyboard */ + int *tabs; } Term; /* Purely graphic info */ @@ -249,7 +257,7 @@ typedef struct { Visual *vis; XSetWindowAttributes attrs; int scr; - bool isfixed; /* is fixed geometry? */ + int isfixed; /* is fixed geometry? */ int l, t; /* left and top offset */ int gm; /* geometry mask */ int tw, th; /* tty width and height */ @@ -293,7 +301,7 @@ typedef struct { char *primary, *clipboard; Atom xtarget; - bool alt; + int alt; struct timespec tclick1; struct timespec tclick2; } Selection; @@ -383,25 +391,25 @@ static void tmoveato(int, int); static void tnew(int, int); static void tnewline(int); static void tputtab(int); -static void tputc(long); +static void tputc(Rune); static void treset(void); static void tresize(int, int); static void tscrollup(int, int); static void tscrolldown(int, int); static void tsetattr(int *, int); -static void tsetchar(long, Glyph *, int, int); +static void tsetchar(Rune, Glyph *, int, int); static void tsetscroll(int, int); static void tswapscreen(void); static void tsetdirt(int, int); static void tsetdirtattr(int); -static void tsetmode(bool, bool, int *, int); +static void tsetmode(int, int, int *, int); static void tfulldirt(void); -static void techo(long); +static void techo(Rune); static void tcontrolcode(uchar ); static void tdectest(char ); static int32_t tdefcolor(int *, int *, int); static void tdeftran(char); -static inline bool match(uint, uint); +static inline int match(uint, uint); static void ttynew(void); static void ttyread(void); static void ttyresize(void); @@ -410,7 +418,8 @@ static void ttywrite(const char *, size_t); static void tstrsequence(uchar); static inline ushort sixd_to_16bit(int); -static void xdraws(char *, Glyph, int, int, int, int); +static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int); +static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int); static void xdrawglyph(Glyph, int, int); static void xhints(void); static void xclear(int, int, int, int); @@ -449,21 +458,22 @@ static void selrequest(XEvent *); static void selinit(void); static void selnormalize(void); -static inline bool selected(int, int); +static inline int selected(int, int); static char *getsel(void); static void selcopy(Time); static void selscroll(int, int); -static void selsnap(int, int *, int *, int); +static void selsnap(int *, int *, int); static int x2col(int); static int y2row(int); static void getbuttoninfo(XEvent *); static void mousereport(XEvent *); -static size_t utf8decode(char *, long *, size_t); -static long utf8decodebyte(char, size_t *); -static size_t utf8encode(long, char *); -static char utf8encodebyte(long, size_t); -static size_t utf8validate(long *, size_t); +static size_t utf8decode(char *, Rune *, size_t); +static Rune utf8decodebyte(char, size_t *); +static size_t utf8encode(Rune, char *); +static char utf8encodebyte(Rune, size_t); +static char *utf8strchr(char *s, Rune u); +static size_t utf8validate(Rune *, size_t); static ssize_t xwrite(int, const char *, size_t); static void *xmalloc(size_t); @@ -502,7 +512,7 @@ static STREscape strescseq; static int cmdfd; static pid_t pid; static Selection sel; -static int iofd = STDOUT_FILENO; +static int iofd = 1; static char **opt_cmd = NULL; static char *opt_io = NULL; static char *opt_title = NULL; @@ -518,8 +528,8 @@ static double defaultfontsize = 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}; +static Rune utfmin[UTF_SIZ + 1] = { 0, 0, 0x80, 0x800, 0x10000}; +static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; /* Font Ring Cache */ enum { @@ -532,7 +542,7 @@ enum { typedef struct { XftFont *font; int flags; - long unicodep; + Rune unicodep; } Fontcache; /* Fontcache is an array now. A new font will be appended to the array. */ @@ -540,7 +550,8 @@ static Fontcache frc[16]; static int frclen = 0; ssize_t -xwrite(int fd, const char *s, size_t len) { +xwrite(int fd, const char *s, size_t len) +{ size_t aux = len; while(len > 0) { @@ -554,7 +565,8 @@ xwrite(int fd, const char *s, size_t len) { } void * -xmalloc(size_t len) { +xmalloc(size_t len) +{ void *p = malloc(len); if(!p) @@ -564,7 +576,8 @@ xmalloc(size_t len) { } void * -xrealloc(void *p, size_t len) { +xrealloc(void *p, size_t len) +{ if((p = realloc(p, len)) == NULL) die("Out of memory\n"); @@ -572,7 +585,8 @@ xrealloc(void *p, size_t len) { } char * -xstrdup(char *s) { +xstrdup(char *s) +{ if((s = strdup(s)) == NULL) die("Out of memory\n"); @@ -580,9 +594,10 @@ xstrdup(char *s) { } size_t -utf8decode(char *c, long *u, size_t clen) { +utf8decode(char *c, Rune *u, size_t clen) +{ size_t i, j, len, type; - long udecoded; + Rune udecoded; *u = UTF_INVALID; if(!clen) @@ -602,8 +617,9 @@ utf8decode(char *c, long *u, size_t clen) { return len; } -long -utf8decodebyte(char c, size_t *i) { +Rune +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]; @@ -611,7 +627,8 @@ utf8decodebyte(char c, size_t *i) { } size_t -utf8encode(long u, char *c) { +utf8encode(Rune u, char *c) +{ size_t len, i; len = utf8validate(&u, 0); @@ -626,12 +643,30 @@ utf8encode(long u, char *c) { } char -utf8encodebyte(long u, size_t i) { +utf8encodebyte(Rune u, size_t i) +{ return utfbyte[i] | (u & ~utfmask[i]); } +char * +utf8strchr(char *s, Rune u) +{ + Rune r; + size_t i, j, len; + + len = strlen(s); + for(i = 0, j = 0; i < len; i += j) { + if(!(j = utf8decode(&s[i], &r, len - i))) + break; + if(r == u) + return &(s[i]); + } + return NULL; +} + size_t -utf8validate(long *u, size_t i) { +utf8validate(Rune *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) @@ -640,10 +675,11 @@ utf8validate(long *u, size_t i) { } void -selinit(void) { +selinit(void) +{ memset(&sel.tclick1, 0, sizeof(sel.tclick1)); memset(&sel.tclick2, 0, sizeof(sel.tclick2)); - sel.mode = 0; + sel.mode = SEL_IDLE; sel.ob.x = -1; sel.primary = NULL; sel.clipboard = NULL; @@ -653,7 +689,8 @@ selinit(void) { } int -x2col(int x) { +x2col(int x) +{ x -= borderpx; x /= xw.cw; @@ -661,7 +698,8 @@ x2col(int x) { } int -y2row(int y) { +y2row(int y) +{ y -= borderpx; y /= xw.ch; @@ -669,7 +707,8 @@ y2row(int y) { } int -tlinelen(int y) { +tlinelen(int y) +{ int i = term.col; if(term.line[y][i - 1].mode & ATTR_WRAP) @@ -682,21 +721,22 @@ tlinelen(int y) { } void -selnormalize(void) { +selnormalize(void) +{ int i; - if(sel.ob.y == sel.oe.y || sel.type == SEL_RECTANGULAR) { - sel.nb.x = MIN(sel.ob.x, sel.oe.x); - sel.ne.x = MAX(sel.ob.x, sel.oe.x); - } else { + if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { 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; + } else { + sel.nb.x = MIN(sel.ob.x, sel.oe.x); + sel.ne.x = MAX(sel.ob.x, sel.oe.x); } sel.nb.y = MIN(sel.ob.y, sel.oe.y); sel.ne.y = MAX(sel.ob.y, sel.oe.y); - selsnap(sel.snap, &sel.nb.x, &sel.nb.y, -1); - selsnap(sel.snap, &sel.ne.x, &sel.ne.y, +1); + selsnap(&sel.nb.x, &sel.nb.y, -1); + selsnap(&sel.ne.x, &sel.ne.y, +1); /* expand selection over line breaks */ if (sel.type == SEL_RECTANGULAR) @@ -708,8 +748,12 @@ selnormalize(void) { sel.ne.x = term.col - 1; } -bool -selected(int x, int y) { +int +selected(int x, int y) +{ + if(sel.mode == SEL_EMPTY) + return 0; + if(sel.type == SEL_RECTANGULAR) return BETWEEN(y, sel.nb.y, sel.ne.y) && BETWEEN(x, sel.nb.x, sel.ne.x); @@ -720,12 +764,13 @@ selected(int x, int y) { } void -selsnap(int mode, int *x, int *y, int direction) { +selsnap(int *x, int *y, int direction) +{ int newx, newy, xt, yt; - bool delim, prevdelim; + int delim, prevdelim; Glyph *gp, *prevgp; - switch(mode) { + switch(sel.snap) { case SNAP_WORD: /* * Snap around if the word wraps around at the end or @@ -772,15 +817,15 @@ selsnap(int mode, int *x, int *y, int direction) { * previous line will be selected. */ *x = (direction < 0) ? 0 : term.col - 1; - if(direction < 0 && *y > 0) { + if(direction < 0) { for(; *y > 0; *y += direction) { if(!(term.line[*y-1][term.col-1].mode & ATTR_WRAP)) { break; } } - } else if(direction > 0 && *y < term.row-1) { - for(; *y < term.row; *y += direction) { + } else if(direction > 0) { + for(; *y < term.row-1; *y += direction) { if(!(term.line[*y][term.col-1].mode & ATTR_WRAP)) { break; @@ -792,7 +837,8 @@ selsnap(int mode, int *x, int *y, int direction) { } void -getbuttoninfo(XEvent *e) { +getbuttoninfo(XEvent *e) +{ int type; uint state = e->xbutton.state & ~(Button1Mask | forceselmod); @@ -812,7 +858,8 @@ getbuttoninfo(XEvent *e) { } void -mousereport(XEvent *e) { +mousereport(XEvent *e) +{ int x = x2col(e->xbutton.x), y = y2row(e->xbutton.y), button = e->xbutton.button, state = e->xbutton.state, len; @@ -855,12 +902,11 @@ mousereport(XEvent *e) { } if(!IS_SET(MODE_MOUSEX10)) { - button += (state & ShiftMask ? 4 : 0) - + (state & Mod4Mask ? 8 : 0) - + (state & ControlMask ? 16 : 0); + button += ((state & ShiftMask ) ? 4 : 0) + + ((state & Mod4Mask ) ? 8 : 0) + + ((state & ControlMask) ? 16 : 0); } - len = 0; if(IS_SET(MODE_MOUSESGR)) { len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c", button, x+1, y+1, @@ -876,7 +922,8 @@ mousereport(XEvent *e) { } void -bpress(XEvent *e) { +bpress(XEvent *e) +{ struct timespec now; Mousekey *mk; @@ -898,7 +945,7 @@ bpress(XEvent *e) { /* Clear previous selection, logically and visually. */ selclear(NULL); - sel.mode = 1; + sel.mode = SEL_EMPTY; sel.type = SEL_REGULAR; sel.oe.x = sel.ob.x = x2col(e->xbutton.x); sel.oe.y = sel.ob.y = y2row(e->xbutton.y); @@ -916,21 +963,17 @@ bpress(XEvent *e) { } selnormalize(); - /* - * Draw selection, unless it's regular and we don't want to - * make clicks visible - */ - if(sel.snap != 0) { - sel.mode++; - tsetdirt(sel.nb.y, sel.ne.y); - } + if(sel.snap != 0) + sel.mode = SEL_READY; + tsetdirt(sel.nb.y, sel.ne.y); sel.tclick2 = sel.tclick1; sel.tclick1 = now; } } char * -getsel(void) { +getsel(void) +{ char *str, *ptr; int y, bufsize, lastx, linelen; Glyph *gp, *last; @@ -980,12 +1023,14 @@ getsel(void) { } void -selcopy(Time t) { +selcopy(Time t) +{ xsetsel(getsel(), t); } void -selnotify(XEvent *e) { +selnotify(XEvent *e) +{ ulong nitems, ofs, rem; int format; uchar *data, *last, *repl; @@ -1030,13 +1075,15 @@ selnotify(XEvent *e) { } void -selpaste(const Arg *dummy) { +selpaste(const Arg *dummy) +{ XConvertSelection(xw.dpy, XA_PRIMARY, sel.xtarget, XA_PRIMARY, xw.win, CurrentTime); } void -clipcopy(const Arg *dummy) { +clipcopy(const Arg *dummy) +{ Atom clipboard; if(sel.clipboard != NULL) @@ -1050,7 +1097,8 @@ clipcopy(const Arg *dummy) { } void -clippaste(const Arg *dummy) { +clippaste(const Arg *dummy) +{ Atom clipboard; clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); @@ -1059,15 +1107,18 @@ clippaste(const Arg *dummy) { } void -selclear(XEvent *e) { +selclear(XEvent *e) +{ if(sel.ob.x == -1) return; + sel.mode = SEL_IDLE; sel.ob.x = -1; tsetdirt(sel.nb.y, sel.ne.y); } void -selrequest(XEvent *e) { +selrequest(XEvent *e) +{ XSelectionRequestEvent *xsre; XSelectionEvent xev; Atom xa_targets, string, clipboard; @@ -1079,8 +1130,8 @@ selrequest(XEvent *e) { xev.selection = xsre->selection; xev.target = xsre->target; xev.time = xsre->time; - if (xsre->property == None) - xsre->property = xsre->target; + if (xsre->property == None) + xsre->property = xsre->target; /* reject */ xev.property = None; @@ -1119,22 +1170,24 @@ selrequest(XEvent *e) { } /* all done, send a notification to the listener */ - if(!XSendEvent(xsre->display, xsre->requestor, True, 0, (XEvent *) &xev)) + if(!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev)) fprintf(stderr, "Error sending SelectionNotify event\n"); } void -xsetsel(char *str, Time t) { +xsetsel(char *str, Time t) +{ free(sel.primary); sel.primary = str; XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t); - if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) - selclear(0); + if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win) + selclear(0); } void -brelease(XEvent *e) { +brelease(XEvent *e) +{ if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { mousereport(e); return; @@ -1143,19 +1196,19 @@ brelease(XEvent *e) { if(e->xbutton.button == Button2) { selpaste(NULL); } else if(e->xbutton.button == Button1) { - if(sel.mode < 2) { - selclear(NULL); - } else { + if(sel.mode == SEL_READY) { getbuttoninfo(e); selcopy(e->xbutton.time); - } - sel.mode = 0; + } else + selclear(NULL); + sel.mode = SEL_IDLE; tsetdirt(sel.nb.y, sel.ne.y); } } void -bmotion(XEvent *e) { +bmotion(XEvent *e) +{ int oldey, oldex, oldsby, oldsey; if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { @@ -1166,7 +1219,7 @@ bmotion(XEvent *e) { if(!sel.mode) return; - sel.mode++; + sel.mode = SEL_READY; oldey = sel.oe.y; oldex = sel.oe.x; oldsby = sel.nb.y; @@ -1178,17 +1231,19 @@ bmotion(XEvent *e) { } void -die(const char *errstr, ...) { +die(const char *errstr, ...) +{ va_list ap; va_start(ap, errstr); vfprintf(stderr, errstr, ap); va_end(ap); - exit(EXIT_FAILURE); + exit(1); } void -execsh(void) { +execsh(void) +{ char **args, *sh, *prog; const struct passwd *pw; char buf[sizeof(long) * 8 + 1]; @@ -1233,20 +1288,24 @@ execsh(void) { signal(SIGALRM, SIG_DFL); execvp(prog, args); - _exit(EXIT_FAILURE); + _exit(1); } void -sigchld(int a) { - int stat, ret; +sigchld(int a) +{ + int stat; + pid_t p; - if(waitpid(pid, &stat, 0) < 0) + if((p = waitpid(pid, &stat, WNOHANG)) < 0) die("Waiting for pid %hd failed: %s\n", pid, strerror(errno)); - ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE; - if (ret != EXIT_SUCCESS) + if(pid != p) + return; + + if (!WIFEXITED(stat) || WEXITSTATUS(stat)) die("child finished with error '%d'\n", stat); - exit(EXIT_SUCCESS); + exit(0); } @@ -1275,15 +1334,15 @@ stty(void) } void -ttynew(void) { +ttynew(void) +{ int m, s; struct winsize w = {term.row, term.col, 0, 0}; if(opt_io) { term.mode |= MODE_PRINT; iofd = (!strcmp(opt_io, "-")) ? - STDOUT_FILENO : - open(opt_io, O_WRONLY | O_CREAT, 0666); + 1 : open(opt_io, O_WRONLY | O_CREAT, 0666); if(iofd < 0) { fprintf(stderr, "Error opening %s:%s\n", opt_io, strerror(errno)); @@ -1293,7 +1352,7 @@ ttynew(void) { if (opt_line) { if((cmdfd = open(opt_line, O_RDWR)) < 0) die("open line failed: %s\n", strerror(errno)); - close(STDIN_FILENO); + close(0); dup(cmdfd); stty(); return; @@ -1310,9 +1369,9 @@ ttynew(void) { case 0: close(iofd); setsid(); /* create a new process group */ - dup2(s, STDIN_FILENO); - dup2(s, STDOUT_FILENO); - dup2(s, STDERR_FILENO); + dup2(s, 0); + dup2(s, 1); + dup2(s, 2); if(ioctl(s, TIOCSCTTY, NULL) < 0) die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); close(s); @@ -1328,12 +1387,13 @@ ttynew(void) { } void -ttyread(void) { +ttyread(void) +{ static char buf[BUFSIZ]; static int buflen = 0; char *ptr; int charsize; /* size of utf8 char in bytes */ - long unicodep; + Rune unicodep; int ret; /* append read bytes to unprocessed bytes */ @@ -1354,15 +1414,17 @@ ttyread(void) { } void -ttywrite(const char *s, size_t n) { +ttywrite(const char *s, size_t n) +{ if(xwrite(cmdfd, s, n) == -1) die("write error on tty: %s\n", strerror(errno)); } void -ttysend(char *s, size_t n) { +ttysend(char *s, size_t n) +{ int len; - long u; + Rune u; ttywrite(s, n); if(IS_SET(MODE_ECHO)) @@ -1374,7 +1436,8 @@ ttysend(char *s, size_t n) { } void -ttyresize(void) { +ttyresize(void) +{ struct winsize w; w.ws_row = term.row; @@ -1386,7 +1449,8 @@ ttyresize(void) { } int -tattrset(int attr) { +tattrset(int attr) +{ int i, j; for(i = 0; i < term.row-1; i++) { @@ -1400,7 +1464,8 @@ tattrset(int attr) { } void -tsetdirt(int top, int bot) { +tsetdirt(int top, int bot) +{ int i; LIMIT(top, 0, term.row-1); @@ -1411,7 +1476,8 @@ tsetdirt(int top, int bot) { } void -tsetdirtattr(int attr) { +tsetdirtattr(int attr) +{ int i, j; for(i = 0; i < term.row-1; i++) { @@ -1425,14 +1491,16 @@ tsetdirtattr(int attr) { } void -tfulldirt(void) { +tfulldirt(void) +{ tsetdirt(0, term.row-1); } void -tcursor(int mode) { +tcursor(int mode) +{ static TCursor c[2]; - bool alt = IS_SET(MODE_ALTSCREEN); + int alt = IS_SET(MODE_ALTSCREEN); if(mode == CURSOR_SAVE) { c[alt] = term.c; @@ -1443,7 +1511,8 @@ tcursor(int mode) { } void -treset(void) { +treset(void) +{ uint i; term.c = (TCursor){{ @@ -1470,7 +1539,8 @@ treset(void) { } void -tnew(int col, int row) { +tnew(int col, int row) +{ term = (Term){ .c = { .attr = { .fg = defaultfg, .bg = defaultbg } } }; tresize(col, row); term.numlock = 1; @@ -1479,7 +1549,8 @@ tnew(int col, int row) { } void -tswapscreen(void) { +tswapscreen(void) +{ Line *tmp = term.line; term.line = term.alt; @@ -1489,7 +1560,8 @@ tswapscreen(void) { } void -tscrolldown(int orig, int n) { +tscrolldown(int orig, int n) +{ int i; Line temp; @@ -1508,7 +1580,8 @@ tscrolldown(int orig, int n) { } void -tscrollup(int orig, int n) { +tscrollup(int orig, int n) +{ int i; Line temp; @@ -1527,7 +1600,8 @@ tscrollup(int orig, int n) { } void -selscroll(int orig, int n) { +selscroll(int orig, int n) +{ if(sel.ob.x == -1) return; @@ -1556,7 +1630,8 @@ selscroll(int orig, int n) { } void -tnewline(int first_col) { +tnewline(int first_col) +{ int y = term.c.y; if(y == term.bot) { @@ -1568,7 +1643,8 @@ tnewline(int first_col) { } void -csiparse(void) { +csiparse(void) +{ char *p = csiescseq.buf, *np; long int v; @@ -1598,12 +1674,14 @@ csiparse(void) { /* for absolute user moves, when decom is set */ void -tmoveato(int x, int y) { +tmoveato(int x, int y) +{ tmoveto(x, y + ((term.c.state & CURSOR_ORIGIN) ? term.top: 0)); } void -tmoveto(int x, int y) { +tmoveto(int x, int y) +{ int miny, maxy; if(term.c.state & CURSOR_ORIGIN) { @@ -1619,7 +1697,8 @@ tmoveto(int x, int y) { } void -tsetchar(long u, Glyph *attr, int x, int y) { +tsetchar(Rune u, 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 */ @@ -1654,7 +1733,8 @@ tsetchar(long u, Glyph *attr, int x, int y) { } void -tclearregion(int x1, int y1, int x2, int y2) { +tclearregion(int x1, int y1, int x2, int y2) +{ int x, y, temp; Glyph *gp; @@ -1683,7 +1763,8 @@ tclearregion(int x1, int y1, int x2, int y2) { } void -tdeletechar(int n) { +tdeletechar(int n) +{ int dst, src, size; Glyph *line; @@ -1699,7 +1780,8 @@ tdeletechar(int n) { } void -tinsertblank(int n) { +tinsertblank(int n) +{ int dst, src, size; Glyph *line; @@ -1715,19 +1797,22 @@ tinsertblank(int n) { } void -tinsertblankline(int n) { +tinsertblankline(int n) +{ if(BETWEEN(term.c.y, term.top, term.bot)) tscrolldown(term.c.y, n); } void -tdeleteline(int n) { +tdeleteline(int n) +{ if(BETWEEN(term.c.y, term.top, term.bot)) tscrollup(term.c.y, n); } int32_t -tdefcolor(int *attr, int *npar, int l) { +tdefcolor(int *attr, int *npar, int l) +{ int32_t idx = -1; uint r, g, b; @@ -1744,7 +1829,7 @@ tdefcolor(int *attr, int *npar, int l) { 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", + fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n", r, g, b); else idx = TRUECOLOR(r, g, b); @@ -1776,7 +1861,8 @@ tdefcolor(int *attr, int *npar, int l) { } void -tsetattr(int *attr, int l) { +tsetattr(int *attr, int l) +{ int i; int32_t idx; @@ -1876,7 +1962,8 @@ tsetattr(int *attr, int l) { } void -tsetscroll(int t, int b) { +tsetscroll(int t, int b) +{ int temp; LIMIT(t, 0, term.row-1); @@ -1891,9 +1978,10 @@ tsetscroll(int t, int b) { } void -tsetmode(bool priv, bool set, int *args, int narg) { +tsetmode(int priv, int set, int *args, int narg) +{ int *lim, mode; - bool alt; + int alt; for(lim = args + narg; args < lim; ++args) { if(priv) { @@ -2023,7 +2111,8 @@ tsetmode(bool priv, bool set, int *args, int narg) { } void -csihandle(void) { +csihandle(void) +{ char buf[40]; int len; @@ -2232,7 +2321,8 @@ csihandle(void) { } void -csidump(void) { +csidump(void) +{ int i; uint c; @@ -2255,12 +2345,14 @@ csidump(void) { } void -csireset(void) { +csireset(void) +{ memset(&csiescseq, 0, sizeof(csiescseq)); } void -strhandle(void) { +strhandle(void) +{ char *p = NULL; int j, narg, par; @@ -2310,7 +2402,8 @@ strhandle(void) { } void -strparse(void) { +strparse(void) +{ int c; char *p = strescseq.buf; @@ -2331,7 +2424,8 @@ strparse(void) { } void -strdump(void) { +strdump(void) +{ int i; uint c; @@ -2356,12 +2450,14 @@ strdump(void) { } void -strreset(void) { +strreset(void) +{ memset(&strescseq, 0, sizeof(strescseq)); } void -tprinter(char *s, size_t len) { +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)); @@ -2371,22 +2467,26 @@ tprinter(char *s, size_t len) { } void -toggleprinter(const Arg *arg) { +toggleprinter(const Arg *arg) +{ term.mode ^= MODE_PRINT; } void -printscreen(const Arg *arg) { +printscreen(const Arg *arg) +{ tdump(); } void -printsel(const Arg *arg) { +printsel(const Arg *arg) +{ tdumpsel(); } void -tdumpsel(void) { +tdumpsel(void) +{ char *ptr; if((ptr = getsel())) { @@ -2396,7 +2496,8 @@ tdumpsel(void) { } void -tdumpline(int n) { +tdumpline(int n) +{ char buf[UTF_SIZ]; Glyph *bp, *end; @@ -2410,7 +2511,8 @@ tdumpline(int n) { } void -tdump(void) { +tdump(void) +{ int i; for(i = 0; i < term.row; ++i) @@ -2418,7 +2520,8 @@ tdump(void) { } void -tputtab(int n) { +tputtab(int n) +{ uint x = term.c.x; if(n > 0) { @@ -2434,7 +2537,8 @@ tputtab(int n) { } void -techo(long u) { +techo(Rune u) +{ if(ISCONTROL(u)) { /* control code */ if(u & 0x80) { u &= 0x7f; @@ -2449,7 +2553,8 @@ techo(long u) { } void -tdeftran(char ascii) { +tdeftran(char ascii) +{ static char cs[] = "0B"; static int vcs[] = {CS_GRAPHIC0, CS_USA}; char *p; @@ -2462,7 +2567,8 @@ tdeftran(char ascii) { } void -tdectest(char c) { +tdectest(char c) +{ int x, y; if(c == '8') { /* DEC screen alignment test. */ @@ -2474,7 +2580,8 @@ tdectest(char c) { } void -tstrsequence(uchar c) { +tstrsequence(uchar c) +{ switch (c) { case 0x90: /* DCS -- Device Control String */ c = 'P'; @@ -2495,7 +2602,8 @@ tstrsequence(uchar c) { } void -tcontrolcode(uchar ascii) { +tcontrolcode(uchar ascii) +{ switch(ascii) { case '\t': /* HT */ tputtab(1); @@ -2578,7 +2686,8 @@ tcontrolcode(uchar ascii) { * more characters for this sequence, otherwise 0 */ int -eschandle(uchar ascii) { +eschandle(uchar ascii) +{ switch(ascii) { case '[': term.esc |= ESC_CSI; @@ -2657,9 +2766,10 @@ eschandle(uchar ascii) { } void -tputc(long u) { +tputc(Rune u) +{ char c[UTF_SIZ]; - bool control; + int control; int width, len; Glyph *gp; @@ -2779,11 +2889,12 @@ tputc(long u) { } void -tresize(int col, int row) { +tresize(int col, int row) +{ int i; int minrow = MIN(row, term.row); int mincol = MIN(col, term.col); - bool *bp; + int *bp; TCursor c; if(col < 1 || row < 1) { @@ -2811,6 +2922,9 @@ tresize(int col, int row) { free(term.alt[i]); } + /* resize to new width */ + term.specbuf = xrealloc(term.specbuf, col * sizeof(XftGlyphFontSpec)); + /* resize to new height */ term.line = xrealloc(term.line, row * sizeof(Line)); term.alt = xrealloc(term.alt, row * sizeof(Line)); @@ -2860,7 +2974,8 @@ tresize(int col, int row) { } void -xresize(int col, int row) { +xresize(int col, int row) +{ xw.tw = MAX(1, col * xw.cw); xw.th = MAX(1, row * xw.ch); @@ -2872,12 +2987,14 @@ xresize(int col, int row) { } ushort -sixd_to_16bit(int x) { +sixd_to_16bit(int x) +{ return x == 0 ? 0 : 0x3737 + 0x2828 * x; } -bool -xloadcolor(int i, const char *name, Color *ncolor) { +int +xloadcolor(int i, const char *name, Color *ncolor) +{ XRenderColor color = { .alpha = 0xffff }; if(!name) { @@ -2899,9 +3016,10 @@ xloadcolor(int i, const char *name, Color *ncolor) { } void -xloadcols(void) { +xloadcols(void) +{ int i; - static bool loaded; + static int loaded; Color *cp; if(loaded) { @@ -2916,11 +3034,12 @@ xloadcols(void) { else die("Could not allocate color %d\n", i); } - loaded = true; + loaded = 1; } int -xsetcolorname(int x, const char *name) { +xsetcolorname(int x, const char *name) +{ Color ncolor; if(!BETWEEN(x, 0, LEN(dc.col))) @@ -2936,7 +3055,8 @@ xsetcolorname(int x, const char *name) { } void -xtermclear(int col1, int row1, int col2, int row2) { +xtermclear(int col1, int row1, int col2, int row2) +{ XftDrawRect(xw.draw, &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg], borderpx + col1 * xw.cw, @@ -2949,14 +3069,16 @@ xtermclear(int col1, int row1, int col2, int row2) { * Absolute coordinates. */ void -xclear(int x1, int y1, int x2, int y2) { +xclear(int x1, int y1, int x2, int y2) +{ XftDrawRect(xw.draw, &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg], x1, y1, x2-x1, y2-y1); } void -xhints(void) { +xhints(void) +{ XClassHint class = {opt_class ? opt_class : termname, termname}; XWMHints wm = {.flags = InputHint, .input = 1}; XSizeHints *sizeh = NULL; @@ -2970,7 +3092,7 @@ xhints(void) { sizeh->width_inc = xw.cw; sizeh->base_height = 2 * borderpx; sizeh->base_width = 2 * borderpx; - if(xw.isfixed == True) { + if(xw.isfixed) { sizeh->flags |= PMaxSize | PMinSize; sizeh->min_width = sizeh->max_width = xw.w; sizeh->min_height = sizeh->max_height = xw.h; @@ -2988,7 +3110,8 @@ xhints(void) { } int -xgeommasktogravity(int mask) { +xgeommasktogravity(int mask) +{ switch(mask & (XNegative|YNegative)) { case 0: return NorthWestGravity; @@ -3001,7 +3124,8 @@ xgeommasktogravity(int mask) { } int -xloadfont(Font *f, FcPattern *pattern) { +xloadfont(Font *f, FcPattern *pattern) +{ FcPattern *match; FcResult result; @@ -3029,9 +3153,9 @@ xloadfont(Font *f, FcPattern *pattern) { } void -xloadfonts(char *fontstr, double fontsize) { +xloadfonts(char *fontstr, double fontsize) +{ FcPattern *pattern; - FcResult r_sz, r_psz; double fontval; float ceilf(float); @@ -3050,11 +3174,11 @@ xloadfonts(char *fontstr, double fontsize) { FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); usedfontsize = fontsize; } else { - r_psz = FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval); - r_sz = FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval); - if(r_psz == FcResultMatch) { + if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == + FcResultMatch) { usedfontsize = fontval; - } else if(r_sz == FcResultMatch) { + } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == + FcResultMatch) { usedfontsize = -1; } else { /* @@ -3104,7 +3228,8 @@ xloadfonts(char *fontstr, double fontsize) { } void -xunloadfont(Font *f) { +xunloadfont(Font *f) +{ XftFontClose(xw.dpy, f->match); FcPatternDestroy(f->pattern); if(f->set) @@ -3112,7 +3237,8 @@ xunloadfont(Font *f) { } void -xunloadfonts(void) { +xunloadfonts(void) +{ /* Free the loaded fonts in the font cache. */ while(frclen > 0) XftFontClose(xw.dpy, frc[--frclen].font); @@ -3124,34 +3250,38 @@ xunloadfonts(void) { } void -xzoom(const Arg *arg) { +xzoom(const Arg *arg) +{ Arg larg; - larg.i = usedfontsize + arg->i; + larg.f = usedfontsize + arg->f; xzoomabs(&larg); } void -xzoomabs(const Arg *arg) { +xzoomabs(const Arg *arg) +{ xunloadfonts(); - xloadfonts(usedfont, arg->i); + xloadfonts(usedfont, arg->f); cresize(0, 0); redraw(); xhints(); } void -xzoomreset(const Arg *arg) { +xzoomreset(const Arg *arg) +{ Arg larg; if(defaultfontsize > 0) { - larg.i = defaultfontsize; + larg.f = defaultfontsize; xzoomabs(&larg); } } void -xinit(void) { +xinit(void) +{ XGCValues gcvalues; Cursor cursor; Window parent; @@ -3249,38 +3379,155 @@ xinit(void) { 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 frcflags, charexists; - int u8fl, u8fblen, u8cblen, doesexist; - char *u8c, *u8fs; - long unicodep; +int +xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y) +{ + float winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, xp, yp; + ushort mode, prevmode = USHRT_MAX; Font *font = &dc.font; + int frcflags = FRC_NORMAL; + float runewidth = xw.cw; + Rune rune; + FT_UInt glyphidx; FcResult fcres; FcPattern *fcpattern, *fontpattern; FcFontSet *fcsets[] = { NULL }; FcCharSet *fccharset; + int i, f, numspecs = 0; + + for(i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { + /* Fetch rune and mode for current glyph. */ + rune = glyphs[i].u; + mode = glyphs[i].mode; + + /* Skip dummy wide-character spacing. */ + if(mode == ATTR_WDUMMY) + continue; + + /* Determine font for glyph if different from previous glyph. */ + if(prevmode != mode) { + prevmode = mode; + font = &dc.font; + frcflags = FRC_NORMAL; + runewidth = xw.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); + if((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { + font = &dc.ibfont; + frcflags = FRC_ITALICBOLD; + } else if(mode & ATTR_ITALIC) { + font = &dc.ifont; + frcflags = FRC_ITALIC; + } else if(mode & ATTR_BOLD) { + font = &dc.bfont; + frcflags = FRC_BOLD; + } + yp = winy + font->ascent; + } + + /* Lookup character index with default font. */ + glyphidx = XftCharIndex(xw.dpy, font->match, rune); + if(glyphidx) { + specs[numspecs].font = font->match; + specs[numspecs].glyph = glyphidx; + specs[numspecs].x = (short)xp; + specs[numspecs].y = (short)yp; + xp += runewidth; + numspecs++; + continue; + } + + /* Fallback on font cache, search the font cache for match. */ + for(f = 0; f < frclen; f++) { + glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune); + /* Everything correct. */ + if(glyphidx && frc[f].flags == frcflags) + break; + /* We got a default font for a not found glyph. */ + if(!glyphidx && frc[f].flags == frcflags + && frc[f].unicodep == rune) { + break; + } + } + + /* Nothing was found. Use fontconfig to find matching font. */ + if(f >= frclen) { + if(!font->set) + font->set = FcFontSort(0, font->pattern, + 1, 0, &fcres); + 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, rune); + FcPatternAddCharSet(fcpattern, FC_CHARSET, + fccharset); + FcPatternAddBool(fcpattern, FC_SCALABLE, 1); + + FcConfigSubstitute(0, fcpattern, + FcMatchPattern); + FcDefaultSubstitute(fcpattern); + + fontpattern = FcFontSetMatch(0, fcsets, 1, + fcpattern, &fcres); + + /* + * Overwrite or create the new cache entry. + */ + if(frclen >= LEN(frc)) { + frclen = LEN(frc) - 1; + XftFontClose(xw.dpy, frc[frclen].font); + frc[frclen].unicodep = 0; + } + + frc[frclen].font = XftFontOpenPattern(xw.dpy, + fontpattern); + frc[frclen].flags = frcflags; + frc[frclen].unicodep = rune; + + glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune); + + f = frclen; + frclen++; + + FcPatternDestroy(fcpattern); + FcCharSetDestroy(fccharset); + } + + specs[numspecs].font = frc[f].font; + specs[numspecs].glyph = glyphidx; + specs[numspecs].x = (short)xp; + specs[numspecs].y = (short)(winy + frc[f].font->ascent); + xp += runewidth; + numspecs++; + } + + return numspecs; +} + +void +xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) +{ + int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1); + int winx = borderpx + x * xw.cw, winy = borderpx + y * xw.ch, + width = charlen * xw.cw; Color *fg, *bg, *temp, revfg, revbg, truefg, truebg; XRenderColor colfg, colbg; XRectangle r; - int oneatatime; - frcflags = FRC_NORMAL; - - if(base.mode & ATTR_ITALIC) { - if(base.fg == defaultfg) + /* Determine foreground and background colors based on mode. */ + if(base.fg == defaultfg) { + if(base.mode & ATTR_ITALIC) base.fg = defaultitalic; - font = &dc.ifont; - frcflags = FRC_ITALIC; - } else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) { - if(base.fg == defaultfg) + else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) base.fg = defaultitalic; - font = &dc.ibfont; - frcflags = FRC_ITALICBOLD; - } else if(base.mode & ATTR_UNDERLINE) { - if(base.fg == defaultfg) + else if(base.mode & ATTR_UNDERLINE) base.fg = defaultunderline; } @@ -3306,22 +3553,9 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { bg = &dc.col[base.bg]; } - if(base.mode & ATTR_BOLD) { - /* - * change basic system colors [0-7] - * to bright system colors [8-15] - */ - if(BETWEEN(base.fg, 0, 7) && !(base.mode & ATTR_FAINT)) - fg = &dc.col[base.fg + 8]; - - if(base.mode & ATTR_ITALIC) { - font = &dc.ibfont; - frcflags = FRC_ITALICBOLD; - } else { - font = &dc.bfont; - frcflags = FRC_BOLD; - } - } + /* Change basic system colors [0-7] to bright system colors [8-15] */ + if((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) + fg = &dc.col[base.fg + 8]; if(IS_SET(MODE_REVERSE)) { if(fg == &dc.col[defaultfg]) { @@ -3355,7 +3589,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { bg = temp; } - if(base.mode & ATTR_FAINT && !(base.mode & ATTR_BOLD)) { + if((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) { colfg.red = fg->color.red / 2; colfg.green = fg->color.green / 2; colfg.blue = fg->color.blue / 2; @@ -3393,136 +3627,17 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { r.width = width; XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1); - for(xp = winx; bytelen > 0;) { - /* - * Search for the range in the to be printed string of glyphs - * that are in the main font. Then print that range. If - * some glyph is found that is not in the font, do the - * fallback dance. - */ - u8fs = s; - u8fblen = 0; - u8fl = 0; - oneatatime = font->width != xw.cw; - for(;;) { - u8c = s; - u8cblen = utf8decode(s, &unicodep, UTF_SIZ); - s += u8cblen; - bytelen -= u8cblen; - - doesexist = XftCharExists(xw.dpy, font->match, unicodep); - if(doesexist) { - u8fl++; - u8fblen += u8cblen; - if(!oneatatime && bytelen > 0) - continue; - } - - if(u8fl > 0) { - XftDrawStringUtf8(xw.draw, fg, - font->match, xp, - winy + font->ascent, - (FcChar8 *)u8fs, - u8fblen); - xp += xw.cw * u8fl; - } - break; - } - if(doesexist) { - if(oneatatime) - continue; - break; - } - - /* Search the font cache. */ - for(i = 0; i < frclen; i++) { - charexists = XftCharExists(xw.dpy, frc[i].font, unicodep); - /* Everything correct. */ - if(charexists && frc[i].flags == frcflags) - break; - /* We got a default font for a not found glyph. */ - if(!charexists && frc[i].flags == frcflags \ - && frc[i].unicodep == unicodep) { - break; - } - } - - /* Nothing was found. */ - if(i >= frclen) { - if(!font->set) - font->set = FcFontSort(0, font->pattern, - FcTrue, 0, &fcres); - 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, unicodep); - FcPatternAddCharSet(fcpattern, FC_CHARSET, - fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, - FcTrue); - - FcConfigSubstitute(0, fcpattern, - FcMatchPattern); - FcDefaultSubstitute(fcpattern); - - fontpattern = FcFontSetMatch(0, fcsets, 1, - fcpattern, &fcres); - - /* - * Overwrite or create the new cache entry. - */ - if(frclen >= LEN(frc)) { - frclen = LEN(frc) - 1; - XftFontClose(xw.dpy, frc[frclen].font); - frc[frclen].unicodep = 0; - } - - frc[frclen].font = XftFontOpenPattern(xw.dpy, - fontpattern); - frc[frclen].flags = frcflags; - frc[frclen].unicodep = unicodep; - - i = frclen; - frclen++; - - FcPatternDestroy(fcpattern); - FcCharSetDestroy(fccharset); - } - - XftDrawStringUtf8(xw.draw, fg, frc[i].font, - xp, winy + frc[i].font->ascent, - (FcChar8 *)u8c, u8cblen); - - 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); - */ + /* Render the glyphs. */ + XftDrawGlyphFontSpec(xw.draw, fg, specs, len); + /* Render underline and strikethrough. */ if(base.mode & ATTR_UNDERLINE) { - XftDrawRect(xw.draw, fg, winx, winy + font->ascent + 1, + XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, width, 1); } if(base.mode & ATTR_STRUCK) { - XftDrawRect(xw.draw, fg, winx, winy + 2 * font->ascent / 3, + XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, width, 1); } @@ -3531,16 +3646,17 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) { } void -xdrawglyph(Glyph g, int x, int y) { - static char buf[UTF_SIZ]; - size_t len = utf8encode(g.u, buf); - int width = g.mode & ATTR_WIDE ? 2 : 1; - - xdraws(buf, g, x, y, width, len); +xdrawglyph(Glyph g, int x, int y) +{ + int numspecs; + XftGlyphFontSpec spec; + numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y); + xdrawglyphfontspecs(&spec, g, numspecs, x, y); } void -xdrawcursor(void) { +xdrawcursor(void) +{ static int oldx = 0, oldy = 0; int curx; Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}; @@ -3617,7 +3733,8 @@ xdrawcursor(void) { void -xsettitle(char *p) { +xsettitle(char *p) +{ XTextProperty prop; Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, @@ -3628,18 +3745,21 @@ xsettitle(char *p) { } void -xresettitle(void) { +xresettitle(void) +{ xsettitle(opt_title ? opt_title : "st"); } void -redraw(void) { +redraw(void) +{ tfulldirt(); draw(); } void -draw(void) { +draw(void) +{ drawregion(0, 0, term.col, term.row); XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, xw.w, xw.h, 0, 0); @@ -3649,11 +3769,12 @@ draw(void) { } void -drawregion(int x1, int y1, int x2, int y2) { - int ic, ib, x, y, ox; +drawregion(int x1, int y1, int x2, int y2) +{ + int i, x, y, ox, numspecs; Glyph base, new; - char buf[DRAW_BUF_SIZ]; - bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); + XftGlyphFontSpec* specs; + int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); if(!(xw.state & WIN_VISIBLE)) return; @@ -3664,58 +3785,65 @@ drawregion(int x1, int y1, int x2, int y2) { xtermclear(0, y, term.col, y); term.dirty[y] = 0; - base = term.line[y][0]; - ic = ib = ox = 0; - for(x = x1; x < x2; x++) { + + specs = term.specbuf; + numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); + + i = ox = 0; + for(x = x1; x < x2 && i < numspecs; 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) - || ib >= DRAW_BUF_SIZ-UTF_SIZ)) { - xdraws(buf, base, ox, y, ic, ib); - ic = ib = 0; + if(i > 0 && ATTRCMP(base, new)) { + xdrawglyphfontspecs(specs, base, i, ox, y); + specs += i; + numspecs -= i; + i = 0; } - if(ib == 0) { + if(i == 0) { ox = x; base = new; } - - ib += utf8encode(new.u, buf+ib); - ic += (new.mode & ATTR_WIDE)? 2 : 1; + i++; } - if(ib > 0) - xdraws(buf, base, ox, y, ic, ib); + if(i > 0) + xdrawglyphfontspecs(specs, base, i, ox, y); } xdrawcursor(); } void -expose(XEvent *ev) { +expose(XEvent *ev) +{ redraw(); } void -visibility(XEvent *ev) { +visibility(XEvent *ev) +{ XVisibilityEvent *e = &ev->xvisibility; MODBIT(xw.state, e->state != VisibilityFullyObscured, WIN_VISIBLE); } void -unmap(XEvent *ev) { +unmap(XEvent *ev) +{ xw.state &= ~WIN_VISIBLE; } void -xsetpointermotion(int set) { +xsetpointermotion(int set) +{ MODBIT(xw.attrs.event_mask, set, PointerMotionMask); XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs); } void -xseturgency(int add) { +xseturgency(int add) +{ XWMHints *h = XGetWMHints(xw.dpy, xw.win); MODBIT(h->flags, add, XUrgencyHint); @@ -3724,7 +3852,8 @@ xseturgency(int add) { } void -focus(XEvent *ev) { +focus(XEvent *ev) +{ XFocusChangeEvent *e = &ev->xfocus; if(e->mode == NotifyGrab) @@ -3744,18 +3873,21 @@ focus(XEvent *ev) { } } -bool -match(uint mask, uint state) { +int +match(uint mask, uint state) +{ return mask == XK_ANY_MOD || mask == (state & ~ignoremod); } void -numlock(const Arg *dummy) { +numlock(const Arg *dummy) +{ term.numlock ^= 1; } char* -kmap(KeySym k, uint state) { +kmap(KeySym k, uint state) +{ Key *kp; int i; @@ -3794,12 +3926,13 @@ kmap(KeySym k, uint state) { } void -kpress(XEvent *ev) { +kpress(XEvent *ev) +{ XKeyEvent *e = &ev->xkey; KeySym ksym; char buf[32], *customkey; int len; - long c; + Rune c; Status status; Shortcut *bp; @@ -3841,7 +3974,8 @@ kpress(XEvent *ev) { void -cmessage(XEvent *e) { +cmessage(XEvent *e) +{ /* * See xembed specs * http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html @@ -3856,12 +3990,13 @@ cmessage(XEvent *e) { } else if(e->xclient.data.l[0] == xw.wmdeletewin) { /* Send SIGHUP to shell */ kill(pid, SIGHUP); - exit(EXIT_SUCCESS); + exit(0); } } void -cresize(int width, int height) { +cresize(int width, int height) +{ int col, row; if(width != 0) @@ -3878,7 +4013,8 @@ cresize(int width, int height) { } void -resize(XEvent *e) { +resize(XEvent *e) +{ if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) return; @@ -3886,7 +4022,8 @@ resize(XEvent *e) { } void -run(void) { +run(void) +{ XEvent ev; int w = xw.w, h = xw.h; fd_set rfd; @@ -3897,6 +4034,13 @@ run(void) { /* Waiting for window mapping */ do { XNextEvent(xw.dpy, &ev); + /* + * XFilterEvent is required to be called after you using XOpenIM, + * this is not unnecessary.It does not only filter the key event, + * but some clientmessage for input method as well. + */ + if(XFilterEvent(&ev, None)) + continue; if(ev.type == ConfigureNotify) { w = ev.xconfigure.width; h = ev.xconfigure.height; @@ -3986,7 +4130,8 @@ run(void) { } void -usage(void) { +usage(void) +{ die("%s " VERSION " (c) 2010-2015 st engineers\n" "usage: st [-a] [-v] [-c class] [-f font] [-g geometry] [-o file]\n" " [-i] [-t title] [-w windowid] [-e command ...] [command ...]\n" @@ -3996,7 +4141,8 @@ usage(void) { } int -main(int argc, char *argv[]) { +main(int argc, char *argv[]) +{ uint cols = 80, rows = 24; xw.l = xw.t = 0; @@ -4005,13 +4151,13 @@ main(int argc, char *argv[]) { ARGBEGIN { case 'a': - allowaltscreen = false; + allowaltscreen = 0; break; case 'c': opt_class = EARGF(usage()); break; case 'e': - if(argc > 1) + if(argc > 0) --argc, ++argv; goto run; case 'f': @@ -4022,7 +4168,7 @@ main(int argc, char *argv[]) { &xw.l, &xw.t, &cols, &rows); break; case 'i': - xw.isfixed = True; + xw.isfixed = 1; break; case 'o': opt_io = EARGF(usage()); @@ -4057,4 +4203,3 @@ run: return 0; } -