aboutsummaryrefslogtreecommitdiffstats
path: root/sway/desktop/xdg_shell.c
diff options
context:
space:
mode:
authorLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-25 23:30:09 +1000
committerLibravatar Ryan Dwyer <ryandwyer1@gmail.com>2018-10-25 23:37:40 +1000
commit60a1d79de71660949f7a6fc83e242d9d95c75187 (patch)
tree821502ef188985ee023df3f24b9e4e468eb96aef /sway/desktop/xdg_shell.c
parentMerge pull request #2950 from emersion/presentation-time (diff)
downloadsway-60a1d79de71660949f7a6fc83e242d9d95c75187.tar.gz
sway-60a1d79de71660949f7a6fc83e242d9d95c75187.tar.zst
sway-60a1d79de71660949f7a6fc83e242d9d95c75187.zip
Rebase the cursor after applying transactions
This approaches cursor rebasing from a different angle. Rather than littering the codebase with cursor_rebase calls and using transaction callbacks, this just runs cursor_rebase after applying every transaction - but only if there's outputs connected, because otherwise it causes a crash during shutdown. There is one known case where we still need to call cursor_rebase directly, and that's when running `seat seat0 cursor move ...`. This command doesn't set anything as dirty so no transaction occurs.
Diffstat (limited to 'sway/desktop/xdg_shell.c')
-rw-r--r--sway/desktop/xdg_shell.c8
1 files changed, 1 insertions, 7 deletions
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) {
397 wl_list_remove(&xdg_shell_view->set_app_id.link); 397 wl_list_remove(&xdg_shell_view->set_app_id.link);
398} 398}
399 399
400static void do_rebase(void *data) {
401 struct sway_cursor *cursor = data;
402 cursor_rebase(cursor);
403}
404
405static void handle_map(struct wl_listener *listener, void *data) { 400static void handle_map(struct wl_listener *listener, void *data) {
406 struct sway_xdg_shell_view *xdg_shell_view = 401 struct sway_xdg_shell_view *xdg_shell_view =
407 wl_container_of(listener, xdg_shell_view, map); 402 wl_container_of(listener, xdg_shell_view, map);
@@ -428,8 +423,7 @@ static void handle_map(struct wl_listener *listener, void *data) {
428 view_map(view, view->wlr_xdg_surface->surface, 423 view_map(view, view->wlr_xdg_surface->surface,
429 xdg_surface->toplevel->client_pending.fullscreen, csd); 424 xdg_surface->toplevel->client_pending.fullscreen, csd);
430 425
431 struct sway_seat *seat = input_manager_current_seat(); 426 transaction_commit_dirty();
432 transaction_commit_dirty_with_callback(do_rebase, seat->cursor);
433 427
434 xdg_shell_view->commit.notify = handle_commit; 428 xdg_shell_view->commit.notify = handle_commit;
435 wl_signal_add(&xdg_surface->surface->events.commit, 429 wl_signal_add(&xdg_surface->surface->events.commit,