brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Split out logic for determining whether an X window is ours

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-01 18:43:33 -05:00
parent 14db280fab
commit 91b789c707
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/core/window.c
View File

@ -771,6 +771,35 @@ maybe_filter_xwindow (MetaDisplay *display,
return filtered; return filtered;
} }
static gboolean
is_our_xwindow (MetaDisplay *display,
MetaScreen *screen
Window xwindow,
XWindowAttributes *attrs)
{
/* A black list of override redirect windows that we don't need to manage: */
if (attrs->override_redirect &&
(xwindow == screen->no_focus_window ||
xwindow == screen->flash_window ||
xwindow == screen->wm_sn_selection_window ||
attrs->class == InputOnly ||
/* any windows created via meta_create_offscreen_window: */
(attrs->x == -100 && attrs->y == -100
&& attrs->width == 1 && attrs->height == 1) ||
xwindow == screen->wm_cm_selection_window ||
xwindow == screen->guard_window ||
(display->compositor &&
xwindow == XCompositeGetOverlayWindow (display->xdisplay,
screen->xroot)
)
)
) {
return TRUE;
}
return FALSE;
}
gboolean gboolean
meta_window_should_attach_to_parent (MetaWindow *window) meta_window_should_attach_to_parent (MetaWindow *window)
{ {
@ -1449,26 +1478,11 @@ meta_window_new (MetaDisplay *display,
g_assert (screen); g_assert (screen);
/* A black list of override redirect windows that we don't need to manage: */ if (is_our_xwindow (display, screen, xwindow, &attrs))
if (attrs.override_redirect && {
(xwindow == screen->no_focus_window || meta_verbose ("Not managing our own windows\n");
xwindow == screen->flash_window || goto error;
xwindow == screen->wm_sn_selection_window || }
attrs.class == InputOnly ||
/* any windows created via meta_create_offscreen_window: */
(attrs.x == -100 && attrs.y == -100
&& attrs.width == 1 && attrs.height == 1) ||
xwindow == screen->wm_cm_selection_window ||
xwindow == screen->guard_window ||
(display->compositor &&
xwindow == XCompositeGetOverlayWindow (display->xdisplay,
screen->xroot)
)
)
) {
meta_verbose ("Not managing our own windows\n");
goto error;
}
if (maybe_filter_xwindow (display, xwindow, must_be_viewable, &attrs)) if (maybe_filter_xwindow (display, xwindow, must_be_viewable, &attrs))
{ {