Make pango markup in mode names optional with a flag.

This introduces the flag "--pango" on the mode config directive to
explicitly enable pango markup for mode names. Not setting this will
cause the mode name to be rendered as is.
This fixes a regression in 4.11 where mode names containing characters
such as '<' would break user's configs as they didn't escape these
characters.

fixes #1992
This commit is contained in:
Ingo Bürk
2015-10-12 23:43:47 +02:00
parent d24964ff6a
commit 82dc747396
9 changed files with 68 additions and 20 deletions

View File

@ -53,7 +53,7 @@ mode "meh" {
EOT
my $expected = <<'EOT';
cfg_enter_mode(meh)
cfg_enter_mode((null), meh)
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)
@ -627,7 +627,7 @@ mode "yo" {
EOT
$expected = <<'EOT';
cfg_enter_mode(yo)
cfg_enter_mode((null), yo)
cfg_mode_binding(bindsym, (null), x, (null), (null), (null), resize shrink left)
ERROR: CONFIG: Expected one of these tokens: <end>, '#', 'set', 'bindsym', 'bindcode', 'bind', '}'
ERROR: CONFIG: (in file <stdin>)