diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2019-02-25 18:47:59 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2019-05-24 15:30:31 +0000 |
| commit | ea9d8a895bbb7919a9f2f44fd57dd426e45134cc (patch) | |
| tree | a115298613ee9daa9f37b63f00b715f5aaf5a8d0 | |
| parent | 38432da328c63ce80e2540007b6a0780bd608868 (diff) | |
| download | mutter-ea9d8a895bbb7919a9f2f44fd57dd426e45134cc.tar.gz | |
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
| -rw-r--r-- | src/wayland/meta-window-wayland.c | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/wayland/meta-window-wayland.c b/src/wayland/meta-window-wayland.c index 8191adadd..5ce67c689 100644 --- a/src/wayland/meta-window-wayland.c +++ b/src/wayland/meta-window-wayland.c @@ -655,7 +655,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 @@ -670,26 +669,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 |