Bugfix: Handle nested transient popups properly
During smart popup fullscreen handling, display all transient popups that belong to the respective fullscreen application. A popup window belongs to another window if the latter is reachable via the path induced by the WM_TRANSIENT_FOR hints. fixes #881
This commit is contained in:
parent
d5358a749e
commit
a38749e7e4
14
src/manage.c
14
src/manage.c
|
@ -385,10 +385,20 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
|
||||||
con_toggle_fullscreen(fs, CF_OUTPUT);
|
con_toggle_fullscreen(fs, CF_OUTPUT);
|
||||||
} else if (config.popup_during_fullscreen == PDF_SMART &&
|
} else if (config.popup_during_fullscreen == PDF_SMART &&
|
||||||
fs != NULL &&
|
fs != NULL &&
|
||||||
fs->window != NULL &&
|
fs->window != NULL) {
|
||||||
fs->window->id == cwindow->transient_for) {
|
i3Window *transient_win = cwindow;
|
||||||
|
while (transient_win != NULL &&
|
||||||
|
transient_win->transient_for != XCB_NONE) {
|
||||||
|
if (transient_win->transient_for == fs->window->id) {
|
||||||
LOG("This floating window belongs to the fullscreen window (popup_during_fullscreen == smart)\n");
|
LOG("This floating window belongs to the fullscreen window (popup_during_fullscreen == smart)\n");
|
||||||
con_focus(nc);
|
con_focus(nc);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Con *next_transient = con_by_window_id(transient_win->transient_for);
|
||||||
|
if (next_transient == NULL)
|
||||||
|
break;
|
||||||
|
transient_win = next_transient->window;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
20
src/render.c
20
src/render.c
|
@ -271,18 +271,28 @@ void render_con(Con *con, bool render_fullscreen) {
|
||||||
/* Don’t render floating windows when there is a fullscreen window
|
/* Don’t render floating windows when there is a fullscreen window
|
||||||
* on that workspace. Necessary to make floating fullscreen work
|
* on that workspace. Necessary to make floating fullscreen work
|
||||||
* correctly (ticket #564). */
|
* correctly (ticket #564). */
|
||||||
if (fullscreen != NULL) {
|
if (fullscreen != NULL && fullscreen->window != NULL) {
|
||||||
Con *floating_child = con_descend_focused(child);
|
Con *floating_child = con_descend_focused(child);
|
||||||
|
Con *transient_con = floating_child;
|
||||||
|
bool is_transient_for = false;
|
||||||
/* Exception to the above rule: smart
|
/* Exception to the above rule: smart
|
||||||
* popup_during_fullscreen handling (popups belonging to
|
* popup_during_fullscreen handling (popups belonging to
|
||||||
* the fullscreen app will be rendered). */
|
* the fullscreen app will be rendered). */
|
||||||
if (floating_child->window == NULL ||
|
while (transient_con != NULL &&
|
||||||
fullscreen->window == NULL ||
|
transient_con->window != NULL &&
|
||||||
floating_child->window->transient_for != fullscreen->window->id)
|
transient_con->window->transient_for != XCB_NONE) {
|
||||||
|
if (transient_con->window->transient_for == fullscreen->window->id) {
|
||||||
|
is_transient_for = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
transient_con = con_by_window_id(transient_con->window->transient_for);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_transient_for)
|
||||||
continue;
|
continue;
|
||||||
else {
|
else {
|
||||||
DLOG("Rendering floating child even though in fullscreen mode: "
|
DLOG("Rendering floating child even though in fullscreen mode: "
|
||||||
"floating->transient_for (0x%08x) == fullscreen->id (0x%08x)\n",
|
"floating->transient_for (0x%08x) --> fullscreen->id (0x%08x)\n",
|
||||||
floating_child->window->transient_for, fullscreen->window->id);
|
floating_child->window->transient_for, fullscreen->window->id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue