aboutsummaryrefslogtreecommitdiffstats
path: root/sway/commands/focus.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/commands/focus.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/commands/focus.c')
-rw-r--r--sway/commands/focus.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sway/commands/focus.c b/sway/commands/focus.c
index 81af8e0f..b4965cf8 100644
--- a/sway/commands/focus.c
+++ b/sway/commands/focus.c
@@ -236,7 +236,6 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
236 if (argc == 0 && container) { 236 if (argc == 0 && container) {
237 seat_set_focus_container(seat, container); 237 seat_set_focus_container(seat, container);
238 seat_consider_warp_to_focus(seat); 238 seat_consider_warp_to_focus(seat);
239 cursor_rebase(seat->cursor);
240 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 239 return cmd_results_new(CMD_SUCCESS, NULL, NULL);
241 } 240 }
242 241
@@ -294,7 +293,6 @@ struct cmd_results *cmd_focus(int argc, char **argv) {
294 if (next_focus) { 293 if (next_focus) {
295 seat_set_focus(seat, next_focus); 294 seat_set_focus(seat, next_focus);
296 seat_consider_warp_to_focus(seat); 295 seat_consider_warp_to_focus(seat);
297 cursor_rebase(seat->cursor);
298 } 296 }
299 297
300 return cmd_results_new(CMD_SUCCESS, NULL, NULL); 298 return cmd_results_new(CMD_SUCCESS, NULL, NULL);