From c884a8ede0189efae770501fa9abbc837f6d6464 Mon Sep 17 00:00:00 2001 From: oga Date: Sat, 17 Jan 2009 18:41:50 +0000 Subject: Finally fix the really annoying race where if you rapidly switch groups several times you'd end up losing clients (thinking they had gone away). From the ICCCM (which should not be read without a stiff drink in hand, I made this mistake so you don't have to): to request a window to be withdrawn one should send a synthetic UnmapRequest event when iconified. To request iconification one should just unmap the window. The ICCM further recommends that the synthetic event should just be taken as a cue to withdraw, to deal with legacy clients. Taking a hint from this, rework xev_handle_unmaprequest to correctly detect these situations. A Withdrawn window may come back anywhere, even as a subwindow of something else, so the correct way to handle this state is to forget it ever existed. While i'm here, kill a dumb attempt to notice this in client_delete, and nuke the very unnecessary arguments. Todd confirmed this fixes the `race'. ok todd@, ok ok okan@ --- client.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index 2549848..147d93d 100644 --- a/client.c +++ b/client.c @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $Id: client.c,v 1.43 2009/01/16 15:24:14 okan Exp $ + * $Id: client.c,v 1.44 2009/01/17 18:41:50 oga Exp $ */ #include "headers.h" @@ -144,14 +144,11 @@ client_new(Window win, struct screen_ctx *sc, int mapped) } int -client_delete(struct client_ctx *cc, int sendevent, int ignorewindow) +client_delete(struct client_ctx *cc) { struct screen_ctx *sc = CCTOSC(cc); struct winname *wn; - if (cc->state == IconicState && !sendevent) - return (1); - group_client_delete(cc); XGrabServer(X_Dpy); -- cgit v1.2.3-2-gb3c3