iDon't treat clauses like functions - st - Simple Terminal Err gopher.r-36.net 70 i Err gopher.r-36.net 70 1Log /scm/st//log.gph gopher.r-36.net 70 1Files /scm/st//files.gph gopher.r-36.net 70 1Refs /scm/st//refs.gph gopher.r-36.net 70 1README /scm/st//file/README.gph gopher.r-36.net 70 1LICENSE /scm/st//file/LICENSE.gph gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1commit f1307d91e2ec351a4a8b7352be8b5f6e4cb24294 /scm/st//commit/f1307d91e2ec351a4a8b7352be8b5f6e4cb24294.gph gopher.r-36.net 70 1parent 13233574ed1ead29bb7e99e71a0665e62c640617 /scm/st//commit/13233574ed1ead29bb7e99e71a0665e62c640617.gph gopher.r-36.net 70 hAuthor: FRIGN URL:mailto:dev@frign.de gopher.r-36.net 70 iDate: Fri, 10 Jul 2015 10:29:53 +0200 Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDon't treat clauses like functions Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iand add a space between the keyword and the parentheses. Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iSigned-off-by: Christoph Lohmann <20h@r-36.net> Err gopher.r-36.net 70 i Err gopher.r-36.net 70 iDiffstat: Err gopher.r-36.net 70 i st.c | 764 ++++++++++++++++---------------- Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i1 file changed, 382 insertions(+), 382 deletions(-) Err gopher.r-36.net 70 i--- Err gopher.r-36.net 70 1diff --git a/st.c b/st.c /scm/st//file/st.c.gph gopher.r-36.net 70 i@@ -554,9 +554,9 @@ xwrite(int fd, const char *s, size_t len) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i size_t aux = len; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- while(len > 0) { Err gopher.r-36.net 70 i+ while (len > 0) { Err gopher.r-36.net 70 i ssize_t r = write(fd, s, len); Err gopher.r-36.net 70 i- if(r < 0) Err gopher.r-36.net 70 i+ if (r < 0) Err gopher.r-36.net 70 i return r; Err gopher.r-36.net 70 i len -= r; Err gopher.r-36.net 70 i s += r; Err gopher.r-36.net 70 i@@ -569,7 +569,7 @@ xmalloc(size_t len) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i void *p = malloc(len); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!p) Err gopher.r-36.net 70 i+ if (!p) Err gopher.r-36.net 70 i die("Out of memory\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return p; Err gopher.r-36.net 70 i@@ -578,7 +578,7 @@ xmalloc(size_t len) Err gopher.r-36.net 70 i void * Err gopher.r-36.net 70 i xrealloc(void *p, size_t len) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if((p = realloc(p, len)) == NULL) Err gopher.r-36.net 70 i+ if ((p = realloc(p, len)) == NULL) Err gopher.r-36.net 70 i die("Out of memory\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return p; Err gopher.r-36.net 70 i@@ -587,7 +587,7 @@ xrealloc(void *p, size_t len) Err gopher.r-36.net 70 i char * Err gopher.r-36.net 70 i xstrdup(char *s) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if((s = strdup(s)) == NULL) Err gopher.r-36.net 70 i+ if ((s = strdup(s)) == NULL) Err gopher.r-36.net 70 i die("Out of memory\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return s; Err gopher.r-36.net 70 i@@ -600,17 +600,17 @@ utf8decode(char *c, Rune *u, size_t clen) Err gopher.r-36.net 70 i Rune udecoded; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i *u = UTF_INVALID; Err gopher.r-36.net 70 i- if(!clen) Err gopher.r-36.net 70 i+ if (!clen) Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i udecoded = utf8decodebyte(c[0], &len); Err gopher.r-36.net 70 i- if(!BETWEEN(len, 1, UTF_SIZ)) Err gopher.r-36.net 70 i+ if (!BETWEEN(len, 1, UTF_SIZ)) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i- for(i = 1, j = 1; i < clen && j < len; ++i, ++j) { Err gopher.r-36.net 70 i+ for (i = 1, j = 1; i < clen && j < len; ++i, ++j) { Err gopher.r-36.net 70 i udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type); Err gopher.r-36.net 70 i- if(type != 0) Err gopher.r-36.net 70 i+ if (type != 0) Err gopher.r-36.net 70 i return j; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(j < len) Err gopher.r-36.net 70 i+ if (j < len) Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i *u = udecoded; Err gopher.r-36.net 70 i utf8validate(u, len); Err gopher.r-36.net 70 i@@ -620,8 +620,8 @@ utf8decode(char *c, Rune *u, size_t clen) Err gopher.r-36.net 70 i Rune Err gopher.r-36.net 70 i utf8decodebyte(char c, size_t *i) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- for(*i = 0; *i < LEN(utfmask); ++(*i)) Err gopher.r-36.net 70 i- if(((uchar)c & utfmask[*i]) == utfbyte[*i]) Err gopher.r-36.net 70 i+ for (*i = 0; *i < LEN(utfmask); ++(*i)) Err gopher.r-36.net 70 i+ if (((uchar)c & utfmask[*i]) == utfbyte[*i]) Err gopher.r-36.net 70 i return (uchar)c & ~utfmask[*i]; Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -632,9 +632,9 @@ utf8encode(Rune u, char *c) Err gopher.r-36.net 70 i size_t len, i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i len = utf8validate(&u, 0); Err gopher.r-36.net 70 i- if(len > UTF_SIZ) Err gopher.r-36.net 70 i+ if (len > UTF_SIZ) Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i- for(i = len - 1; i != 0; --i) { Err gopher.r-36.net 70 i+ for (i = len - 1; i != 0; --i) { Err gopher.r-36.net 70 i c[i] = utf8encodebyte(u, 0); Err gopher.r-36.net 70 i u >>= 6; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -655,10 +655,10 @@ utf8strchr(char *s, Rune u) Err gopher.r-36.net 70 i size_t i, j, len; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i len = strlen(s); Err gopher.r-36.net 70 i- for(i = 0, j = 0; i < len; i += j) { Err gopher.r-36.net 70 i- if(!(j = utf8decode(&s[i], &r, len - i))) Err gopher.r-36.net 70 i+ for (i = 0, j = 0; i < len; i += j) { Err gopher.r-36.net 70 i+ if (!(j = utf8decode(&s[i], &r, len - i))) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i- if(r == u) Err gopher.r-36.net 70 i+ if (r == u) Err gopher.r-36.net 70 i return &(s[i]); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i return NULL; Err gopher.r-36.net 70 i@@ -667,9 +667,9 @@ utf8strchr(char *s, Rune u) Err gopher.r-36.net 70 i size_t Err gopher.r-36.net 70 i utf8validate(Rune *u, size_t i) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) Err gopher.r-36.net 70 i+ if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF)) Err gopher.r-36.net 70 i *u = UTF_INVALID; Err gopher.r-36.net 70 i- for(i = 1; *u > utfmax[i]; ++i) Err gopher.r-36.net 70 i+ for (i = 1; *u > utfmax[i]; ++i) Err gopher.r-36.net 70 i ; Err gopher.r-36.net 70 i return i; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -684,7 +684,7 @@ selinit(void) Err gopher.r-36.net 70 i sel.primary = NULL; Err gopher.r-36.net 70 i sel.clipboard = NULL; Err gopher.r-36.net 70 i sel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0); Err gopher.r-36.net 70 i- if(sel.xtarget == None) Err gopher.r-36.net 70 i+ if (sel.xtarget == None) Err gopher.r-36.net 70 i sel.xtarget = XA_STRING; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -711,10 +711,10 @@ tlinelen(int y) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int i = term.col; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(term.line[y][i - 1].mode & ATTR_WRAP) Err gopher.r-36.net 70 i+ if (term.line[y][i - 1].mode & ATTR_WRAP) Err gopher.r-36.net 70 i return i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- while(i > 0 && term.line[y][i - 1].u == ' ') Err gopher.r-36.net 70 i+ while (i > 0 && term.line[y][i - 1].u == ' ') Err gopher.r-36.net 70 i --i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return i; Err gopher.r-36.net 70 i@@ -725,7 +725,7 @@ selnormalize(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { Err gopher.r-36.net 70 i+ if (sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) { Err gopher.r-36.net 70 i sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x; Err gopher.r-36.net 70 i sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -751,10 +751,10 @@ selnormalize(void) Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i selected(int x, int y) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(sel.mode == SEL_EMPTY) Err gopher.r-36.net 70 i+ if (sel.mode == SEL_EMPTY) Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.type == SEL_RECTANGULAR) Err gopher.r-36.net 70 i+ if (sel.type == SEL_RECTANGULAR) Err gopher.r-36.net 70 i return BETWEEN(y, sel.nb.y, sel.ne.y) Err gopher.r-36.net 70 i && BETWEEN(x, sel.nb.x, sel.ne.x); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -770,7 +770,7 @@ selsnap(int *x, int *y, int direction) Err gopher.r-36.net 70 i int delim, prevdelim; Err gopher.r-36.net 70 i Glyph *gp, *prevgp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- switch(sel.snap) { Err gopher.r-36.net 70 i+ switch (sel.snap) { Err gopher.r-36.net 70 i case SNAP_WORD: Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * Snap around if the word wraps around at the end or Err gopher.r-36.net 70 i@@ -778,20 +778,20 @@ selsnap(int *x, int *y, int direction) Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i prevgp = &term.line[*y][*x]; Err gopher.r-36.net 70 i prevdelim = ISDELIM(prevgp->u); Err gopher.r-36.net 70 i- for(;;) { Err gopher.r-36.net 70 i+ for (;;) { Err gopher.r-36.net 70 i newx = *x + direction; Err gopher.r-36.net 70 i newy = *y; Err gopher.r-36.net 70 i- if(!BETWEEN(newx, 0, term.col - 1)) { Err gopher.r-36.net 70 i+ if (!BETWEEN(newx, 0, term.col - 1)) { Err gopher.r-36.net 70 i newy += direction; Err gopher.r-36.net 70 i newx = (newx + term.col) % term.col; Err gopher.r-36.net 70 i if (!BETWEEN(newy, 0, term.row - 1)) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(direction > 0) Err gopher.r-36.net 70 i+ if (direction > 0) Err gopher.r-36.net 70 i yt = *y, xt = *x; Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i yt = newy, xt = newx; Err gopher.r-36.net 70 i- if(!(term.line[yt][xt].mode & ATTR_WRAP)) Err gopher.r-36.net 70 i+ if (!(term.line[yt][xt].mode & ATTR_WRAP)) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -800,7 +800,7 @@ selsnap(int *x, int *y, int direction) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i gp = &term.line[newy][newx]; Err gopher.r-36.net 70 i delim = ISDELIM(gp->u); Err gopher.r-36.net 70 i- if(!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim Err gopher.r-36.net 70 i+ if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim Err gopher.r-36.net 70 i || (delim && gp->u != prevgp->u))) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -817,16 +817,16 @@ selsnap(int *x, int *y, int direction) Err gopher.r-36.net 70 i * previous line will be selected. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i *x = (direction < 0) ? 0 : term.col - 1; Err gopher.r-36.net 70 i- if(direction < 0) { Err gopher.r-36.net 70 i- for(; *y > 0; *y += direction) { Err gopher.r-36.net 70 i- if(!(term.line[*y-1][term.col-1].mode Err gopher.r-36.net 70 i+ if (direction < 0) { Err gopher.r-36.net 70 i+ for (; *y > 0; *y += direction) { Err gopher.r-36.net 70 i+ if (!(term.line[*y-1][term.col-1].mode Err gopher.r-36.net 70 i & ATTR_WRAP)) { Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- } else if(direction > 0) { Err gopher.r-36.net 70 i- for(; *y < term.row-1; *y += direction) { Err gopher.r-36.net 70 i- if(!(term.line[*y][term.col-1].mode Err gopher.r-36.net 70 i+ } else if (direction > 0) { Err gopher.r-36.net 70 i+ for (; *y < term.row-1; *y += direction) { Err gopher.r-36.net 70 i+ if (!(term.line[*y][term.col-1].mode Err gopher.r-36.net 70 i & ATTR_WRAP)) { Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -849,8 +849,8 @@ getbuttoninfo(XEvent *e) Err gopher.r-36.net 70 i selnormalize(); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i sel.type = SEL_REGULAR; Err gopher.r-36.net 70 i- for(type = 1; type < LEN(selmasks); ++type) { Err gopher.r-36.net 70 i- if(match(selmasks[type], state)) { Err gopher.r-36.net 70 i+ for (type = 1; type < LEN(selmasks); ++type) { Err gopher.r-36.net 70 i+ if (match(selmasks[type], state)) { Err gopher.r-36.net 70 i sel.type = type; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -867,51 +867,51 @@ mousereport(XEvent *e) Err gopher.r-36.net 70 i static int ox, oy; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* from urxvt */ Err gopher.r-36.net 70 i- if(e->xbutton.type == MotionNotify) { Err gopher.r-36.net 70 i- if(x == ox && y == oy) Err gopher.r-36.net 70 i+ if (e->xbutton.type == MotionNotify) { Err gopher.r-36.net 70 i+ if (x == ox && y == oy) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i- if(!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) Err gopher.r-36.net 70 i+ if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i /* MOUSE_MOTION: no reporting if no button is pressed */ Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSEMOTION) && oldbutton == 3) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i button = oldbutton + 32; Err gopher.r-36.net 70 i ox = x; Err gopher.r-36.net 70 i oy = y; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- if(!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) { Err gopher.r-36.net 70 i+ if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) { Err gopher.r-36.net 70 i button = 3; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i button -= Button1; Err gopher.r-36.net 70 i- if(button >= 3) Err gopher.r-36.net 70 i+ if (button >= 3) Err gopher.r-36.net 70 i button += 64 - 3; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(e->xbutton.type == ButtonPress) { Err gopher.r-36.net 70 i+ if (e->xbutton.type == ButtonPress) { Err gopher.r-36.net 70 i oldbutton = button; Err gopher.r-36.net 70 i ox = x; Err gopher.r-36.net 70 i oy = y; Err gopher.r-36.net 70 i- } else if(e->xbutton.type == ButtonRelease) { Err gopher.r-36.net 70 i+ } else if (e->xbutton.type == ButtonRelease) { Err gopher.r-36.net 70 i oldbutton = 3; Err gopher.r-36.net 70 i /* MODE_MOUSEX10: no button release reporting */ Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSEX10)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSEX10)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i if (button == 64 || button == 65) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!IS_SET(MODE_MOUSEX10)) { Err gopher.r-36.net 70 i+ if (!IS_SET(MODE_MOUSEX10)) { Err gopher.r-36.net 70 i button += ((state & ShiftMask ) ? 4 : 0) Err gopher.r-36.net 70 i + ((state & Mod4Mask ) ? 8 : 0) Err gopher.r-36.net 70 i + ((state & ControlMask) ? 16 : 0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSESGR)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSESGR)) { Err gopher.r-36.net 70 i len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c", Err gopher.r-36.net 70 i button, x+1, y+1, Err gopher.r-36.net 70 i e->xbutton.type == ButtonRelease ? 'm' : 'M'); Err gopher.r-36.net 70 i- } else if(x < 223 && y < 223) { Err gopher.r-36.net 70 i+ } else if (x < 223 && y < 223) { Err gopher.r-36.net 70 i len = snprintf(buf, sizeof(buf), "\033[M%c%c%c", Err gopher.r-36.net 70 i 32+button, 32+x+1, 32+y+1); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -927,20 +927,20 @@ bpress(XEvent *e) Err gopher.r-36.net 70 i struct timespec now; Err gopher.r-36.net 70 i Mousekey *mk; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i mousereport(e); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { Err gopher.r-36.net 70 i- if(e->xbutton.button == mk->b Err gopher.r-36.net 70 i+ for (mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) { Err gopher.r-36.net 70 i+ if (e->xbutton.button == mk->b Err gopher.r-36.net 70 i && match(mk->mask, e->xbutton.state)) { Err gopher.r-36.net 70 i ttysend(mk->s, strlen(mk->s)); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(e->xbutton.button == Button1) { Err gopher.r-36.net 70 i+ if (e->xbutton.button == Button1) { Err gopher.r-36.net 70 i clock_gettime(CLOCK_MONOTONIC, &now); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Clear previous selection, logically and visually. */ Err gopher.r-36.net 70 i@@ -954,16 +954,16 @@ bpress(XEvent *e) Err gopher.r-36.net 70 i * If the user clicks below predefined timeouts specific Err gopher.r-36.net 70 i * snapping behaviour is exposed. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) { Err gopher.r-36.net 70 i+ if (TIMEDIFF(now, sel.tclick2) <= tripleclicktimeout) { Err gopher.r-36.net 70 i sel.snap = SNAP_LINE; Err gopher.r-36.net 70 i- } else if(TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) { Err gopher.r-36.net 70 i+ } else if (TIMEDIFF(now, sel.tclick1) <= doubleclicktimeout) { Err gopher.r-36.net 70 i sel.snap = SNAP_WORD; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i sel.snap = 0; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i selnormalize(); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.snap != 0) Err gopher.r-36.net 70 i+ if (sel.snap != 0) Err gopher.r-36.net 70 i sel.mode = SEL_READY; Err gopher.r-36.net 70 i tsetdirt(sel.nb.y, sel.ne.y); Err gopher.r-36.net 70 i sel.tclick2 = sel.tclick1; Err gopher.r-36.net 70 i@@ -978,17 +978,17 @@ getsel(void) Err gopher.r-36.net 70 i int y, bufsize, lastx, linelen; Err gopher.r-36.net 70 i Glyph *gp, *last; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.ob.x == -1) Err gopher.r-36.net 70 i+ if (sel.ob.x == -1) Err gopher.r-36.net 70 i return NULL; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i bufsize = (term.col+1) * (sel.ne.y-sel.nb.y+1) * UTF_SIZ; Err gopher.r-36.net 70 i ptr = str = xmalloc(bufsize); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* append every set & selected glyph to the selection */ Err gopher.r-36.net 70 i- for(y = sel.nb.y; y <= sel.ne.y; y++) { Err gopher.r-36.net 70 i+ for (y = sel.nb.y; y <= sel.ne.y; y++) { Err gopher.r-36.net 70 i linelen = tlinelen(y); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.type == SEL_RECTANGULAR) { Err gopher.r-36.net 70 i+ if (sel.type == SEL_RECTANGULAR) { Err gopher.r-36.net 70 i gp = &term.line[y][sel.nb.x]; Err gopher.r-36.net 70 i lastx = sel.ne.x; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -996,11 +996,11 @@ getsel(void) Err gopher.r-36.net 70 i lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i last = &term.line[y][MIN(lastx, linelen-1)]; Err gopher.r-36.net 70 i- while(last >= gp && last->u == ' ') Err gopher.r-36.net 70 i+ while (last >= gp && last->u == ' ') Err gopher.r-36.net 70 i --last; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for( ; gp <= last; ++gp) { Err gopher.r-36.net 70 i- if(gp->mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i+ for ( ; gp <= last; ++gp) { Err gopher.r-36.net 70 i+ if (gp->mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i ptr += utf8encode(gp->u, ptr); Err gopher.r-36.net 70 i@@ -1015,7 +1015,7 @@ getsel(void) Err gopher.r-36.net 70 i * st. Err gopher.r-36.net 70 i * FIXME: Fix the computer world. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP)) Err gopher.r-36.net 70 i+ if ((y < sel.ne.y || lastx >= linelen) && !(last->mode & ATTR_WRAP)) Err gopher.r-36.net 70 i *ptr++ = '\n'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i *ptr = 0; Err gopher.r-36.net 70 i@@ -1042,7 +1042,7 @@ selnotify(XEvent *e) Err gopher.r-36.net 70 i if (xsev->property == None) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i do { Err gopher.r-36.net 70 i- if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs, Err gopher.r-36.net 70 i+ if (XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs, Err gopher.r-36.net 70 i BUFSIZ/4, False, AnyPropertyType, Err gopher.r-36.net 70 i &type, &format, &nitems, &rem, Err gopher.r-36.net 70 i &data)) { Err gopher.r-36.net 70 i@@ -1059,19 +1059,19 @@ selnotify(XEvent *e) Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i repl = data; Err gopher.r-36.net 70 i last = data + nitems * format / 8; Err gopher.r-36.net 70 i- while((repl = memchr(repl, '\n', last - repl))) { Err gopher.r-36.net 70 i+ while ((repl = memchr(repl, '\n', last - repl))) { Err gopher.r-36.net 70 i *repl++ = '\r'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_BRCKTPASTE)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_BRCKTPASTE)) Err gopher.r-36.net 70 i ttywrite("\033[200~", 6); Err gopher.r-36.net 70 i ttysend((char *)data, nitems * format / 8); Err gopher.r-36.net 70 i- if(IS_SET(MODE_BRCKTPASTE)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_BRCKTPASTE)) Err gopher.r-36.net 70 i ttywrite("\033[201~", 6); Err gopher.r-36.net 70 i XFree(data); Err gopher.r-36.net 70 i /* number of 32-bit chunks returned */ Err gopher.r-36.net 70 i ofs += nitems * format / 32; Err gopher.r-36.net 70 i- } while(rem > 0); Err gopher.r-36.net 70 i+ } while (rem > 0); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i@@ -1086,10 +1086,10 @@ clipcopy(const Arg *dummy) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i Atom clipboard; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.clipboard != NULL) Err gopher.r-36.net 70 i+ if (sel.clipboard != NULL) Err gopher.r-36.net 70 i free(sel.clipboard); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(sel.primary != NULL) { Err gopher.r-36.net 70 i+ if (sel.primary != NULL) { Err gopher.r-36.net 70 i sel.clipboard = xstrdup(sel.primary); Err gopher.r-36.net 70 i clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); Err gopher.r-36.net 70 i XSetSelectionOwner(xw.dpy, clipboard, xw.win, CurrentTime); Err gopher.r-36.net 70 i@@ -1109,7 +1109,7 @@ clippaste(const Arg *dummy) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i selclear(XEvent *e) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(sel.ob.x == -1) Err gopher.r-36.net 70 i+ if (sel.ob.x == -1) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i sel.mode = SEL_IDLE; Err gopher.r-36.net 70 i sel.ob.x = -1; Err gopher.r-36.net 70 i@@ -1137,22 +1137,22 @@ selrequest(XEvent *e) Err gopher.r-36.net 70 i xev.property = None; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i xa_targets = XInternAtom(xw.dpy, "TARGETS", 0); Err gopher.r-36.net 70 i- if(xsre->target == xa_targets) { Err gopher.r-36.net 70 i+ if (xsre->target == xa_targets) { Err gopher.r-36.net 70 i /* respond with the supported type */ Err gopher.r-36.net 70 i string = sel.xtarget; Err gopher.r-36.net 70 i XChangeProperty(xsre->display, xsre->requestor, xsre->property, Err gopher.r-36.net 70 i XA_ATOM, 32, PropModeReplace, Err gopher.r-36.net 70 i (uchar *) &string, 1); Err gopher.r-36.net 70 i xev.property = xsre->property; Err gopher.r-36.net 70 i- } else if(xsre->target == sel.xtarget || xsre->target == XA_STRING) { Err gopher.r-36.net 70 i+ } else if (xsre->target == sel.xtarget || xsre->target == XA_STRING) { Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * xith XA_STRING non ascii characters may be incorrect in the Err gopher.r-36.net 70 i * requestor. It is not our problem, use utf8. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i clipboard = XInternAtom(xw.dpy, "CLIPBOARD", 0); Err gopher.r-36.net 70 i- if(xsre->selection == XA_PRIMARY) { Err gopher.r-36.net 70 i+ if (xsre->selection == XA_PRIMARY) { Err gopher.r-36.net 70 i seltext = sel.primary; Err gopher.r-36.net 70 i- } else if(xsre->selection == clipboard) { Err gopher.r-36.net 70 i+ } else if (xsre->selection == clipboard) { Err gopher.r-36.net 70 i seltext = sel.clipboard; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i fprintf(stderr, Err gopher.r-36.net 70 i@@ -1160,7 +1160,7 @@ selrequest(XEvent *e) Err gopher.r-36.net 70 i xsre->selection); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(seltext != NULL) { Err gopher.r-36.net 70 i+ if (seltext != NULL) { Err gopher.r-36.net 70 i XChangeProperty(xsre->display, xsre->requestor, Err gopher.r-36.net 70 i xsre->property, xsre->target, Err gopher.r-36.net 70 i 8, PropModeReplace, Err gopher.r-36.net 70 i@@ -1170,7 +1170,7 @@ selrequest(XEvent *e) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* all done, send a notification to the listener */ Err gopher.r-36.net 70 i- if(!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev)) Err gopher.r-36.net 70 i+ if (!XSendEvent(xsre->display, xsre->requestor, 1, 0, (XEvent *) &xev)) Err gopher.r-36.net 70 i fprintf(stderr, "Error sending SelectionNotify event\n"); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1188,15 +1188,15 @@ xsetsel(char *str, Time t) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i brelease(XEvent *e) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i mousereport(e); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(e->xbutton.button == Button2) { Err gopher.r-36.net 70 i+ if (e->xbutton.button == Button2) { Err gopher.r-36.net 70 i selpaste(NULL); Err gopher.r-36.net 70 i- } else if(e->xbutton.button == Button1) { Err gopher.r-36.net 70 i- if(sel.mode == SEL_READY) { Err gopher.r-36.net 70 i+ } else if (e->xbutton.button == Button1) { Err gopher.r-36.net 70 i+ if (sel.mode == SEL_READY) { Err gopher.r-36.net 70 i getbuttoninfo(e); Err gopher.r-36.net 70 i selcopy(e->xbutton.time); Err gopher.r-36.net 70 i } else Err gopher.r-36.net 70 i@@ -1211,12 +1211,12 @@ bmotion(XEvent *e) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int oldey, oldex, oldsby, oldsey; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forceselmod)) { Err gopher.r-36.net 70 i mousereport(e); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!sel.mode) Err gopher.r-36.net 70 i+ if (!sel.mode) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i sel.mode = SEL_READY; Err gopher.r-36.net 70 i@@ -1226,7 +1226,7 @@ bmotion(XEvent *e) Err gopher.r-36.net 70 i oldsey = sel.ne.y; Err gopher.r-36.net 70 i getbuttoninfo(e); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(oldey != sel.oe.y || oldex != sel.oe.x) Err gopher.r-36.net 70 i+ if (oldey != sel.oe.y || oldex != sel.oe.x) Err gopher.r-36.net 70 i tsetdirt(MIN(sel.nb.y, oldsby), MAX(sel.ne.y, oldsey)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1249,8 +1249,8 @@ execsh(void) Err gopher.r-36.net 70 i char buf[sizeof(long) * 8 + 1]; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i errno = 0; Err gopher.r-36.net 70 i- if((pw = getpwuid(getuid())) == NULL) { Err gopher.r-36.net 70 i- if(errno) Err gopher.r-36.net 70 i+ if ((pw = getpwuid(getuid())) == NULL) { Err gopher.r-36.net 70 i+ if (errno) Err gopher.r-36.net 70 i die("getpwuid:%s\n", strerror(errno)); Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i die("who are you?\n"); Err gopher.r-36.net 70 i@@ -1260,9 +1260,9 @@ execsh(void) Err gopher.r-36.net 70 i sh = (pw->pw_shell[0]) ? pw->pw_shell : shell; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(opt_cmd) Err gopher.r-36.net 70 i+ if (opt_cmd) Err gopher.r-36.net 70 i prog = opt_cmd[0]; Err gopher.r-36.net 70 i- else if(utmp) Err gopher.r-36.net 70 i+ else if (utmp) Err gopher.r-36.net 70 i prog = utmp; Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i prog = sh; Err gopher.r-36.net 70 i@@ -1297,10 +1297,10 @@ sigchld(int a) Err gopher.r-36.net 70 i int stat; Err gopher.r-36.net 70 i pid_t p; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if((p = waitpid(pid, &stat, WNOHANG)) < 0) Err gopher.r-36.net 70 i+ if ((p = waitpid(pid, &stat, WNOHANG)) < 0) Err gopher.r-36.net 70 i die("Waiting for pid %hd failed: %s\n", pid, strerror(errno)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(pid != p) Err gopher.r-36.net 70 i+ if (pid != p) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (!WIFEXITED(stat) || WEXITSTATUS(stat)) Err gopher.r-36.net 70 i@@ -1315,13 +1315,13 @@ stty(void) Err gopher.r-36.net 70 i char cmd[_POSIX_ARG_MAX], **p, *q, *s; Err gopher.r-36.net 70 i size_t n, siz; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if((n = strlen(stty_args)) > sizeof(cmd)-1) Err gopher.r-36.net 70 i+ if ((n = strlen(stty_args)) > sizeof(cmd)-1) Err gopher.r-36.net 70 i die("incorrect stty parameters\n"); Err gopher.r-36.net 70 i memcpy(cmd, stty_args, n); Err gopher.r-36.net 70 i q = cmd + n; Err gopher.r-36.net 70 i siz = sizeof(cmd) - n; Err gopher.r-36.net 70 i- for(p = opt_cmd; p && (s = *p); ++p) { Err gopher.r-36.net 70 i- if((n = strlen(s)) > siz-1) Err gopher.r-36.net 70 i+ for (p = opt_cmd; p && (s = *p); ++p) { Err gopher.r-36.net 70 i+ if ((n = strlen(s)) > siz-1) Err gopher.r-36.net 70 i die("stty parameter length too long\n"); Err gopher.r-36.net 70 i *q++ = ' '; Err gopher.r-36.net 70 i q = memcpy(q, s, n); Err gopher.r-36.net 70 i@@ -1339,18 +1339,18 @@ ttynew(void) Err gopher.r-36.net 70 i int m, s; Err gopher.r-36.net 70 i struct winsize w = {term.row, term.col, 0, 0}; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(opt_io) { Err gopher.r-36.net 70 i+ if (opt_io) { Err gopher.r-36.net 70 i term.mode |= MODE_PRINT; Err gopher.r-36.net 70 i iofd = (!strcmp(opt_io, "-")) ? Err gopher.r-36.net 70 i 1 : open(opt_io, O_WRONLY | O_CREAT, 0666); Err gopher.r-36.net 70 i- if(iofd < 0) { Err gopher.r-36.net 70 i+ if (iofd < 0) { Err gopher.r-36.net 70 i fprintf(stderr, "Error opening %s:%s\n", Err gopher.r-36.net 70 i opt_io, strerror(errno)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i if (opt_line) { Err gopher.r-36.net 70 i- if((cmdfd = open(opt_line, O_RDWR)) < 0) Err gopher.r-36.net 70 i+ if ((cmdfd = open(opt_line, O_RDWR)) < 0) Err gopher.r-36.net 70 i die("open line failed: %s\n", strerror(errno)); Err gopher.r-36.net 70 i close(0); Err gopher.r-36.net 70 i dup(cmdfd); Err gopher.r-36.net 70 i@@ -1359,10 +1359,10 @@ ttynew(void) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* seems to work fine on linux, openbsd and freebsd */ Err gopher.r-36.net 70 i- if(openpty(&m, &s, NULL, NULL, &w) < 0) Err gopher.r-36.net 70 i+ if (openpty(&m, &s, NULL, NULL, &w) < 0) Err gopher.r-36.net 70 i die("openpty failed: %s\n", strerror(errno)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- switch(pid = fork()) { Err gopher.r-36.net 70 i+ switch (pid = fork()) { Err gopher.r-36.net 70 i case -1: Err gopher.r-36.net 70 i die("fork failed\n"); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -1372,7 +1372,7 @@ ttynew(void) Err gopher.r-36.net 70 i dup2(s, 0); Err gopher.r-36.net 70 i dup2(s, 1); Err gopher.r-36.net 70 i dup2(s, 2); Err gopher.r-36.net 70 i- if(ioctl(s, TIOCSCTTY, NULL) < 0) Err gopher.r-36.net 70 i+ if (ioctl(s, TIOCSCTTY, NULL) < 0) Err gopher.r-36.net 70 i die("ioctl TIOCSCTTY failed: %s\n", strerror(errno)); Err gopher.r-36.net 70 i close(s); Err gopher.r-36.net 70 i close(m); Err gopher.r-36.net 70 i@@ -1397,13 +1397,13 @@ ttyread(void) Err gopher.r-36.net 70 i int ret; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* append read bytes to unprocessed bytes */ Err gopher.r-36.net 70 i- if((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0) Err gopher.r-36.net 70 i+ if ((ret = read(cmdfd, buf+buflen, LEN(buf)-buflen)) < 0) Err gopher.r-36.net 70 i die("Couldn't read from shell: %s\n", strerror(errno)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* process every complete utf8 char */ Err gopher.r-36.net 70 i buflen += ret; Err gopher.r-36.net 70 i ptr = buf; Err gopher.r-36.net 70 i- while((charsize = utf8decode(ptr, &unicodep, buflen))) { Err gopher.r-36.net 70 i+ while ((charsize = utf8decode(ptr, &unicodep, buflen))) { Err gopher.r-36.net 70 i tputc(unicodep); Err gopher.r-36.net 70 i ptr += charsize; Err gopher.r-36.net 70 i buflen -= charsize; Err gopher.r-36.net 70 i@@ -1416,7 +1416,7 @@ ttyread(void) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i tttywrite(const char *s, size_t n) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(xwrite(cmdfd, s, n) == -1) Err gopher.r-36.net 70 i+ if (xwrite(cmdfd, s, n) == -1) Err gopher.r-36.net 70 i die("write error on tty: %s\n", strerror(errno)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1427,8 +1427,8 @@ ttysend(char *s, size_t n) Err gopher.r-36.net 70 i Rune u; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i ttywrite(s, n); Err gopher.r-36.net 70 i- if(IS_SET(MODE_ECHO)) Err gopher.r-36.net 70 i- while((len = utf8decode(s, &u, n)) > 0) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_ECHO)) Err gopher.r-36.net 70 i+ while ((len = utf8decode(s, &u, n)) > 0) { Err gopher.r-36.net 70 i techo(u); Err gopher.r-36.net 70 i n -= len; Err gopher.r-36.net 70 i s += len; Err gopher.r-36.net 70 i@@ -1444,7 +1444,7 @@ ttyresize(void) Err gopher.r-36.net 70 i w.ws_col = term.col; Err gopher.r-36.net 70 i w.ws_xpixel = xw.tw; Err gopher.r-36.net 70 i w.ws_ypixel = xw.th; Err gopher.r-36.net 70 i- if(ioctl(cmdfd, TIOCSWINSZ, &w) < 0) Err gopher.r-36.net 70 i+ if (ioctl(cmdfd, TIOCSWINSZ, &w) < 0) Err gopher.r-36.net 70 i fprintf(stderr, "Couldn't set window size: %s\n", strerror(errno)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1453,9 +1453,9 @@ tattrset(int attr) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int i, j; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < term.row-1; i++) { Err gopher.r-36.net 70 i- for(j = 0; j < term.col-1; j++) { Err gopher.r-36.net 70 i- if(term.line[i][j].mode & attr) Err gopher.r-36.net 70 i+ for (i = 0; i < term.row-1; i++) { Err gopher.r-36.net 70 i+ for (j = 0; j < term.col-1; j++) { Err gopher.r-36.net 70 i+ if (term.line[i][j].mode & attr) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1471,7 +1471,7 @@ tsetdirt(int top, int bot) Err gopher.r-36.net 70 i LIMIT(top, 0, term.row-1); Err gopher.r-36.net 70 i LIMIT(bot, 0, term.row-1); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = top; i <= bot; i++) Err gopher.r-36.net 70 i+ for (i = top; i <= bot; i++) Err gopher.r-36.net 70 i term.dirty[i] = 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1480,9 +1480,9 @@ tsetdirtattr(int attr) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int i, j; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < term.row-1; i++) { Err gopher.r-36.net 70 i- for(j = 0; j < term.col-1; j++) { Err gopher.r-36.net 70 i- if(term.line[i][j].mode & attr) { Err gopher.r-36.net 70 i+ for (i = 0; i < term.row-1; i++) { Err gopher.r-36.net 70 i+ for (j = 0; j < term.col-1; j++) { Err gopher.r-36.net 70 i+ if (term.line[i][j].mode & attr) { Err gopher.r-36.net 70 i tsetdirt(i, i); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1502,9 +1502,9 @@ tcursor(int mode) Err gopher.r-36.net 70 i static TCursor c[2]; Err gopher.r-36.net 70 i int alt = IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(mode == CURSOR_SAVE) { Err gopher.r-36.net 70 i+ if (mode == CURSOR_SAVE) { Err gopher.r-36.net 70 i c[alt] = term.c; Err gopher.r-36.net 70 i- } else if(mode == CURSOR_LOAD) { Err gopher.r-36.net 70 i+ } else if (mode == CURSOR_LOAD) { Err gopher.r-36.net 70 i term.c = c[alt]; Err gopher.r-36.net 70 i tmoveto(c[alt].x, c[alt].y); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1522,7 +1522,7 @@ treset(void) Err gopher.r-36.net 70 i }, .x = 0, .y = 0, .state = CURSOR_DEFAULT}; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i memset(term.tabs, 0, term.col * sizeof(*term.tabs)); Err gopher.r-36.net 70 i- for(i = tabspaces; i < term.col; i += tabspaces) Err gopher.r-36.net 70 i+ for (i = tabspaces; i < term.col; i += tabspaces) Err gopher.r-36.net 70 i term.tabs[i] = 1; Err gopher.r-36.net 70 i term.top = 0; Err gopher.r-36.net 70 i term.bot = term.row - 1; Err gopher.r-36.net 70 i@@ -1530,7 +1530,7 @@ treset(void) Err gopher.r-36.net 70 i memset(term.trantbl, CS_USA, sizeof(term.trantbl)); Err gopher.r-36.net 70 i term.charset = 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < 2; i++) { Err gopher.r-36.net 70 i+ for (i = 0; i < 2; i++) { Err gopher.r-36.net 70 i tmoveto(0, 0); Err gopher.r-36.net 70 i tcursor(CURSOR_SAVE); Err gopher.r-36.net 70 i tclearregion(0, 0, term.col-1, term.row-1); Err gopher.r-36.net 70 i@@ -1570,7 +1570,7 @@ tscrolldown(int orig, int n) Err gopher.r-36.net 70 i tsetdirt(orig, term.bot-n); Err gopher.r-36.net 70 i tclearregion(0, term.bot-n+1, term.col-1, term.bot); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = term.bot; i >= orig+n; i--) { Err gopher.r-36.net 70 i+ for (i = term.bot; i >= orig+n; i--) { Err gopher.r-36.net 70 i temp = term.line[i]; Err gopher.r-36.net 70 i term.line[i] = term.line[i-n]; Err gopher.r-36.net 70 i term.line[i-n] = temp; Err gopher.r-36.net 70 i@@ -1590,7 +1590,7 @@ tscrollup(int orig, int n) Err gopher.r-36.net 70 i tclearregion(0, orig, term.col-1, orig+n-1); Err gopher.r-36.net 70 i tsetdirt(orig+n, term.bot); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = orig; i <= term.bot-n; i++) { Err gopher.r-36.net 70 i+ for (i = orig; i <= term.bot-n; i++) { Err gopher.r-36.net 70 i temp = term.line[i]; Err gopher.r-36.net 70 i term.line[i] = term.line[i+n]; Err gopher.r-36.net 70 i term.line[i+n] = temp; Err gopher.r-36.net 70 i@@ -1602,25 +1602,25 @@ tscrollup(int orig, int n) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i selscroll(int orig, int n) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(sel.ob.x == -1) Err gopher.r-36.net 70 i+ if (sel.ob.x == -1) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) { Err gopher.r-36.net 70 i- if((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) { Err gopher.r-36.net 70 i+ if (BETWEEN(sel.ob.y, orig, term.bot) || BETWEEN(sel.oe.y, orig, term.bot)) { Err gopher.r-36.net 70 i+ if ((sel.ob.y += n) > term.bot || (sel.oe.y += n) < term.top) { Err gopher.r-36.net 70 i selclear(NULL); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(sel.type == SEL_RECTANGULAR) { Err gopher.r-36.net 70 i- if(sel.ob.y < term.top) Err gopher.r-36.net 70 i+ if (sel.type == SEL_RECTANGULAR) { Err gopher.r-36.net 70 i+ if (sel.ob.y < term.top) Err gopher.r-36.net 70 i sel.ob.y = term.top; Err gopher.r-36.net 70 i- if(sel.oe.y > term.bot) Err gopher.r-36.net 70 i+ if (sel.oe.y > term.bot) Err gopher.r-36.net 70 i sel.oe.y = term.bot; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- if(sel.ob.y < term.top) { Err gopher.r-36.net 70 i+ if (sel.ob.y < term.top) { Err gopher.r-36.net 70 i sel.ob.y = term.top; Err gopher.r-36.net 70 i sel.ob.x = 0; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(sel.oe.y > term.bot) { Err gopher.r-36.net 70 i+ if (sel.oe.y > term.bot) { Err gopher.r-36.net 70 i sel.oe.y = term.bot; Err gopher.r-36.net 70 i sel.oe.x = term.col; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1634,7 +1634,7 @@ tnewline(int first_col) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int y = term.c.y; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(y == term.bot) { Err gopher.r-36.net 70 i+ if (y == term.bot) { Err gopher.r-36.net 70 i tscrollup(term.top, 1); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i y++; Err gopher.r-36.net 70 i@@ -1649,22 +1649,22 @@ csiparse(void) Err gopher.r-36.net 70 i long int v; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i csiescseq.narg = 0; Err gopher.r-36.net 70 i- if(*p == '?') { Err gopher.r-36.net 70 i+ if (*p == '?') { Err gopher.r-36.net 70 i csiescseq.priv = 1; Err gopher.r-36.net 70 i p++; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i csiescseq.buf[csiescseq.len] = '\0'; Err gopher.r-36.net 70 i- while(p < csiescseq.buf+csiescseq.len) { Err gopher.r-36.net 70 i+ while (p < csiescseq.buf+csiescseq.len) { Err gopher.r-36.net 70 i np = NULL; Err gopher.r-36.net 70 i v = strtol(p, &np, 10); Err gopher.r-36.net 70 i- if(np == p) Err gopher.r-36.net 70 i+ if (np == p) Err gopher.r-36.net 70 i v = 0; Err gopher.r-36.net 70 i- if(v == LONG_MAX || v == LONG_MIN) Err gopher.r-36.net 70 i+ if (v == LONG_MAX || v == LONG_MIN) Err gopher.r-36.net 70 i v = -1; Err gopher.r-36.net 70 i csiescseq.arg[csiescseq.narg++] = v; Err gopher.r-36.net 70 i p = np; Err gopher.r-36.net 70 i- if(*p != ';' || csiescseq.narg == ESC_ARG_SIZ) Err gopher.r-36.net 70 i+ if (*p != ';' || csiescseq.narg == ESC_ARG_SIZ) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i p++; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1684,7 +1684,7 @@ tmoveto(int x, int y) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int miny, maxy; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(term.c.state & CURSOR_ORIGIN) { Err gopher.r-36.net 70 i+ if (term.c.state & CURSOR_ORIGIN) { Err gopher.r-36.net 70 i miny = term.top; Err gopher.r-36.net 70 i maxy = term.bot; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -1713,16 +1713,16 @@ tsetchar(Rune u, Glyph *attr, int x, int y) Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * The table is proudly stolen from rxvt. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(term.trantbl[term.charset] == CS_GRAPHIC0 && Err gopher.r-36.net 70 i+ if (term.trantbl[term.charset] == CS_GRAPHIC0 && Err gopher.r-36.net 70 i BETWEEN(u, 0x41, 0x7e) && vt100_0[u - 0x41]) Err gopher.r-36.net 70 i utf8decode(vt100_0[u - 0x41], &u, UTF_SIZ); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(term.line[y][x].mode & ATTR_WIDE) { Err gopher.r-36.net 70 i- if(x+1 < term.col) { Err gopher.r-36.net 70 i+ if (term.line[y][x].mode & ATTR_WIDE) { Err gopher.r-36.net 70 i+ if (x+1 < term.col) { Err gopher.r-36.net 70 i term.line[y][x+1].u = ' '; Err gopher.r-36.net 70 i term.line[y][x+1].mode &= ~ATTR_WDUMMY; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- } else if(term.line[y][x].mode & ATTR_WDUMMY) { Err gopher.r-36.net 70 i+ } else if (term.line[y][x].mode & ATTR_WDUMMY) { Err gopher.r-36.net 70 i term.line[y][x-1].u = ' '; Err gopher.r-36.net 70 i term.line[y][x-1].mode &= ~ATTR_WIDE; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -1738,9 +1738,9 @@ tclearregion(int x1, int y1, int x2, int y2) Err gopher.r-36.net 70 i int x, y, temp; Err gopher.r-36.net 70 i Glyph *gp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(x1 > x2) Err gopher.r-36.net 70 i+ if (x1 > x2) Err gopher.r-36.net 70 i temp = x1, x1 = x2, x2 = temp; Err gopher.r-36.net 70 i- if(y1 > y2) Err gopher.r-36.net 70 i+ if (y1 > y2) Err gopher.r-36.net 70 i temp = y1, y1 = y2, y2 = temp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i LIMIT(x1, 0, term.col-1); Err gopher.r-36.net 70 i@@ -1748,11 +1748,11 @@ tclearregion(int x1, int y1, int x2, int y2) Err gopher.r-36.net 70 i LIMIT(y1, 0, term.row-1); Err gopher.r-36.net 70 i LIMIT(y2, 0, term.row-1); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(y = y1; y <= y2; y++) { Err gopher.r-36.net 70 i+ for (y = y1; y <= y2; y++) { Err gopher.r-36.net 70 i term.dirty[y] = 1; Err gopher.r-36.net 70 i- for(x = x1; x <= x2; x++) { Err gopher.r-36.net 70 i+ for (x = x1; x <= x2; x++) { Err gopher.r-36.net 70 i gp = &term.line[y][x]; Err gopher.r-36.net 70 i- if(selected(x, y)) Err gopher.r-36.net 70 i+ if (selected(x, y)) Err gopher.r-36.net 70 i selclear(NULL); Err gopher.r-36.net 70 i gp->fg = term.c.attr.fg; Err gopher.r-36.net 70 i gp->bg = term.c.attr.bg; Err gopher.r-36.net 70 i@@ -1799,14 +1799,14 @@ tinsertblank(int n) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttinsertblankline(int n) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(BETWEEN(term.c.y, term.top, term.bot)) Err gopher.r-36.net 70 i+ if (BETWEEN(term.c.y, term.top, term.bot)) Err gopher.r-36.net 70 i tscrolldown(term.c.y, n); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttdeleteline(int n) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(BETWEEN(term.c.y, term.top, term.bot)) Err gopher.r-36.net 70 i+ if (BETWEEN(term.c.y, term.top, term.bot)) Err gopher.r-36.net 70 i tscrollup(term.c.y, n); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -1828,7 +1828,7 @@ tdefcolor(int *attr, int *npar, int l) Err gopher.r-36.net 70 i g = attr[*npar + 3]; Err gopher.r-36.net 70 i b = attr[*npar + 4]; Err gopher.r-36.net 70 i *npar += 4; Err gopher.r-36.net 70 i- if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255)) Err gopher.r-36.net 70 i+ if (!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255)) Err gopher.r-36.net 70 i fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n", Err gopher.r-36.net 70 i r, g, b); Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i@@ -1842,7 +1842,7 @@ tdefcolor(int *attr, int *npar, int l) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i *npar += 2; Err gopher.r-36.net 70 i- if(!BETWEEN(attr[*npar], 0, 255)) Err gopher.r-36.net 70 i+ if (!BETWEEN(attr[*npar], 0, 255)) Err gopher.r-36.net 70 i fprintf(stderr, "erresc: bad fgcolor %d\n", attr[*npar]); Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i idx = attr[*npar]; Err gopher.r-36.net 70 i@@ -1866,8 +1866,8 @@ tsetattr(int *attr, int l) Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i int32_t idx; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < l; i++) { Err gopher.r-36.net 70 i- switch(attr[i]) { Err gopher.r-36.net 70 i+ for (i = 0; i < l; i++) { Err gopher.r-36.net 70 i+ switch (attr[i]) { Err gopher.r-36.net 70 i case 0: Err gopher.r-36.net 70 i term.c.attr.mode &= ~( Err gopher.r-36.net 70 i ATTR_BOLD | Err gopher.r-36.net 70 i@@ -1943,13 +1943,13 @@ tsetattr(int *attr, int l) Err gopher.r-36.net 70 i term.c.attr.bg = defaultbg; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i- if(BETWEEN(attr[i], 30, 37)) { Err gopher.r-36.net 70 i+ if (BETWEEN(attr[i], 30, 37)) { Err gopher.r-36.net 70 i term.c.attr.fg = attr[i] - 30; Err gopher.r-36.net 70 i- } else if(BETWEEN(attr[i], 40, 47)) { Err gopher.r-36.net 70 i+ } else if (BETWEEN(attr[i], 40, 47)) { Err gopher.r-36.net 70 i term.c.attr.bg = attr[i] - 40; Err gopher.r-36.net 70 i- } else if(BETWEEN(attr[i], 90, 97)) { Err gopher.r-36.net 70 i+ } else if (BETWEEN(attr[i], 90, 97)) { Err gopher.r-36.net 70 i term.c.attr.fg = attr[i] - 90 + 8; Err gopher.r-36.net 70 i- } else if(BETWEEN(attr[i], 100, 107)) { Err gopher.r-36.net 70 i+ } else if (BETWEEN(attr[i], 100, 107)) { Err gopher.r-36.net 70 i term.c.attr.bg = attr[i] - 100 + 8; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i fprintf(stderr, Err gopher.r-36.net 70 i@@ -1968,7 +1968,7 @@ tsetscroll(int t, int b) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i LIMIT(t, 0, term.row-1); Err gopher.r-36.net 70 i LIMIT(b, 0, term.row-1); Err gopher.r-36.net 70 i- if(t > b) { Err gopher.r-36.net 70 i+ if (t > b) { Err gopher.r-36.net 70 i temp = t; Err gopher.r-36.net 70 i t = b; Err gopher.r-36.net 70 i b = temp; Err gopher.r-36.net 70 i@@ -1983,16 +1983,16 @@ tsetmode(int priv, int set, int *args, int narg) Err gopher.r-36.net 70 i int *lim, mode; Err gopher.r-36.net 70 i int alt; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(lim = args + narg; args < lim; ++args) { Err gopher.r-36.net 70 i- if(priv) { Err gopher.r-36.net 70 i- switch(*args) { Err gopher.r-36.net 70 i+ for (lim = args + narg; args < lim; ++args) { Err gopher.r-36.net 70 i+ if (priv) { Err gopher.r-36.net 70 i+ switch (*args) { Err gopher.r-36.net 70 i case 1: /* DECCKM -- Cursor key */ Err gopher.r-36.net 70 i MODBIT(term.mode, set, MODE_APPCURSOR); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 5: /* DECSCNM -- Reverse video */ Err gopher.r-36.net 70 i mode = term.mode; Err gopher.r-36.net 70 i MODBIT(term.mode, set, MODE_REVERSE); Err gopher.r-36.net 70 i- if(mode != term.mode) Err gopher.r-36.net 70 i+ if (mode != term.mode) Err gopher.r-36.net 70 i redraw(); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 6: /* DECOM -- Origin */ Err gopher.r-36.net 70 i@@ -2054,13 +2054,13 @@ tsetmode(int priv, int set, int *args, int narg) Err gopher.r-36.net 70 i if (!allowaltscreen) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i alt = IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i- if(alt) { Err gopher.r-36.net 70 i+ if (alt) { Err gopher.r-36.net 70 i tclearregion(0, 0, term.col-1, Err gopher.r-36.net 70 i term.row-1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(set ^ alt) /* set is always 1 or 0 */ Err gopher.r-36.net 70 i+ if (set ^ alt) /* set is always 1 or 0 */ Err gopher.r-36.net 70 i tswapscreen(); Err gopher.r-36.net 70 i- if(*args != 1049) Err gopher.r-36.net 70 i+ if (*args != 1049) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i /* FALLTHROUGH */ Err gopher.r-36.net 70 i case 1048: Err gopher.r-36.net 70 i@@ -2085,7 +2085,7 @@ tsetmode(int priv, int set, int *args, int narg) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- switch(*args) { Err gopher.r-36.net 70 i+ switch (*args) { Err gopher.r-36.net 70 i case 0: /* Error (IGNORED) */ Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 2: /* KAM -- keyboard action */ Err gopher.r-36.net 70 i@@ -2116,7 +2116,7 @@ csihandle(void) Err gopher.r-36.net 70 i char buf[40]; Err gopher.r-36.net 70 i int len; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- switch(csiescseq.mode[0]) { Err gopher.r-36.net 70 i+ switch (csiescseq.mode[0]) { Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i unknown: Err gopher.r-36.net 70 i fprintf(stderr, "erresc: unknown csi "); Err gopher.r-36.net 70 i@@ -2137,7 +2137,7 @@ csihandle(void) Err gopher.r-36.net 70 i tmoveto(term.c.x, term.c.y+csiescseq.arg[0]); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'i': /* MC -- Media Copy */ Err gopher.r-36.net 70 i- switch(csiescseq.arg[0]) { Err gopher.r-36.net 70 i+ switch (csiescseq.arg[0]) { Err gopher.r-36.net 70 i case 0: Err gopher.r-36.net 70 i tdump(); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -2156,7 +2156,7 @@ csihandle(void) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'c': /* DA -- Device Attributes */ Err gopher.r-36.net 70 i- if(csiescseq.arg[0] == 0) Err gopher.r-36.net 70 i+ if (csiescseq.arg[0] == 0) Err gopher.r-36.net 70 i ttywrite(vtiden, sizeof(vtiden) - 1); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'C': /* CUF -- Cursor Forward */ Err gopher.r-36.net 70 i@@ -2177,7 +2177,7 @@ csihandle(void) Err gopher.r-36.net 70 i tmoveto(0, term.c.y-csiescseq.arg[0]); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'g': /* TBC -- Tabulation clear */ Err gopher.r-36.net 70 i- switch(csiescseq.arg[0]) { Err gopher.r-36.net 70 i+ switch (csiescseq.arg[0]) { Err gopher.r-36.net 70 i case 0: /* clear current tab stop */ Err gopher.r-36.net 70 i term.tabs[term.c.x] = 0; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -2205,16 +2205,16 @@ csihandle(void) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'J': /* ED -- Clear screen */ Err gopher.r-36.net 70 i selclear(NULL); Err gopher.r-36.net 70 i- switch(csiescseq.arg[0]) { Err gopher.r-36.net 70 i+ switch (csiescseq.arg[0]) { Err gopher.r-36.net 70 i case 0: /* below */ Err gopher.r-36.net 70 i tclearregion(term.c.x, term.c.y, term.col-1, term.c.y); Err gopher.r-36.net 70 i- if(term.c.y < term.row-1) { Err gopher.r-36.net 70 i+ if (term.c.y < term.row-1) { Err gopher.r-36.net 70 i tclearregion(0, term.c.y+1, term.col-1, Err gopher.r-36.net 70 i term.row-1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 1: /* above */ Err gopher.r-36.net 70 i- if(term.c.y > 1) Err gopher.r-36.net 70 i+ if (term.c.y > 1) Err gopher.r-36.net 70 i tclearregion(0, 0, term.col-1, term.c.y-1); Err gopher.r-36.net 70 i tclearregion(0, term.c.y, term.c.x, term.c.y); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i@@ -2226,7 +2226,7 @@ csihandle(void) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'K': /* EL -- Clear line */ Err gopher.r-36.net 70 i- switch(csiescseq.arg[0]) { Err gopher.r-36.net 70 i+ switch (csiescseq.arg[0]) { Err gopher.r-36.net 70 i case 0: /* right */ Err gopher.r-36.net 70 i tclearregion(term.c.x, term.c.y, term.col-1, Err gopher.r-36.net 70 i term.c.y); Err gopher.r-36.net 70 i@@ -2289,7 +2289,7 @@ csihandle(void) Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'r': /* DECSTBM -- Set Scrolling Region */ Err gopher.r-36.net 70 i- if(csiescseq.priv) { Err gopher.r-36.net 70 i+ if (csiescseq.priv) { Err gopher.r-36.net 70 i goto unknown; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i DEFAULT(csiescseq.arg[0], 1); Err gopher.r-36.net 70 i@@ -2327,15 +2327,15 @@ csidump(void) Err gopher.r-36.net 70 i uint c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i printf("ESC["); Err gopher.r-36.net 70 i- for(i = 0; i < csiescseq.len; i++) { Err gopher.r-36.net 70 i+ for (i = 0; i < csiescseq.len; i++) { Err gopher.r-36.net 70 i c = csiescseq.buf[i] & 0xff; Err gopher.r-36.net 70 i- if(isprint(c)) { Err gopher.r-36.net 70 i+ if (isprint(c)) { Err gopher.r-36.net 70 i putchar(c); Err gopher.r-36.net 70 i- } else if(c == '\n') { Err gopher.r-36.net 70 i+ } else if (c == '\n') { Err gopher.r-36.net 70 i printf("(\\n)"); Err gopher.r-36.net 70 i- } else if(c == '\r') { Err gopher.r-36.net 70 i+ } else if (c == '\r') { Err gopher.r-36.net 70 i printf("(\\r)"); Err gopher.r-36.net 70 i- } else if(c == 0x1b) { Err gopher.r-36.net 70 i+ } else if (c == 0x1b) { Err gopher.r-36.net 70 i printf("(\\e)"); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i printf("(%02x)", c); Err gopher.r-36.net 70 i@@ -2360,23 +2360,23 @@ strhandle(void) Err gopher.r-36.net 70 i strparse(); Err gopher.r-36.net 70 i par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- switch(strescseq.type) { Err gopher.r-36.net 70 i+ switch (strescseq.type) { Err gopher.r-36.net 70 i case ']': /* OSC -- Operating System Command */ Err gopher.r-36.net 70 i- switch(par) { Err gopher.r-36.net 70 i+ switch (par) { Err gopher.r-36.net 70 i case 0: Err gopher.r-36.net 70 i case 1: Err gopher.r-36.net 70 i case 2: Err gopher.r-36.net 70 i- if(narg > 1) Err gopher.r-36.net 70 i+ if (narg > 1) Err gopher.r-36.net 70 i xsettitle(strescseq.args[1]); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i case 4: /* color set */ Err gopher.r-36.net 70 i- if(narg < 3) Err gopher.r-36.net 70 i+ if (narg < 3) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i p = strescseq.args[2]; Err gopher.r-36.net 70 i /* FALLTHROUGH */ Err gopher.r-36.net 70 i case 104: /* color reset, here p = NULL */ Err gopher.r-36.net 70 i j = (narg > 1) ? atoi(strescseq.args[1]) : -1; Err gopher.r-36.net 70 i- if(xsetcolorname(j, p)) { Err gopher.r-36.net 70 i+ if (xsetcolorname(j, p)) { Err gopher.r-36.net 70 i fprintf(stderr, "erresc: invalid color %s\n", p); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i@@ -2410,14 +2410,14 @@ strparse(void) Err gopher.r-36.net 70 i strescseq.narg = 0; Err gopher.r-36.net 70 i strescseq.buf[strescseq.len] = '\0'; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(*p == '\0') Err gopher.r-36.net 70 i+ if (*p == '\0') Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- while(strescseq.narg < STR_ARG_SIZ) { Err gopher.r-36.net 70 i+ while (strescseq.narg < STR_ARG_SIZ) { Err gopher.r-36.net 70 i strescseq.args[strescseq.narg++] = p; Err gopher.r-36.net 70 i- while((c = *p) != ';' && c != '\0') Err gopher.r-36.net 70 i+ while ((c = *p) != ';' && c != '\0') Err gopher.r-36.net 70 i ++p; Err gopher.r-36.net 70 i- if(c == '\0') Err gopher.r-36.net 70 i+ if (c == '\0') Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i *p++ = '\0'; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2430,17 +2430,17 @@ strdump(void) Err gopher.r-36.net 70 i uint c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i printf("ESC%c", strescseq.type); Err gopher.r-36.net 70 i- for(i = 0; i < strescseq.len; i++) { Err gopher.r-36.net 70 i+ for (i = 0; i < strescseq.len; i++) { Err gopher.r-36.net 70 i c = strescseq.buf[i] & 0xff; Err gopher.r-36.net 70 i- if(c == '\0') { Err gopher.r-36.net 70 i+ if (c == '\0') { Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i- } else if(isprint(c)) { Err gopher.r-36.net 70 i+ } else if (isprint(c)) { Err gopher.r-36.net 70 i putchar(c); Err gopher.r-36.net 70 i- } else if(c == '\n') { Err gopher.r-36.net 70 i+ } else if (c == '\n') { Err gopher.r-36.net 70 i printf("(\\n)"); Err gopher.r-36.net 70 i- } else if(c == '\r') { Err gopher.r-36.net 70 i+ } else if (c == '\r') { Err gopher.r-36.net 70 i printf("(\\r)"); Err gopher.r-36.net 70 i- } else if(c == 0x1b) { Err gopher.r-36.net 70 i+ } else if (c == 0x1b) { Err gopher.r-36.net 70 i printf("(\\e)"); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i printf("(%02x)", c); Err gopher.r-36.net 70 i@@ -2458,7 +2458,7 @@ strreset(void) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttprinter(char *s, size_t len) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(iofd != -1 && xwrite(iofd, s, len) < 0) { Err gopher.r-36.net 70 i+ if (iofd != -1 && xwrite(iofd, s, len) < 0) { Err gopher.r-36.net 70 i fprintf(stderr, "Error writing in %s:%s\n", Err gopher.r-36.net 70 i opt_io, strerror(errno)); Err gopher.r-36.net 70 i close(iofd); Err gopher.r-36.net 70 i@@ -2489,7 +2489,7 @@ tdumpsel(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i char *ptr; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if((ptr = getsel())) { Err gopher.r-36.net 70 i+ if ((ptr = getsel())) { Err gopher.r-36.net 70 i tprinter(ptr, strlen(ptr)); Err gopher.r-36.net 70 i free(ptr); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2503,8 +2503,8 @@ tdumpline(int n) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i bp = &term.line[n][0]; Err gopher.r-36.net 70 i end = &bp[MIN(tlinelen(n), term.col) - 1]; Err gopher.r-36.net 70 i- if(bp != end || bp->u != ' ') { Err gopher.r-36.net 70 i- for( ;bp <= end; ++bp) Err gopher.r-36.net 70 i+ if (bp != end || bp->u != ' ') { Err gopher.r-36.net 70 i+ for ( ;bp <= end; ++bp) Err gopher.r-36.net 70 i tprinter(buf, utf8encode(bp->u, buf)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i tprinter("\n", 1); Err gopher.r-36.net 70 i@@ -2515,7 +2515,7 @@ tdump(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < term.row; ++i) Err gopher.r-36.net 70 i+ for (i = 0; i < term.row; ++i) Err gopher.r-36.net 70 i tdumpline(i); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -2524,13 +2524,13 @@ tputtab(int n) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i uint x = term.c.x; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(n > 0) { Err gopher.r-36.net 70 i- while(x < term.col && n--) Err gopher.r-36.net 70 i- for(++x; x < term.col && !term.tabs[x]; ++x) Err gopher.r-36.net 70 i+ if (n > 0) { Err gopher.r-36.net 70 i+ while (x < term.col && n--) Err gopher.r-36.net 70 i+ for (++x; x < term.col && !term.tabs[x]; ++x) Err gopher.r-36.net 70 i /* nothing */ ; Err gopher.r-36.net 70 i- } else if(n < 0) { Err gopher.r-36.net 70 i- while(x > 0 && n++) Err gopher.r-36.net 70 i- for(--x; x > 0 && !term.tabs[x]; --x) Err gopher.r-36.net 70 i+ } else if (n < 0) { Err gopher.r-36.net 70 i+ while (x > 0 && n++) Err gopher.r-36.net 70 i+ for (--x; x > 0 && !term.tabs[x]; --x) Err gopher.r-36.net 70 i /* nothing */ ; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i term.c.x = LIMIT(x, 0, term.col-1); Err gopher.r-36.net 70 i@@ -2539,12 +2539,12 @@ tputtab(int n) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttecho(Rune u) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(ISCONTROL(u)) { /* control code */ Err gopher.r-36.net 70 i- if(u & 0x80) { Err gopher.r-36.net 70 i+ if (ISCONTROL(u)) { /* control code */ Err gopher.r-36.net 70 i+ if (u & 0x80) { Err gopher.r-36.net 70 i u &= 0x7f; Err gopher.r-36.net 70 i tputc('^'); Err gopher.r-36.net 70 i tputc('['); Err gopher.r-36.net 70 i- } else if(u != '\n' && u != '\r' && u != '\t') { Err gopher.r-36.net 70 i+ } else if (u != '\n' && u != '\r' && u != '\t') { Err gopher.r-36.net 70 i u ^= 0x40; Err gopher.r-36.net 70 i tputc('^'); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2559,7 +2559,7 @@ tdeftran(char ascii) Err gopher.r-36.net 70 i static int vcs[] = {CS_GRAPHIC0, CS_USA}; Err gopher.r-36.net 70 i char *p; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if((p = strchr(cs, ascii)) == NULL) { Err gopher.r-36.net 70 i+ if ((p = strchr(cs, ascii)) == NULL) { Err gopher.r-36.net 70 i fprintf(stderr, "esc unhandled charset: ESC ( %c\n", ascii); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i term.trantbl[term.icharset] = vcs[p - cs]; Err gopher.r-36.net 70 i@@ -2571,9 +2571,9 @@ tdectest(char c) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int x, y; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(c == '8') { /* DEC screen alignment test. */ Err gopher.r-36.net 70 i- for(x = 0; x < term.col; ++x) { Err gopher.r-36.net 70 i- for(y = 0; y < term.row; ++y) Err gopher.r-36.net 70 i+ if (c == '8') { /* DEC screen alignment test. */ Err gopher.r-36.net 70 i+ for (x = 0; x < term.col; ++x) { Err gopher.r-36.net 70 i+ for (y = 0; y < term.row; ++y) Err gopher.r-36.net 70 i tsetchar('E', &term.c.attr, x, y); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2604,7 +2604,7 @@ tstrsequence(uchar c) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i ttcontrolcode(uchar ascii) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- switch(ascii) { Err gopher.r-36.net 70 i+ switch (ascii) { Err gopher.r-36.net 70 i case '\t': /* HT */ Err gopher.r-36.net 70 i tputtab(1); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i@@ -2621,11 +2621,11 @@ tcontrolcode(uchar ascii) Err gopher.r-36.net 70 i tnewline(IS_SET(MODE_CRLF)); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i case '\a': /* BEL */ Err gopher.r-36.net 70 i- if(term.esc & ESC_STR_END) { Err gopher.r-36.net 70 i+ if (term.esc & ESC_STR_END) { Err gopher.r-36.net 70 i /* backwards compatibility to xterm */ Err gopher.r-36.net 70 i strhandle(); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- if(!(xw.state & WIN_FOCUSED)) Err gopher.r-36.net 70 i+ if (!(xw.state & WIN_FOCUSED)) Err gopher.r-36.net 70 i xseturgency(1); Err gopher.r-36.net 70 i if (bellvolume) Err gopher.r-36.net 70 i XkbBell(xw.dpy, xw.win, bellvolume, (Atom)NULL); Err gopher.r-36.net 70 i@@ -2688,7 +2688,7 @@ tcontrolcode(uchar ascii) Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i eschandle(uchar ascii) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- switch(ascii) { Err gopher.r-36.net 70 i+ switch (ascii) { Err gopher.r-36.net 70 i case '[': Err gopher.r-36.net 70 i term.esc |= ESC_CSI; Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i@@ -2714,7 +2714,7 @@ eschandle(uchar ascii) Err gopher.r-36.net 70 i term.esc |= ESC_ALTCHARSET; Err gopher.r-36.net 70 i return 0; Err gopher.r-36.net 70 i case 'D': /* IND -- Linefeed */ Err gopher.r-36.net 70 i- if(term.c.y == term.bot) { Err gopher.r-36.net 70 i+ if (term.c.y == term.bot) { Err gopher.r-36.net 70 i tscrollup(term.top, 1); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i tmoveto(term.c.x, term.c.y+1); Err gopher.r-36.net 70 i@@ -2727,7 +2727,7 @@ eschandle(uchar ascii) Err gopher.r-36.net 70 i term.tabs[term.c.x] = 1; Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'M': /* RI -- Reverse index */ Err gopher.r-36.net 70 i- if(term.c.y == term.top) { Err gopher.r-36.net 70 i+ if (term.c.y == term.top) { Err gopher.r-36.net 70 i tscrolldown(term.top, 1); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i tmoveto(term.c.x, term.c.y-1); Err gopher.r-36.net 70 i@@ -2754,7 +2754,7 @@ eschandle(uchar ascii) Err gopher.r-36.net 70 i tcursor(CURSOR_LOAD); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case '\\': /* ST -- String Terminator */ Err gopher.r-36.net 70 i- if(term.esc & ESC_STR_END) Err gopher.r-36.net 70 i+ if (term.esc & ESC_STR_END) Err gopher.r-36.net 70 i strhandle(); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i default: Err gopher.r-36.net 70 i@@ -2774,12 +2774,12 @@ tputc(Rune u) Err gopher.r-36.net 70 i Glyph *gp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i len = utf8encode(u, c); Err gopher.r-36.net 70 i- if((width = wcwidth(u)) == -1) { Err gopher.r-36.net 70 i+ if ((width = wcwidth(u)) == -1) { Err gopher.r-36.net 70 i memcpy(c, "\357\277\275", 4); /* UTF_INVALID */ Err gopher.r-36.net 70 i width = 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_PRINT)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_PRINT)) Err gopher.r-36.net 70 i tprinter(c, len); Err gopher.r-36.net 70 i control = ISCONTROL(u); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -2789,12 +2789,12 @@ tputc(Rune u) Err gopher.r-36.net 70 i * receives a ESC, a SUB, a ST or any other C1 control Err gopher.r-36.net 70 i * character. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(term.esc & ESC_STR) { Err gopher.r-36.net 70 i- if(u == '\a' || u == 030 || u == 032 || u == 033 || Err gopher.r-36.net 70 i+ if (term.esc & ESC_STR) { Err gopher.r-36.net 70 i+ if (u == '\a' || u == 030 || u == 032 || u == 033 || Err gopher.r-36.net 70 i ISCONTROLC1(u)) { Err gopher.r-36.net 70 i term.esc &= ~(ESC_START|ESC_STR); Err gopher.r-36.net 70 i term.esc |= ESC_STR_END; Err gopher.r-36.net 70 i- } else if(strescseq.len + len < sizeof(strescseq.buf) - 1) { Err gopher.r-36.net 70 i+ } else if (strescseq.len + len < sizeof(strescseq.buf) - 1) { Err gopher.r-36.net 70 i memmove(&strescseq.buf[strescseq.len], c, len); Err gopher.r-36.net 70 i strescseq.len += len; Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i@@ -2821,16 +2821,16 @@ tputc(Rune u) Err gopher.r-36.net 70 i * because they can be embedded inside a control sequence, and Err gopher.r-36.net 70 i * they must not cause conflicts with sequences. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(control) { Err gopher.r-36.net 70 i+ if (control) { Err gopher.r-36.net 70 i tcontrolcode(u); Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * control codes are not shown ever Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i- } else if(term.esc & ESC_START) { Err gopher.r-36.net 70 i- if(term.esc & ESC_CSI) { Err gopher.r-36.net 70 i+ } else if (term.esc & ESC_START) { Err gopher.r-36.net 70 i+ if (term.esc & ESC_CSI) { Err gopher.r-36.net 70 i csiescseq.buf[csiescseq.len++] = u; Err gopher.r-36.net 70 i- if(BETWEEN(u, 0x40, 0x7E) Err gopher.r-36.net 70 i+ if (BETWEEN(u, 0x40, 0x7E) Err gopher.r-36.net 70 i || csiescseq.len >= \ Err gopher.r-36.net 70 i sizeof(csiescseq.buf)-1) { Err gopher.r-36.net 70 i term.esc = 0; Err gopher.r-36.net 70 i@@ -2838,9 +2838,9 @@ tputc(Rune u) Err gopher.r-36.net 70 i csihandle(); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i- } else if(term.esc & ESC_ALTCHARSET) { Err gopher.r-36.net 70 i+ } else if (term.esc & ESC_ALTCHARSET) { Err gopher.r-36.net 70 i tdeftran(u); Err gopher.r-36.net 70 i- } else if(term.esc & ESC_TEST) { Err gopher.r-36.net 70 i+ } else if (term.esc & ESC_TEST) { Err gopher.r-36.net 70 i tdectest(u); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i if (!eschandle(u)) Err gopher.r-36.net 70 i@@ -2854,34 +2854,34 @@ tputc(Rune u) Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) Err gopher.r-36.net 70 i+ if (sel.ob.x != -1 && BETWEEN(term.c.y, sel.ob.y, sel.oe.y)) Err gopher.r-36.net 70 i selclear(NULL); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i gp = &term.line[term.c.y][term.c.x]; Err gopher.r-36.net 70 i- if(IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_WRAP) && (term.c.state & CURSOR_WRAPNEXT)) { Err gopher.r-36.net 70 i gp->mode |= ATTR_WRAP; Err gopher.r-36.net 70 i tnewline(1); Err gopher.r-36.net 70 i gp = &term.line[term.c.y][term.c.x]; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_INSERT) && term.c.x+width < term.col) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_INSERT) && term.c.x+width < term.col) Err gopher.r-36.net 70 i memmove(gp+width, gp, (term.col - term.c.x - width) * sizeof(Glyph)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(term.c.x+width > term.col) { Err gopher.r-36.net 70 i+ if (term.c.x+width > term.col) { Err gopher.r-36.net 70 i tnewline(1); Err gopher.r-36.net 70 i gp = &term.line[term.c.y][term.c.x]; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i tsetchar(u, &term.c.attr, term.c.x, term.c.y); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(width == 2) { Err gopher.r-36.net 70 i+ if (width == 2) { Err gopher.r-36.net 70 i gp->mode |= ATTR_WIDE; Err gopher.r-36.net 70 i- if(term.c.x+1 < term.col) { Err gopher.r-36.net 70 i+ if (term.c.x+1 < term.col) { Err gopher.r-36.net 70 i gp[1].u = '\0'; Err gopher.r-36.net 70 i gp[1].mode = ATTR_WDUMMY; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(term.c.x+width < term.col) { Err gopher.r-36.net 70 i+ if (term.c.x+width < term.col) { Err gopher.r-36.net 70 i tmoveto(term.c.x+width, term.c.y); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i term.c.state |= CURSOR_WRAPNEXT; Err gopher.r-36.net 70 i@@ -2897,7 +2897,7 @@ tresize(int col, int row) Err gopher.r-36.net 70 i int *bp; Err gopher.r-36.net 70 i TCursor c; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(col < 1 || row < 1) { Err gopher.r-36.net 70 i+ if (col < 1 || row < 1) { Err gopher.r-36.net 70 i fprintf(stderr, Err gopher.r-36.net 70 i "tresize: error resizing to %dx%d\n", col, row); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i@@ -2908,7 +2908,7 @@ tresize(int col, int row) Err gopher.r-36.net 70 i * tscrollup would work here, but we can optimize to Err gopher.r-36.net 70 i * memmove because we're freeing the earlier lines Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- for(i = 0; i <= term.c.y - row; i++) { Err gopher.r-36.net 70 i+ for (i = 0; i <= term.c.y - row; i++) { Err gopher.r-36.net 70 i free(term.line[i]); Err gopher.r-36.net 70 i free(term.alt[i]); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2917,7 +2917,7 @@ tresize(int col, int row) Err gopher.r-36.net 70 i memmove(term.line, term.line + i, row * sizeof(Line)); Err gopher.r-36.net 70 i memmove(term.alt, term.alt + i, row * sizeof(Line)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- for(i += row; i < term.row; i++) { Err gopher.r-36.net 70 i+ for (i += row; i < term.row; i++) { Err gopher.r-36.net 70 i free(term.line[i]); Err gopher.r-36.net 70 i free(term.alt[i]); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -2932,23 +2932,23 @@ tresize(int col, int row) Err gopher.r-36.net 70 i term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs)); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* resize each row to new width, zero-pad if needed */ Err gopher.r-36.net 70 i- for(i = 0; i < minrow; i++) { Err gopher.r-36.net 70 i+ for (i = 0; i < minrow; i++) { Err gopher.r-36.net 70 i term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph)); Err gopher.r-36.net 70 i term.alt[i] = xrealloc(term.alt[i], col * sizeof(Glyph)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* allocate any new rows */ Err gopher.r-36.net 70 i- for(/* i == minrow */; i < row; i++) { Err gopher.r-36.net 70 i+ for (/* i == minrow */; i < row; i++) { Err gopher.r-36.net 70 i term.line[i] = xmalloc(col * sizeof(Glyph)); Err gopher.r-36.net 70 i term.alt[i] = xmalloc(col * sizeof(Glyph)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(col > term.col) { Err gopher.r-36.net 70 i+ if (col > term.col) { Err gopher.r-36.net 70 i bp = term.tabs + term.col; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i memset(bp, 0, sizeof(*term.tabs) * (col - term.col)); Err gopher.r-36.net 70 i- while(--bp > term.tabs && !*bp) Err gopher.r-36.net 70 i+ while (--bp > term.tabs && !*bp) Err gopher.r-36.net 70 i /* nothing */ ; Err gopher.r-36.net 70 i- for(bp += tabspaces; bp < term.tabs + col; bp += tabspaces) Err gopher.r-36.net 70 i+ for (bp += tabspaces; bp < term.tabs + col; bp += tabspaces) Err gopher.r-36.net 70 i *bp = 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i /* update terminal size */ Err gopher.r-36.net 70 i@@ -2960,11 +2960,11 @@ tresize(int col, int row) Err gopher.r-36.net 70 i tmoveto(term.c.x, term.c.y); Err gopher.r-36.net 70 i /* Clearing both screens (it makes dirty all lines) */ Err gopher.r-36.net 70 i c = term.c; Err gopher.r-36.net 70 i- for(i = 0; i < 2; i++) { Err gopher.r-36.net 70 i- if(mincol < col && 0 < minrow) { Err gopher.r-36.net 70 i+ for (i = 0; i < 2; i++) { Err gopher.r-36.net 70 i+ if (mincol < col && 0 < minrow) { Err gopher.r-36.net 70 i tclearregion(mincol, 0, col - 1, minrow - 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(0 < col && minrow < row) { Err gopher.r-36.net 70 i+ if (0 < col && minrow < row) { Err gopher.r-36.net 70 i tclearregion(0, minrow, col - 1, row - 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i tswapscreen(); Err gopher.r-36.net 70 i@@ -2997,9 +2997,9 @@ xloadcolor(int i, const char *name, Color *ncolor) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i XRenderColor color = { .alpha = 0xffff }; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!name) { Err gopher.r-36.net 70 i- if(BETWEEN(i, 16, 255)) { /* 256 color */ Err gopher.r-36.net 70 i- if(i < 6*6*6+16) { /* same colors as xterm */ Err gopher.r-36.net 70 i+ if (!name) { Err gopher.r-36.net 70 i+ if (BETWEEN(i, 16, 255)) { /* 256 color */ Err gopher.r-36.net 70 i+ if (i < 6*6*6+16) { /* same colors as xterm */ Err gopher.r-36.net 70 i color.red = sixd_to_16bit( ((i-16)/36)%6 ); Err gopher.r-36.net 70 i color.green = sixd_to_16bit( ((i-16)/6) %6 ); Err gopher.r-36.net 70 i color.blue = sixd_to_16bit( ((i-16)/1) %6 ); Err gopher.r-36.net 70 i@@ -3022,14 +3022,14 @@ xloadcols(void) Err gopher.r-36.net 70 i static int loaded; Err gopher.r-36.net 70 i Color *cp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(loaded) { Err gopher.r-36.net 70 i+ if (loaded) { Err gopher.r-36.net 70 i for (cp = dc.col; cp < &dc.col[LEN(dc.col)]; ++cp) Err gopher.r-36.net 70 i XftColorFree(xw.dpy, xw.vis, xw.cmap, cp); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0; i < LEN(dc.col); i++) Err gopher.r-36.net 70 i- if(!xloadcolor(i, NULL, &dc.col[i])) { Err gopher.r-36.net 70 i- if(colorname[i]) Err gopher.r-36.net 70 i+ for (i = 0; i < LEN(dc.col); i++) Err gopher.r-36.net 70 i+ if (!xloadcolor(i, NULL, &dc.col[i])) { Err gopher.r-36.net 70 i+ if (colorname[i]) Err gopher.r-36.net 70 i die("Could not allocate color '%s'\n", colorname[i]); Err gopher.r-36.net 70 i else Err gopher.r-36.net 70 i die("Could not allocate color %d\n", i); Err gopher.r-36.net 70 i@@ -3042,11 +3042,11 @@ xsetcolorname(int x, const char *name) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i Color ncolor; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!BETWEEN(x, 0, LEN(dc.col))) Err gopher.r-36.net 70 i+ if (!BETWEEN(x, 0, LEN(dc.col))) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!xloadcolor(x, name, &ncolor)) Err gopher.r-36.net 70 i+ if (!xloadcolor(x, name, &ncolor)) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i XftColorFree(xw.dpy, xw.vis, xw.cmap, &dc.col[x]); Err gopher.r-36.net 70 i@@ -3092,12 +3092,12 @@ xhints(void) Err gopher.r-36.net 70 i sizeh->width_inc = xw.cw; Err gopher.r-36.net 70 i sizeh->base_height = 2 * borderpx; Err gopher.r-36.net 70 i sizeh->base_width = 2 * borderpx; Err gopher.r-36.net 70 i- if(xw.isfixed) { Err gopher.r-36.net 70 i+ if (xw.isfixed) { Err gopher.r-36.net 70 i sizeh->flags |= PMaxSize | PMinSize; Err gopher.r-36.net 70 i sizeh->min_width = sizeh->max_width = xw.w; Err gopher.r-36.net 70 i sizeh->min_height = sizeh->max_height = xw.h; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(xw.gm & (XValue|YValue)) { Err gopher.r-36.net 70 i+ if (xw.gm & (XValue|YValue)) { Err gopher.r-36.net 70 i sizeh->flags |= USPosition | PWinGravity; Err gopher.r-36.net 70 i sizeh->x = xw.l; Err gopher.r-36.net 70 i sizeh->y = xw.t; Err gopher.r-36.net 70 i@@ -3112,7 +3112,7 @@ xhints(void) Err gopher.r-36.net 70 i int Err gopher.r-36.net 70 i xgeommasktogravity(int mask) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- switch(mask & (XNegative|YNegative)) { Err gopher.r-36.net 70 i+ switch (mask & (XNegative|YNegative)) { Err gopher.r-36.net 70 i case 0: Err gopher.r-36.net 70 i return NorthWestGravity; Err gopher.r-36.net 70 i case XNegative: Err gopher.r-36.net 70 i@@ -3130,10 +3130,10 @@ xloadfont(Font *f, FcPattern *pattern) Err gopher.r-36.net 70 i FcResult result; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i match = FcFontMatch(NULL, pattern, &result); Err gopher.r-36.net 70 i- if(!match) Err gopher.r-36.net 70 i+ if (!match) Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(f->match = XftFontOpenPattern(xw.dpy, match))) { Err gopher.r-36.net 70 i+ if (!(f->match = XftFontOpenPattern(xw.dpy, match))) { Err gopher.r-36.net 70 i FcPatternDestroy(match); Err gopher.r-36.net 70 i return 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3159,25 +3159,25 @@ xloadfonts(char *fontstr, double fontsize) Err gopher.r-36.net 70 i double fontval; Err gopher.r-36.net 70 i float ceilf(float); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(fontstr[0] == '-') { Err gopher.r-36.net 70 i+ if (fontstr[0] == '-') { Err gopher.r-36.net 70 i pattern = XftXlfdParse(fontstr, False, False); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i pattern = FcNameParse((FcChar8 *)fontstr); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!pattern) Err gopher.r-36.net 70 i+ if (!pattern) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(fontsize > 1) { Err gopher.r-36.net 70 i+ if (fontsize > 1) { Err gopher.r-36.net 70 i FcPatternDel(pattern, FC_PIXEL_SIZE); Err gopher.r-36.net 70 i FcPatternDel(pattern, FC_SIZE); Err gopher.r-36.net 70 i FcPatternAddDouble(pattern, FC_PIXEL_SIZE, (double)fontsize); Err gopher.r-36.net 70 i usedfontsize = fontsize; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i- if(FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i+ if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i FcResultMatch) { Err gopher.r-36.net 70 i usedfontsize = fontval; Err gopher.r-36.net 70 i- } else if(FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i+ } else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) == Err gopher.r-36.net 70 i FcResultMatch) { Err gopher.r-36.net 70 i usedfontsize = -1; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -3194,14 +3194,14 @@ xloadfonts(char *fontstr, double fontsize) Err gopher.r-36.net 70 i FcConfigSubstitute(0, pattern, FcMatchPattern); Err gopher.r-36.net 70 i FcDefaultSubstitute(pattern); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(xloadfont(&dc.font, pattern)) Err gopher.r-36.net 70 i+ if (xloadfont(&dc.font, pattern)) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(usedfontsize < 0) { Err gopher.r-36.net 70 i+ if (usedfontsize < 0) { Err gopher.r-36.net 70 i FcPatternGetDouble(dc.font.match->pattern, Err gopher.r-36.net 70 i FC_PIXEL_SIZE, 0, &fontval); Err gopher.r-36.net 70 i usedfontsize = fontval; Err gopher.r-36.net 70 i- if(fontsize == 0) Err gopher.r-36.net 70 i+ if (fontsize == 0) Err gopher.r-36.net 70 i defaultfontsize = fontval; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -3211,17 +3211,17 @@ xloadfonts(char *fontstr, double fontsize) Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i FcPatternDel(pattern, FC_SLANT); Err gopher.r-36.net 70 i FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC); Err gopher.r-36.net 70 i- if(xloadfont(&dc.ifont, pattern)) Err gopher.r-36.net 70 i+ if (xloadfont(&dc.ifont, pattern)) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i FcPatternDel(pattern, FC_WEIGHT); Err gopher.r-36.net 70 i FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD); Err gopher.r-36.net 70 i- if(xloadfont(&dc.ibfont, pattern)) Err gopher.r-36.net 70 i+ if (xloadfont(&dc.ibfont, pattern)) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i FcPatternDel(pattern, FC_SLANT); Err gopher.r-36.net 70 i FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN); Err gopher.r-36.net 70 i- if(xloadfont(&dc.bfont, pattern)) Err gopher.r-36.net 70 i+ if (xloadfont(&dc.bfont, pattern)) Err gopher.r-36.net 70 i die("st: can't open font %s\n", fontstr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i FcPatternDestroy(pattern); Err gopher.r-36.net 70 i@@ -3232,7 +3232,7 @@ xunloadfont(Font *f) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i XftFontClose(xw.dpy, f->match); Err gopher.r-36.net 70 i FcPatternDestroy(f->pattern); Err gopher.r-36.net 70 i- if(f->set) Err gopher.r-36.net 70 i+ if (f->set) Err gopher.r-36.net 70 i FcFontSetDestroy(f->set); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i@@ -3240,7 +3240,7 @@ void Err gopher.r-36.net 70 i xunloadfonts(void) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i /* Free the loaded fonts in the font cache. */ Err gopher.r-36.net 70 i- while(frclen > 0) Err gopher.r-36.net 70 i+ while (frclen > 0) Err gopher.r-36.net 70 i XftFontClose(xw.dpy, frc[--frclen].font); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i xunloadfont(&dc.font); Err gopher.r-36.net 70 i@@ -3273,7 +3273,7 @@ xzoomreset(const Arg *arg) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i Arg larg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(defaultfontsize > 0) { Err gopher.r-36.net 70 i+ if (defaultfontsize > 0) { Err gopher.r-36.net 70 i larg.f = defaultfontsize; Err gopher.r-36.net 70 i xzoomabs(&larg); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3287,13 +3287,13 @@ xinit(void) Err gopher.r-36.net 70 i Window parent; Err gopher.r-36.net 70 i pid_t thispid = getpid(); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(xw.dpy = XOpenDisplay(NULL))) Err gopher.r-36.net 70 i+ if (!(xw.dpy = XOpenDisplay(NULL))) Err gopher.r-36.net 70 i die("Can't open display\n"); Err gopher.r-36.net 70 i xw.scr = XDefaultScreen(xw.dpy); Err gopher.r-36.net 70 i xw.vis = XDefaultVisual(xw.dpy, xw.scr); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* font */ Err gopher.r-36.net 70 i- if(!FcInit()) Err gopher.r-36.net 70 i+ if (!FcInit()) Err gopher.r-36.net 70 i die("Could not init fontconfig.\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i usedfont = (opt_font == NULL)? font : opt_font; Err gopher.r-36.net 70 i@@ -3306,9 +3306,9 @@ xinit(void) Err gopher.r-36.net 70 i /* adjust fixed window geometry */ Err gopher.r-36.net 70 i xw.w = 2 * borderpx + term.col * xw.cw; Err gopher.r-36.net 70 i xw.h = 2 * borderpx + term.row * xw.ch; Err gopher.r-36.net 70 i- if(xw.gm & XNegative) Err gopher.r-36.net 70 i+ if (xw.gm & XNegative) Err gopher.r-36.net 70 i xw.l += DisplayWidth(xw.dpy, xw.scr) - xw.w - 2; Err gopher.r-36.net 70 i- if(xw.gm & YNegative) Err gopher.r-36.net 70 i+ if (xw.gm & YNegative) Err gopher.r-36.net 70 i xw.t += DisplayWidth(xw.dpy, xw.scr) - xw.h - 2; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Events */ Err gopher.r-36.net 70 i@@ -3340,11 +3340,11 @@ xinit(void) Err gopher.r-36.net 70 i xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* input methods */ Err gopher.r-36.net 70 i- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { Err gopher.r-36.net 70 i+ if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { Err gopher.r-36.net 70 i XSetLocaleModifiers("@im=local"); Err gopher.r-36.net 70 i- if((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { Err gopher.r-36.net 70 i+ if ((xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL)) == NULL) { Err gopher.r-36.net 70 i XSetLocaleModifiers("@im="); Err gopher.r-36.net 70 i- if((xw.xim = XOpenIM(xw.dpy, Err gopher.r-36.net 70 i+ if ((xw.xim = XOpenIM(xw.dpy, Err gopher.r-36.net 70 i NULL, NULL, NULL)) == NULL) { Err gopher.r-36.net 70 i die("XOpenIM failed. Could not open input" Err gopher.r-36.net 70 i " device.\n"); Err gopher.r-36.net 70 i@@ -3354,7 +3354,7 @@ xinit(void) Err gopher.r-36.net 70 i xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing Err gopher.r-36.net 70 i | XIMStatusNothing, XNClientWindow, xw.win, Err gopher.r-36.net 70 i XNFocusWindow, xw.win, NULL); Err gopher.r-36.net 70 i- if(xw.xic == NULL) Err gopher.r-36.net 70 i+ if (xw.xic == NULL) Err gopher.r-36.net 70 i die("XCreateIC failed. Could not obtain input method.\n"); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* white cursor, black outline */ Err gopher.r-36.net 70 i@@ -3395,28 +3395,28 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i FcCharSet *fccharset; Err gopher.r-36.net 70 i int i, f, numspecs = 0; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { Err gopher.r-36.net 70 i+ for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) { Err gopher.r-36.net 70 i /* Fetch rune and mode for current glyph. */ Err gopher.r-36.net 70 i rune = glyphs[i].u; Err gopher.r-36.net 70 i mode = glyphs[i].mode; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Skip dummy wide-character spacing. */ Err gopher.r-36.net 70 i- if(mode == ATTR_WDUMMY) Err gopher.r-36.net 70 i+ if (mode == ATTR_WDUMMY) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Determine font for glyph if different from previous glyph. */ Err gopher.r-36.net 70 i- if(prevmode != mode) { Err gopher.r-36.net 70 i+ if (prevmode != mode) { Err gopher.r-36.net 70 i prevmode = mode; Err gopher.r-36.net 70 i font = &dc.font; Err gopher.r-36.net 70 i frcflags = FRC_NORMAL; Err gopher.r-36.net 70 i runewidth = xw.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f); Err gopher.r-36.net 70 i- if((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { Err gopher.r-36.net 70 i+ if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) { Err gopher.r-36.net 70 i font = &dc.ibfont; Err gopher.r-36.net 70 i frcflags = FRC_ITALICBOLD; Err gopher.r-36.net 70 i- } else if(mode & ATTR_ITALIC) { Err gopher.r-36.net 70 i+ } else if (mode & ATTR_ITALIC) { Err gopher.r-36.net 70 i font = &dc.ifont; Err gopher.r-36.net 70 i frcflags = FRC_ITALIC; Err gopher.r-36.net 70 i- } else if(mode & ATTR_BOLD) { Err gopher.r-36.net 70 i+ } else if (mode & ATTR_BOLD) { Err gopher.r-36.net 70 i font = &dc.bfont; Err gopher.r-36.net 70 i frcflags = FRC_BOLD; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3425,7 +3425,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Lookup character index with default font. */ Err gopher.r-36.net 70 i glyphidx = XftCharIndex(xw.dpy, font->match, rune); Err gopher.r-36.net 70 i- if(glyphidx) { Err gopher.r-36.net 70 i+ if (glyphidx) { Err gopher.r-36.net 70 i specs[numspecs].font = font->match; Err gopher.r-36.net 70 i specs[numspecs].glyph = glyphidx; Err gopher.r-36.net 70 i specs[numspecs].x = (short)xp; Err gopher.r-36.net 70 i@@ -3436,21 +3436,21 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Fallback on font cache, search the font cache for match. */ Err gopher.r-36.net 70 i- for(f = 0; f < frclen; f++) { Err gopher.r-36.net 70 i+ for (f = 0; f < frclen; f++) { Err gopher.r-36.net 70 i glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune); Err gopher.r-36.net 70 i /* Everything correct. */ Err gopher.r-36.net 70 i- if(glyphidx && frc[f].flags == frcflags) Err gopher.r-36.net 70 i+ if (glyphidx && frc[f].flags == frcflags) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i /* We got a default font for a not found glyph. */ Err gopher.r-36.net 70 i- if(!glyphidx && frc[f].flags == frcflags Err gopher.r-36.net 70 i+ if (!glyphidx && frc[f].flags == frcflags Err gopher.r-36.net 70 i && frc[f].unicodep == rune) { Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Nothing was found. Use fontconfig to find matching font. */ Err gopher.r-36.net 70 i- if(f >= frclen) { Err gopher.r-36.net 70 i- if(!font->set) Err gopher.r-36.net 70 i+ if (f >= frclen) { Err gopher.r-36.net 70 i+ if (!font->set) Err gopher.r-36.net 70 i font->set = FcFontSort(0, font->pattern, Err gopher.r-36.net 70 i 1, 0, &fcres); Err gopher.r-36.net 70 i fcsets[0] = font->set; Err gopher.r-36.net 70 i@@ -3480,7 +3480,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x Err gopher.r-36.net 70 i /* Err gopher.r-36.net 70 i * Overwrite or create the new cache entry. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(frclen >= LEN(frc)) { Err gopher.r-36.net 70 i+ if (frclen >= LEN(frc)) { Err gopher.r-36.net 70 i frclen = LEN(frc) - 1; Err gopher.r-36.net 70 i XftFontClose(xw.dpy, frc[frclen].font); Err gopher.r-36.net 70 i frc[frclen].unicodep = 0; Err gopher.r-36.net 70 i@@ -3522,16 +3522,16 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i XRectangle r; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Determine foreground and background colors based on mode. */ Err gopher.r-36.net 70 i- if(base.fg == defaultfg) { Err gopher.r-36.net 70 i- if(base.mode & ATTR_ITALIC) Err gopher.r-36.net 70 i+ if (base.fg == defaultfg) { Err gopher.r-36.net 70 i+ if (base.mode & ATTR_ITALIC) Err gopher.r-36.net 70 i base.fg = defaultitalic; Err gopher.r-36.net 70 i- else if((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) Err gopher.r-36.net 70 i+ else if ((base.mode & ATTR_ITALIC) && (base.mode & ATTR_BOLD)) Err gopher.r-36.net 70 i base.fg = defaultitalic; Err gopher.r-36.net 70 i- else if(base.mode & ATTR_UNDERLINE) Err gopher.r-36.net 70 i+ else if (base.mode & ATTR_UNDERLINE) Err gopher.r-36.net 70 i base.fg = defaultunderline; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_TRUECOL(base.fg)) { Err gopher.r-36.net 70 i+ if (IS_TRUECOL(base.fg)) { Err gopher.r-36.net 70 i colfg.alpha = 0xffff; Err gopher.r-36.net 70 i colfg.red = TRUERED(base.fg); Err gopher.r-36.net 70 i colfg.green = TRUEGREEN(base.fg); Err gopher.r-36.net 70 i@@ -3542,7 +3542,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i fg = &dc.col[base.fg]; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_TRUECOL(base.bg)) { Err gopher.r-36.net 70 i+ if (IS_TRUECOL(base.bg)) { Err gopher.r-36.net 70 i colbg.alpha = 0xffff; Err gopher.r-36.net 70 i colbg.green = TRUEGREEN(base.bg); Err gopher.r-36.net 70 i colbg.red = TRUERED(base.bg); Err gopher.r-36.net 70 i@@ -3554,11 +3554,11 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Change basic system colors [0-7] to bright system colors [8-15] */ Err gopher.r-36.net 70 i- if((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) Err gopher.r-36.net 70 i+ if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7)) Err gopher.r-36.net 70 i fg = &dc.col[base.fg + 8]; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_REVERSE)) { Err gopher.r-36.net 70 i- if(fg == &dc.col[defaultfg]) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_REVERSE)) { Err gopher.r-36.net 70 i+ if (fg == &dc.col[defaultfg]) { Err gopher.r-36.net 70 i fg = &dc.col[defaultbg]; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i colfg.red = ~fg->color.red; Err gopher.r-36.net 70 i@@ -3570,7 +3570,7 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i fg = &revfg; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(bg == &dc.col[defaultbg]) { Err gopher.r-36.net 70 i+ if (bg == &dc.col[defaultbg]) { Err gopher.r-36.net 70 i bg = &dc.col[defaultfg]; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i colbg.red = ~bg->color.red; Err gopher.r-36.net 70 i@@ -3583,13 +3583,13 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(base.mode & ATTR_REVERSE) { Err gopher.r-36.net 70 i+ if (base.mode & ATTR_REVERSE) { Err gopher.r-36.net 70 i temp = fg; Err gopher.r-36.net 70 i fg = bg; Err gopher.r-36.net 70 i bg = temp; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) { Err gopher.r-36.net 70 i+ if ((base.mode & ATTR_BOLD_FAINT) == ATTR_FAINT) { Err gopher.r-36.net 70 i colfg.red = fg->color.red / 2; Err gopher.r-36.net 70 i colfg.green = fg->color.green / 2; Err gopher.r-36.net 70 i colfg.blue = fg->color.blue / 2; Err gopher.r-36.net 70 i@@ -3597,24 +3597,24 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i fg = &revfg; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(base.mode & ATTR_BLINK && term.mode & MODE_BLINK) Err gopher.r-36.net 70 i+ if (base.mode & ATTR_BLINK && term.mode & MODE_BLINK) Err gopher.r-36.net 70 i fg = bg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(base.mode & ATTR_INVISIBLE) Err gopher.r-36.net 70 i+ if (base.mode & ATTR_INVISIBLE) Err gopher.r-36.net 70 i fg = bg; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Intelligent cleaning up of the borders. */ Err gopher.r-36.net 70 i- if(x == 0) { Err gopher.r-36.net 70 i+ if (x == 0) { Err gopher.r-36.net 70 i xclear(0, (y == 0)? 0 : winy, borderpx, Err gopher.r-36.net 70 i winy + xw.ch + ((y >= term.row-1)? xw.h : 0)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(x + charlen >= term.col) { Err gopher.r-36.net 70 i+ if (x + charlen >= term.col) { Err gopher.r-36.net 70 i xclear(winx + width, (y == 0)? 0 : winy, xw.w, Err gopher.r-36.net 70 i ((y >= term.row-1)? xw.h : (winy + xw.ch))); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(y == 0) Err gopher.r-36.net 70 i+ if (y == 0) Err gopher.r-36.net 70 i xclear(winx, 0, winx + width, borderpx); Err gopher.r-36.net 70 i- if(y == term.row-1) Err gopher.r-36.net 70 i+ if (y == term.row-1) Err gopher.r-36.net 70 i xclear(winx, winy + xw.ch, winx + width, xw.h); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Clean up the region we want to draw to. */ Err gopher.r-36.net 70 i@@ -3631,12 +3631,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i Err gopher.r-36.net 70 i XftDrawGlyphFontSpec(xw.draw, fg, specs, len); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Render underline and strikethrough. */ Err gopher.r-36.net 70 i- if(base.mode & ATTR_UNDERLINE) { Err gopher.r-36.net 70 i+ if (base.mode & ATTR_UNDERLINE) { Err gopher.r-36.net 70 i XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1, Err gopher.r-36.net 70 i width, 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(base.mode & ATTR_STRUCK) { Err gopher.r-36.net 70 i+ if (base.mode & ATTR_STRUCK) { Err gopher.r-36.net 70 i XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3, Err gopher.r-36.net 70 i width, 1); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3667,9 +3667,9 @@ xdrawcursor(void) Err gopher.r-36.net 70 i curx = term.c.x; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* adjust position if in dummy */ Err gopher.r-36.net 70 i- if(term.line[oldy][oldx].mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i+ if (term.line[oldy][oldx].mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i oldx--; Err gopher.r-36.net 70 i- if(term.line[term.c.y][curx].mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i+ if (term.line[term.c.y][curx].mode & ATTR_WDUMMY) Err gopher.r-36.net 70 i curx--; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i g.u = term.line[term.c.y][term.c.x].u; Err gopher.r-36.net 70 i@@ -3677,16 +3677,16 @@ xdrawcursor(void) Err gopher.r-36.net 70 i /* remove the old cursor */ Err gopher.r-36.net 70 i xdrawglyph(term.line[oldy][oldx], oldx, oldy); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_HIDE)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_HIDE)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* draw the new one */ Err gopher.r-36.net 70 i- if(xw.state & WIN_FOCUSED) { Err gopher.r-36.net 70 i+ if (xw.state & WIN_FOCUSED) { Err gopher.r-36.net 70 i switch (xw.cursor) { Err gopher.r-36.net 70 i case 0: /* Blinking Block */ Err gopher.r-36.net 70 i case 1: /* Blinking Block (Default) */ Err gopher.r-36.net 70 i case 2: /* Steady Block */ Err gopher.r-36.net 70 i- if(IS_SET(MODE_REVERSE)) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_REVERSE)) { Err gopher.r-36.net 70 i g.mode |= ATTR_REVERSE; Err gopher.r-36.net 70 i g.fg = defaultcs; Err gopher.r-36.net 70 i g.bg = defaultfg; Err gopher.r-36.net 70 i@@ -3776,11 +3776,11 @@ drawregion(int x1, int y1, int x2, int y2) Err gopher.r-36.net 70 i XftGlyphFontSpec* specs; Err gopher.r-36.net 70 i int ena_sel = sel.ob.x != -1 && sel.alt == IS_SET(MODE_ALTSCREEN); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!(xw.state & WIN_VISIBLE)) Err gopher.r-36.net 70 i+ if (!(xw.state & WIN_VISIBLE)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(y = y1; y < y2; y++) { Err gopher.r-36.net 70 i- if(!term.dirty[y]) Err gopher.r-36.net 70 i+ for (y = y1; y < y2; y++) { Err gopher.r-36.net 70 i+ if (!term.dirty[y]) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i xtermclear(0, y, term.col, y); Err gopher.r-36.net 70 i@@ -3790,25 +3790,25 @@ drawregion(int x1, int y1, int x2, int y2) Err gopher.r-36.net 70 i numspecs = xmakeglyphfontspecs(specs, &term.line[y][x1], x2 - x1, x1, y); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i i = ox = 0; Err gopher.r-36.net 70 i- for(x = x1; x < x2 && i < numspecs; x++) { Err gopher.r-36.net 70 i+ for (x = x1; x < x2 && i < numspecs; x++) { Err gopher.r-36.net 70 i new = term.line[y][x]; Err gopher.r-36.net 70 i- if(new.mode == ATTR_WDUMMY) Err gopher.r-36.net 70 i+ if (new.mode == ATTR_WDUMMY) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i- if(ena_sel && selected(x, y)) Err gopher.r-36.net 70 i+ if (ena_sel && selected(x, y)) Err gopher.r-36.net 70 i new.mode ^= ATTR_REVERSE; Err gopher.r-36.net 70 i- if(i > 0 && ATTRCMP(base, new)) { Err gopher.r-36.net 70 i+ if (i > 0 && ATTRCMP(base, new)) { Err gopher.r-36.net 70 i xdrawglyphfontspecs(specs, base, i, ox, y); Err gopher.r-36.net 70 i specs += i; Err gopher.r-36.net 70 i numspecs -= i; Err gopher.r-36.net 70 i i = 0; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(i == 0) { Err gopher.r-36.net 70 i+ if (i == 0) { Err gopher.r-36.net 70 i ox = x; Err gopher.r-36.net 70 i base = new; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i i++; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(i > 0) Err gopher.r-36.net 70 i+ if (i > 0) Err gopher.r-36.net 70 i xdrawglyphfontspecs(specs, base, i, ox, y); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i xdrawcursor(); Err gopher.r-36.net 70 i@@ -3856,19 +3856,19 @@ focus(XEvent *ev) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i XFocusChangeEvent *e = &ev->xfocus; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(e->mode == NotifyGrab) Err gopher.r-36.net 70 i+ if (e->mode == NotifyGrab) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(ev->type == FocusIn) { Err gopher.r-36.net 70 i+ if (ev->type == FocusIn) { Err gopher.r-36.net 70 i XSetICFocus(xw.xic); Err gopher.r-36.net 70 i xw.state |= WIN_FOCUSED; Err gopher.r-36.net 70 i xseturgency(0); Err gopher.r-36.net 70 i- if(IS_SET(MODE_FOCUS)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_FOCUS)) Err gopher.r-36.net 70 i ttywrite("\033[I", 3); Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i XUnsetICFocus(xw.xic); Err gopher.r-36.net 70 i xw.state &= ~WIN_FOCUSED; Err gopher.r-36.net 70 i- if(IS_SET(MODE_FOCUS)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_FOCUS)) Err gopher.r-36.net 70 i ttywrite("\033[O", 3); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3892,31 +3892,31 @@ kmap(KeySym k, uint state) Err gopher.r-36.net 70 i int i; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* Check for mapped keys out of X11 function keys. */ Err gopher.r-36.net 70 i- for(i = 0; i < LEN(mappedkeys); i++) { Err gopher.r-36.net 70 i- if(mappedkeys[i] == k) Err gopher.r-36.net 70 i+ for (i = 0; i < LEN(mappedkeys); i++) { Err gopher.r-36.net 70 i+ if (mappedkeys[i] == k) Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(i == LEN(mappedkeys)) { Err gopher.r-36.net 70 i- if((k & 0xFFFF) < 0xFD00) Err gopher.r-36.net 70 i+ if (i == LEN(mappedkeys)) { Err gopher.r-36.net 70 i+ if ((k & 0xFFFF) < 0xFD00) Err gopher.r-36.net 70 i return NULL; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(kp = key; kp < key + LEN(key); kp++) { Err gopher.r-36.net 70 i- if(kp->k != k) Err gopher.r-36.net 70 i+ for (kp = key; kp < key + LEN(key); kp++) { Err gopher.r-36.net 70 i+ if (kp->k != k) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(!match(kp->mask, state)) Err gopher.r-36.net 70 i+ if (!match(kp->mask, state)) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i- if(term.numlock && kp->appkey == 2) Err gopher.r-36.net 70 i+ if (term.numlock && kp->appkey == 2) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i return kp->s; Err gopher.r-36.net 70 i@@ -3936,30 +3936,30 @@ kpress(XEvent *ev) Err gopher.r-36.net 70 i Status status; Err gopher.r-36.net 70 i Shortcut *bp; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(IS_SET(MODE_KBDLOCK)) Err gopher.r-36.net 70 i+ if (IS_SET(MODE_KBDLOCK)) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); Err gopher.r-36.net 70 i /* 1. shortcuts */ Err gopher.r-36.net 70 i- for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { Err gopher.r-36.net 70 i- if(ksym == bp->keysym && match(bp->mod, e->state)) { Err gopher.r-36.net 70 i+ for (bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { Err gopher.r-36.net 70 i+ if (ksym == bp->keysym && match(bp->mod, e->state)) { Err gopher.r-36.net 70 i bp->func(&(bp->arg)); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* 2. custom keys from config.h */ Err gopher.r-36.net 70 i- if((customkey = kmap(ksym, e->state))) { Err gopher.r-36.net 70 i+ if ((customkey = kmap(ksym, e->state))) { Err gopher.r-36.net 70 i ttysend(customkey, strlen(customkey)); Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i /* 3. composed string from input method */ Err gopher.r-36.net 70 i- if(len == 0) Err gopher.r-36.net 70 i+ if (len == 0) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i- if(len == 1 && e->state & Mod1Mask) { Err gopher.r-36.net 70 i- if(IS_SET(MODE_8BIT)) { Err gopher.r-36.net 70 i- if(*buf < 0177) { Err gopher.r-36.net 70 i+ if (len == 1 && e->state & Mod1Mask) { Err gopher.r-36.net 70 i+ if (IS_SET(MODE_8BIT)) { Err gopher.r-36.net 70 i+ if (*buf < 0177) { Err gopher.r-36.net 70 i c = *buf | 0x80; Err gopher.r-36.net 70 i len = utf8encode(c, buf); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i@@ -3980,14 +3980,14 @@ cmessage(XEvent *e) Err gopher.r-36.net 70 i * See xembed specs Err gopher.r-36.net 70 i * http://standards.freedesktop.org/xembed-spec/xembed-spec-latest.html Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(e->xclient.message_type == xw.xembed && e->xclient.format == 32) { Err gopher.r-36.net 70 i- if(e->xclient.data.l[1] == XEMBED_FOCUS_IN) { Err gopher.r-36.net 70 i+ if (e->xclient.message_type == xw.xembed && e->xclient.format == 32) { Err gopher.r-36.net 70 i+ if (e->xclient.data.l[1] == XEMBED_FOCUS_IN) { Err gopher.r-36.net 70 i xw.state |= WIN_FOCUSED; Err gopher.r-36.net 70 i xseturgency(0); Err gopher.r-36.net 70 i- } else if(e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { Err gopher.r-36.net 70 i+ } else if (e->xclient.data.l[1] == XEMBED_FOCUS_OUT) { Err gopher.r-36.net 70 i xw.state &= ~WIN_FOCUSED; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- } else if(e->xclient.data.l[0] == xw.wmdeletewin) { Err gopher.r-36.net 70 i+ } else if (e->xclient.data.l[0] == xw.wmdeletewin) { Err gopher.r-36.net 70 i /* Send SIGHUP to shell */ Err gopher.r-36.net 70 i kill(pid, SIGHUP); Err gopher.r-36.net 70 i exit(0); Err gopher.r-36.net 70 i@@ -3999,9 +3999,9 @@ cresize(int width, int height) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i int col, row; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(width != 0) Err gopher.r-36.net 70 i+ if (width != 0) Err gopher.r-36.net 70 i xw.w = width; Err gopher.r-36.net 70 i- if(height != 0) Err gopher.r-36.net 70 i+ if (height != 0) Err gopher.r-36.net 70 i xw.h = height; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i col = (xw.w - 2 * borderpx) / xw.cw; Err gopher.r-36.net 70 i@@ -4015,7 +4015,7 @@ cresize(int width, int height) Err gopher.r-36.net 70 i void Err gopher.r-36.net 70 i resize(XEvent *e) Err gopher.r-36.net 70 i { Err gopher.r-36.net 70 i- if(e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) Err gopher.r-36.net 70 i+ if (e->xconfigure.width == xw.w && e->xconfigure.height == xw.h) Err gopher.r-36.net 70 i return; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i cresize(e->xconfigure.width, e->xconfigure.height); Err gopher.r-36.net 70 i@@ -4039,13 +4039,13 @@ run(void) Err gopher.r-36.net 70 i * this is not unnecessary.It does not only filter the key event, Err gopher.r-36.net 70 i * but some clientmessage for input method as well. Err gopher.r-36.net 70 i */ Err gopher.r-36.net 70 i- if(XFilterEvent(&ev, None)) Err gopher.r-36.net 70 i+ if (XFilterEvent(&ev, None)) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i- if(ev.type == ConfigureNotify) { Err gopher.r-36.net 70 i+ if (ev.type == ConfigureNotify) { Err gopher.r-36.net 70 i w = ev.xconfigure.width; Err gopher.r-36.net 70 i h = ev.xconfigure.height; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- } while(ev.type != MapNotify); Err gopher.r-36.net 70 i+ } while (ev.type != MapNotify); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i ttynew(); Err gopher.r-36.net 70 i cresize(w, h); Err gopher.r-36.net 70 i@@ -4053,26 +4053,26 @@ run(void) Err gopher.r-36.net 70 i clock_gettime(CLOCK_MONOTONIC, &last); Err gopher.r-36.net 70 i lastblink = last; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- for(xev = actionfps;;) { Err gopher.r-36.net 70 i+ for (xev = actionfps;;) { Err gopher.r-36.net 70 i FD_ZERO(&rfd); Err gopher.r-36.net 70 i FD_SET(cmdfd, &rfd); Err gopher.r-36.net 70 i FD_SET(xfd, &rfd); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { Err gopher.r-36.net 70 i- if(errno == EINTR) Err gopher.r-36.net 70 i+ if (pselect(MAX(xfd, cmdfd)+1, &rfd, NULL, NULL, tv, NULL) < 0) { Err gopher.r-36.net 70 i+ if (errno == EINTR) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i die("select failed: %s\n", strerror(errno)); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i- if(FD_ISSET(cmdfd, &rfd)) { Err gopher.r-36.net 70 i+ if (FD_ISSET(cmdfd, &rfd)) { Err gopher.r-36.net 70 i ttyread(); Err gopher.r-36.net 70 i- if(blinktimeout) { Err gopher.r-36.net 70 i+ if (blinktimeout) { Err gopher.r-36.net 70 i blinkset = tattrset(ATTR_BLINK); Err gopher.r-36.net 70 i- if(!blinkset) Err gopher.r-36.net 70 i+ if (!blinkset) Err gopher.r-36.net 70 i MODBIT(term.mode, 0, MODE_BLINK); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(FD_ISSET(xfd, &rfd)) Err gopher.r-36.net 70 i+ if (FD_ISSET(xfd, &rfd)) Err gopher.r-36.net 70 i xev = actionfps; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i clock_gettime(CLOCK_MONOTONIC, &now); Err gopher.r-36.net 70 i@@ -4081,35 +4081,35 @@ run(void) Err gopher.r-36.net 70 i tv = &drawtimeout; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i dodraw = 0; Err gopher.r-36.net 70 i- if(blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { Err gopher.r-36.net 70 i+ if (blinktimeout && TIMEDIFF(now, lastblink) > blinktimeout) { Err gopher.r-36.net 70 i tsetdirtattr(ATTR_BLINK); Err gopher.r-36.net 70 i term.mode ^= MODE_BLINK; Err gopher.r-36.net 70 i lastblink = now; Err gopher.r-36.net 70 i dodraw = 1; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i deltatime = TIMEDIFF(now, last); Err gopher.r-36.net 70 i- if(deltatime > 1000 / (xev ? xfps : actionfps)) { Err gopher.r-36.net 70 i+ if (deltatime > 1000 / (xev ? xfps : actionfps)) { Err gopher.r-36.net 70 i dodraw = 1; Err gopher.r-36.net 70 i last = now; Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(dodraw) { Err gopher.r-36.net 70 i- while(XPending(xw.dpy)) { Err gopher.r-36.net 70 i+ if (dodraw) { Err gopher.r-36.net 70 i+ while (XPending(xw.dpy)) { Err gopher.r-36.net 70 i XNextEvent(xw.dpy, &ev); Err gopher.r-36.net 70 i- if(XFilterEvent(&ev, None)) Err gopher.r-36.net 70 i+ if (XFilterEvent(&ev, None)) Err gopher.r-36.net 70 i continue; Err gopher.r-36.net 70 i- if(handler[ev.type]) Err gopher.r-36.net 70 i+ if (handler[ev.type]) Err gopher.r-36.net 70 i (handler[ev.type])(&ev); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i draw(); Err gopher.r-36.net 70 i XFlush(xw.dpy); Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i- if(xev && !FD_ISSET(xfd, &rfd)) Err gopher.r-36.net 70 i+ if (xev && !FD_ISSET(xfd, &rfd)) Err gopher.r-36.net 70 i xev--; Err gopher.r-36.net 70 i- if(!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) { Err gopher.r-36.net 70 i- if(blinkset) { Err gopher.r-36.net 70 i- if(TIMEDIFF(now, lastblink) \ Err gopher.r-36.net 70 i+ if (!FD_ISSET(cmdfd, &rfd) && !FD_ISSET(xfd, &rfd)) { Err gopher.r-36.net 70 i+ if (blinkset) { Err gopher.r-36.net 70 i+ if (TIMEDIFF(now, lastblink) \ Err gopher.r-36.net 70 i > blinktimeout) { Err gopher.r-36.net 70 i drawtimeout.tv_nsec = 1000; Err gopher.r-36.net 70 i } else { Err gopher.r-36.net 70 i@@ -4157,7 +4157,7 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i opt_class = EARGF(usage()); Err gopher.r-36.net 70 i break; Err gopher.r-36.net 70 i case 'e': Err gopher.r-36.net 70 i- if(argc > 0) Err gopher.r-36.net 70 i+ if (argc > 0) Err gopher.r-36.net 70 i --argc, ++argv; Err gopher.r-36.net 70 i goto run; Err gopher.r-36.net 70 i case 'f': Err gopher.r-36.net 70 i@@ -4188,10 +4188,10 @@ main(int argc, char *argv[]) Err gopher.r-36.net 70 i } ARGEND; Err gopher.r-36.net 70 i Err gopher.r-36.net 70 i run: Err gopher.r-36.net 70 i- if(argc > 0) { Err gopher.r-36.net 70 i+ if (argc > 0) { Err gopher.r-36.net 70 i /* eat all remaining arguments */ Err gopher.r-36.net 70 i opt_cmd = argv; Err gopher.r-36.net 70 i- if(!opt_title && !opt_line) Err gopher.r-36.net 70 i+ if (!opt_title && !opt_line) Err gopher.r-36.net 70 i opt_title = basename(xstrdup(argv[0])); Err gopher.r-36.net 70 i } Err gopher.r-36.net 70 i setlocale(LC_CTYPE, ""); Err gopher.r-36.net 70 .