[mutter/wip/carlosg/xwayland-on-demand: 15/28] x11: Do not queue stack operation for guard window
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/xwayland-on-demand: 15/28] x11: Do not queue stack operation for guard window
- Date: Fri, 26 Jul 2019 12:32:11 +0000 (UTC)
commit b503000b9791c68f91bedb73b754d0b4508f9d70
Author: Carlos Garnacho <carlosg gnome org>
Date: Fri May 24 23:27:40 2019 +0200
x11: Do not queue stack operation for guard window
In the case mutter is a x11 compositor, it doesn't matter much
since the stack tracker will go away soon. In the case this is a
wayland compositor with mandatory Xwayland, it matters even less
since the session would be shutting down in those paths.
But if this a wayland compositor that can start Xwayland on demand,
this is even harmful, as the MetaStackTracker should be cleared of
x11 windows at this moment, and we actually did right before dispose
on ::x11-display-closing.
src/x11/meta-x11-display.c | 13 -------------
1 file changed, 13 deletions(-)
---
diff --git a/src/x11/meta-x11-display.c b/src/x11/meta-x11-display.c
index def878d2c4..6f20797e61 100644
--- a/src/x11/meta-x11-display.c
+++ b/src/x11/meta-x11-display.c
@@ -182,21 +182,8 @@ meta_x11_display_dispose (GObject *object)
if (x11_display->guard_window != None)
{
- MetaStackTracker *stack_tracker = x11_display->display->stack_tracker;
-
- if (stack_tracker)
- {
- unsigned long serial;
-
- serial = XNextRequest (x11_display->xdisplay);
- meta_stack_tracker_record_remove (stack_tracker,
- x11_display->guard_window,
- serial);
- }
-
XUnmapWindow (x11_display->xdisplay, x11_display->guard_window);
XDestroyWindow (x11_display->xdisplay, x11_display->guard_window);
-
x11_display->guard_window = None;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]