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

migrate-config: Bugfix: 'borderless' has to be 'none'

This commit is contained in:
Michael Stapelberg 2011-07-06 20:21:39 +02:00
parent 03aa95813e
commit 3e24b7170f
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
i3-migrate-config-to-v4.pl
View File

@ -70,7 +70,7 @@ sub need_to_convert {
$command =~ /^floating/ || $command =~ /^floating/ ||
$command =~ /^workspace/ || $command =~ /^workspace/ ||
$command =~ /^focus (left|right|up|down)/ || $command =~ /^focus (left|right|up|down)/ ||
$command =~ /^border (normal|1pixel|borderless)/; $command =~ /^border (normal|1pixel|none)/;
} }
return 1; return 1;
@ -127,10 +127,10 @@ for my $line (@lines) {
next; next;
} }
# new_window changed the parameters from bb to borderless etc. # new_window changed the parameters from bb to none etc.
if ($statement eq 'new_window') { if ($statement eq 'new_window') {
if ($parameters =~ /bb/) { if ($parameters =~ /bb/) {
print "new_window borderless\n"; print "new_window none\n";
} elsif ($parameters =~ /bp/) { } elsif ($parameters =~ /bp/) {
print "new_window 1pixel\n"; print "new_window 1pixel\n";
} elsif ($parameters =~ /bn/) { } elsif ($parameters =~ /bn/) {
@ -216,7 +216,7 @@ sub convert_command {
qr/^ml/ => 'move right', qr/^ml/ => 'move right',
qr/^bn/ => 'border normal', qr/^bn/ => 'border normal',
qr/^bp/ => 'border 1pixel', qr/^bp/ => 'border 1pixel',
qr/^bb/ => 'border borderless', qr/^bb/ => 'border none',
qr/^pw/ => 'workspace prev', qr/^pw/ => 'workspace prev',
qr/^nw/ => 'workspace next', qr/^nw/ => 'workspace next',
); );

6
testcases/t/71-config-migrate.t
View File

@ -112,14 +112,14 @@ $output = migrate_config($input);
ok(line_exists($output, qr|^workspace_layout stacking$|), 'new_container changed'); ok(line_exists($output, qr|^workspace_layout stacking$|), 'new_container changed');
ok(line_exists($output, qr|REMOVED workspace_bar|), 'workspace_bar removed'); ok(line_exists($output, qr|REMOVED workspace_bar|), 'workspace_bar removed');
ok(!line_exists($output, qr|^workspace_bar|), 'no workspace_bar in the output'); ok(!line_exists($output, qr|^workspace_bar|), 'no workspace_bar in the output');
ok(line_exists($output, qr|^new_window borderless$|), 'new_window changed'); ok(line_exists($output, qr|^new_window none$|), 'new_window changed');
##################################################################### #####################################################################
# check whether new_window's parameters get changed correctly # check whether new_window's parameters get changed correctly
##################################################################### #####################################################################
$output = migrate_config('new_window bb'); $output = migrate_config('new_window bb');
ok(line_exists($output, qr|^new_window borderless$|), 'new_window bb changed'); ok(line_exists($output, qr|^new_window none$|), 'new_window bb changed');
$output = migrate_config('new_window bn'); $output = migrate_config('new_window bn');
ok(line_exists($output, qr|^new_window normal$|), 'new_window bn changed'); ok(line_exists($output, qr|^new_window normal$|), 'new_window bn changed');
@ -212,7 +212,7 @@ ok(line_exists($output, qr|^bindsym Mod1\+s move up$|), 'mk replaced');
ok(line_exists($output, qr|^bindsym Mod1\+s move right$|), 'ml replaced'); ok(line_exists($output, qr|^bindsym Mod1\+s move right$|), 'ml replaced');
ok(line_exists($output, qr|^bindsym Mod1\+s border normal$|), 'bn replaced'); ok(line_exists($output, qr|^bindsym Mod1\+s border normal$|), 'bn replaced');
ok(line_exists($output, qr|^bindsym Mod1\+s border 1pixel$|), 'bp replaced'); ok(line_exists($output, qr|^bindsym Mod1\+s border 1pixel$|), 'bp replaced');
ok(line_exists($output, qr|^bindsym Mod1\+s border borderless$|), 'bb replaced'); ok(line_exists($output, qr|^bindsym Mod1\+s border none$|), 'bb replaced');
ok(line_exists($output, qr|^#.*with container.*obsolete.*wch$|), 'with container removed'); ok(line_exists($output, qr|^#.*with container.*obsolete.*wch$|), 'with container removed');
ok(line_exists($output, qr|^#.*with container.*obsolete.*wcml$|), 'with container removed'); ok(line_exists($output, qr|^#.*with container.*obsolete.*wcml$|), 'with container removed');
ok(line_exists($output, qr|^bindsym Mod1\+k kill$|), 'kill unchanged'); ok(line_exists($output, qr|^bindsym Mod1\+k kill$|), 'kill unchanged');