diff options
author | okan <okan> | 2013-11-27 16:24:17 +0000 |
---|---|---|
committer | okan <okan> | 2013-11-27 16:24:17 +0000 |
commit | abf52049b9e93e026c9299f65f326b975fd2f2cc (patch) | |
tree | 0215ae8c3bb9d0a994bd78d435e94fd888f25506 /conf.c | |
parent | 250f98bf1552ebbff28ff4d9c7b853687065d476 (diff) | |
download | cwm-abf52049b9e93e026c9299f65f326b975fd2f2cc.tar.gz cwm-abf52049b9e93e026c9299f65f326b975fd2f2cc.tar.xz cwm-abf52049b9e93e026c9299f65f326b975fd2f2cc.zip |
Remove the option to bind a key by keycode with brackets; it never
worked (and no one complained!). While it's fairly easy to fix, users should be using keysym names and not keycodes. Discussed at length months ago with todd@, matthieu@ and Owain.
Diffstat (limited to 'conf.c')
-rw-r--r-- | conf.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/conf.c b/conf.c index 68a5351..895b681 100644 --- a/conf.c +++ b/conf.c @@ -479,17 +479,8 @@ conf_bind_kbd(struct conf *c, char *name, char *binding) substring = conf_bind_getmask(name, &mask); current_binding->modmask |= mask; - if (substring[0] == '[' && - substring[strlen(substring)-1] == ']') { - sscanf(substring, "[%d]", ¤t_binding->keycode); - current_binding->keysym = NoSymbol; - } else { - current_binding->keycode = 0; - current_binding->keysym = XStringToKeysym(substring); - } - - if (current_binding->keysym == NoSymbol && - current_binding->keycode == 0) { + current_binding->keysym = XStringToKeysym(substring); + if (current_binding->keysym == NoSymbol) { free(current_binding); return; } @@ -530,9 +521,7 @@ conf_unbind_kbd(struct conf *c, struct keybinding *unbind) if (key->modmask != unbind->modmask) continue; - if ((key->keycode != 0 && key->keysym == NoSymbol && - key->keycode == unbind->keycode) || - key->keysym == unbind->keysym) { + if (key->keysym == unbind->keysym) { TAILQ_REMOVE(&c->keybindingq, key, entry); if (key->argtype & ARG_CHAR) free(key->argument.c); |