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

correctly sort numbered workspaces (+testcase)

Browse Source 
Numbered workspaces (workspaces with a name containing only digits) will be
inserted in the correct order now. Named workspaces are always sorted after
numbered workspaces and in the order of creation.
This commit is contained in:
Michael Stapelberg
2010-11-21 23:35:49 +01:00
parent fab8b84db7
commit 1de97a1f1f
7 changed files with 117 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
testcases/t/39-ws-numbers.t Normal file
View File

@ -0,0 +1,59 @@
#!perl
# vim:ts=4:sw=4:expandtab
# Check if numbered workspaces and named workspaces are sorted in the right way
# in get_workspaces IPC output (necessary for i3bar etc.).
use i3test tests => 9;
use X11::XCB qw(:all);
use Time::HiRes qw(sleep);
BEGIN {
use_ok('X11::XCB::Window');
}
my $i3 = i3("/tmp/nestedcons");
my $x = X11::XCB::Connection->new;
sub check_order {
my ($msg) = @_;
my @ws = @{$i3->get_workspaces->recv};
my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
my @sorted = sort @nums;
cmp_deeply(\@nums, \@sorted, $msg);
}
check_order('workspace order alright before testing');
#############################################################################
# open a window to keep this ws open
#############################################################################
$i3->command("workspace 93")->recv;
open_standard_window($x);
my @ws = @{$i3->get_workspaces->recv};
my @f = grep { defined($_->{num}) && $_->{num} == 93 } @ws;
is(@f, 1, 'ws 93 found by num');
check_order('workspace order alright after opening 93');
$i3->command("workspace 92")->recv;
open_standard_window($x);
check_order('workspace order alright after opening 92');
$i3->command("workspace 94")->recv;
open_standard_window($x);
check_order('workspace order alright after opening 94');
$i3->command("workspace 96")->recv;
open_standard_window($x);
check_order('workspace order alright after opening 96');
$i3->command("workspace foo")->recv;
open_standard_window($x);
check_order('workspace order alright after opening foo');
$i3->command("workspace 91")->recv;
open_standard_window($x);
check_order('workspace order alright after opening 91');

2
testcases/t/lib/i3test.pm
View File

@ -10,7 +10,7 @@ use List::Util qw(first);
use v5.10;
use Exporter ();
our @EXPORT = qw(get_workspace_names get_unused_workspace get_ws_content get_ws get_focused open_empty_con);
our @EXPORT = qw(get_workspace_names get_unused_workspace get_ws_content get_ws get_focused open_empty_con open_standard_window);
BEGIN {
my $window_count = 0;