koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sticky focus when switching to workspace on different output

Browse Source 
See the testcase for the exact steps to reproduce the problem.
This commit is contained in:
Orestis Floros
2018-10-11 12:06:17 +03:00
parent 6728696ec8
commit b09090fa7d
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/workspace.c
View File

@ -410,7 +410,6 @@ static void workspace_defer_update_urgent_hint_cb(EV_P_ ev_timer *w, int revents
*/
void workspace_show(Con *workspace) {
Con *current, *old = NULL;
Con *old_focus = focused;
/* safe-guard against showing i3-internal workspaces like __i3_scratch */
if (con_is_internal(workspace))
@ -433,6 +432,13 @@ void workspace_show(Con *workspace) {
return;
}
/* Used to correctly update focus when pushing sticky windows. Holds the
* previously focused container in the same output as workspace. For
* example, if a sticky window is focused and then we switch focus to a
* workspace in another output and then switch to a third workspace in the
* first output, the sticky window needs to be refocused. */
Con *old_focus = old ? con_descend_focused(old) : NULL;
/* Remember currently focused workspace for switching back to it later with
* the 'workspace back_and_forth' command.
* NOTE: We have to duplicate the name as the original will be freed when