Fix stupid bug in tdefcolor returning -1 in unsigned function

[st.git] / st.c

diff --git a/st.c b/st.c
index 77ea0c8..8f1b8d8 100644 (file)
--- a/st.c
+++ b/st.c
@@ -180,8 +180,8 @@ typedef unsigned short ushort;
 typedef struct {
        char c[UTF_SIZ]; /* character code */
        ushort mode;      /* attribute flags */
-       ulong fg;        /* foreground  */
-       ulong bg;        /* background  */
+       uint32_t fg;      /* foreground  */
+       uint32_t bg;      /* background  */
 } Glyph;
 
 typedef Glyph *Line;
@@ -239,7 +239,7 @@ typedef struct {
        Colourmap cmap;
        Window win;
        Drawable buf;
-       Atom xembed, wmdeletewin;
+       Atom xembed, wmdeletewin, netwmname;
        XIM xim;
        XIC xic;
        Draw draw;
@@ -256,15 +256,15 @@ typedef struct {
 } XWindow;
 
 typedef struct {
-       int b;
+       uint b;
        uint mask;
-       char s[ESC_BUF_SIZ];
+       char *s;
 } Mousekey;
 
 typedef struct {
        KeySym k;
        uint mask;
-       char s[ESC_BUF_SIZ];
+       char *s;
        /* three valued logic variables: 0 indifferent, 1 on, -1 off */
        signed char appkey;    /* application keypad */
        signed char appcursor; /* application cursor */
@@ -379,13 +379,14 @@ static void tsetdirtattr(int);
 static void tsetmode(bool, bool, int *, int);
 static void tfulldirt(void);
 static void techo(char *, int);
-static long tdefcolor(int *, int *, int);
+static int32_t tdefcolor(int *, int *, int);
 static void tselcs(void);
 static void tdeftran(char);
 static inline bool match(uint, uint);
 static void ttynew(void);
 static void ttyread(void);
 static void ttyresize(void);
+static void ttysend(char *, size_t);
 static void ttywrite(const char *, size_t);
 
 static void xdraws(char *, Glyph, int, int, int, int);
@@ -893,9 +894,7 @@ bpress(XEvent *e) {
        for(mk = mshortcuts; mk < mshortcuts + LEN(mshortcuts); mk++) {
                if(e->xbutton.button == mk->b
                                && match(mk->mask, e->xbutton.state)) {
-                       ttywrite(mk->s, strlen(mk->s));
-                       if(IS_SET(MODE_ECHO))
-                               techo(mk->s, strlen(mk->s));
+                       ttysend(mk->s, strlen(mk->s));
                        return;
                }
        }
@@ -1031,7 +1030,7 @@ selnotify(XEvent *e) {
 
                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[200~", 6);
-               ttywrite((const char *)data, nitems * format / 8);
+               ttysend((char *)data, nitems * format / 8);
                if(IS_SET(MODE_BRCKTPASTE))
                        ttywrite("\033[201~", 6);
                XFree(data);
@@ -1300,6 +1299,13 @@ ttywrite(const char *s, size_t n) {
 }
 
 void
+ttysend(char *s, size_t n) {
+       ttywrite(s, n);
+       if(IS_SET(MODE_ECHO))
+               techo(s, n);
+}
+
+void
 ttyresize(void) {
        struct winsize w;
 
@@ -1660,9 +1666,9 @@ tdeleteline(int n) {
        tscrollup(term.c.y, n);
 }
 
-long
+int32_t
 tdefcolor(int *attr, int *npar, int l) {
-       long idx = -1;
+       int32_t idx = -1;
        uint r, g, b;
 
        switch (attr[*npar + 1]) {
@@ -1711,7 +1717,7 @@ tdefcolor(int *attr, int *npar, int l) {
 void
 tsetattr(int *attr, int l) {
        int i;
-       long idx;
+       int32_t idx;
 
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
@@ -3017,6 +3023,7 @@ xinit(void) {
 
        xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
        xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
+       xw.netwmname = XInternAtom(xw.dpy, "_NET_WM_NAME", False);
        XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
        xresettitle();
@@ -3349,6 +3356,7 @@ xsettitle(char *p) {
        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
                        &prop);
        XSetWMName(xw.dpy, xw.win, &prop);
+       XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
        XFree(prop.value);
 }
 
@@ -3495,15 +3503,7 @@ focus(XEvent *ev) {
 
 static inline bool
 match(uint mask, uint state) {
-       state &= ~ignoremod;
-
-       if(mask == XK_NO_MOD && state)
-               return false;
-       if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
-               return false;
-       if(mask == XK_ANY_MOD)
-               return true;
-       return state == mask;
+       return mask == XK_ANY_MOD || mask == (state & ~ignoremod);
 }
 
 void
@@ -3533,25 +3533,16 @@ kmap(KeySym k, uint state) {
                if(!match(kp->mask, state))
                        continue;
 
-               if(kp->appkey > 0) {
-                       if(!IS_SET(MODE_APPKEYPAD))
-                               continue;
-                       if(term.numlock && kp->appkey == 2)
-                               continue;
-               } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+               if(IS_SET(MODE_APPKEYPAD) ? kp->appkey < 0 : kp->appkey > 0)
+                       continue;
+               if(term.numlock && kp->appkey == 2)
                        continue;
-               }
 
-               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-                               (kp->appcursor > 0
-                                && !IS_SET(MODE_APPCURSOR))) {
+               if(IS_SET(MODE_APPCURSOR) ? kp->appcursor < 0 : kp->appcursor > 0)
                        continue;
-               }
 
-               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
-                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+               if(IS_SET(MODE_CRLF) ? kp->crlf < 0 : kp->crlf > 0)
                        continue;
-               }
 
                return kp->s;
        }
@@ -3563,8 +3554,8 @@ void
 kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
-       char xstr[31], buf[32], *customkey, *cp = buf;
-       int len, ret;
+       char buf[32], *customkey;
+       int len;
        long c;
        Status status;
        Shortcut *bp;
@@ -3572,8 +3563,7 @@ kpress(XEvent *ev) {
        if(IS_SET(MODE_KBDLOCK))
                return;
 
-       len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
-       e->state &= ~Mod2Mask;
+       len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -3584,33 +3574,26 @@ kpress(XEvent *ev) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {
-               len = strlen(customkey);
-               memcpy(buf, customkey, len);
-       /* 3. hardcoded (overrides X lookup) */
-       } else {
-               if(len == 0)
-                       return;
+               ttysend(customkey, strlen(customkey));
+               return;
+       }
 
-               if(len == 1 && e->state & Mod1Mask) {
-                       if(IS_SET(MODE_8BIT)) {
-                               if(*xstr < 0177) {
-                                       c = *xstr | 0x80;
-                                       ret = utf8encode(&c, cp);
-                                       cp += ret;
-                                       len = 0;
-                               }
-                       } else {
-                               *cp++ = '\033';
+       /* 3. composed string from input method */
+       if(len == 0)
+               return;
+       if(len == 1 && e->state & Mod1Mask) {
+               if(IS_SET(MODE_8BIT)) {
+                       if(*buf < 0177) {
+                               c = *buf | 0x80;
+                               len = utf8encode(&c, buf);
                        }
+               } else {
+                       buf[1] = buf[0];
+                       buf[0] = '\033';
+                       len = 2;
                }
-
-               memcpy(cp, xstr, len);
-               len = cp - buf + len;
        }
-
-       ttywrite(buf, len);
-       if(IS_SET(MODE_ECHO))
-               techo(buf, len);
+       ttysend(buf, len);
 }
 
 
@@ -3688,6 +3671,8 @@ run(void) {
        gettimeofday(&last, NULL);
 
        for(xev = actionfps;;) {
+               long deltatime;
+
                FD_ZERO(&rfd);
                FD_SET(cmdfd, &rfd);
                FD_SET(xfd, &rfd);
@@ -3721,8 +3706,9 @@ run(void) {
                        gettimeofday(&lastblink, NULL);
                        dodraw = 1;
                }
-               if(TIMEDIFF(now, last) \
-                               > (xev? (1000/xfps) : (1000/actionfps))) {
+               deltatime = TIMEDIFF(now, last);
+               if(deltatime > (xev? (1000/xfps) : (1000/actionfps))
+                               || deltatime < 0) {
                        dodraw = 1;
                        last = now;
                }