}
}
-inline bool
+static inline bool
match(uint mask, uint state) {
- state &= ~(ignoremod);
+ state &= ~ignoremod;
if(mask == XK_NO_MOD && state)
return false;
if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
return false;
- if((state & mask) != state)
- return false;
- return true;
+ if(mask == XK_ANY_MOD)
+ return true;
+ return state == mask;
}
void
char*
kmap(KeySym k, uint state) {
- uint mask;
Key *kp;
int i;
}
for(kp = key; kp < key + LEN(key); kp++) {
- mask = kp->mask;
-
if(kp->k != k)
continue;
- if(!match(mask, state))
+ if(!match(kp->mask, state))
continue;
if(kp->appkey > 0) {