Skip to content

Commit

Permalink
added isdestroyed flag to unmanage
Browse files Browse the repository at this point in the history
  • Loading branch information
garbeam committed Sep 8, 2009
1 parent 2e653b8 commit 541a687
Showing 1 changed file with 16 additions and 15 deletions.
31 changes: 16 additions & 15 deletions dwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ static void togglefloating(const Arg *arg);
static void toggletag(const Arg *arg);
static void toggleview(const Arg *arg);
static void unfocus(Client *c);
static void unmanage(Client *c);
static void unmanage(Client *c, Bool isdestroyed);
static void unmapnotify(XEvent *e);
static void updategeom(void);
static void updatebarpos(Monitor *m);
Expand Down Expand Up @@ -466,7 +466,7 @@ cleanup(void) {
selmon->lt[selmon->sellt] = &foo;
for(m = mons; m; m = m->next)
while(m->stack)
unmanage(m->stack);
unmanage(m->stack, False);
if(dc.font.set)
XFreeFontSet(dpy, dc.font.set);
else
Expand Down Expand Up @@ -595,7 +595,7 @@ destroynotify(XEvent *e) {
XDestroyWindowEvent *ev = &e->xdestroywindow;

if((c = wintoclient(ev->window)))
unmanage(c);
unmanage(c, True);
}

void
Expand Down Expand Up @@ -1626,24 +1626,25 @@ unfocus(Client *c) {
}

void
unmanage(Client *c) {
unmanage(Client *c, Bool isdestroyed) {
XWindowChanges wc;

wc.border_width = c->oldbw;
/* The server grab construct avoids race conditions. */
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
detach(c);
detachstack(c);
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
if(!isdestroyed) {
wc.border_width = c->oldbw;
XGrabServer(dpy);
XSetErrorHandler(xerrordummy);
XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
setclientstate(c, WithdrawnState);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
}
free(c);
XSync(dpy, False);
XSetErrorHandler(xerror);
XUngrabServer(dpy);
focus(NULL);
arrange();
}

void
Expand All @@ -1652,7 +1653,7 @@ unmapnotify(XEvent *e) {
XUnmapEvent *ev = &e->xunmap;

if((c = wintoclient(ev->window)))
unmanage(c);
unmanage(c, False);
}

void
Expand Down

0 comments on commit 541a687

Please sign in to comment.