diff options
| -rw-r--r-- | client.c | 11 | ||||
| -rw-r--r-- | xevents.c | 8 |
2 files changed, 10 insertions, 9 deletions
@@ -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: client.c,v 1.207 2015/08/27 18:40:09 okan Exp $ + * $OpenBSD: client.c,v 1.208 2015/08/27 18:42:56 okan Exp $ */ #include <sys/types.h> @@ -204,7 +204,7 @@ client_setactive(struct client_ctx *cc) if (cc->flags & CLIENT_WM_TAKE_FOCUS) client_msg(cc, cwmh[WM_TAKE_FOCUS], Last_Event_Time); - if ((oldcc = client_current())) { + if ((oldcc = client_current()) != NULL) { oldcc->flags &= ~CLIENT_ACTIVE; client_draw_border(oldcc); } @@ -707,9 +707,10 @@ client_cycle_leave(struct screen_ctx *sc) sc->cycling = 0; - if ((cc = client_current())) { + if ((cc = client_current()) != NULL) { client_mtf(cc); - group_toggle_membership_leave(cc); + cc->flags &= ~CLIENT_HIGHLIGHT; + client_draw_border(cc); XUngrabKeyboard(X_Dpy, CurrentTime); } } @@ -914,7 +915,7 @@ client_transient(struct client_ctx *cc) Window trans; if (XGetTransientForHint(X_Dpy, cc->win, &trans)) { - if ((tc = client_find(trans)) && tc->group) { + if ((tc = client_find(trans)) != NULL && tc->group) { group_movetogroup(cc, tc->group->num); if (tc->flags & CLIENT_IGNORE) cc->flags |= CLIENT_IGNORE; @@ -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.118 2015/07/01 14:36:42 okan Exp $ + * $OpenBSD: xevents.c,v 1.119 2015/08/27 18:42:56 okan Exp $ */ /* @@ -77,7 +77,7 @@ xev_handle_maprequest(XEvent *ee) XMapRequestEvent *e = &ee->xmaprequest; struct client_ctx *cc = NULL, *old_cc; - if ((old_cc = client_current())) + if ((old_cc = client_current()) != NULL) client_ptrsave(old_cc); if ((cc = client_find(e->window)) == NULL) @@ -252,7 +252,7 @@ xev_handle_buttonrelease(XEvent *ee) { struct client_ctx *cc; - if ((cc = client_current())) + if ((cc = client_current()) != NULL) group_toggle_membership_leave(cc); } @@ -339,7 +339,7 @@ xev_handle_clientmessage(XEvent *ee) } } else if (e->message_type == ewmh[_NET_ACTIVE_WINDOW]) { if ((cc = client_find(e->window)) != NULL) { - if ((old_cc = client_current())) + if ((old_cc = client_current()) != NULL) client_ptrsave(old_cc); client_ptrwarp(cc); } |