From c3c3502b6de9fecee3c432674128c3121bf83d34 Mon Sep 17 00:00:00 2001
From: okan
Date: Sun, 13 May 2012 15:17:13 +0000
Subject: altpersist->cycling to be more clear that this is for cycling mod
 persistence; based on a diff from Alexander Polakov, in preparation for
 looping through other potential cycling modifiers.

---
 calmwm.h  | 4 ++--
 client.c  | 8 ++++----
 xevents.c | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index 3aaac3e..06df73b 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.142 2011/09/13 08:41:57 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.143 2012/05/13 15:17:13 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -202,7 +202,7 @@ struct screen_ctx {
 	Window			 menuwin;
 	struct color		 color[CWM_COLOR_MAX];
 	GC			 gc;
-	int			 altpersist;
+	int			 cycling;
 	int			 xmax;
 	int			 ymax;
 	struct gap		 gap;
diff --git a/client.c b/client.c
index e88b7d4..09966c3 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.92 2012/05/13 15:15:54 okan Exp $
+ * $OpenBSD: client.c,v 1.93 2012/05/13 15:17:13 okan Exp $
  */
 
 #include <sys/param.h>
@@ -228,7 +228,7 @@ client_setactive(struct client_ctx *cc, int fg)
 		 * If we're in the middle of alt-tabbing, don't change
 		 * the order please.
 		 */
-		if (!sc->altpersist)
+		if (!sc->cycling)
 			client_mtf(cc);
 	} else
 		client_leave(cc);
@@ -638,8 +638,8 @@ client_cycle(struct screen_ctx *sc, int flags)
 		}
 	}
 
-	/* reset when alt is released. XXX I hate this hack */
-	sc->altpersist = 1;
+	/* reset when cycling mod is released. XXX I hate this hack */
+	sc->cycling = 1;
 	client_ptrsave(oldcc);
 	client_ptrwarp(newcc);
 }
diff --git a/xevents.c b/xevents.c
index ce4378a..c0d46fc 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.56 2011/09/13 08:41:57 okan Exp $
+ * $OpenBSD: xevents.c,v 1.57 2012/05/13 15:17:13 okan Exp $
  */
 
 /*
@@ -331,7 +331,7 @@ xev_handle_keyrelease(XEvent *ee)
 	if (keysym != XK_Alt_L && keysym != XK_Alt_R)
 		return;
 
-	sc->altpersist = 0;
+	sc->cycling = 0;
 
 	/*
 	 * XXX - better interface... xevents should not know about
-- 
cgit v1.2.3-2-gb3c3