From ee36c8507ee4f0e37ff5bdf6244bfa0bb3fd38c1 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 8 Oct 2012 13:40:44 +0200 Subject: [PATCH] bugfix: config-parser: bind is a synonym for bindcode --- parser-specs/config.spec | 52 ++++++++++++++++++++-------------------- src/config_directives.c | 2 ++ 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/parser-specs/config.spec b/parser-specs/config.spec index a5b3b6b6..6602dcae 100644 --- a/parser-specs/config.spec +++ b/parser-specs/config.spec @@ -15,32 +15,32 @@ state INITIAL: # We have an end token here for all the commands which just call some # function without using an explicit 'end' token. end -> - '#' -> IGNORE_LINE - 'set' -> IGNORE_LINE - bindtype = 'bindsym', 'bindcode' -> BINDING - 'bar' -> BARBRACE - 'font' -> FONT - 'mode' -> MODENAME - 'floating_minimum_size' -> FLOATING_MINIMUM_SIZE_WIDTH - 'floating_maximum_size' -> FLOATING_MAXIMUM_SIZE_WIDTH - 'floating_modifier' -> FLOATING_MODIFIER - 'default_orientation' -> DEFAULT_ORIENTATION - 'workspace_layout' -> WORKSPACE_LAYOUT - windowtype = 'new_window', 'new_float' -> NEW_WINDOW - 'hide_edge_borders' -> HIDE_EDGE_BORDERS - 'for_window' -> FOR_WINDOW - 'assign' -> ASSIGN - 'focus_follows_mouse' -> FOCUS_FOLLOWS_MOUSE - 'force_focus_wrapping' -> FORCE_FOCUS_WRAPPING - 'force_xinerama', 'force-xinerama' -> FORCE_XINERAMA - 'workspace_auto_back_and_forth' -> WORKSPACE_BACK_AND_FORTH - 'fake_outputs', 'fake-outputs' -> FAKE_OUTPUTS - 'force_display_urgency_hint' -> FORCE_DISPLAY_URGENCY_HINT - 'workspace' -> WORKSPACE - 'ipc_socket', 'ipc-socket' -> IPC_SOCKET - 'restart_state' -> RESTART_STATE - 'popup_during_fullscreen' -> POPUP_DURING_FULLSCREEN - exectype = 'exec_always', 'exec' -> EXEC + '#' -> IGNORE_LINE + 'set' -> IGNORE_LINE + bindtype = 'bindsym', 'bindcode', 'bind' -> BINDING + 'bar' -> BARBRACE + 'font' -> FONT + 'mode' -> MODENAME + 'floating_minimum_size' -> FLOATING_MINIMUM_SIZE_WIDTH + 'floating_maximum_size' -> FLOATING_MAXIMUM_SIZE_WIDTH + 'floating_modifier' -> FLOATING_MODIFIER + 'default_orientation' -> DEFAULT_ORIENTATION + 'workspace_layout' -> WORKSPACE_LAYOUT + windowtype = 'new_window', 'new_float' -> NEW_WINDOW + 'hide_edge_borders' -> HIDE_EDGE_BORDERS + 'for_window' -> FOR_WINDOW + 'assign' -> ASSIGN + 'focus_follows_mouse' -> FOCUS_FOLLOWS_MOUSE + 'force_focus_wrapping' -> FORCE_FOCUS_WRAPPING + 'force_xinerama', 'force-xinerama' -> FORCE_XINERAMA + 'workspace_auto_back_and_forth' -> WORKSPACE_BACK_AND_FORTH + 'fake_outputs', 'fake-outputs' -> FAKE_OUTPUTS + 'force_display_urgency_hint' -> FORCE_DISPLAY_URGENCY_HINT + 'workspace' -> WORKSPACE + 'ipc_socket', 'ipc-socket' -> IPC_SOCKET + 'restart_state' -> RESTART_STATE + 'popup_during_fullscreen' -> POPUP_DURING_FULLSCREEN + exectype = 'exec_always', 'exec' -> EXEC colorclass = 'client.background' -> COLOR_SINGLE colorclass = 'client.focused_inactive', 'client.focused', 'client.unfocused', 'client.urgent' diff --git a/src/config_directives.c b/src/config_directives.c index 70e5792a..c885b256 100644 --- a/src/config_directives.c +++ b/src/config_directives.c @@ -179,6 +179,7 @@ CFGFUN(font, const char *font) { // TODO: refactor with mode_binding CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) { Binding *new_binding = scalloc(sizeof(Binding)); + DLOG("bindtype %s, modifiers %s, key %s, release %s\n", bindtype, modifiers, key, release); new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS); if (strcmp(bindtype, "bindsym") == 0) { new_binding->symbol = sstrdup(key); @@ -200,6 +201,7 @@ static struct bindings_head *current_bindings; CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *command) { Binding *new_binding = scalloc(sizeof(Binding)); + DLOG("bindtype %s, modifiers %s, key %s, release %s\n", bindtype, modifiers, key, release); new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS); if (strcmp(bindtype, "bindsym") == 0) { new_binding->symbol = sstrdup(key); -- 2.39.5