Be careful about mar77i's patches.

[st.git] / st.c

diff --git a/st.c b/st.c
index db21901..42061b9 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"
@@ -194,6 +194,7 @@ typedef struct {
        int bot;        /* bottom scroll limit */
        int mode;       /* terminal mode flags */
        int esc;        /* escape state flags */
+       bool numlock;   /* lock numbers in keyboard */
        bool *tabs;
 } Term;
 
@@ -261,6 +262,7 @@ typedef struct {
 /* function definitions used in config.h */
 static void xzoom(const Arg *);
 static void selpaste(const Arg *);
+static void numlock(const Arg *);
 
 /* Config.h for applying patches and the configuration. */
 #include "config.h"
@@ -621,12 +623,11 @@ selected(int x, int y) {
 }
 
 void
-getbuttoninfo(XEvent *e, int *b, int *x, int *y) {
-       if(b)
-               *b = e->xbutton.button;
+getbuttoninfo(XEvent *e) {
+       sel.alt = IS_SET(MODE_ALTSCREEN);
 
-       *x = x2col(e->xbutton.x);
-       *y = y2row(e->xbutton.y);
+       sel.ex = x2col(e->xbutton.x);
+       sel.ey = y2row(e->xbutton.y);
 
        sel.b.x = sel.by < sel.ey ? sel.bx : sel.ex;
        sel.b.y = MIN(sel.by, sel.ey);
@@ -723,7 +724,6 @@ selcopy(void) {
                }
                *ptr = 0;
        }
-       sel.alt = IS_SET(MODE_ALTSCREEN);
        xsetsel(str);
 }
 
@@ -824,7 +824,7 @@ brelease(XEvent *e) {
                selpaste(NULL);
        } else if(e->xbutton.button == Button1) {
                sel.mode = 0;
-               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+               getbuttoninfo(e);
                term.dirty[sel.ey] = 1;
                if(sel.bx == sel.ex && sel.by == sel.ey) {
                        sel.bx = -1;
@@ -870,16 +870,17 @@ bmotion(XEvent *e) {
                return;
        }
 
-       if(sel.mode) {
-               oldey = sel.ey;
-               oldex = sel.ex;
-               getbuttoninfo(e, NULL, &sel.ex, &sel.ey);
+       if(!sel.mode)
+               return;
+
+       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);
-               }
+       if(oldey != sel.ey || oldex != sel.ex) {
+               starty = MIN(oldey, sel.ey);
+               endy = MAX(oldey, sel.ey);
+               tsetdirt(starty, endy);
        }
 }
 
@@ -1103,6 +1104,8 @@ tnew(int col, int row) {
                term.alt [row] = xmalloc(term.col * sizeof(Glyph));
                term.dirty[row] = 0;
        }
+
+       term.numlock = 1;
        memset(term.tabs, 0, term.col * sizeof(*term.tabs));
        /* setup screen */
        treset();
@@ -1509,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 */
@@ -2082,7 +2085,7 @@ tputc(char *c, int len) {
                        }
                }
                /*
-                * All characters which forms part of a sequence are not
+                * All characters which form part of a sequence are not
                 * printed
                 */
                return;
@@ -2185,8 +2188,8 @@ tresize(int col, int row) {
 
 void
 xresize(int col, int row) {
-       xw.tw = MAX(1, 2*borderpx + col * xw.cw);
-       xw.th = MAX(1, 2*borderpx + row * xw.ch);
+       xw.tw = MAX(1, col * xw.cw);
+       xw.th = MAX(1, row * xw.ch);
 
        XftDrawChange(xw.draw, xw.buf);
 }
@@ -2262,8 +2265,8 @@ xhints(void) {
                sizeh->width = xw.w;
                sizeh->height_inc = xw.ch;
                sizeh->width_inc = xw.cw;
-               sizeh->base_height = 2*borderpx;
-               sizeh->base_width = 2*borderpx;
+               sizeh->base_height = 2 * borderpx;
+               sizeh->base_width = 2 * borderpx;
        } else {
                sizeh->flags = PMaxSize | PMinSize;
                sizeh->min_width = sizeh->max_width = xw.fw;
@@ -2396,8 +2399,8 @@ xinit(void) {
                xw.w = xw.fw;
        } else {
                /* window - default size */
-               xw.h = 2*borderpx + term.row * xw.ch;
-               xw.w = 2*borderpx + term.col * xw.cw;
+               xw.h = 2 * borderpx + term.row * xw.ch;
+               xw.w = 2 * borderpx + term.col * xw.cw;
                xw.fx = 0;
                xw.fy = 0;
        }
@@ -2602,10 +2605,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;
 
@@ -2703,6 +2707,11 @@ match(uint mask, uint state) {
        return true;
 }
 
+void
+numlock(const Arg *dummy) {
+       term.numlock ^= 1;
+}
+
 char*
 kmap(KeySym k, uint state) {
        uint mask;
@@ -2728,13 +2737,18 @@ kmap(KeySym k, uint state) {
                if(!match(mask, state))
                        continue;
 
-               if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
-                               (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
+               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)) {
                        continue;
                }
 
                if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
-                               (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
+                               (kp->appcursor > 0
+                                && !IS_SET(MODE_APPCURSOR))) {
                        continue;
                }
 
@@ -2821,8 +2835,8 @@ cresize(int width, int height)
        if(height != 0)
                xw.h = height;
 
-       col = (xw.w - 2*borderpx) / xw.cw;
-       row = (xw.h - 2*borderpx) / xw.ch;
+       col = (xw.w - 2 * borderpx) / xw.cw;
+       row = (xw.h - 2 * borderpx) / xw.ch;
 
        tresize(col, row);
        xresize(col, row);