window: Clean up is_our_xwindow

This commit is contained in:
Jasper St. Pierre 2014-02-01 18:45:27 -05:00
parent 91b789c707
commit f166240225

View File

@ -777,25 +777,27 @@ is_our_xwindow (MetaDisplay *display,
Window xwindow, Window xwindow,
XWindowAttributes *attrs) XWindowAttributes *attrs)
{ {
/* A black list of override redirect windows that we don't need to manage: */ if (xwindow == screen->no_focus_window)
if (attrs->override_redirect && return TRUE;
(xwindow == screen->no_focus_window ||
xwindow == screen->flash_window || if (xwindow == screen->flash_window)
xwindow == screen->wm_sn_selection_window || return TRUE;
attrs->class == InputOnly ||
/* any windows created via meta_create_offscreen_window: */ if (xwindow == screen->wm_sn_selection_window)
(attrs->x == -100 && attrs->y == -100 return TRUE;
&& attrs->width == 1 && attrs->height == 1) ||
xwindow == screen->wm_cm_selection_window || if (xwindow == screen->wm_cm_selection_window)
xwindow == screen->guard_window || return TRUE;
(display->compositor &&
xwindow == XCompositeGetOverlayWindow (display->xdisplay, if (xwindow == screen->guard_window)
screen->xroot) return TRUE;
)
) if (display->compositor && xwindow == XCompositeGetOverlayWindow (display->xdisplay, screen->xroot))
) { return TRUE;
/* Any windows created via meta_create_offscreen_window */
if (attrs->override_redirect && attrs->x == -100 && attrs->height == -100 && attrs->width == 1 && attrs->height == 1)
return TRUE; return TRUE;
}
return FALSE; return FALSE;
} }