cursor: Update focus at various additional points

- When XDG and XWayland views are positioned (view_moved()).
- When unmanaged XWayland surfaces are mapped, unmapped, or moved.

Do not update cursor focus during an out-of-surface drag.

Along with the existing call in desktop_move_to_front(), this
should hopefully cover the majority of cases where the cursor focus
could get out-of-date, with the possible exception of layer-shell
surfaces.

diff --git a/src/cursor.c b/src/cursor.c
index 89ea699617aa45510f7349dbdf9c8aff822471ce..3fc8efa4b8756db0db6a71efb1e2bf1c363b7661 100644 (file)
--- a/src/cursor.c
+++ b/src/cursor.c
@@ -27,6 +27,11 @@ is_surface(enum ssd_part_type view_area)
 void
 cursor_rebase(struct seat *seat, uint32_t time_msec, bool force)
 {
+       if (seat->pressed.surface) {
+               /* Don't leave surface while a button is pressed */
+               return;
+       }
+
        double sx, sy;
        struct wlr_scene_node *node;
        enum ssd_part_type view_area = LAB_SSD_NONE;
@@ -41,7 +46,7 @@ cursor_rebase(struct seat *seat, uint32_t time_msec, bool force)
        if (surface) {
                if (!force && surface == seat->seat->pointer_state.focused_surface) {
                        /*
-                        * Usually we prevent re-entering an already focued surface
+                        * Usually we prevent re-entering an already focused surface
                         * because it sends useless leave and enter events.
                         *
                         * They may also seriously confuse clients if sent between

diff --git a/src/view.c b/src/view.c
index f1766a919f4426dbb56734b9ffc08fcd977e8746..0f5a83516b29a7bc6861d9322471c39718b933b2 100644 (file)
--- a/src/view.c
+++ b/src/view.c
@@ -149,6 +149,7 @@ view_moved(struct view *view)
        wlr_scene_node_set_position(&view->scene_tree->node, view->x, view->y);
        view_discover_output(view);
        ssd_update_geometry(view);
+       cursor_update_focus(view->server);
 }
 
 /* N.B. Use view_move() if not resizing. */

diff --git a/src/xwayland-unmanaged.c b/src/xwayland-unmanaged.c
index b14760c2ea05253529684c046716ce657ed20840..b09b6196c46bc115f5c67dc00b9796c423a65b6d 100644 (file)
--- a/src/xwayland-unmanaged.c
+++ b/src/xwayland-unmanaged.c
@@ -11,6 +11,7 @@ unmanaged_handle_request_configure(struct wl_listener *listener, void *data)
        wlr_xwayland_surface_configure(xsurface, ev->x, ev->y, ev->width, ev->height);
        if (unmanaged->node) {
                wlr_scene_node_set_position(unmanaged->node, ev->x, ev->y);
+               cursor_update_focus(unmanaged->server);
        }
 }
 
@@ -22,6 +23,7 @@ unmanaged_handle_set_geometry(struct wl_listener *listener, void *data)
        struct wlr_xwayland_surface *xsurface = unmanaged->xwayland_surface;
        if (unmanaged->node) {
                wlr_scene_node_set_position(unmanaged->node, xsurface->x, xsurface->y);
+               cursor_update_focus(unmanaged->server);
        }
 }
 
@@ -49,6 +51,7 @@ unmanaged_handle_map(struct wl_listener *listener, void *data)
                        unmanaged->server->unmanaged_tree,
                        xsurface->surface)->buffer->node;
        wlr_scene_node_set_position(unmanaged->node, xsurface->x, xsurface->y);
+       cursor_update_focus(unmanaged->server);
 }
 
 static void
@@ -102,6 +105,7 @@ unmanaged_handle_unmap(struct wl_listener *listener, void *data)
                seat_reset_pressed(seat);
        }
        unmanaged->node = NULL;
+       cursor_update_focus(unmanaged->server);
 
        if (seat->seat->keyboard_state.focused_surface == xsurface->surface) {
                focus_next_surface(unmanaged->server, xsurface);