summary refs log tree commit diff
diff options
context:
space:
mode:
authorokan <okan>2014-09-27 19:04:32 +0000
committerokan <okan>2014-09-27 19:04:32 +0000
commite9dbd150eaf14d230e7aa6191e5762b69e6b1241 (patch)
tree3dda3458403632fb2799f1548e06c600eabba3aa
parent319d90099d96e5f9d2b9b3ef182baf17a051a357 (diff)
downloadcwm-e9dbd150eaf14d230e7aa6191e5762b69e6b1241.tar.gz
cwm-e9dbd150eaf14d230e7aa6191e5762b69e6b1241.tar.xz
cwm-e9dbd150eaf14d230e7aa6191e5762b69e6b1241.zip
these have nothing to do with 'sticky', but rather group membership; rename.
-rw-r--r--calmwm.h4
-rw-r--r--client.c2
-rw-r--r--group.c7
-rw-r--r--kbfunc.c2
-rw-r--r--mousefunc.c2
-rw-r--r--xevents.c2
6 files changed, 8 insertions, 11 deletions
diff --git a/calmwm.h b/calmwm.h
index 01242ee..00d09bb 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -414,8 +414,8 @@ void			 group_init(struct screen_ctx *);
 void			 group_movetogroup(struct client_ctx *, int);
 void			 group_only(struct screen_ctx *, int);
 void			 group_show(struct group_ctx *);
-void			 group_sticky_toggle_enter(struct client_ctx *);
-void			 group_sticky_toggle_exit(struct client_ctx *);
+void			 group_toggle_membership_enter(struct client_ctx *);
+void			 group_toggle_membership_leave(struct client_ctx *);
 void			 group_update_names(struct screen_ctx *);
 
 void			 search_match_client(struct menu_q *, struct menu_q *,
diff --git a/client.c b/client.c
index d6700a1..1802206 100644
--- a/client.c
+++ b/client.c
@@ -696,7 +696,7 @@ client_cycle_leave(struct screen_ctx *sc)
 
 	if ((cc = client_current())) {
 		client_mtf(cc);
-		group_sticky_toggle_exit(cc);
+		group_toggle_membership_leave(cc);
 		XUngrabKeyboard(X_Dpy, CurrentTime);
 	}
 }
diff --git a/group.c b/group.c
index 6194e58..c7933f0 100644
--- a/group.c
+++ b/group.c
@@ -162,11 +162,8 @@ group_movetogroup(struct client_ctx *cc, int idx)
 	group_assign(gc, cc);
 }
 
-/*
- * Colouring for groups upon add/remove.
- */
 void
-group_sticky_toggle_enter(struct client_ctx *cc)
+group_toggle_membership_enter(struct client_ctx *cc)
 {
 	struct screen_ctx	*sc = cc->sc;
 	struct group_ctx	*gc = sc->group_active;
@@ -183,7 +180,7 @@ group_sticky_toggle_enter(struct client_ctx *cc)
 }
 
 void
-group_sticky_toggle_exit(struct client_ctx *cc)
+group_toggle_membership_leave(struct client_ctx *cc)
 {
 	cc->flags &= ~CLIENT_HIGHLIGHT;
 	client_draw_border(cc);
diff --git a/kbfunc.c b/kbfunc.c
index f144ee0..c3be2f5 100644
--- a/kbfunc.c
+++ b/kbfunc.c
@@ -438,7 +438,7 @@ kbfunc_client_grouptoggle(struct client_ctx *cc, union arg *arg)
 	XGrabKeyboard(X_Dpy, cc->win, True,
 	    GrabModeAsync, GrabModeAsync, CurrentTime);
 
-	group_sticky_toggle_enter(cc);
+	group_toggle_membership_enter(cc);
 }
 
 void
diff --git a/mousefunc.c b/mousefunc.c
index cc3047e..1f3cf34 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -174,7 +174,7 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
 void
 mousefunc_client_grouptoggle(struct client_ctx *cc, union arg *arg)
 {
-	group_sticky_toggle_enter(cc);
+	group_toggle_membership_enter(cc);
 }
 
 void
diff --git a/xevents.c b/xevents.c
index e294c61..e2b7178 100644
--- a/xevents.c
+++ b/xevents.c
@@ -251,7 +251,7 @@ xev_handle_buttonrelease(XEvent *ee)
 	struct client_ctx *cc;
 
 	if ((cc = client_current()))
-		group_sticky_toggle_exit(cc);
+		group_toggle_membership_leave(cc);
 }
 
 static void