Don't do stacking for override-redirect windows

Don't add override-redirect windows to MetaStack; we shouldn't
be restacking them.

Since we *aren't* stacking the override-redirect windows, we need to
be careful that to ignore them when looking for the top managed
window.

http://bugzilla.gnome.org/show_bug.cgi?id=585984
This commit is contained in:
Owen W. Taylor 2009-06-15 14:31:04 -04:00
parent 6314ee8780
commit 34e4b594cd
3 changed files with 34 additions and 25 deletions

View File

@ -1015,8 +1015,11 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
* to be moved below. * to be moved below.
*/ */
} }
else if (meta_display_lookup_x_window (screen->display, else
children[i]) != NULL) {
MetaWindow *other = meta_display_lookup_x_window (screen->display,
children[i]);
if (other != NULL && !other->override_redirect)
{ {
XWindowChanges changes; XWindowChanges changes;
@ -1041,6 +1044,7 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
break; break;
} }
}
--i; --i;
} }

View File

@ -1435,6 +1435,7 @@ reload_transient_for (MetaWindow *window,
meta_window_recalc_window_type (window); meta_window_recalc_window_type (window);
/* update stacking constraints */ /* update stacking constraints */
if (!window->override_redirect)
meta_stack_update_transient (window->screen->stack, window); meta_stack_update_transient (window->screen->stack, window);
/* possibly change its group. We treat being a window's transient as /* possibly change its group. We treat being a window's transient as

View File

@ -955,8 +955,11 @@ meta_window_new_with_attrs (MetaDisplay *display,
* and thus constraints may try to auto-fullscreen it which also * and thus constraints may try to auto-fullscreen it which also
* means restacking it. * means restacking it.
*/ */
if (!window->override_redirect)
meta_stack_add (window->screen->stack, meta_stack_add (window->screen->stack,
window); window);
else
window->layer = META_LAYER_OVERRIDE_REDIRECT; /* otherwise set by MetaStack */
/* Put our state back where it should be, /* Put our state back where it should be,
* passing TRUE for is_configure_request, ICCCM says * passing TRUE for is_configure_request, ICCCM says
@ -1311,6 +1314,7 @@ meta_window_unmanage (MetaWindow *window,
} }
#endif #endif
if (!window->override_redirect)
meta_stack_remove (window->screen->stack, window); meta_stack_remove (window->screen->stack, window);
if (window->frame) if (window->frame)