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

Merge pull request #3368 from orestisf1993/render_root

Browse Source 
(floating) global fullscreen bugs & others
This commit is contained in:
Ingo Bürk
2018-08-24 09:49:41 +02:00
committed by GitHub
parent 9a53d65e18 e1a83d057f
commit 4cba9fcbda
7 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/render.c
View File

@ -234,25 +234,22 @@ static void render_root(Con *con, Con *fullscreen) {
continue;
}
Con *workspace = TAILQ_FIRST(&(content->focus_head));
Con *fullscreen = con_get_fullscreen_con(workspace, CF_OUTPUT);
Con *fullscreen = con_get_fullscreen_covering_ws(workspace);
Con *child;
TAILQ_FOREACH(child, &(workspace->floating_head), floating_windows) {
/* Don’t render floating windows when there is a fullscreen window
* on that workspace. Necessary to make floating fullscreen work
* correctly (ticket #564). */
/* If there is no fullscreen->window, this cannot be a
* transient window, so we _know_ we need to skip it. This
* happens during restarts where the container already exists,
* but the window was not yet associated. */
if (fullscreen != NULL && fullscreen->window == NULL)
continue;
if (fullscreen != NULL && fullscreen->window != NULL) {
if (fullscreen != NULL) {
/* Don’t render floating windows when there is a fullscreen
* window on that workspace. Necessary to make floating
* fullscreen work correctly (ticket #564). Exception to the
* above rule: smart popup_during_fullscreen handling (popups
* belonging to the fullscreen app will be rendered). */
if (config.popup_during_fullscreen != PDF_SMART) {
continue;
}
Con *floating_child = con_descend_focused(child);
Con *transient_con = floating_child;
bool is_transient_for = false;
/* Exception to the above rule: smart
* popup_during_fullscreen handling (popups belonging to
* the fullscreen app will be rendered). */
while (transient_con != NULL &&
transient_con->window != NULL &&
transient_con->window->transient_for != XCB_NONE) {