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

Merge pull request #3448 from orestisf1993/sticky

Browse Source 
Fix sticky focus when switching to workspace on different output
This commit is contained in:
Ingo Bürk
2018-10-23 15:31:57 +02:00
committed by GitHub
parent 66d504f3cd b09090fa7d
commit 0ed29f5678
4 changed files with 71 additions and 27 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