isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

compositor: Delay meta_compositor_add_window until the first show

Browse Source 
In order for the compositor to properly determine whether a client
is an X11 client or not, we need to wait until XWayland calls
set_window_id to mark the surface as an XWayland client. To prevent
the compositor from getting tripped up over this, make sure that
the window has been fully initialized by the time we call
meta_compositor_add_window.

https://bugzilla.gnome.org/show_bug.cgi?id=720631
This commit is contained in:
Jasper St. Pierre 2014-02-06 15:01:59 -05:00
parent 7cdf55871e
commit e3a93db712
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compositor/compositor.c
View File

@ -136,19 +136,6 @@ meta_compositor_destroy (MetaCompositor *compositor)
clutter_threads_remove_repaint_func (compositor->repaint_func_id); clutter_threads_remove_repaint_func (compositor->repaint_func_id);
} }
static void
add_win (MetaWindow *window)
{
MetaScreen *screen = meta_window_get_screen (window);
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
g_return_if_fail (info != NULL);
meta_window_actor_new (window);
sync_actor_stacking (info);
}
static void static void
process_damage (MetaCompositor *compositor, process_damage (MetaCompositor *compositor,
XDamageNotifyEvent *event, XDamageNotifyEvent *event,
@ -737,13 +724,20 @@ meta_compositor_add_window (MetaCompositor *compositor,
{ {
MetaScreen *screen = meta_window_get_screen (window); MetaScreen *screen = meta_window_get_screen (window);
MetaDisplay *display = meta_screen_get_display (screen); MetaDisplay *display = meta_screen_get_display (screen);
MetaCompScreen *info = meta_screen_get_compositor_data (screen);
g_return_if_fail (info != NULL);
/* Window was already added previously, probably coming
* back from hiding */
if (window->compositor_private != NULL)
return;
DEBUG_TRACE ("meta_compositor_add_window\n");
meta_error_trap_push (display); meta_error_trap_push (display);
meta_window_actor_new (window);
add_win (window);
meta_error_trap_pop (display); meta_error_trap_pop (display);
sync_actor_stacking (info);
} }
void void

7
src/core/window.c
View File

@ -1438,9 +1438,6 @@ meta_window_new (MetaDisplay *display,
set_net_wm_state (window); set_net_wm_state (window);
} }
if (screen->display->compositor)
meta_compositor_add_window (screen->display->compositor, window);
/* Sync stack changes */ /* Sync stack changes */
meta_stack_thaw (window->screen->stack); meta_stack_thaw (window->screen->stack);
@ -3054,8 +3051,8 @@ meta_window_show (MetaWindow *window)
break; break;
} }
meta_compositor_show_window (window->display->compositor, meta_compositor_add_window (window->display->compositor, window);
window, effect); meta_compositor_show_window (window->display->compositor, window, effect);
} }
} }