isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "window: Delay the showing of XWayland clients until set_window_id"

Browse Source 
This reverts commit 59c8b949ad.
This commit is contained in:
Jasper St. Pierre 2014-02-24 13:42:21 -05:00
parent 9b24ae2033
commit 1783bf20ec
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/window-x11.c
View File

@ -1485,14 +1485,7 @@ meta_window_x11_new (MetaDisplay *display,
existing_wm_state, existing_wm_state,
effect, effect,
&attrs); &attrs);
meta_window_set_surface_mapped (window, TRUE);
/* When running as an X compositor, we can simply show the window now.
*
* When running as a Wayland compositor, we need to wait until we see
* the Wayland surface appear. We will later call meta_window_set_surface_mapped()
* to show the window in our in our set_surface_id implementation */
if (!meta_is_wayland_compositor ())
meta_window_set_surface_mapped (window, TRUE);
meta_error_trap_pop (display); /* pop the XSync()-reducing trap */ meta_error_trap_pop (display); /* pop the XSync()-reducing trap */
return window; return window;

2
src/wayland/meta-xwayland.c
View File

@ -49,8 +49,6 @@ xserver_set_window_id (struct wl_client *client,
surface->window = window; surface->window = window;
window->surface = surface; window->surface = surface;
meta_window_set_surface_mapped (window, TRUE);
} }
static const struct xserver_interface xserver_implementation = { static const struct xserver_interface xserver_implementation = {