1 files changed, 101 insertions, 58 deletions

diff --git a/sway/input/seat.c b/sway/input/seat.c
index 57cc65f6..4077a8dd 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -124,42 +124,6 @@ static void seat_send_focus(struct sway_container *con,
         }
 }
 
-static struct sway_container *seat_get_focus_by_type(struct sway_seat *seat,
-                struct sway_container *container, enum sway_container_type type,
-                bool only_tiling) {
-        if (container->type == C_VIEW) {
-                return container;
-        }
-
-        struct sway_container *floating =
-                container->type == C_WORKSPACE && !only_tiling ?
-                container->sway_workspace->floating : NULL;
-        if (container->children->length == 0 &&
-                        (!floating || floating->children->length == 0)) {
-                return container;
-        }
-
-        struct sway_seat_container *current = NULL;
-        wl_list_for_each(current, &seat->focus_stack, link) {
-                if (current->container->type != type && type != C_TYPES) {
-                        continue;
-                }
-
-                if (container_has_ancestor(current->container, container)) {
-                        if (only_tiling &&
-                                        container_is_floating_or_child(current->container)) {
-                                continue;
-                        }
-                        return current->container;
-                }
-                if (floating && container_has_ancestor(current->container, floating)) {
-                        return current->container;
-                }
-        }
-
-        return NULL;
-}
-
 void seat_focus_inactive_children_for_each(struct sway_seat *seat,
                 struct sway_container *container,
                 void (*f)(struct sway_container *container, void *data), void *data) {
@@ -175,8 +139,18 @@ void seat_focus_inactive_children_for_each(struct sway_seat *seat,
 }
 
 struct sway_container *seat_get_focus_inactive_view(struct sway_seat *seat,
-                struct sway_container *container) {
-        return seat_get_focus_by_type(seat, container, C_VIEW, false);
+                struct sway_container *ancestor) {
+        if (ancestor->type == C_VIEW) {
+                return ancestor;
+        }
+        struct sway_seat_container *current;
+        wl_list_for_each(current, &seat->focus_stack, link) {
+                struct sway_container *con = current->container;
+                if (con->type == C_VIEW && container_has_ancestor(con, ancestor)) {
+                        return con;
+                }
+        }
+        return NULL;
 }
 
 static void handle_seat_container_destroy(struct wl_listener *listener,
@@ -198,7 +172,7 @@ static void handle_seat_container_destroy(struct wl_listener *listener,
         if (set_focus) {
                 struct sway_container *next_focus = NULL;
                 while (next_focus == NULL) {
-                        next_focus = seat_get_focus_by_type(seat, parent, C_VIEW, false);
+                        next_focus = seat_get_focus_inactive_view(seat, parent);
 
                         if (next_focus == NULL && parent->type == C_WORKSPACE) {
                                 next_focus = parent;
@@ -339,9 +313,6 @@ static void handle_new_drag_icon(struct wl_listener *listener, void *data) {
 
 static void collect_focus_iter(struct sway_container *con, void *data) {
         struct sway_seat *seat = data;
-        if (con->type > C_WORKSPACE) {
-                return;
-        }
         struct sway_seat_container *seat_con =
                 seat_container_from_container(seat, con);
         if (!seat_con) {
@@ -375,7 +346,8 @@ struct sway_seat *seat_create(struct sway_input_manager *input,
         // init the focus stack
         wl_list_init(&seat->focus_stack);
 
-        container_for_each_descendant(&root_container, collect_focus_iter, seat);
+        root_for_each_workspace(collect_focus_iter, seat);
+        root_for_each_container(collect_focus_iter, seat);
 
         wl_signal_add(&root_container.sway_root->events.new_container,
                 &seat->new_container);
@@ -653,8 +625,7 @@ void seat_set_focus_warp(struct sway_seat *seat,
         // find new output's old workspace, which might have to be removed if empty
         struct sway_container *new_output_last_ws = NULL;
         if (last_output && new_output && last_output != new_output) {
-                new_output_last_ws =
-                        seat_get_focus_by_type(seat, new_output, C_WORKSPACE, false);
+                new_output_last_ws = seat_get_active_child(seat, new_output);
         }
 
         if (container && container->parent) {
@@ -717,7 +688,8 @@ void seat_set_focus_warp(struct sway_seat *seat,
         // If we've focused a floating container, bring it to the front.
         // We do this by putting it at the end of the floating list.
         if (container && container_is_floating(container)) {
-                list_move_to_end(container->parent->children, container);
+                list_move_to_end(
+                                container->parent->sway_workspace->floating, container);
         }
 
         // clean up unfocused empty workspace on new output
@@ -877,22 +849,66 @@ void seat_set_exclusive_client(struct sway_seat *seat,
 }
 
 struct sway_container *seat_get_focus_inactive(struct sway_seat *seat,
-                struct sway_container *container) {
-        return seat_get_focus_by_type(seat, container, C_TYPES, false);
+                struct sway_container *con) {
+        if (con->type == C_WORKSPACE && !con->children->length &&
+                        !con->sway_workspace->floating->length) {
+                return con;
+        }
+        if (con->type == C_VIEW) {
+                return con;
+        }
+        struct sway_seat_container *current;
+        wl_list_for_each(current, &seat->focus_stack, link) {
+                if (container_has_ancestor(current->container, con)) {
+                        return current->container;
+                }
+        }
+        return NULL;
 }
 
 struct sway_container *seat_get_focus_inactive_tiling(struct sway_seat *seat,
-                struct sway_container *container) {
-        return seat_get_focus_by_type(seat, container, C_TYPES, true);
+                struct sway_container *ancestor) {
+        if (ancestor->type == C_WORKSPACE && !ancestor->children->length) {
+                return ancestor;
+        }
+        struct sway_seat_container *current;
+        wl_list_for_each(current, &seat->focus_stack, link) {
+                struct sway_container *con = current->container;
+                if (!container_is_floating_or_child(con) &&
+                                container_has_ancestor(current->container, ancestor)) {
+                        return con;
+                }
+        }
+        return NULL;
+}
+
+struct sway_container *seat_get_focus_inactive_floating(struct sway_seat *seat,
+                struct sway_container *ancestor) {
+        if (ancestor->type == C_WORKSPACE &&
+                        !ancestor->sway_workspace->floating->length) {
+                return NULL;
+        }
+        struct sway_seat_container *current;
+        wl_list_for_each(current, &seat->focus_stack, link) {
+                struct sway_container *con = current->container;
+                if (container_is_floating_or_child(con) &&
+                                container_has_ancestor(current->container, ancestor)) {
+                        return con;
+                }
+        }
+        return NULL;
 }
 
 struct sway_container *seat_get_active_child(struct sway_seat *seat,
-                struct sway_container *container) {
-        struct sway_seat_container *current = NULL;
+                struct sway_container *parent) {
+        if (parent->type == C_VIEW) {
+                return parent;
+        }
+        struct sway_seat_container *current;
         wl_list_for_each(current, &seat->focus_stack, link) {
-                if (current->container->parent == container &&
-                                current->container->layout != L_FLOATING) {
-                        return current->container;
+                struct sway_container *con = current->container;
+                if (con->parent == parent) {
+                        return con;
                 }
         }
         return NULL;
@@ -902,7 +918,9 @@ struct sway_container *seat_get_focus(struct sway_seat *seat) {
         if (!seat->has_focus) {
                 return NULL;
         }
-        return seat_get_focus_inactive(seat, &root_container);
+        struct sway_seat_container *current =
+                wl_container_of(seat->focus_stack.next, current, link);
+        return current->container;
 }
 
 void seat_apply_config(struct sway_seat *seat,
@@ -930,6 +948,18 @@ struct seat_config *seat_get_config(struct sway_seat *seat) {
         return NULL;
 }
 
+void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
+                uint32_t button, double sx, double sy) {
+        seat->operation = OP_DOWN;
+        seat->op_container = con;
+        seat->op_button = button;
+        seat->op_ref_lx = seat->cursor->cursor->x;
+        seat->op_ref_ly = seat->cursor->cursor->y;
+        seat->op_ref_con_lx = sx;
+        seat->op_ref_con_ly = sy;
+        seat->op_moved = false;
+}
+
 void seat_begin_move(struct sway_seat *seat, struct sway_container *con,
                 uint32_t button) {
         if (!seat->cursor) {
@@ -954,7 +984,7 @@ void seat_begin_resize_floating(struct sway_seat *seat,
         seat->op_resize_preserve_ratio = keyboard &&
                 (wlr_keyboard_get_modifiers(keyboard) & WLR_MODIFIER_SHIFT);
         seat->op_resize_edge = edge == WLR_EDGE_NONE ?
-                RESIZE_EDGE_BOTTOM | RESIZE_EDGE_RIGHT : edge;
+                WLR_EDGE_BOTTOM | WLR_EDGE_RIGHT : edge;
         seat->op_button = button;
         seat->op_ref_lx = seat->cursor->cursor->x;
         seat->op_ref_ly = seat->cursor->cursor->y;
@@ -983,6 +1013,7 @@ void seat_begin_resize_tiling(struct sway_seat *seat,
 }
 
 void seat_end_mouse_operation(struct sway_seat *seat) {
+        enum sway_seat_operation operation = seat->operation;
         if (seat->operation == OP_MOVE) {
                 // We "move" the container to its own location so it discovers its
                 // output again.
@@ -991,7 +1022,19 @@ void seat_end_mouse_operation(struct sway_seat *seat) {
         }
         seat->operation = OP_NONE;
         seat->op_container = NULL;
-        cursor_set_image(seat->cursor, "left_ptr", NULL);
+        if (operation == OP_DOWN) {
+                // Set the cursor's previous coords to the x/y at the start of the
+                // operation, so the container change will be detected if using
+                // focus_follows_mouse and the cursor moved off the original container
+                // during the operation.
+                seat->cursor->previous.x = seat->op_ref_lx;
+                seat->cursor->previous.y = seat->op_ref_ly;
+                if (seat->op_moved) {
+                        cursor_send_pointer_motion(seat->cursor, 0, true);
+                }
+        } else {
+                cursor_set_image(seat->cursor, "left_ptr", NULL);
+        }
 }
 
 void seat_pointer_notify_button(struct sway_seat *seat, uint32_t time_msec,