From ce48d5c5d735ff63f5bccd39ed331808f4df16cc Mon Sep 17 00:00:00 2001 From: Deiz Date: Wed, 1 Apr 2015 21:43:46 -0400 Subject: [PATCH] Add a --border flag to enable mouse binds to trigger on border click --- include/bindings.h | 3 ++- include/config_directives.h | 4 ++-- include/data.h | 4 ++++ parser-specs/config.spec | 12 ++++++++++-- src/bindings.c | 4 +++- src/click.c | 5 +++-- src/config_directives.c | 8 ++++---- testcases/t/201-config-parser.t | 12 ++++++------ 8 files changed, 34 insertions(+), 18 deletions(-) diff --git a/include/bindings.h b/include/bindings.h index 19345f8c..c20152e9 100644 --- a/include/bindings.h +++ b/include/bindings.h @@ -24,7 +24,8 @@ const char *DEFAULT_BINDING_MODE; * */ Binding *configure_binding(const char *bindtype, const char *modifiers, const char *input_code, - const char *release, const char *whole_window, const char *command, const char *mode); + const char *release, const char *border, const char *whole_window, + const char *command, const char *mode); /** * Grab the bound keys (tell X to send us keypress events for those keycodes) diff --git a/include/config_directives.h b/include/config_directives.h index f5039624..e24c834b 100644 --- a/include/config_directives.h +++ b/include/config_directives.h @@ -64,10 +64,10 @@ CFGFUN(color_single, const char *colorclass, const char *color); CFGFUN(floating_modifier, const char *modifiers); CFGFUN(new_window, const char *windowtype, const char *border, const long width); CFGFUN(workspace, const char *workspace, const char *output); -CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command); +CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command); CFGFUN(enter_mode, const char *mode); -CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command); +CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command); CFGFUN(bar_font, const char *font); CFGFUN(bar_separator_symbol, const char *separator); diff --git a/include/data.h b/include/data.h index 50e1f180..43862263 100644 --- a/include/data.h +++ b/include/data.h @@ -255,6 +255,10 @@ struct Binding { B_UPON_KEYRELEASE_IGNORE_MODS = 2, } release; + /** If this is true for a mouse binding, the binding should be executed + * when the button is pressed over the window border. */ + bool border; + /** If this is true for a mouse binding, the binding should be executed * when the button is pressed over any part of the window, not just the * title bar (default). */ diff --git a/parser-specs/config.spec b/parser-specs/config.spec index d27e0792..da534a38 100644 --- a/parser-specs/config.spec +++ b/parser-specs/config.spec @@ -300,6 +300,8 @@ state FONT: state BINDING: release = '--release' -> + border = '--border' + -> whole_window = '--whole-window' -> modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod' @@ -312,10 +314,12 @@ state BINDING: state BINDCOMMAND: release = '--release' -> + border = '--border' + -> whole_window = '--whole-window' -> command = string - -> call cfg_binding($bindtype, $modifiers, $key, $release, $whole_window, $command) + -> call cfg_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $command) ################################################################################ # Mode configuration @@ -349,6 +353,8 @@ state MODE_IGNORE_LINE: state MODE_BINDING: release = '--release' -> + border = '--border' + -> whole_window = '--whole-window' -> modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod' @@ -361,10 +367,12 @@ state MODE_BINDING: state MODE_BINDCOMMAND: release = '--release' -> + border = '--border' + -> whole_window = '--whole-window' -> command = string - -> call cfg_mode_binding($bindtype, $modifiers, $key, $release, $whole_window, $command); MODE + -> call cfg_mode_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $command); MODE ################################################################################ # Bar configuration (i3bar) diff --git a/src/bindings.c b/src/bindings.c index cbac2dfd..e83e0acc 100644 --- a/src/bindings.c +++ b/src/bindings.c @@ -49,10 +49,12 @@ static struct Mode *mode_from_name(const char *name) { * */ Binding *configure_binding(const char *bindtype, const char *modifiers, const char *input_code, - const char *release, const char *whole_window, const char *command, const char *modename) { + const char *release, const char *border, const char *whole_window, + const char *command, const char *modename) { Binding *new_binding = scalloc(sizeof(Binding)); DLOG("bindtype %s, modifiers %s, input code %s, release %s\n", bindtype, modifiers, input_code, release); new_binding->release = (release != NULL ? B_UPON_KEYRELEASE : B_UPON_KEYPRESS); + new_binding->border = (border != NULL); new_binding->whole_window = (whole_window != NULL); if (strcmp(bindtype, "bindsym") == 0) { new_binding->input_type = (strncasecmp(input_code, "button", (sizeof("button") - 1)) == 0 diff --git a/src/click.c b/src/click.c index 3cd367cc..40884c34 100644 --- a/src/click.c +++ b/src/click.c @@ -185,12 +185,13 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod /* if the user has bound an action to this click, it should override the * default behavior. */ - if (dest == CLICK_DECORATION || dest == CLICK_INSIDE) { + if (dest == CLICK_DECORATION || dest == CLICK_INSIDE || dest == CLICK_BORDER) { Binding *bind = get_binding_from_xcb_event((xcb_generic_event_t *)event); /* clicks over a window decoration will always trigger the binding and * clicks on the inside of the window will only trigger a binding if * the --whole-window flag was given for the binding. */ - if (bind && (dest == CLICK_DECORATION || bind->whole_window)) { + if (bind && ((dest == CLICK_DECORATION || bind->whole_window) || + (dest == CLICK_BORDER && bind->border))) { CommandResult *result = run_binding(bind, con); /* ASYNC_POINTER eats the event */ diff --git a/src/config_directives.c b/src/config_directives.c index 398e53bb..daf4339b 100644 --- a/src/config_directives.c +++ b/src/config_directives.c @@ -171,8 +171,8 @@ CFGFUN(font, const char *font) { font_pattern = sstrdup(font); } -CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) { - configure_binding(bindtype, modifiers, key, release, whole_window, command, DEFAULT_BINDING_MODE); +CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) { + configure_binding(bindtype, modifiers, key, release, border, whole_window, command, DEFAULT_BINDING_MODE); } /******************************************************************************* @@ -181,8 +181,8 @@ CFGFUN(binding, const char *bindtype, const char *modifiers, const char *key, co static char *current_mode; -CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *whole_window, const char *command) { - configure_binding(bindtype, modifiers, key, release, whole_window, command, current_mode); +CFGFUN(mode_binding, const char *bindtype, const char *modifiers, const char *key, const char *release, const char *border, const char *whole_window, const char *command) { + configure_binding(bindtype, modifiers, key, release, border, whole_window, command, current_mode); } CFGFUN(enter_mode, const char *modename) { diff --git a/testcases/t/201-config-parser.t b/testcases/t/201-config-parser.t index 9ec8b5eb..8664aac3 100644 --- a/testcases/t/201-config-parser.t +++ b/testcases/t/201-config-parser.t @@ -52,11 +52,11 @@ EOT my $expected = <<'EOT'; cfg_enter_mode(meh) -cfg_mode_binding(bindsym, Mod1,Shift, x, (null), (null), resize grow) -cfg_mode_binding(bindcode, Mod1, 44, (null), (null), resize shrink) -cfg_mode_binding(bindsym, Mod1, x, --release, (null), exec foo) -cfg_mode_binding(bindsym, (null), button3, (null), --whole-window, nop) -cfg_mode_binding(bindsym, (null), button3, --release, --whole-window, nop) +cfg_mode_binding(bindsym, Mod1,Shift, x, (null), (null), (null), resize grow) +cfg_mode_binding(bindcode, Mod1, 44, (null), (null), (null), resize shrink) +cfg_mode_binding(bindsym, Mod1, x, --release, (null), (null), exec foo) +cfg_mode_binding(bindsym, (null), button3, (null), (null), --whole-window, nop) +cfg_mode_binding(bindsym, (null), button3, --release, (null), --whole-window, nop) EOT is(parser_calls($config), @@ -624,7 +624,7 @@ EOT $expected = <<'EOT'; cfg_enter_mode(yo) -cfg_mode_binding(bindsym, (null), x, (null), (null), resize shrink left) +cfg_mode_binding(bindsym, (null), x, (null), (null), (null), resize shrink left) ERROR: CONFIG: Expected one of these tokens: , '#', 'set', 'bindsym', 'bindcode', 'bind', '}' ERROR: CONFIG: (in file ) ERROR: CONFIG: Line 1: mode "yo" { -- 2.39.5