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

accept slashes in RandR output names (+test) (Thanks dbp) 

fixes #785
This commit is contained in:
Michael Stapelberg 2012-08-28 13:26:12 +02:00
parent a007283773
commit 6d8f61205d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cfgparse.l
View File

@ -159,7 +159,7 @@ EOL (\r?\n)
return STR; return STR;
} }
<WANT_STRING>[^\n]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return STR; } <WANT_STRING>[^\n]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return STR; }
<OUTPUT_COND>[a-zA-Z0-9_-]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return OUTPUT; } <OUTPUT_COND>[a-zA-Z0-9\/_-]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return OUTPUT; }
^[ \t]*#[^\n]* { return TOKCOMMENT; } ^[ \t]*#[^\n]* { return TOKCOMMENT; }
<COLOR_COND>#[0-9a-fA-F]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return HEXCOLOR; } <COLOR_COND>#[0-9a-fA-F]+ { yy_pop_state(); yylval.string = sstrdup(yytext); return HEXCOLOR; }
<COLOR_COND>{EOL} { <COLOR_COND>{EOL} {

22
testcases/t/196-randr-output-names.t Normal file
View File

@ -0,0 +1,22 @@
#!perl
# vim:ts=4:sw=4:expandtab
# Verify that i3 allows strange RandR output names such as DVI-I_1/digital.
# Ticket: #785
# Bug still in: 4.2-256-ga007283
use i3test i3_autostart => 0;
use File::Temp qw(tempfile);
my ($fh, $filename) = tempfile(UNLINK => 1);
print $fh <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
workspace 2 output DVI-I_1/digital
EOT
my $output = qx(../i3 -C -c $filename);
unlike($output, qr/ERROR/, 'no errors in i3 -C');
close($fh);
done_testing;