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

Merge branch 'fix-release'

This commit is contained in:
Michael Stapelberg 2012-12-14 21:42:21 +01:00
parent 2bf7793d4d 6dfb08170c
commit f91e6fb73f
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parser-specs/config.spec
View File

@ -270,6 +270,8 @@ state FONT:
# bindsym/bindcode # bindsym/bindcode
state BINDING: state BINDING:
release = '--release'
->
modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch' modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
-> ->
'+' '+'
@ -313,6 +315,8 @@ state MODE_IGNORE_LINE:
-> MODE -> MODE
state MODE_BINDING: state MODE_BINDING:
release = '--release'
->
modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch' modifiers = 'Mod1', 'Mod2', 'Mod3', 'Mod4', 'Mod5', 'Shift', 'Control', 'Ctrl', 'Mode_switch'
-> ->
'+' '+'

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

@ -44,6 +44,7 @@ my $config = <<'EOT';
mode "meh" { 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
} }
EOT EOT
@ -51,6 +52,7 @@ my $expected = <<'EOT';
cfg_enter_mode(meh) cfg_enter_mode(meh)
cfg_mode_binding(bindsym, Mod1,Shift, x, (null), resize grow) cfg_mode_binding(bindsym, Mod1,Shift, x, (null), resize grow)
cfg_mode_binding(bindcode, Mod1, 44, (null), resize shrink) cfg_mode_binding(bindcode, Mod1, 44, (null), resize shrink)
cfg_mode_binding(bindsym, Mod1, x, --release, exec foo)
EOT EOT
is(parser_calls($config), is(parser_calls($config),