summary refs log tree commit diff
path: root/client.c
diff options
context:
space:
mode:
authorokan <okan>2012-12-17 14:26:29 +0000
committerokan <okan>2012-12-17 14:26:29 +0000
commitd651c1cc3b5b1f4c00cbefd6247083c5f3f0fce5 (patch)
tree870a9ff0c3ea9480b423c72fbad20038dd9a126d /client.c
parent980c6de1ff5e836b831e0cd49fcea5db4792103e (diff)
downloadcwm-d651c1cc3b5b1f4c00cbefd6247083c5f3f0fce5.tar.gz
cwm-d651c1cc3b5b1f4c00cbefd6247083c5f3f0fce5.tar.xz
cwm-d651c1cc3b5b1f4c00cbefd6247083c5f3f0fce5.zip
current_client() returns _curcc, so use it where appropriate
Diffstat (limited to 'client.c')
-rw-r--r--client.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/client.c b/client.c
index 57f2218..8824f1c 100644
--- a/client.c
+++ b/client.c
@@ -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;