From e3e13ade60b2b14f64549e60f5f36252605a6154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Wed, 1 Apr 2015 23:13:25 +0200 Subject: [PATCH 1/2] Allow --whole-window right after 'bindsym' within binding modes fixes #1629 --- parser-specs/config.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/parser-specs/config.spec b/parser-specs/config.spec index 433e1d11..d27e0792 100644 --- a/parser-specs/config.spec +++ b/parser-specs/config.spec @@ -349,6 +349,8 @@ state MODE_IGNORE_LINE: state MODE_BINDING: release = '--release' -> + whole_window = '--whole-window' + -> modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod' -> '+' From 42a666be3ccc5340f6e1577378e30521420c5583 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20B=C3=BCrk?= Date: Thu, 2 Apr 2015 11:17:29 +0200 Subject: [PATCH 2/2] Added testcases for --whole-window in a binding inside a mode (#1629) --- testcases/t/201-config-parser.t | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/testcases/t/201-config-parser.t b/testcases/t/201-config-parser.t index 0f22878d..9ec8b5eb 100644 --- a/testcases/t/201-config-parser.t +++ b/testcases/t/201-config-parser.t @@ -45,6 +45,8 @@ mode "meh" { bindsym Mod1 + Shift + x resize grow bindcode Mod1+44 resize shrink bindsym --release Mod1+x exec foo + bindsym --whole-window button3 nop + bindsym --release --whole-window button3 nop } EOT @@ -53,11 +55,13 @@ 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) EOT is(parser_calls($config), $expected, - 'single number (move workspace 3) ok'); + 'mode bindings ok'); ################################################################################ # exec and exec_always