4 files changed, 18 insertions, 51 deletions

diff --git a/sway/desktop/transaction.c b/sway/desktop/transaction.c
index b2f7f922..955b05d6 100644
--- a/sway/desktop/transaction.c
+++ b/sway/desktop/transaction.c
@@ -11,6 +11,8 @@
 #include "sway/desktop.h"
 #include "sway/desktop/idle_inhibit_v1.h"
 #include "sway/desktop/transaction.h"
+#include "sway/input/cursor.h"
+#include "sway/input/input-manager.h"
 #include "sway/output.h"
 #include "sway/tree/container.h"
 #include "sway/tree/node.h"
@@ -25,8 +27,6 @@ struct sway_transaction {
 	size_t num_waiting;
 	size_t num_configures;
 	struct timespec commit_time;
-	void (*callback)(void *data);
-	void *callback_data;
 };
 
 struct sway_transaction_instruction {
@@ -298,8 +298,11 @@ static void transaction_apply(struct sway_transaction *transaction) {
 		node->instruction = NULL;
 	}
 
-	if (transaction->callback) {
-		transaction->callback(transaction->callback_data);
+	if (root->outputs->length) {
+		struct sway_seat *seat;
+		wl_list_for_each(seat, &server.input->seats, link) {
+			cursor_rebase(seat->cursor);
+		}
 	}
 }
 
@@ -505,7 +508,14 @@ void transaction_notify_view_ready_by_size(struct sway_view *view,
 	}
 }
 
-static void do_commit_dirty(struct sway_transaction *transaction) {
+void transaction_commit_dirty(void) {
+	if (!server.dirty_nodes->length) {
+		return;
+	}
+	struct sway_transaction *transaction = transaction_create();
+	if (!transaction) {
+		return;
+	}
 	for (int i = 0; i < server.dirty_nodes->length; ++i) {
 		struct sway_node *node = server.dirty_nodes->items[i];
 		transaction_add_node(transaction, node);
@@ -524,28 +534,3 @@ static void do_commit_dirty(struct sway_transaction *transaction) {
 		transaction_progress_queue();
 	}
 }
-
-void transaction_commit_dirty(void) {
-	if (!server.dirty_nodes->length) {
-		return;
-	}
-	struct sway_transaction *transaction = transaction_create();
-	if (!transaction) {
-		return;
-	}
-	do_commit_dirty(transaction);
-}
-
-void transaction_commit_dirty_with_callback(
-		void (*callback)(void *data), void *data) {
-	if (!server.dirty_nodes->length) {
-		return;
-	}
-	struct sway_transaction *transaction = transaction_create();
-	if (!transaction) {
-		return;
-	}
-	transaction->callback = callback;
-	transaction->callback_data = data;
-	do_commit_dirty(transaction);
-}
diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index 064e2707..0b2ebc96 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -397,11 +397,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 	wl_list_remove(&xdg_shell_view->set_app_id.link);
 }
 
-static void do_rebase(void *data) {
-	struct sway_cursor *cursor = data;
-	cursor_rebase(cursor);
-}
-
 static void handle_map(struct wl_listener *listener, void *data) {
 	struct sway_xdg_shell_view *xdg_shell_view =
 		wl_container_of(listener, xdg_shell_view, map);
@@ -428,8 +423,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	view_map(view, view->wlr_xdg_surface->surface,
 		xdg_surface->toplevel->client_pending.fullscreen, csd);
 
-	struct sway_seat *seat = input_manager_current_seat();
-	transaction_commit_dirty_with_callback(do_rebase, seat->cursor);
+	transaction_commit_dirty();
 
 	xdg_shell_view->commit.notify = handle_commit;
 	wl_signal_add(&xdg_surface->surface->events.commit,
diff --git a/sway/desktop/xdg_shell_v6.c b/sway/desktop/xdg_shell_v6.c
index 90bf55b2..692cfbf5 100644
--- a/sway/desktop/xdg_shell_v6.c
+++ b/sway/desktop/xdg_shell_v6.c
@@ -394,11 +394,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 	wl_list_remove(&xdg_shell_v6_view->set_app_id.link);
 }
 
-static void do_rebase(void *data) {
-	struct sway_cursor *cursor = data;
-	cursor_rebase(cursor);
-}
-
 static void handle_map(struct wl_listener *listener, void *data) {
 	struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
 		wl_container_of(listener, xdg_shell_v6_view, map);
@@ -419,8 +414,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	view_map(view, view->wlr_xdg_surface_v6->surface,
 		xdg_surface->toplevel->client_pending.fullscreen, csd);
 
-	struct sway_seat *seat = input_manager_current_seat();
-	transaction_commit_dirty_with_callback(do_rebase, seat->cursor);
+	transaction_commit_dirty();
 
 	xdg_shell_v6_view->commit.notify = handle_commit;
 	wl_signal_add(&xdg_surface->surface->events.commit,
diff --git a/sway/desktop/xwayland.c b/sway/desktop/xwayland.c
index 95275937..0c41d960 100644
--- a/sway/desktop/xwayland.c
+++ b/sway/desktop/xwayland.c
@@ -391,11 +391,6 @@ static void handle_unmap(struct wl_listener *listener, void *data) {
 	wl_list_remove(&xwayland_view->commit.link);
 }
 
-static void do_rebase(void *data) {
-	struct sway_cursor *cursor = data;
-	cursor_rebase(cursor);
-}
-
 static void handle_map(struct wl_listener *listener, void *data) {
 	struct sway_xwayland_view *xwayland_view =
 		wl_container_of(listener, xwayland_view, map);
@@ -422,8 +417,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
 	// Put it back into the tree
 	view_map(view, xsurface->surface, xsurface->fullscreen, false);
 
-	struct sway_seat *seat = input_manager_current_seat();
-	transaction_commit_dirty_with_callback(do_rebase, seat->cursor);
+	transaction_commit_dirty();
 }
 
 static void handle_request_configure(struct wl_listener *listener, void *data) {