these have nothing to do with 'sticky', but rather group membership; rename.

6 files changed, 14 insertions, 17 deletions

diff --git a/calmwm.h b/calmwm.h
index b3a969f..694a744 100644
--- a/calmwm.h
+++ b/calmwm.h
@@ -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: calmwm.h,v 1.281 2014/09/23 14:25:08 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.282 2014/09/27 19:04:32 okan Exp $
  */
 
 #ifndef _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 91538b1..c2cddb4 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.187 2014/09/17 18:41:44 okan Exp $
+ * $OpenBSD: client.c,v 1.188 2014/09/27 19:04:32 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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 5a7a29f..bbc3f39 100644
--- a/group.c
+++ b/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: group.c,v 1.107 2014/09/27 18:57:11 okan Exp $
+ * $OpenBSD: group.c,v 1.108 2014/09/27 19:04:32 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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 d92f545..d5afd1f 100644
--- a/kbfunc.c
+++ b/kbfunc.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: kbfunc.c,v 1.103 2014/09/17 18:41:44 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.104 2014/09/27 19:04:32 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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 5efb180..1edf5e5 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: mousefunc.c,v 1.84 2014/09/18 13:56:58 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.85 2014/09/27 19:04:32 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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 62cfea1..1f297a5 100644
--- a/xevents.c
+++ b/xevents.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: xevents.c,v 1.114 2014/09/15 13:00:49 okan Exp $
+ * $OpenBSD: xevents.c,v 1.115 2014/09/27 19:04:32 okan Exp $
  */
 
 /*
@@ -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