[mutter/wip/carlosg/x11less-preparations: 18/18] wayland: Drop error trap
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/x11less-preparations: 18/18] wayland: Drop error trap
- Date: Mon, 25 Feb 2019 18:10:33 +0000 (UTC)
commit e4cac9018f6afb19529d1eb6c14394326c349f61
Author: Carlos Garnacho <carlosg gnome org>
Date: Mon Feb 25 18:47:59 2019 +0100
wayland: Drop error trap
Code underneath seems to handle errors properly, or be x11-agnostic
entirely, this is apparently here to save a few XSync()s on X11. Just
drop this windowing dependent bit to make things cleaner.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/420
src/wayland/meta-window-wayland.c | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
---
diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c
index e20351ff1..de243f97c 100644
--- a/src/wayland/meta-window-wayland.c
+++ b/src/wayland/meta-window-wayland.c
@@ -643,7 +643,6 @@ meta_window_wayland_new (MetaDisplay *display,
MetaWaylandSurface *surface)
{
XWindowAttributes attrs = { 0 };
- MetaWindow *window;
/*
* Set attributes used by _meta_window_shared_new, don't bother trying to fake
@@ -658,26 +657,13 @@ meta_window_wayland_new (MetaDisplay *display,
attrs.map_state = IsUnmapped;
attrs.override_redirect = False;
- /* XXX: Note: In the Wayland case we currently still trap X errors while
- * creating a MetaWindow because we will still be making various redundant
- * X requests (passing a window xid of None) until we thoroughly audit all
- * the code to make sure it knows about non X based clients...
- */
- meta_x11_error_trap_push (display->x11_display); /* Push a trap over all of window
- * creation, to reduce XSync() calls
- */
-
- window = _meta_window_shared_new (display,
- META_WINDOW_CLIENT_TYPE_WAYLAND,
- surface,
- None,
- WithdrawnState,
- META_COMP_EFFECT_CREATE,
- &attrs);
-
- meta_x11_error_trap_pop (display->x11_display); /* pop the XSync()-reducing trap */
-
- return window;
+ return _meta_window_shared_new (display,
+ META_WINDOW_CLIENT_TYPE_WAYLAND,
+ surface,
+ None,
+ WithdrawnState,
+ META_COMP_EFFECT_CREATE,
+ &attrs);
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]