Merge branch 'floating-focus' into next

diff --git a/src/floating.c b/src/floating.c
index 2fbf66bcfb275dc4a7f1a030e1e5d71589ea6fef..e225b8a6843820793e8976fbe37e13d3c13bd22f 100644 (file)
--- a/src/floating.c
+++ b/src/floating.c
@@ -520,31 +520,6 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
 }
 
 #if 0
-/*
- * Changes focus in the given direction for floating clients.
- *
- * Changing to the left/right means going to the previous/next floating client,
- * changing to top/bottom means cycling through the Z-index.
- *
- */
-void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, direction_t direction) {
-        DLOG("floating focus\n");
-
-        if (direction == D_LEFT || direction == D_RIGHT) {
-                /* Go to the next/previous floating client */
-                Client *client;
-
-                while ((client = (direction == D_LEFT ? TAILQ_PREV(currently_focused, floating_clients_head, floating_clients) :
-                                                        TAILQ_NEXT(currently_focused, floating_clients))) !=
-                       TAILQ_END(&(currently_focused->workspace->floating_clients))) {
-                        if (!client->floating)
-                                continue;
-                        set_focus(conn, client, true);
-                        return;
-                }
-        }
-}
-
 /*
  * Moves the client 10px to the specified direction.
  *

diff --git a/src/tree.c b/src/tree.c
index 240c22a6551957b2c0fe2ccf162bfe80429d3342..3f0705fc0ef92f907d93f8aa7c43245e306e33e9 100644 (file)
--- a/src/tree.c
+++ b/src/tree.c
@@ -421,12 +421,35 @@ static bool _tree_next(Con *con, char way, orientation_t orientation, bool wrap)
         return true;
     }
 
+    Con *parent = con->parent;
+
     if (con->type == CT_FLOATING_CON) {
-        /* TODO: implement focus for floating windows */
-        return false;
-    }
+        /* left/right focuses the previous/next floating container */
+        if (orientation == HORIZ) {
+            Con *next;
+            if (way == 'n')
+                next = TAILQ_NEXT(con, floating_windows);
+            else next = TAILQ_PREV(con, floating_head, floating_windows);
+
+            /* If there is no next/previous container, wrap */
+            if (!next) {
+                if (way == 'n')
+                    next = TAILQ_FIRST(&(parent->floating_head));
+                else next = TAILQ_LAST(&(parent->floating_head), floating_head);
+            }
 
-    Con *parent = con->parent;
+            /* Still no next/previous container? bail out */
+            if (!next)
+                return false;
+
+            con_focus(con_descend_focused(next));
+            return true;
+        } else {
+            /* up/down cycles through the Z-index */
+            /* TODO: implement cycling through the z-index */
+            return false;
+        }
+    }
 
     /* If the orientation does not match or there is no other con to focus, we
      * need to go higher in the hierarchy */

diff --git a/testcases/t/35-floating-focus.t b/testcases/t/35-floating-focus.t
index 3f820ea5c5b92797c379a8e6dc1147b53ce5a816..6adad246292a50ae06b01574523dc9f36c1a1b2c 100644 (file)
--- a/testcases/t/35-floating-focus.t
+++ b/testcases/t/35-floating-focus.t
@@ -170,5 +170,46 @@ sleep 0.25;
 
 is($x->input_focus, $second->id, 'second (floating) container focused');
 
+#############################################################################
+# 6: see if switching floating focus using the focus left/right command works
+#############################################################################
+
+$tmp = fresh_workspace;
+
+$first = open_standard_window($x, '#ff0000', 1);    # window 10
+$second = open_standard_window($x, '#00ff00', 1);   # window 11
+$third = open_standard_window($x, '#0000ff', 1);   # window 12
+
+is($x->input_focus, $third->id, 'third container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $second->id, 'second container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $first->id, 'first container focused');
+
+cmd 'focus left';
+
+sleep 0.25;
+
+is($x->input_focus, $third->id, 'focus wrapped to third container');
+
+cmd 'focus right';
+
+sleep 0.25;
+
+is($x->input_focus, $first->id, 'focus wrapped to first container');
+
+cmd 'focus right';
+
+sleep 0.25;
+
+is($x->input_focus, $second->id, 'focus on second container');
 
 done_testing;

diff --git a/testcases/t/lib/i3test.pm b/testcases/t/lib/i3test.pm
index 054bb2ae56de6676246c48e433e0cfc0587e5aa3..749b89b77d4df4290cb8aecdffd3a28b73999e6e 100644 (file)
--- a/testcases/t/lib/i3test.pm
+++ b/testcases/t/lib/i3test.pm
@@ -48,16 +48,23 @@ use warnings;
 }
 
 sub open_standard_window {
-    my ($x, $color) = @_;
+    my ($x, $color, $floating) = @_;
 
     $color ||= '#c0c0c0';
 
-    my $window = $x->root->create_child(
+    # We cannot use a hashref here because create_child expands the arguments into an array
+    my @args = (
         class => WINDOW_CLASS_INPUT_OUTPUT,
-        rect => [ 0, 0, 30, 30 ],
+        rect => X11::XCB::Rect->new(x => 0, y => 0, width => 30, height => 30 ),
         background_color => $color,
     );
 
+    if (defined($floating) && $floating) {
+        @args = (@args, window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'));
+    }
+
+    my $window = $x->root->create_child(@args);
+
     $window->name('Window ' . counter_window());
     $window->map;