diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-17 14:26:30 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2012-12-17 14:26:30 +0000 |
| commit | 90c4b20838683daf77774e055cad198d426fee80 (patch) | |
| tree | 2761057c38baba87514289bf4dda237d348dd7d1 /app | |
| parent | 68cf5932c610146eec1af940c3cc2b33722c27ee (diff) | |
current_client() returns _curcc, so use it where appropriate
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/client.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/cwm/client.c b/app/cwm/client.c index 6eab0ff92..d48ace81f 100644 --- a/app/cwm/client.c +++ b/app/cwm/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.103 2012/11/09 03:52:02 okan Exp $ + * $OpenBSD: client.c,v 1.104 2012/12/17 14:26:29 okan Exp $ */ #include <sys/param.h> @@ -158,7 +158,7 @@ client_delete(struct client_ctx *cc) xu_ewmh_net_client_list(sc); - if (_curcc == cc) + if (cc == client_current()) client_none(sc); XFree(cc->size); @@ -180,7 +180,7 @@ client_leave(struct client_ctx *cc) struct screen_ctx *sc; if (cc == NULL) - cc = _curcc; + cc = client_current(); if (cc == NULL) return; @@ -194,7 +194,7 @@ client_setactive(struct client_ctx *cc, int fg) struct screen_ctx *sc; if (cc == NULL) - cc = _curcc; + cc = client_current(); if (cc == NULL) return; @@ -214,7 +214,7 @@ client_setactive(struct client_ctx *cc, int fg) } else client_leave(cc); - if (fg && _curcc != cc) { + if (fg && cc != client_current()) { client_setactive(NULL, 0); _curcc = cc; xu_ewmh_net_active_window(sc, cc->win); @@ -480,7 +480,7 @@ client_hide(struct client_ctx *cc) cc->flags |= CLIENT_HIDDEN; xu_setstate(cc, IconicState); - if (cc == _curcc) + if (cc == client_current()) client_none(cc->sc); } @@ -737,7 +737,7 @@ client_mtf(struct client_ctx *cc) struct screen_ctx *sc; if (cc == NULL) - cc = _curcc; + cc = client_current(); if (cc == NULL) return; |