From 7c8ffa9d8af57ad9db9d8e99a694aebfa76ea11a Mon Sep 17 00:00:00 2001 From: okan Date: Tue, 10 Nov 2015 20:05:33 +0000 Subject: Start cleaning up name vs function differences; replace magic numbers. --- client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index 0b9f3c2..d9a9b7d 100644 --- a/client.c +++ b/client.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: client.c,v 1.211 2015/11/09 20:03:29 okan Exp $ + * $OpenBSD: client.c,v 1.212 2015/11/10 20:05:33 okan Exp $ */ #include @@ -678,7 +678,7 @@ client_cycle(struct screen_ctx *sc, int flags) oldcc = client_current(); if (oldcc == NULL) - oldcc = (flags & CWM_RCYCLE) ? + oldcc = (flags & CWM_CLIENT_RCYCLE) ? TAILQ_LAST(&sc->clientq, client_ctx_q) : TAILQ_FIRST(&sc->clientq); @@ -686,12 +686,12 @@ client_cycle(struct screen_ctx *sc, int flags) while (again) { again = 0; - newcc = (flags & CWM_RCYCLE) ? client_prev(newcc) : + newcc = (flags & CWM_CLIENT_RCYCLE) ? client_prev(newcc) : client_next(newcc); /* Only cycle visible and non-ignored windows. */ if ((newcc->flags & (CLIENT_HIDDEN | CLIENT_IGNORE)) - || ((flags & CWM_INGROUP) && + || ((flags & CWM_CLIENT_CYCLE_INGRP) && (newcc->gc != oldcc->gc))) again = 1; -- cgit v1.2.3-2-gb3c3