X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=st.c;h=03866f1be16621b3a2a2144705a5ca2f85b80863;hb=13233574ed1ead29bb7e99e71a0665e62c640617;hp=c2da66bf7610fa0d6b1b3f57a7e9d1cf901c1bcb;hpb=ae1923d27533ff46400d93765e971558201ca1ee;p=st.git diff --git a/st.c b/st.c index c2da66b..03866f1 100644 --- a/st.c +++ b/st.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -71,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) @@ -191,8 +190,8 @@ typedef XftColor Color; typedef struct { 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; @@ -231,7 +230,7 @@ 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 */ @@ -241,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 */ @@ -258,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 */ @@ -302,7 +301,7 @@ typedef struct { char *primary, *clipboard; Atom xtarget; - bool alt; + int alt; struct timespec tclick1; struct timespec tclick2; } Selection; @@ -403,14 +402,14 @@ 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(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); @@ -459,7 +458,7 @@ 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); @@ -473,6 +472,7 @@ 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); @@ -512,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; @@ -550,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) { @@ -564,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) @@ -574,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"); @@ -582,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"); @@ -590,7 +594,8 @@ xstrdup(char *s) { } size_t -utf8decode(char *c, Rune *u, size_t clen) { +utf8decode(char *c, Rune *u, size_t clen) +{ size_t i, j, len, type; Rune udecoded; @@ -613,7 +618,8 @@ utf8decode(char *c, Rune *u, size_t clen) { } Rune -utf8decodebyte(char c, size_t *i) { +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]; @@ -621,7 +627,8 @@ utf8decodebyte(char c, size_t *i) { } size_t -utf8encode(Rune u, char *c) { +utf8encode(Rune u, char *c) +{ size_t len, i; len = utf8validate(&u, 0); @@ -636,12 +643,30 @@ utf8encode(Rune u, char *c) { } char -utf8encodebyte(Rune 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(Rune *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) @@ -650,7 +675,8 @@ utf8validate(Rune *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 = SEL_IDLE; @@ -663,7 +689,8 @@ selinit(void) { } int -x2col(int x) { +x2col(int x) +{ x -= borderpx; x /= xw.cw; @@ -671,7 +698,8 @@ x2col(int x) { } int -y2row(int y) { +y2row(int y) +{ y -= borderpx; y /= xw.ch; @@ -679,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) @@ -692,7 +721,8 @@ tlinelen(int y) { } void -selnormalize(void) { +selnormalize(void) +{ int i; if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { @@ -718,10 +748,11 @@ 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 false; + return 0; if(sel.type == SEL_RECTANGULAR) return BETWEEN(y, sel.nb.y, sel.ne.y) @@ -733,9 +764,10 @@ selected(int x, int y) { } void -selsnap(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(sel.snap) { @@ -805,7 +837,8 @@ selsnap(int *x, int *y, int direction) { } void -getbuttoninfo(XEvent *e) { +getbuttoninfo(XEvent *e) +{ int type; uint state = e->xbutton.state & ~(Button1Mask | forceselmod); @@ -825,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; @@ -888,7 +922,8 @@ mousereport(XEvent *e) { } void -bpress(XEvent *e) { +bpress(XEvent *e) +{ struct timespec now; Mousekey *mk; @@ -937,7 +972,8 @@ bpress(XEvent *e) { } char * -getsel(void) { +getsel(void) +{ char *str, *ptr; int y, bufsize, lastx, linelen; Glyph *gp, *last; @@ -987,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; @@ -1037,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) @@ -1057,7 +1097,8 @@ clipcopy(const Arg *dummy) { } void -clippaste(const Arg *dummy) { +clippaste(const Arg *dummy) +{ Atom clipboard; clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); @@ -1066,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; @@ -1126,12 +1170,13 @@ 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; @@ -1141,7 +1186,8 @@ xsetsel(char *str, Time t) { } void -brelease(XEvent *e) { +brelease(XEvent *e) +{ if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { mousereport(e); return; @@ -1161,7 +1207,8 @@ brelease(XEvent *e) { } void -bmotion(XEvent *e) { +bmotion(XEvent *e) +{ int oldey, oldex, oldsby, oldsey; if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { @@ -1184,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]; @@ -1239,12 +1288,13 @@ 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((p = waitpid(pid, &stat, WNOHANG)) < 0) @@ -1253,10 +1303,9 @@ sigchld(int a) { if(pid != p) return; - ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE; - if (ret != EXIT_SUCCESS) + if (!WIFEXITED(stat) || WEXITSTATUS(stat)) die("child finished with error '%d'\n", stat); - exit(EXIT_SUCCESS); + exit(0); } @@ -1285,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)); @@ -1303,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; @@ -1320,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); @@ -1338,7 +1387,8 @@ ttynew(void) { } void -ttyread(void) { +ttyread(void) +{ static char buf[BUFSIZ]; static int buflen = 0; char *ptr; @@ -1364,13 +1414,15 @@ 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; Rune u; @@ -1384,7 +1436,8 @@ ttysend(char *s, size_t n) { } void -ttyresize(void) { +ttyresize(void) +{ struct winsize w; w.ws_row = term.row; @@ -1396,7 +1449,8 @@ ttyresize(void) { } int -tattrset(int attr) { +tattrset(int attr) +{ int i, j; for(i = 0; i < term.row-1; i++) { @@ -1410,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); @@ -1421,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++) { @@ -1435,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; @@ -1453,7 +1511,8 @@ tcursor(int mode) { } void -treset(void) { +treset(void) +{ uint i; term.c = (TCursor){{ @@ -1480,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; @@ -1489,7 +1549,8 @@ tnew(int col, int row) { } void -tswapscreen(void) { +tswapscreen(void) +{ Line *tmp = term.line; term.line = term.alt; @@ -1499,7 +1560,8 @@ tswapscreen(void) { } void -tscrolldown(int orig, int n) { +tscrolldown(int orig, int n) +{ int i; Line temp; @@ -1518,7 +1580,8 @@ tscrolldown(int orig, int n) { } void -tscrollup(int orig, int n) { +tscrollup(int orig, int n) +{ int i; Line temp; @@ -1537,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; @@ -1566,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) { @@ -1578,7 +1643,8 @@ tnewline(int first_col) { } void -csiparse(void) { +csiparse(void) +{ char *p = csiescseq.buf, *np; long int v; @@ -1608,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) { @@ -1629,7 +1697,8 @@ tmoveto(int x, int y) { } void -tsetchar(Rune 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 */ @@ -1664,7 +1733,8 @@ tsetchar(Rune 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; @@ -1693,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; @@ -1709,7 +1780,8 @@ tdeletechar(int n) { } void -tinsertblank(int n) { +tinsertblank(int n) +{ int dst, src, size; Glyph *line; @@ -1725,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; @@ -1786,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; @@ -1886,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); @@ -1901,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) { @@ -2033,7 +2111,8 @@ tsetmode(bool priv, bool set, int *args, int narg) { } void -csihandle(void) { +csihandle(void) +{ char buf[40]; int len; @@ -2242,7 +2321,8 @@ csihandle(void) { } void -csidump(void) { +csidump(void) +{ int i; uint c; @@ -2265,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; @@ -2320,7 +2402,8 @@ strhandle(void) { } void -strparse(void) { +strparse(void) +{ int c; char *p = strescseq.buf; @@ -2341,7 +2424,8 @@ strparse(void) { } void -strdump(void) { +strdump(void) +{ int i; uint c; @@ -2366,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)); @@ -2381,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())) { @@ -2406,7 +2496,8 @@ tdumpsel(void) { } void -tdumpline(int n) { +tdumpline(int n) +{ char buf[UTF_SIZ]; Glyph *bp, *end; @@ -2420,7 +2511,8 @@ tdumpline(int n) { } void -tdump(void) { +tdump(void) +{ int i; for(i = 0; i < term.row; ++i) @@ -2428,7 +2520,8 @@ tdump(void) { } void -tputtab(int n) { +tputtab(int n) +{ uint x = term.c.x; if(n > 0) { @@ -2444,7 +2537,8 @@ tputtab(int n) { } void -techo(Rune u) { +techo(Rune u) +{ if(ISCONTROL(u)) { /* control code */ if(u & 0x80) { u &= 0x7f; @@ -2459,7 +2553,8 @@ techo(Rune u) { } void -tdeftran(char ascii) { +tdeftran(char ascii) +{ static char cs[] = "0B"; static int vcs[] = {CS_GRAPHIC0, CS_USA}; char *p; @@ -2472,7 +2567,8 @@ tdeftran(char ascii) { } void -tdectest(char c) { +tdectest(char c) +{ int x, y; if(c == '8') { /* DEC screen alignment test. */ @@ -2484,7 +2580,8 @@ tdectest(char c) { } void -tstrsequence(uchar c) { +tstrsequence(uchar c) +{ switch (c) { case 0x90: /* DCS -- Device Control String */ c = 'P'; @@ -2505,7 +2602,8 @@ tstrsequence(uchar c) { } void -tcontrolcode(uchar ascii) { +tcontrolcode(uchar ascii) +{ switch(ascii) { case '\t': /* HT */ tputtab(1); @@ -2588,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; @@ -2667,9 +2766,10 @@ eschandle(uchar ascii) { } void -tputc(Rune u) { +tputc(Rune u) +{ char c[UTF_SIZ]; - bool control; + int control; int width, len; Glyph *gp; @@ -2789,11 +2889,12 @@ tputc(Rune 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) { @@ -2873,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); @@ -2885,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) { @@ -2912,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) { @@ -2929,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))) @@ -2949,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, @@ -2962,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; @@ -2983,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; @@ -3001,7 +3110,8 @@ xhints(void) { } int -xgeommasktogravity(int mask) { +xgeommasktogravity(int mask) +{ switch(mask & (XNegative|YNegative)) { case 0: return NorthWestGravity; @@ -3014,7 +3124,8 @@ xgeommasktogravity(int mask) { } int -xloadfont(Font *f, FcPattern *pattern) { +xloadfont(Font *f, FcPattern *pattern) +{ FcPattern *match; FcResult result; @@ -3042,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); @@ -3063,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 { /* @@ -3117,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) @@ -3125,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); @@ -3137,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; @@ -3335,7 +3452,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x if(f >= frclen) { if(!font->set) font->set = FcFontSort(0, font->pattern, - FcTrue, 0, &fcres); + 1, 0, &fcres); fcsets[0] = font->set; /* @@ -3351,8 +3468,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x FcCharSetAddChar(fccharset, rune); FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); - FcPatternAddBool(fcpattern, FC_SCALABLE, - FcTrue); + FcPatternAddBool(fcpattern, FC_SCALABLE, 1); FcConfigSubstitute(0, fcpattern, FcMatchPattern); @@ -3396,7 +3512,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x } void -xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y) { +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; @@ -3529,7 +3646,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i } void -xdrawglyph(Glyph g, int x, int y) { +xdrawglyph(Glyph g, int x, int y) +{ int numspecs; XftGlyphFontSpec spec; numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y); @@ -3537,7 +3655,8 @@ xdrawglyph(Glyph g, int x, int y) { } void -xdrawcursor(void) { +xdrawcursor(void) +{ static int oldx = 0, oldy = 0; int curx; Glyph g = {' ', ATTR_NULL, defaultbg, defaultcs}; @@ -3614,7 +3733,8 @@ xdrawcursor(void) { void -xsettitle(char *p) { +xsettitle(char *p) +{ XTextProperty prop; Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, @@ -3625,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); @@ -3646,11 +3769,12 @@ draw(void) { } void -drawregion(int x1, int y1, int x2, int y2) { +drawregion(int x1, int y1, int x2, int y2) +{ int i, x, y, ox, numspecs; Glyph base, new; XftGlyphFontSpec* specs; - bool ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); + int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); if(!(xw.state & WIN_VISIBLE)) return; @@ -3663,7 +3787,7 @@ drawregion(int x1, int y1, int x2, int y2) { term.dirty[y] = 0; specs = term.specbuf; - numspecs = xmakeglyphfontspecs(specs, &term.line[y][0], x2 - x1, x1, y); + numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); i = ox = 0; for(x = x1; x < x2 && i < numspecs; x++) { @@ -3691,30 +3815,35 @@ drawregion(int x1, int y1, int x2, int y2) { } 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); @@ -3723,7 +3852,8 @@ xseturgency(int add) { } void -focus(XEvent *ev) { +focus(XEvent *ev) +{ XFocusChangeEvent *e = &ev->xfocus; if(e->mode == NotifyGrab) @@ -3743,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; @@ -3793,7 +3926,8 @@ kmap(KeySym k, uint state) { } void -kpress(XEvent *ev) { +kpress(XEvent *ev) +{ XKeyEvent *e = &ev->xkey; KeySym ksym; char buf[32], *customkey; @@ -3840,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 @@ -3855,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) @@ -3877,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; @@ -3885,7 +4022,8 @@ resize(XEvent *e) { } void -run(void) { +run(void) +{ XEvent ev; int w = xw.w, h = xw.h; fd_set rfd; @@ -3896,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; @@ -3985,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" @@ -3995,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; @@ -4004,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': @@ -4021,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()); @@ -4056,4 +4203,3 @@ run: return 0; } -