isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-09-22 07:25:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "compositor: Delay meta_compositor_add_window until the first show"

Browse Source 
This reverts commit e3a93db712.
This commit is contained in:
Jasper St. Pierre 2014-02-19 12:18:02 -05:00
parent 91770d0477
commit 870c6382ed
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compositor/compositor.c
View File

@ -137,6 +137,19 @@ 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,
@ -725,20 +738,13 @@ 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);
meta_error_trap_pop (display);
sync_actor_stacking (info); add_win (window);
meta_error_trap_pop (display);
} }
void void

7
src/core/window.c
View File

@ -1474,6 +1474,9 @@ 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);
@ -3087,8 +3090,8 @@ meta_window_show (MetaWindow *window)
break; break;
} }
meta_compositor_add_window (window->display->compositor, window); meta_compositor_show_window (window->display->compositor,
meta_compositor_show_window (window->display->compositor, window, effect); window, effect);
} }
} }