mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-26 06:59:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rebase the cursor after applying transactions

Browse source 
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.
This commit is contained in:
Ryan Dwyer 2018-10-25 23:30:09 +10:00
parent ea2497d35c
commit 60a1d79de7
10 changed files with 18 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sway/desktop/xdg_shell.c
View file

@ -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,