Ignore numlock (Mod2Mask) for button events too.

Conflicts:
	config.def.h
	st.c
master
Mark Edgar 11 years ago committed by Roberto E. Vargas Caballero
parent 0f6942cdf6
commit 297c886b72
  1. 6
      config.def.h
  2. 1
      st.c

@ -146,10 +146,10 @@ static Shortcut shortcuts[] = {
static KeySym mappedkeys[] = { -1 }; static KeySym mappedkeys[] = { -1 };
/* /*
* Which bits of the state should be ignored. By default the state bit for the * State bits to ignore when matching key or button events. By default,
* keyboard layout (XK_SWITCH_MOD) is ignored. * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
*/ */
uint ignoremod = XK_SWITCH_MOD; static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
/* key, mask, output, keypad, cursor, crlf */ /* key, mask, output, keypad, cursor, crlf */
static Key key[] = { static Key key[] = {

@ -3579,7 +3579,6 @@ kpress(XEvent *ev) {
return; return;
len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status); len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
e->state &= ~Mod2Mask;
/* 1. shortcuts */ /* 1. shortcuts */
for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) { for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
if(ksym == bp->keysym && match(bp->mod, e->state)) { if(ksym == bp->keysym && match(bp->mod, e->state)) {

Loading…
Cancel
Save