[hackers] [wmii] Remove destroyed clients from the save set. Closes issue #129. || Kris Maglione

changeset: 2597:36ae459c64b0
tag: tip
user: Kris Maglione <kris_AT_suckless.org>
date: Sat Jan 23 16:56:42 2010 -0500
files: cmd/wmii/client.c cmd/wmii/dat.h cmd/wmii/main.c
description:
Remove destroyed clients from the save set. Closes issue #129.

diff -r 54c9b922e200 -r 36ae459c64b0 cmd/wmii/client.c
--- a/cmd/wmii/client.c Fri Jan 22 20:56:00 2010 -0500
+++ b/cmd/wmii/client.c Sat Jan 23 16:56:42 2010 -0500
@@ -293,12 +293,16 @@
         else
                 reparentwindow(&c->w, &scr.root, r.min);
 
+ if(starting > -1)
+ XRemoveFromSaveSet(display, c->w.xid);
+
         traperrors(false);
         XUngrabServer(display);
 
         none = nil;
         client_setviews(c, &none);
- client_unmap(c, WithdrawnState);
+ if(starting > -1)
+ client_unmap(c, WithdrawnState);
         refree(&c->tagre);
         refree(&c->tagvre);
         free(c->retags);
@@ -307,7 +311,8 @@
 
         ewmh_destroyclient(c);
         group_remove(c);
- event("DestroyClient %C\n", c);
+ if(starting > -1)
+ event("DestroyClient %C\n", c);
 
         flushevents(FocusChangeMask, true);
         free(c->w.hints);
diff -r 54c9b922e200 -r 36ae459c64b0 cmd/wmii/dat.h
--- a/cmd/wmii/dat.h Fri Jan 22 20:56:00 2010 -0500
+++ b/cmd/wmii/dat.h Sat Jan 23 16:56:42 2010 -0500
@@ -385,7 +385,7 @@
 EXTERN XHandler handler[LASTEvent];
 
 /* Misc */
-EXTERN bool starting;
+EXTERN int starting;
 EXTERN bool resizing;
 EXTERN long ignoreenter;
 EXTERN char* user;
diff -r 54c9b922e200 -r 36ae459c64b0 cmd/wmii/main.c
--- a/cmd/wmii/main.c Fri Jan 22 20:56:00 2010 -0500
+++ b/cmd/wmii/main.c Sat Jan 23 16:56:42 2010 -0500
@@ -225,6 +225,7 @@
 
 static void
 cleanup(void) {
+ starting = -1;
         while(client)
                 client_destroy(client);
         ixp_server_close(&srv);
Received on Sat Jan 23 2010 - 21:56:59 UTC