nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1631 from Airblader/bug-1629 

Allow --whole-window right after 'bindsym' within binding modes
This commit is contained in:
Michael Stapelberg 2015-04-02 13:15:28 -07:00
parent 15d516f58c 42a666be3c
commit 9eba4eecb7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser-specs/config.spec
View File

@ -349,6 +349,8 @@ state MODE_IGNORE_LINE:
state MODE_BINDING: state MODE_BINDING:
release = '--release' release = '--release'
-> ->
whole_window = '--whole-window'
->
modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod' modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch', '$mod'
-> ->
'+' '+'

6
testcases/t/201-config-parser.t
View File

@ -45,6 +45,8 @@ mode "meh" {
bindsym Mod1 + Shift + x resize grow bindsym Mod1 + Shift + x resize grow
bindcode Mod1+44 resize shrink bindcode Mod1+44 resize shrink
bindsym --release Mod1+x exec foo bindsym --release Mod1+x exec foo
bindsym --whole-window button3 nop
bindsym --release --whole-window button3 nop
} }
EOT EOT
@ -53,11 +55,13 @@ cfg_enter_mode(meh)
cfg_mode_binding(bindsym, Mod1,Shift, x, (null), (null), resize grow) cfg_mode_binding(bindsym, Mod1,Shift, x, (null), (null), resize grow)
cfg_mode_binding(bindcode, Mod1, 44, (null), (null), resize shrink) cfg_mode_binding(bindcode, Mod1, 44, (null), (null), resize shrink)
cfg_mode_binding(bindsym, Mod1, x, --release, (null), exec foo) 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 EOT
is(parser_calls($config), is(parser_calls($config),
$expected, $expected,
'single number (move workspace 3) ok'); 'mode bindings ok');
################################################################################ ################################################################################
# exec and exec_always # exec and exec_always