diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-25 23:30:09 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-25 23:37:40 +1000 |
commit | 60a1d79de71660949f7a6fc83e242d9d95c75187 (patch) | |
tree | 821502ef188985ee023df3f24b9e4e468eb96aef /sway/desktop/xdg_shell.c | |
parent | ea2497d35cc1a7357d69b8e09ce0104c82a7be39 (diff) |
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.c | 8 |
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) { 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, |