Fixing a compile error.

[st.git] / st.c

diff --git a/st.c b/st.c
index 900b567..8074df9 100644 (file)
--- a/st.c
+++ b/st.c
@@ -73,7 +73,7 @@
 #define BETWEEN(x, a, b)  ((a) <= (x) && (x) <= (b))
 #define LIMIT(x, a, b)    (x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
-#define IS_SET(flag) (term.mode & (flag))
+#define IS_SET(flag) ((term.mode & (flag)) != 0)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
 
 #define VT102ID "\033[?6c"
@@ -624,6 +624,8 @@ selected(int x, int y) {
 
 void
 getbuttoninfo(XEvent *e) {
+       sel.alt = IS_SET(MODE_ALTSCREEN);
+
        sel.ex = x2col(e->xbutton.x);
        sel.ey = y2row(e->xbutton.y);
 
@@ -722,7 +724,6 @@ selcopy(void) {
                }
                *ptr = 0;
        }
-       sel.alt = IS_SET(MODE_ALTSCREEN);
        xsetsel(str);
 }
 
@@ -869,16 +870,17 @@ bmotion(XEvent *e) {
                return;
        }
 
-       if(sel.mode) {
-               oldey = sel.ey;
-               oldex = sel.ex;
-               getbuttoninfo(e);
+       if(!sel.mode)
+               return;
 
-               if(oldey != sel.ey || oldex != sel.ex) {
-                       starty = MIN(oldey, sel.ey);
-                       endy = MAX(oldey, sel.ey);
-                       tsetdirt(starty, endy);
-               }
+       oldey = sel.ey;
+       oldex = sel.ex;
+       getbuttoninfo(e);
+
+       if(oldey != sel.ey || oldex != sel.ex) {
+               starty = MIN(oldey, sel.ey);
+               endy = MAX(oldey, sel.ey);
+               tsetdirt(starty, endy);
        }
 }
 
@@ -1510,7 +1512,7 @@ tsetmode(bool priv, bool set, int *args, int narg) {
                        case 1049: /* = 1047 and 1048 */
                        case 47:
                        case 1047: {
-                               alt = IS_SET(MODE_ALTSCREEN) != 0;
+                               alt = IS_SET(MODE_ALTSCREEN);
                                if(alt)
                                        tclearregion(0, 0, term.col-1, term.row-1);
                                if(set ^ alt)           /* set is always 1 or 0 */
@@ -2246,7 +2248,7 @@ xtermclear(int col1, int row1, int col2, int row2) {
 void
 xclear(int x1, int y1, int x2, int y2) {
        XftDrawRect(xw.draw,
-                       &dc.col[IS_SET(MODE_REVERSE) ? defaultfg : defaultbg],
+                       &dc.col[IS_SET(MODE_REVERSE)? defaultfg : defaultbg],
                        x1, y1, x2-x1, y2-y1);
 }
 
@@ -2429,9 +2431,13 @@ xinit(void) {
 
        /* input methods */
        xw.xim = XOpenIM(xw.dpy, NULL, NULL, NULL);
+       if(xw.xim == NULL)
+               die("XOpenIM failed. Could not open input device.\n");
        xw.xic = XCreateIC(xw.xim, XNInputStyle, XIMPreeditNothing
                                           | XIMStatusNothing, XNClientWindow, xw.win,
                                           XNFocusWindow, xw.win, NULL);
+       if(xw.xic == NULL)
+               die("XCreateIC failed. Could not obtain input method.\n");
 
        /* white cursor, black outline */
        cursor = XCreateFontCursor(xw.dpy, XC_xterm);
@@ -2509,8 +2515,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
                }
        }
 
-       if(base.mode & ATTR_REVERSE)
-               temp = fg, fg = bg, bg = temp;
+       if(base.mode & ATTR_REVERSE) {
+               temp = fg;
+               fg = bg;
+               bg = temp;
+       }
 
        XftTextExtentsUtf8(xw.dpy, font->set, (FcChar8 *)s, bytelen,
                        &extents);
@@ -2519,11 +2528,11 @@ xdraws(char *s, Glyph base, int x, int y, int charlen, int bytelen) {
        /* Intelligent cleaning up of the borders. */
        if(x == 0) {
                xclear(0, (y == 0)? 0 : winy, borderpx,
-                       winy + xw.ch + (y == term.row-1)? xw.h : 0);
+                       winy + xw.ch + ((y >= term.row-1)? xw.h : 0));
        }
-       if(x + charlen >= term.col-1) {
+       if(x + charlen >= term.col) {
                xclear(winx + width, (y == 0)? 0 : winy, xw.w,
-                       (y == term.row-1)? xw.h : (winy + xw.ch));
+                       ((y >= term.row-1)? xw.h : (winy + xw.ch)));
        }
        if(y == 0)
                xclear(winx, 0, winx + width, borderpx);
@@ -2603,10 +2612,11 @@ drawregion(int x1, int y1, int x2, int y2) {
        int ic, ib, x, y, ox, sl;
        Glyph base, new;
        char buf[DRAW_BUF_SIZ];
-       bool ena_sel = sel.bx != -1, alt = IS_SET(MODE_ALTSCREEN) != 0;
+       bool ena_sel = sel.bx != -1;
 
-       if((sel.alt != 0) ^ alt)
+       if(sel.alt ^ IS_SET(MODE_ALTSCREEN))
                ena_sel = 0;
+
        if(!(xw.state & WIN_VISIBLE))
                return;
 
@@ -2721,7 +2731,7 @@ kmap(KeySym k, uint state) {
                        break;
        }
        if(i == LEN(mappedkeys)) {
-               if((k & 0xFFFF) < 0xFF00)
+               if((k & 0xFFFF) < 0xFD00)
                        return NULL;
        }
 
@@ -2739,12 +2749,13 @@ kmap(KeySym k, uint state) {
                                continue;
                        if(term.numlock && kp->appkey == 2)
                                continue;
-               } else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
+               } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) {
                        continue;
                }
 
                if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-                               (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
+                               (kp->appcursor > 0
+                                && !IS_SET(MODE_APPCURSOR))) {
                        continue;
                }