koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not canonicalize "nonprimary" output for i3bar

Browse Source 
Fixes #5346
This commit is contained in:
Orestis Floros 2023-01-06 22:24:08 +01:00
parent 46de32eedd
commit fa25afedd2
No known key found for this signature in database
GPG Key ID: A09DBD7D3222C1C3
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release-notes/bugfixes/1-i3bar-nonprimary Normal file
View File

@ -0,0 +1 @@
fix regression with i3bar's output nonprimary

2
src/ipc.c
View File

@ -739,7 +739,7 @@ static void dump_bar_bindings(yajl_gen gen, Barconfig *config) {
static char *canonicalize_output_name(char *name) {
/* Do not canonicalize special output names. */
if (strcasecmp(name, "primary") == 0) {
if (strcasecmp(name, "primary") == 0 || strcasecmp(name, "nonprimary") == 0) {
return name;
}
Output *output = get_output_by_name(name, false);

29
testcases/t/538-i3bar-primary-output.t
View File

@ -17,8 +17,10 @@
# Tests that i3bars configured to use the primary output do not have
# their output names canonicalized to something other than "primary".
# Ticket: #2948
# Ticket: #5346
# Bug still in: 4.14-93-ga3a7d04a
use i3test i3_config => <<EOT;
use i3test i3_autostart => 0;
my $config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
@ -28,6 +30,7 @@ bar {
output primary
}
EOT
my $pid = launch_with_config($config);
my $bars = i3->get_bar_config()->recv;
is(@$bars, 1, 'one bar configured');
@ -36,5 +39,29 @@ my $bar_id = shift @$bars;
my $bar_config = i3->get_bar_config($bar_id)->recv;
is_deeply($bar_config->{outputs}, [ "primary" ], 'bar_config output is primary');
exit_gracefully($pid);
# Same but for "nonprimary"
$config = <<EOT;
# i3 config file (v4)
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
fake-outputs 1024x768+0+0P,1024x768+0+0
bar {
output nonprimary
}
EOT
$pid = launch_with_config($config);
$bars = i3->get_bar_config()->recv;
is(@$bars, 1, 'one bar configured');
$bar_id = shift @$bars;
$bar_config = i3->get_bar_config($bar_id)->recv;
is_deeply($bar_config->{outputs}, [ "nonprimary" ], 'bar_config output is nonprimary');
exit_gracefully($pid);
done_testing;