diff options
author | Mark Edgar <medgar123@gmail.com> | 2013-09-22 00:07:49 +0200 |
---|---|---|
committer | Roberto E. Vargas Caballero <k0ga@shike2.com> | 2013-10-20 09:53:34 +0200 |
commit | 297c886b72f4e9093973aaa14b66d392f6196634 (patch) | |
tree | c5a84250c4ccd726c8453018cd98624513dc5128 | |
parent | 0f6942cdf6f8220f1ecd06e4b398e95c43833d44 (diff) | |
download | st-patched-297c886b72f4e9093973aaa14b66d392f6196634.tar.bz2 st-patched-297c886b72f4e9093973aaa14b66d392f6196634.tar.xz st-patched-297c886b72f4e9093973aaa14b66d392f6196634.zip |
Ignore numlock (Mod2Mask) for button events too.
Conflicts:
config.def.h
st.c
-rw-r--r-- | config.def.h | 6 | ||||
-rw-r--r-- | st.c | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config.def.h b/config.def.h index def6c9e..2a7e098 100644 --- a/config.def.h +++ b/config.def.h | |||
@@ -146,10 +146,10 @@ static Shortcut shortcuts[] = { | |||
146 | static KeySym mappedkeys[] = { -1 }; | 146 | static KeySym mappedkeys[] = { -1 }; |
147 | 147 | ||
148 | /* | 148 | /* |
149 | * Which bits of the state should be ignored. By default the state bit for the | 149 | * State bits to ignore when matching key or button events. By default, |
150 | * keyboard layout (XK_SWITCH_MOD) is ignored. | 150 | * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored. |
151 | */ | 151 | */ |
152 | uint ignoremod = XK_SWITCH_MOD; | 152 | static uint ignoremod = Mod2Mask|XK_SWITCH_MOD; |
153 | 153 | ||
154 | /* key, mask, output, keypad, cursor, crlf */ | 154 | /* key, mask, output, keypad, cursor, crlf */ |
155 | static Key key[] = { | 155 | static Key key[] = { |
@@ -3579,7 +3579,6 @@ kpress(XEvent *ev) { | |||
3579 | return; | 3579 | return; |
3580 | 3580 | ||
3581 | len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); | 3581 | len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); |
3582 | e->state &= ~Mod2Mask; | ||
3583 | /* 1. shortcuts */ | 3582 | /* 1. shortcuts */ |
3584 | for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { | 3583 | for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { |
3585 | if(ksym == bp->keysym && match(bp->mod, e->state)) { | 3584 | if(ksym == bp->keysym && match(bp->mod, e->state)) { |