Changed type for UTF-32 codepoints from long to uint_least32_t

[st.git] / st.c

diff --git a/st.c b/st.c
index 60c07d0..4add638 100644 (file)
--- a/st.c
+++ b/st.c
@@ -162,6 +162,12 @@ enum window_state {
        WIN_FOCUSED = 2
 };
 
+enum selection_mode {
+       SEL_IDLE = 0,
+       SEL_EMPTY = 1,
+       SEL_READY = 2
+};
+
 enum selection_type {
        SEL_REGULAR = 1,
        SEL_RECTANGULAR = 2
@@ -177,11 +183,13 @@ typedef unsigned int uint;
 typedef unsigned long ulong;
 typedef unsigned short ushort;
 
+typedef uint_least32_t Rune;
+
 typedef XftDraw *Draw;
 typedef XftColor Color;
 
 typedef struct {
-       long u;           /* character code */
+       Rune u;           /* character code */
        ushort mode;      /* attribute flags */
        ushort fg;        /* foreground  */
        ushort bg;        /* background  */
@@ -383,20 +391,20 @@ static void tmoveato(int, int);
 static void tnew(int, int);
 static void tnewline(int);
 static void tputtab(int);
-static void tputc(long);
+static void tputc(Rune);
 static void treset(void);
 static void tresize(int, int);
 static void tscrollup(int, int);
 static void tscrolldown(int, int);
 static void tsetattr(int *, int);
-static void tsetchar(long, Glyph *, int, int);
+static void tsetchar(Rune, Glyph *, int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
 static void tsetdirt(int, int);
 static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
-static void techo(long);
+static void techo(Rune);
 static void tcontrolcode(uchar );
 static void tdectest(char );
 static int32_t tdefcolor(int *, int *, int);
@@ -453,17 +461,17 @@ static inline bool selected(int, int);
 static char *getsel(void);
 static void selcopy(Time);
 static void selscroll(int, int);
-static void selsnap(int, int *, int *, int);
+static void selsnap(int *, int *, int);
 static int x2col(int);
 static int y2row(int);
 static void getbuttoninfo(XEvent *);
 static void mousereport(XEvent *);
 
-static size_t utf8decode(char *, long *, size_t);
-static long utf8decodebyte(char, size_t *);
-static size_t utf8encode(long, char *);
-static char utf8encodebyte(long, size_t);
-static size_t utf8validate(long *, size_t);
+static size_t utf8decode(char *, Rune *, size_t);
+static Rune utf8decodebyte(char, size_t *);
+static size_t utf8encode(Rune, char *);
+static char utf8encodebyte(Rune, size_t);
+static size_t utf8validate(Rune *, size_t);
 
 static ssize_t xwrite(int, const char *, size_t);
 static void *xmalloc(size_t);
@@ -518,8 +526,8 @@ static double defaultfontsize = 0;
 
 static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
 static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 /* Font Ring Cache */
 enum {
@@ -532,7 +540,7 @@ enum {
 typedef struct {
        XftFont *font;
        int flags;
-       long unicodep;
+       Rune unicodep;
 } Fontcache;
 
 /* Fontcache is an array now. A new font will be appended to the array. */
@@ -580,9 +588,9 @@ xstrdup(char *s) {
 }
 
 size_t
-utf8decode(char *c, long *u, size_t clen) {
+utf8decode(char *c, Rune *u, size_t clen) {
        size_t i, j, len, type;
-       long udecoded;
+       Rune udecoded;
 
        *u = UTF_INVALID;
        if(!clen)
@@ -602,7 +610,7 @@ utf8decode(char *c, long *u, size_t clen) {
        return len;
 }
 
-long
+Rune
 utf8decodebyte(char c, size_t *i) {
        for(*i = 0; *i < LEN(utfmask); ++(*i))
                if(((uchar)c & utfmask[*i]) == utfbyte[*i])
@@ -611,7 +619,7 @@ utf8decodebyte(char c, size_t *i) {
 }
 
 size_t
-utf8encode(long u, char *c) {
+utf8encode(Rune u, char *c) {
        size_t len, i;
 
        len = utf8validate(&u, 0);
@@ -626,12 +634,12 @@ utf8encode(long u, char *c) {
 }
 
 char
-utf8encodebyte(long u, size_t i) {
+utf8encodebyte(Rune u, size_t i) {
        return utfbyte[i] | (u & ~utfmask[i]);
 }
 
 size_t
-utf8validate(long *u, size_t i) {
+utf8validate(Rune *u, size_t i) {
        if(!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
                *u = UTF_INVALID;
        for(i = 1; *u > utfmax[i]; ++i)
@@ -643,7 +651,7 @@ void
 selinit(void) {
        memset(&sel.tclick1, 0, sizeof(sel.tclick1));
        memset(&sel.tclick2, 0, sizeof(sel.tclick2));
-       sel.mode = 0;
+       sel.mode = SEL_IDLE;
        sel.ob.x = -1;
        sel.primary = NULL;
        sel.clipboard = NULL;
@@ -685,18 +693,18 @@ void
 selnormalize(void) {
        int i;
 
-       if(sel.ob.y == sel.oe.y || sel.type == SEL_RECTANGULAR) {
-               sel.nb.x = MIN(sel.ob.x, sel.oe.x);
-               sel.ne.x = MAX(sel.ob.x, sel.oe.x);
-       } else {
+       if(sel.type == SEL_REGULAR && sel.ob.y != sel.oe.y) {
                sel.nb.x = sel.ob.y < sel.oe.y ? sel.ob.x : sel.oe.x;
                sel.ne.x = sel.ob.y < sel.oe.y ? sel.oe.x : sel.ob.x;
+       } else {
+               sel.nb.x = MIN(sel.ob.x, sel.oe.x);
+               sel.ne.x = MAX(sel.ob.x, sel.oe.x);
        }
        sel.nb.y = MIN(sel.ob.y, sel.oe.y);
        sel.ne.y = MAX(sel.ob.y, sel.oe.y);
 
-       selsnap(sel.snap, &sel.nb.x, &sel.nb.y, -1);
-       selsnap(sel.snap, &sel.ne.x, &sel.ne.y, +1);
+       selsnap(&sel.nb.x, &sel.nb.y, -1);
+       selsnap(&sel.ne.x, &sel.ne.y, +1);
 
        /* expand selection over line breaks */
        if (sel.type == SEL_RECTANGULAR)
@@ -710,6 +718,9 @@ selnormalize(void) {
 
 bool
 selected(int x, int y) {
+       if(sel.mode == SEL_EMPTY)
+               return false;
+
        if(sel.type == SEL_RECTANGULAR)
                return BETWEEN(y, sel.nb.y, sel.ne.y)
                    && BETWEEN(x, sel.nb.x, sel.ne.x);
@@ -720,12 +731,12 @@ selected(int x, int y) {
 }
 
 void
-selsnap(int mode, int *x, int *y, int direction) {
+selsnap(int *x, int *y, int direction) {
        int newx, newy, xt, yt;
        bool delim, prevdelim;
        Glyph *gp, *prevgp;
 
-       switch(mode) {
+       switch(sel.snap) {
        case SNAP_WORD:
                /*
                 * Snap around if the word wraps around at the end or
@@ -772,15 +783,15 @@ selsnap(int mode, int *x, int *y, int direction) {
                 * previous line will be selected.
                 */
                *x = (direction < 0) ? 0 : term.col - 1;
-               if(direction < 0 && *y > 0) {
+               if(direction < 0) {
                        for(; *y > 0; *y += direction) {
                                if(!(term.line[*y-1][term.col-1].mode
                                                & ATTR_WRAP)) {
                                        break;
                                }
                        }
-               } else if(direction > 0 && *y < term.row-1) {
-                       for(; *y < term.row; *y += direction) {
+               } else if(direction > 0) {
+                       for(; *y < term.row-1; *y += direction) {
                                if(!(term.line[*y][term.col-1].mode
                                                & ATTR_WRAP)) {
                                        break;
@@ -855,12 +866,11 @@ mousereport(XEvent *e) {
        }
 
        if(!IS_SET(MODE_MOUSEX10)) {
-               button += (state & ShiftMask   ? 4  : 0)
-                       + (state & Mod4Mask    ? 8  : 0)
-                       + (state & ControlMask ? 16 : 0);
+               button += ((state & ShiftMask  ) ? 4  : 0)
+                       + ((state & Mod4Mask   ) ? 8  : 0)
+                       + ((state & ControlMask) ? 16 : 0);
        }
 
-       len = 0;
        if(IS_SET(MODE_MOUSESGR)) {
                len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
                                button, x+1, y+1,
@@ -898,7 +908,7 @@ bpress(XEvent *e) {
 
                /* Clear previous selection, logically and visually. */
                selclear(NULL);
-               sel.mode = 1;
+               sel.mode = SEL_EMPTY;
                sel.type = SEL_REGULAR;
                sel.oe.x = sel.ob.x = x2col(e->xbutton.x);
                sel.oe.y = sel.ob.y = y2row(e->xbutton.y);
@@ -916,14 +926,9 @@ bpress(XEvent *e) {
                }
                selnormalize();
 
-               /*
-                * Draw selection, unless it's regular and we don't want to
-                * make clicks visible
-                */
-               if(sel.snap != 0) {
-                       sel.mode++;
-                       tsetdirt(sel.nb.y, sel.ne.y);
-               }
+               if(sel.snap != 0)
+                       sel.mode = SEL_READY;
+               tsetdirt(sel.nb.y, sel.ne.y);
                sel.tclick2 = sel.tclick1;
                sel.tclick1 = now;
        }
@@ -1079,8 +1084,8 @@ selrequest(XEvent *e) {
        xev.selection = xsre->selection;
        xev.target = xsre->target;
        xev.time = xsre->time;
-        if (xsre->property == None)
-            xsre->property = xsre->target;
+       if (xsre->property == None)
+               xsre->property = xsre->target;
 
        /* reject */
        xev.property = None;
@@ -1129,8 +1134,8 @@ xsetsel(char *str, Time t) {
        sel.primary = str;
 
        XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
-        if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
-            selclear(0);
+       if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
+               selclear(0);
 }
 
 void
@@ -1143,13 +1148,12 @@ brelease(XEvent *e) {
        if(e->xbutton.button == Button2) {
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
-               if(sel.mode < 2) {
-                       selclear(NULL);
-               } else {
+               if(sel.mode == SEL_READY) {
                        getbuttoninfo(e);
                        selcopy(e->xbutton.time);
-               }
-               sel.mode = 0;
+               } else
+                       selclear(NULL);
+               sel.mode = SEL_IDLE;
                tsetdirt(sel.nb.y, sel.ne.y);
        }
 }
@@ -1166,7 +1170,7 @@ bmotion(XEvent *e) {
        if(!sel.mode)
                return;
 
-       sel.mode++;
+       sel.mode = SEL_READY;
        oldey = sel.oe.y;
        oldex = sel.oe.x;
        oldsby = sel.nb.y;
@@ -1239,10 +1243,14 @@ execsh(void) {
 void
 sigchld(int a) {
        int stat, ret;
+       pid_t p;
 
-       if(waitpid(pid, &stat, 0) < 0)
+       if((p = waitpid(pid, &stat, WNOHANG)) < 0)
                die("Waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
+       if(pid != p)
+               return;
+
        ret = WIFEXITED(stat) ? WEXITSTATUS(stat) : EXIT_FAILURE;
        if (ret != EXIT_SUCCESS)
                die("child finished with error '%d'\n", stat);
@@ -1333,7 +1341,7 @@ ttyread(void) {
        static int buflen = 0;
        char *ptr;
        int charsize; /* size of utf8 char in bytes */
-       long unicodep;
+       Rune unicodep;
        int ret;
 
        /* append read bytes to unprocessed bytes */
@@ -1362,7 +1370,7 @@ ttywrite(const char *s, size_t n) {
 void
 ttysend(char *s, size_t n) {
        int len;
-       long u;
+       Rune u;
 
        ttywrite(s, n);
        if(IS_SET(MODE_ECHO))
@@ -1619,7 +1627,7 @@ tmoveto(int x, int y) {
 }
 
 void
-tsetchar(long u, Glyph *attr, int x, int y) {
+tsetchar(Rune u, Glyph *attr, int x, int y) {
        static char *vt100_0[62] = { /* 0x41 - 0x7e */
                "↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
                0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
@@ -1744,7 +1752,7 @@ tdefcolor(int *attr, int *npar, int l) {
                b = attr[*npar + 4];
                *npar += 4;
                if(!BETWEEN(r, 0, 255) || !BETWEEN(g, 0, 255) || !BETWEEN(b, 0, 255))
-                       fprintf(stderr, "erresc: bad rgb color (%d,%d,%d)\n",
+                       fprintf(stderr, "erresc: bad rgb color (%u,%u,%u)\n",
                                r, g, b);
                else
                        idx = TRUECOLOR(r, g, b);
@@ -2434,7 +2442,7 @@ tputtab(int n) {
 }
 
 void
-techo(long u) {
+techo(Rune u) {
        if(ISCONTROL(u)) { /* control code */
                if(u & 0x80) {
                        u &= 0x7f;
@@ -2657,7 +2665,7 @@ eschandle(uchar ascii) {
 }
 
 void
-tputc(long u) {
+tputc(Rune u) {
        char c[UTF_SIZ];
        bool control;
        int width, len;
@@ -3256,7 +3264,7 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        int frcflags, charexists;
        int u8fl, u8fblen, u8cblen, doesexist;
        char *u8c, *u8fs;
-       long unicodep;
+       Rune unicodep;
        Font *font = &dc.font;
        FcResult fcres;
        FcPattern *fcpattern, *fontpattern;
@@ -3799,7 +3807,7 @@ kpress(XEvent *ev) {
        KeySym ksym;
        char buf[32], *customkey;
        int len;
-       long c;
+       Rune c;
        Status status;
        Shortcut *bp;