Ignore numlock (Mod2Mask) for button events too.

[st.git] / st.c

diff --git a/st.c b/st.c
index 16bf68b..12e1e1f 100644 (file)
--- a/st.c
+++ b/st.c
@@ -256,9 +256,9 @@ typedef struct {
 } XWindow;
 
 typedef struct {
-       int b;
+       uint b;
        uint mask;
-       char s[ESC_BUF_SIZ];
+       char *s;
 } Mousekey;
 
 typedef struct {
@@ -386,6 +386,7 @@ 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;
 
@@ -3573,7 +3579,6 @@ kpress(XEvent *ev) {
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
-       e->state &= ~Mod2Mask;
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {
@@ -3584,10 +3589,7 @@ kpress(XEvent *ev) {
 
        /* 2. custom keys from config.h */
        if((customkey = kmap(ksym, e->state))) {
-               len = strlen(customkey);
-               ttywrite(customkey, len);
-               if(IS_SET(MODE_ECHO))
-                       techo(customkey, len);
+               ttysend(customkey, strlen(customkey));
                return;
        }
 
@@ -3606,9 +3608,7 @@ kpress(XEvent *ev) {
                        len = 2;
                }
        }
-       ttywrite(buf, len);
-       if(IS_SET(MODE_ECHO))
-               techo(buf, len);
+       ttysend(buf, len);
 }