isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-21 15:05:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

display: Clean up creation of the guard window a bit...

Browse Source 
Do it consistently in all code paths...
This commit is contained in:
Jasper St. Pierre 2014-02-01 23:09:53 -05:00
parent 66c4555dc7
commit 3e73babaf7
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/display.c
View File

@ -830,22 +830,12 @@ meta_display_open (void)
{ {
MetaScreen *screen = tmp->data; MetaScreen *screen = tmp->data;
if (meta_is_wayland_compositor ()) meta_screen_create_guard_window (screen);
{
/* Instead of explicitly enumerating all windows during /* We know that if mutter is running as a Wayland compositor,
* initialization, when we run as a wayland compositor we can rely on * we start out with no windows.
* xwayland notifying us of all top level windows so we create
* MetaWindows when we get those notifications.
*
* We still want a guard window so we can avoid
* unmapping/withdrawing minimized windows for live
* thumbnails...
*/ */
if (screen->guard_window == None) if (!meta_is_wayland_compositor ())
screen->guard_window =
meta_screen_create_guard_window (screen->display->xdisplay, screen);
}
else
meta_screen_manage_all_windows (screen); meta_screen_manage_all_windows (screen);
tmp = tmp->next; tmp = tmp->next;

15
src/core/screen.c
View File

@ -445,8 +445,8 @@ reload_monitor_infos (MetaScreen *screen)
* should effectively be forwarded to events on the background actor, * should effectively be forwarded to events on the background actor,
* providing that the scene graph is set up correctly. * providing that the scene graph is set up correctly.
*/ */
Window static Window
meta_screen_create_guard_window (Display *xdisplay, MetaScreen *screen) create_guard_window (Display *xdisplay, MetaScreen *screen)
{ {
XSetWindowAttributes attributes; XSetWindowAttributes attributes;
Window guard_window; Window guard_window;
@ -877,6 +877,13 @@ meta_screen_free (MetaScreen *screen,
meta_display_ungrab (display); meta_display_ungrab (display);
} }
void
meta_screen_create_guard_window (MetaScreen *screen)
{
if (screen->guard_window == None)
screen->guard_window = create_guard_window (screen->display->xdisplay, screen);
}
void void
meta_screen_manage_all_windows (MetaScreen *screen) meta_screen_manage_all_windows (MetaScreen *screen)
{ {
@ -884,10 +891,6 @@ meta_screen_manage_all_windows (MetaScreen *screen)
MetaStackWindow *children; MetaStackWindow *children;
int n_children, i; int n_children, i;
if (screen->guard_window == None)
screen->guard_window =
meta_screen_create_guard_window (screen->display->xdisplay, screen);
meta_stack_freeze (screen->stack); meta_stack_freeze (screen->stack);
meta_stack_tracker_get_stack (screen->stack_tracker, &_children, &n_children); meta_stack_tracker_get_stack (screen->stack_tracker, &_children, &n_children);