From 469adc46d62977073e58e627e4bc03babc9517db Mon Sep 17 00:00:00 2001
From: John Lindgren <john@jlindgren.net>
Date: Sat, 3 Sep 2022 17:46:53 -0400
Subject: [PATCH] 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.
---
 src/cursor.c             | 7 ++++++-
 src/view.c               | 1 +
 src/xwayland-unmanaged.c | 4 ++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/cursor.c b/src/cursor.c
index 89ea6996..3fc8efa4 100644
--- 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 f1766a91..0f5a8351 100644
--- 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 b14760c2..b09b6196 100644
--- 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);