Fix floating click events

* Set focus to a floating container when clicking its title bar.
* Raise floating when user clicks title bar or decorations (in the
seat_begin functions).
* In container_at, it only returned a floating container if the user had
clicked the surface. This makes it use floating_container_at instead.

2 files changed, 13 insertions, 1 deletions

diff --git a/sway/input/cursor.c b/sway/input/cursor.c
index 6d57c45f..5c446299 100644
--- a/sway/input/cursor.c
+++ b/sway/input/cursor.c
@@ -877,6 +877,7 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
                         while (cont->parent) {
                                 cont = cont->parent;
                         }
+                        seat_set_focus_container(seat, cont);
                         seat_begin_move_floating(seat, cont, button);
                         return;
                 }
diff --git a/sway/input/seat.c b/sway/input/seat.c
index f418785d..daf5b160 100644
--- a/sway/input/seat.c
+++ b/sway/input/seat.c
@@ -1038,7 +1038,7 @@ void seat_begin_down(struct sway_seat *seat, struct sway_container *con,
         seat->op_moved = false;
 
         // In case the container was not raised by gaining focus, raise on click
-        if (con && !config->raise_floating) {
+        if (!config->raise_floating) {
                 container_raise_floating(con);
         }
 }
@@ -1052,6 +1052,12 @@ void seat_begin_move_floating(struct sway_seat *seat,
         seat->operation = OP_MOVE_FLOATING;
         seat->op_container = con;
         seat->op_button = button;
+
+        // In case the container was not raised by gaining focus, raise on click
+        if (!config->raise_floating) {
+                container_raise_floating(con);
+        }
+
         cursor_set_image(seat->cursor, "grab", NULL);
 }
 
@@ -1085,6 +1091,11 @@ void seat_begin_resize_floating(struct sway_seat *seat,
         seat->op_ref_con_ly = con->y;
         seat->op_ref_width = con->width;
         seat->op_ref_height = con->height;
+        //
+        // In case the container was not raised by gaining focus, raise on click
+        if (!config->raise_floating) {
+                container_raise_floating(con);
+        }
 
         const char *image = edge == WLR_EDGE_NONE ?
                 "se-resize" : wlr_xcursor_get_resize_name(edge);