Introduce con_get_fullscreen_covering_ws

[i3/i3] / src / manage.c

diff --git a/src/manage.c b/src/manage.c
index b4d0af959d850f69e869ea5655f248224e0c63d7..f97ecc62a997f0e793544225ae8b937b97b32e6c 100644 (file)
--- a/src/manage.c
+++ b/src/manage.c
@@ -378,9 +378,7 @@ void manage_window(xcb_window_t window, xcb_get_window_attributes_cookie_t cooki
 
     /* handle fullscreen containers */
     Con *ws = con_get_workspace(nc);
-    Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
-    if (fs == NULL)
-        fs = con_get_fullscreen_con(croot, CF_GLOBAL);
+    Con *fs = con_get_fullscreen_covering_ws(ws);
 
     if (xcb_reply_contains_atom(state_reply, A__NET_WM_STATE_FULLSCREEN)) {
         /* If this window is already fullscreen (after restarting!), skip