diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2020-02-28 18:32:14 +0200 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2020-02-28 18:32:14 +0200 |
| commit | fd696d43b37859ca999680252835ff9b34d192ee (patch) | |
| tree | 39f9238c7e383babd93202f8b14e1ab8a6fddd80 /src/core/frame.c | |
| parent | 6ea3ed3a8aa0755ff53af2a3c00b3c5445711aab (diff) | |
| download | metacity-fd696d43b37859ca999680252835ff9b34d192ee.tar.gz | |
window: track pending unmaps using serials
Diffstat (limited to 'src/core/frame.c')
| -rw-r--r-- | src/core/frame.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/frame.c b/src/core/frame.c index c166b865..8a2a6bc4 100644 --- a/src/core/frame.c +++ b/src/core/frame.c @@ -126,9 +126,6 @@ meta_window_ensure_frame (MetaWindow *window) window->mapped = FALSE; /* the reparent will unmap the window, * we don't want to take that as a withdraw */ - meta_topic (META_DEBUG_WINDOW_STATE, - "Incrementing unmaps_pending on %s for reparent\n", window->desc); - window->unmaps_pending += 1; } /* window was reparented to this position */ window->rect.x = 0; @@ -138,6 +135,10 @@ meta_window_ensure_frame (MetaWindow *window) window->xwindow, XNextRequest (window->display->xdisplay)); + meta_window_add_pending_unmap (window, + NextRequest (window->display->xdisplay), + "reparent"); + XReparentWindow (window->display->xdisplay, window->xwindow, frame->xwindow, @@ -200,15 +201,16 @@ meta_window_destroy_frame (MetaWindow *window) * can identify a withdraw initiated * by the client. */ - meta_topic (META_DEBUG_WINDOW_STATE, - "Incrementing unmaps_pending on %s for reparent back to root\n", window->desc); - window->unmaps_pending += 1; } meta_stack_tracker_record_add (window->screen->stack_tracker, window->xwindow, XNextRequest (window->display->xdisplay)); + meta_window_add_pending_unmap (window, + NextRequest (window->display->xdisplay), + "reparent back to root"); + XReparentWindow (window->display->xdisplay, window->xwindow, window->screen->xroot, |