summaryrefslogtreecommitdiff
path: root/st.c
diff options
context:
space:
mode:
authorAurélien Aptel <aurelien.aptel@gmail.com>2011-08-14 17:13:59 +0200
committerAurélien Aptel <aurelien.aptel@gmail.com>2011-08-14 17:13:59 +0200
commit6f260ba164ee302b50398e529f71e305e435504a (patch)
tree75c5323df2bd71d57fb57f9902df2543a90707b5 /st.c
parent8503f954a1cb2d08124fe2c1f0227bd23dffff46 (diff)
fix custom key handling.
Diffstat (limited to 'st.c')
-rw-r--r--st.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/st.c b/st.c
index f0c2cd2..a60377b 100644
--- a/st.c
+++ b/st.c
@@ -43,6 +43,8 @@
#define ESC_ARG_SIZ 16
#define DRAW_BUF_SIZ 1024
#define UTF_SIZ 4
+#define XK_NO_MOD UINT_MAX
+#define XK_ANY_MOD 0
#define SERRNO strerror(errno)
#define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -1833,9 +1835,12 @@ focus(XEvent *ev) {
char*
kmap(KeySym k, unsigned int state) {
int i;
- for(i = 0; i < LEN(key); i++)
- if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+ state &= ~Mod2Mask;
+ for(i = 0; i < LEN(key); i++) {
+ unsigned int mask = key[i].mask;
+ if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
return (char*)key[i].s;
+ }
return NULL;
}