From d18d51e1062b26e38587abf720f6659a2438f69e Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Mon, 28 Dec 2009 19:14:46 +0100 Subject: [PATCH] Revert "Handle synthetic UnmapNotify events" This reverts commit 8e672897cb3321dbd245c9ed4e114ee0cdfbf425. Signed-off-by: Julien Danjou --- event.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/event.c b/event.c index 38e61a16..370d9ae0 100644 --- a/event.c +++ b/event.c @@ -665,23 +665,10 @@ event_handle_unmapnotify(void *data __attribute__ ((unused)), if((c = client_getbywin(ev->window))) { - if(ev->event == xutil_screen_get(connection, c->phys_screen)->root) - { - if(!XCB_EVENT_SENT(ev)) - { - /* A regular UnmapNotify, remove that client from our lists */ - client_unmanage(c); - } - else - { - /* According to ICCCM 4.1.4 a client sends a synthetic - * UnmapNotify when it wants to switch to Widthdrawn state. - * We handle these by unmapping the client and waiting for the - * "real" UnmapNotify. - */ - xcb_unmap_window(connection, ev->window); - } - } + if(ev->event == xutil_screen_get(connection, c->phys_screen)->root + && XCB_EVENT_SENT(ev) + && xwindow_get_state_reply(xwindow_get_state_unchecked(c->window)) == XCB_WM_STATE_NORMAL) + client_unmanage(c); } else for(int i = 0; i < globalconf.embedded.len; i++)