perl: use get_tree instead of get_workspaces

diff --git a/dump-asy.pl b/dump-asy.pl
index 315dcc6ff76647fdac9befba0abef968ede8f33a..dc2cbeab19fff5d6b97d08ae093278c2089fda20 100755 (executable)
--- a/dump-asy.pl
+++ b/dump-asy.pl
@@ -11,7 +11,7 @@ use v5.10;
 
 my $i3 = i3("/tmp/nestedcons");
 
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 
 my $tmp = File::Temp->new(UNLINK => 0, SUFFIX => '.asy');
 

diff --git a/gtk-tree-watch.pl b/gtk-tree-watch.pl
index b82d25d25c2d6fb2ce3836171c65873e69135861..f15d0c1814eca7e73a13133b08f29538ca42c44f 100755 (executable)
--- a/gtk-tree-watch.pl
+++ b/gtk-tree-watch.pl
@@ -116,7 +116,7 @@ my $layout_container = Gtk2::HBox->new(0, 0);
 $layout_sw->add_with_viewport($layout_container);
 
 sub copy_tree {
-    my $tree = $i3->get_workspaces->recv;
+    my $tree = $i3->get_tree->recv;
 
     # convert the tree back to json so we only rebuild/redraw when the tree is changed
     my $json = encode_json($tree);

diff --git a/testcases/t/02-fullscreen.t b/testcases/t/02-fullscreen.t
index aa6861fb690ce2f106bee5e5dba27482452259cb..e13bff63457c7c2ac44f243b85f27aff03b3a304 100644 (file)
--- a/testcases/t/02-fullscreen.t
+++ b/testcases/t/02-fullscreen.t
@@ -16,7 +16,7 @@ sub fullscreen_windows {
 }
 
 # get the output of this workspace
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 my @outputs = @{$tree->{nodes}};
 my $output = first { defined(first { $_->{name} eq $tmp } @{$_->{nodes}}) } @outputs;
 

diff --git a/testcases/t/16-nestedcons.t b/testcases/t/16-nestedcons.t
index 3d392c460da5277232db866fa4718e6c5603f53d..8c66516cbacd0ca6b99dfc9deb0fa31451add1c4 100644 (file)
--- a/testcases/t/16-nestedcons.t
+++ b/testcases/t/16-nestedcons.t
@@ -10,7 +10,7 @@ my $i3 = i3("/tmp/nestedcons");
 # Request tree
 ####################
 
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 
 my $expected = {
     fullscreen_mode => 0,

diff --git a/testcases/t/26-regress-close.t b/testcases/t/26-regress-close.t
index 95bac4586e178f1052a23374ddfd3b1527e90f8e..125caf733ebbbae2e81d4e0afc70c31e4e5d08f0 100644 (file)
--- a/testcases/t/26-regress-close.t
+++ b/testcases/t/26-regress-close.t
@@ -18,7 +18,7 @@ $i3->command('kill')->recv;
 $i3->command('kill')->recv;
 
 
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 my @nodes = @{$tree->{nodes}};
 ok(@nodes > 0, 'i3 still lives');
 

diff --git a/testcases/t/27-regress-floating-parent.t b/testcases/t/27-regress-floating-parent.t
index c09858f607e31154e425443892fe8232d0f13a9b..f489eaa6e781b31603ecf705d01dceb82f95e272 100644 (file)
--- a/testcases/t/27-regress-floating-parent.t
+++ b/testcases/t/27-regress-floating-parent.t
@@ -32,7 +32,7 @@ is(get_focused($tmp), $floating, 'floating window focused');
 sleep 1;
 $i3->command('mode toggle')->recv;
 
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 my @nodes = @{$tree->{nodes}};
 ok(@nodes > 0, 'i3 still lives');
 

diff --git a/testcases/t/34-invalid-command.t b/testcases/t/34-invalid-command.t
index 12380d461907cf189a7efe2deda8e6ec6e96819a..e1cc2c6fd27dfd7e3f85e3824089440f5f04d65d 100644 (file)
--- a/testcases/t/34-invalid-command.t
+++ b/testcases/t/34-invalid-command.t
@@ -9,7 +9,7 @@ my $i3 = i3("/tmp/nestedcons");
 
 $i3->command("blargh!")->recv;
 
-my $tree = $i3->get_workspaces->recv;
+my $tree = $i3->get_tree->recv;
 my @nodes = @{$tree->{nodes}};
 ok(@nodes > 0, 'i3 still lives');
 

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index d241cfae871a933a28187d77d2ad5cbc8643d5cc..c0a229dc5f25f0222e1fd9202331c24ca713de31 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -63,7 +63,7 @@ sub open_empty_con {
 sub get_workspace_names {
     my $i3 = i3("/tmp/nestedcons");
     # TODO: use correct command as soon as AnyEvent::i3 is updated
-    my $tree = $i3->get_workspaces->recv;
+    my $tree = $i3->get_tree->recv;
     my @workspaces = map { @{$_->{nodes}} } @{$tree->{nodes}};
     [ map { $_->{name} } @workspaces ]
 }
@@ -78,7 +78,7 @@ sub get_unused_workspace {
 sub get_ws {
     my ($name) = @_;
     my $i3 = i3("/tmp/nestedcons");
-    my $tree = $i3->get_workspaces->recv;
+    my $tree = $i3->get_tree->recv;
     my @ws = map { @{$_->{nodes}} } @{$tree->{nodes}};
 
     # as there can only be one workspace with this name, we can safely
@@ -100,7 +100,7 @@ sub get_ws_content {
 sub get_focused {
     my ($ws) = @_;
     my $i3 = i3("/tmp/nestedcons");
-    my $tree = $i3->get_workspaces->recv;
+    my $tree = $i3->get_tree->recv;
 
     my @ws = map { @{$_->{nodes}} } @{$tree->{nodes}};
     my @cons = grep { $_->{name} eq $ws } @ws;