diff options
-rw-r--r-- | client.c | 12 | ||||
-rw-r--r-- | search.c | 4 | ||||
-rw-r--r-- | xevents.c | 9 |
3 files changed, 14 insertions, 11 deletions
diff --git a/client.c b/client.c index d9c8241..b730c78 100644 --- a/client.c +++ b/client.c @@ -176,12 +176,12 @@ client_delete(struct client_ctx *cc) xu_ewmh_net_client_list(sc); xu_ewmh_net_client_list_stacking(sc); + if (cc->flags & CLIENT_ACTIVE) + client_none(sc); + if (cc->gc != NULL) TAILQ_REMOVE(&cc->gc->clientq, cc, group_entry); - if (cc == client_current()) - client_none(sc); - while ((wn = TAILQ_FIRST(&cc->nameq)) != NULL) { TAILQ_REMOVE(&cc->nameq, wn, entry); free(wn->name); @@ -510,12 +510,12 @@ client_hide(struct client_ctx *cc) { XUnmapWindow(X_Dpy, cc->win); + if (cc->flags & CLIENT_ACTIVE) + client_none(cc->sc); + cc->flags &= ~CLIENT_ACTIVE; cc->flags |= CLIENT_HIDDEN; client_set_wm_state(cc, IconicState); - - if (cc == client_current()) - client_none(cc->sc); } void diff --git a/search.c b/search.c index aa409e0..f52d87d 100644 --- a/search.c +++ b/search.c @@ -94,7 +94,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) * window. Furthermore, this is denoted by a "!" when * printing the window name in the search menu. */ - if (cc == client_current() && tier < nitems(tierp) - 1) + if ((cc->flags & CLIENT_ACTIVE) && (tier < nitems(tierp) - 1)) tier++; /* Clients that are hidden get ranked one up. */ @@ -147,7 +147,7 @@ search_print_client(struct menu *mi, int list) struct client_ctx *cc = (struct client_ctx *)mi->ctx; char flag = ' '; - if (cc == client_current()) + if (cc->flags & CLIENT_ACTIVE) flag = '!'; else if (cc->flags & CLIENT_HIDDEN) flag = '&'; diff --git a/xevents.c b/xevents.c index a3a12c2..8763c8a 100644 --- a/xevents.c +++ b/xevents.c @@ -250,10 +250,13 @@ xev_handle_buttonpress(XEvent *ee) static void xev_handle_buttonrelease(XEvent *ee) { - struct client_ctx *cc; + XButtonEvent *e = &ee->xbutton; + struct client_ctx *cc; - if ((cc = client_current()) != NULL) - group_toggle_membership_leave(cc); + if ((cc = client_find(e->window)) != NULL) { + if (cc->flags & CLIENT_ACTIVE) + group_toggle_membership_leave(cc); + } } static void |