diff options
author | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-16 08:17:24 +1000 |
---|---|---|
committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-16 08:17:24 +1000 |
commit | 05284b65db5f3cdfa88d7e06055aadd0d5fa8e50 (patch) | |
tree | 7238c53d8310712a94b6d798ef096bd3ad48f43e /sway/input/seat.c | |
parent | Introduce seat_set_raw_focus and remove notify argument from seat_set_focus_warp (diff) | |
download | sway-05284b65db5f3cdfa88d7e06055aadd0d5fa8e50.tar.gz sway-05284b65db5f3cdfa88d7e06055aadd0d5fa8e50.tar.zst sway-05284b65db5f3cdfa88d7e06055aadd0d5fa8e50.zip |
Prevent duplicate workspace::focus events
Previously we would compare the last focus's workspace with the new
focus's workspace to determine if we need to emit an IPC
workspace::focus event. This doesn't work when moving the focused
container to a new workspace.
This adds a workspace property to the seat which stores the last emitted
workspace::focus workspace. Using this method, after moving the
container, refocusing it will trigger exactly one workspace::focus
event: from the old workspace to the new workspace.
Diffstat (limited to 'sway/input/seat.c')
-rw-r--r-- | sway/input/seat.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sway/input/seat.c b/sway/input/seat.c index 6dbd1900..c7deabed 100644 --- a/sway/input/seat.c +++ b/sway/input/seat.c | |||
@@ -623,6 +623,15 @@ static void container_raise_floating(struct sway_container *con) { | |||
623 | } | 623 | } |
624 | } | 624 | } |
625 | 625 | ||
626 | static void set_workspace(struct sway_seat *seat, | ||
627 | struct sway_workspace *new_ws) { | ||
628 | if (seat->workspace == new_ws) { | ||
629 | return; | ||
630 | } | ||
631 | ipc_event_workspace(seat->workspace, new_ws, "focus"); | ||
632 | seat->workspace = new_ws; | ||
633 | } | ||
634 | |||
626 | void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) { | 635 | void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) { |
627 | struct sway_seat_node *seat_node = seat_node_from_node(seat, node); | 636 | struct sway_seat_node *seat_node = seat_node_from_node(seat, node); |
628 | wl_list_remove(&seat_node->link); | 637 | wl_list_remove(&seat_node->link); |
@@ -709,9 +718,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, | |||
709 | } | 718 | } |
710 | 719 | ||
711 | // emit ipc events | 720 | // emit ipc events |
712 | if (new_workspace && last_workspace != new_workspace) { | 721 | set_workspace(seat, new_workspace); |
713 | ipc_event_workspace(last_workspace, new_workspace, "focus"); | ||
714 | } | ||
715 | if (container && container->view) { | 722 | if (container && container->view) { |
716 | ipc_event_window(container, "focus"); | 723 | ipc_event_window(container, "focus"); |
717 | } | 724 | } |