diff options
author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-25 19:46:17 +0000 |
---|---|---|
committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-10-25 19:46:17 +0000 |
commit | 749e39e8a9145226d3dae2aa5876ed92c9fdf167 (patch) | |
tree | 64b8d94a563881efcc47013803846e4e7d80d1d5 /app/cwm/xevents.c | |
parent | 7b612f9706bf91820dfcfacfd1428f400fd0942b (diff) |
A client_delete should behave differently depending on whether the
triggering event was unmap (with pending destroy) log destroy; we only
need to grab/ungrab the server lock, set WithdrawnState and
XRemoveFromSaveSet clients coming from an unmap event - doing so for
clients coming from destroy are already gone, hence we generate errors.
Diffstat (limited to 'app/cwm/xevents.c')
-rw-r--r-- | app/cwm/xevents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/cwm/xevents.c b/app/cwm/xevents.c index 786ae0cd7..d92386bb5 100644 --- a/app/cwm/xevents.c +++ b/app/cwm/xevents.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. * - * $OpenBSD: xevents.c,v 1.90 2013/07/15 23:51:59 okan Exp $ + * $OpenBSD: xevents.c,v 1.91 2013/10/25 19:46:16 okan Exp $ */ /* @@ -113,7 +113,7 @@ xev_handle_unmapnotify(XEvent *ee) */ if (XCheckTypedWindowEvent(X_Dpy, cc->win, DestroyNotify, &ev) || e->send_event != 0) { - client_delete(cc); + client_delete(cc, 1); } else client_hide(cc); } @@ -127,7 +127,7 @@ xev_handle_destroynotify(XEvent *ee) struct client_ctx *cc; if ((cc = client_find(e->window)) != NULL) - client_delete(cc); + client_delete(cc, 0); } static void |