mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-01 19:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipc: fix workspace::focus event behaviour

Browse source
This commit is contained in:
Ian Fan 2018-07-18 21:52:15 +01:00
parent 3edaf2ce2a
commit b2ac234569
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/input/seat.c
View file

@ -739,7 +739,9 @@ void seat_set_focus_warp(struct sway_seat *seat,
if (last_focus) { if (last_focus) {
if (last_workspace) { if (last_workspace) {
ipc_event_workspace(last_workspace, container, "focus"); if (last_workspace != new_workspace) {
ipc_event_workspace(last_workspace, new_workspace, "focus");
}
if (!workspace_is_visible(last_workspace) if (!workspace_is_visible(last_workspace)
&& workspace_is_empty(last_workspace)) { && workspace_is_empty(last_workspace)) {
if (last_workspace == last_focus) { if (last_workspace == last_focus) {

2
sway/tree/layout.c
View file

@ -598,7 +598,7 @@ void container_move(struct sway_container *container,
next_ws = container_parent(next_ws, C_WORKSPACE); next_ws = container_parent(next_ws, C_WORKSPACE);
} }
if (last_ws && next_ws && last_ws != next_ws) { if (last_ws && next_ws && last_ws != next_ws) {
ipc_event_workspace(last_ws, container, "focus"); ipc_event_workspace(last_ws, next_ws, "focus");
workspace_detect_urgent(last_ws); workspace_detect_urgent(last_ws);
workspace_detect_urgent(next_ws); workspace_detect_urgent(next_ws);
} }