diff options
author | Aurélien Aptel <aurelien.aptel@gmail.com> | 2011-09-16 18:24:13 +0200 |
---|---|---|
committer | Aurélien Aptel <aurelien.aptel@gmail.com> | 2011-09-16 18:24:13 +0200 |
commit | 98042a1a2d3ec09e3411bc1937e413a64b8a024d (patch) | |
tree | 9afcd59da8592f63212605f9e95e5ab11aca3eef /st.c | |
parent | 5c6df8b3c361e36728e41d7c955d7faf375ef729 (diff) | |
parent | 5d1c52bf5c16390403a7037f5eb896bc74e01da0 (diff) | |
download | st-patched-98042a1a2d3ec09e3411bc1937e413a64b8a024d.tar.bz2 st-patched-98042a1a2d3ec09e3411bc1937e413a64b8a024d.tar.xz st-patched-98042a1a2d3ec09e3411bc1937e413a64b8a024d.zip |
working on old repo, merging recent changesets.
Diffstat (limited to 'st.c')
-rw-r--r-- | st.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -47,6 +47,8 @@ | |||
47 | #define ESC_ARG_SIZ 16 | 47 | #define ESC_ARG_SIZ 16 |
48 | #define DRAW_BUF_SIZ 1024 | 48 | #define DRAW_BUF_SIZ 1024 |
49 | #define UTF_SIZ 4 | 49 | #define UTF_SIZ 4 |
50 | #define XK_NO_MOD UINT_MAX | ||
51 | #define XK_ANY_MOD 0 | ||
50 | 52 | ||
51 | #define SERRNO strerror(errno) | 53 | #define SERRNO strerror(errno) |
52 | #define MIN(a, b) ((a) < (b) ? (a) : (b)) | 54 | #define MIN(a, b) ((a) < (b) ? (a) : (b)) |
@@ -1840,9 +1842,12 @@ focus(XEvent *ev) { | |||
1840 | char* | 1842 | char* |
1841 | kmap(KeySym k, unsigned int state) { | 1843 | kmap(KeySym k, unsigned int state) { |
1842 | int i; | 1844 | int i; |
1843 | for(i = 0; i < LEN(key); i++) | 1845 | state &= ~Mod2Mask; |
1844 | if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state)) | 1846 | for(i = 0; i < LEN(key); i++) { |
1847 | unsigned int mask = key[i].mask; | ||
1848 | if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state))) | ||
1845 | return (char*)key[i].s; | 1849 | return (char*)key[i].s; |
1850 | } | ||
1846 | return NULL; | 1851 | return NULL; |
1847 | } | 1852 | } |
1848 | 1853 | ||