nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

output_push_sticky_windows: Make a bit easier to understand

next
Orestis Floros 2018-10-11 12:05:31 +03:00
parent ba8c64c4d9
commit 6728696ec8
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/output.h
View File

@ -40,5 +40,12 @@ Output *get_output_for_con(Con *con);
* Iterates over all outputs and pushes sticky windows to the currently visible
* workspace on that output.
*
* old_focus is used to determine if a sticky window is going to be focused.
* old_focus might be different than the currently focused container because the
* caller might need to temporarily change the focus and then call
* output_push_sticky_windows. For example, workspace_show needs to set focus to
* one of its descendants first, then call output_push_sticky_windows that
* should focus a sticky window if it was the focused in the previous workspace.
*
*/
void output_push_sticky_windows(Con *to_focus);
void output_push_sticky_windows(Con *old_focus);

28
src/output.c
View File

@ -72,8 +72,15 @@ Output *get_output_for_con(Con *con) {
* Iterates over all outputs and pushes sticky windows to the currently visible
* workspace on that output.
*
* old_focus is used to determine if a sticky window is going to be focused.
* old_focus might be different than the currently focused container because the
* caller might need to temporarily change the focus and then call
* output_push_sticky_windows. For example, workspace_show needs to set focus to
* one of its descendants first, then call output_push_sticky_windows that
* should focus a sticky window if it was the focused in the previous workspace.
*
*/
void output_push_sticky_windows(Con *to_focus) {
void output_push_sticky_windows(Con *old_focus) {
Con *output;
TAILQ_FOREACH(output, &(croot->focus_head), focused) {
Con *workspace, *visible_ws = NULL;
@ -95,18 +102,17 @@ void output_push_sticky_windows(Con *to_focus) {
child != TAILQ_END(&(current_ws->focus_head));) {
Con *current = child;
child = TAILQ_NEXT(child, focused);
if (current->type != CT_FLOATING_CON)
if (current->type != CT_FLOATING_CON || !con_is_sticky(current)) {
continue;
}
if (con_is_sticky(current)) {
bool ignore_focus = (to_focus == NULL) || (current != to_focus->parent);
con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
if (!ignore_focus) {
Con *current_ws = con_get_workspace(focused);
con_activate(con_descend_focused(current));
/* Pushing sticky windows shouldn't change the focused workspace. */
con_activate(con_descend_focused(current_ws));
}
bool ignore_focus = (old_focus == NULL) || (current != old_focus->parent);
con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
if (!ignore_focus) {
Con *current_ws = con_get_workspace(focused);
con_activate(con_descend_focused(current));
/* Pushing sticky windows shouldn't change the focused workspace. */
con_activate(con_descend_focused(current_ws));
}
}
}