From 26278b694c5eeff38512cfe8156567718db73c65 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Mon, 15 Oct 2018 21:06:24 +1000 Subject: Introduce seat_set_raw_focus and remove notify argument from seat_set_focus_warp This introduces seat_set_raw_focus: a function that manipulates the focus stack without doing any other behaviour whatsoever. There are a few places where this is useful, such as where we set focus_inactive followed by another call to set the real focus again. With this change, the notify argument to seat_set_focus_warp is also removed as these cases now use the raw function instead. A bonus of this is we are no longer emitting window::focus IPC events when setting focus_inactive, nor are we sending focus/unfocus events to the surface. This also fixes the following: * When running `move workspace to output ` and moving the last workspace from the source output, the workspace::focus IPC event is no longer emitted for the newly created workspace. * When splitting the currently focused container, unfocus/focus events will not be sent to the surface when giving focus_inactive to the newly created parent, and window::focus events will not be emitted. --- include/sway/input/seat.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'include/sway/input') diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index ebb0cd43..921373d4 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -112,8 +112,16 @@ void seat_set_focus_container(struct sway_seat *seat, void seat_set_focus_workspace(struct sway_seat *seat, struct sway_workspace *ws); +/** + * Manipulate the focus stack without triggering any other behaviour. + * + * This can be used to set focus_inactive by calling the function a second time + * with the real focus. + */ +void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node); + void seat_set_focus_warp(struct sway_seat *seat, - struct sway_node *node, bool warp, bool notify); + struct sway_node *node, bool warp); void seat_set_focus_surface(struct sway_seat *seat, struct wlr_surface *surface, bool unfocus); -- cgit v1.2.3 From 05284b65db5f3cdfa88d7e06055aadd0d5fa8e50 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 16 Oct 2018 08:17:24 +1000 Subject: 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. --- include/sway/input/seat.h | 1 + sway/commands/move.c | 2 +- sway/input/seat.c | 13 ++++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'include/sway/input') diff --git a/include/sway/input/seat.h b/include/sway/input/seat.h index 921373d4..be95567e 100644 --- a/include/sway/input/seat.h +++ b/include/sway/input/seat.h @@ -51,6 +51,7 @@ struct sway_seat { bool has_focus; struct wl_list focus_stack; // list of containers in focus order + struct sway_workspace *workspace; // If the focused layer is set, views cannot receive keyboard focus struct wlr_layer_surface_v1 *focused_layer; diff --git a/sway/commands/move.c b/sway/commands/move.c index 215ffe27..24036f36 100644 --- a/sway/commands/move.c +++ b/sway/commands/move.c @@ -704,7 +704,7 @@ static struct cmd_results *cmd_move_in_direction( } // Hack to re-focus container - seat_set_focus_workspace(config->handler_context.seat, new_ws); + seat_set_raw_focus(config->handler_context.seat, &new_ws->node); seat_set_focus_container(config->handler_context.seat, container); if (old_ws != new_ws) { 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) { } } +static void set_workspace(struct sway_seat *seat, + struct sway_workspace *new_ws) { + if (seat->workspace == new_ws) { + return; + } + ipc_event_workspace(seat->workspace, new_ws, "focus"); + seat->workspace = new_ws; +} + void seat_set_raw_focus(struct sway_seat *seat, struct sway_node *node) { struct sway_seat_node *seat_node = seat_node_from_node(seat, node); wl_list_remove(&seat_node->link); @@ -709,9 +718,7 @@ void seat_set_focus_warp(struct sway_seat *seat, struct sway_node *node, } // emit ipc events - if (new_workspace && last_workspace != new_workspace) { - ipc_event_workspace(last_workspace, new_workspace, "focus"); - } + set_workspace(seat, new_workspace); if (container && container->view) { ipc_event_window(container, "focus"); } -- cgit v1.2.3