From 068d256bb7f3ff3381885ac9668d70d69271ac37 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 17 Dec 2012 18:35:26 +0000
Subject: cmap -> colormap in client_ctx

---
 calmwm.h | 4 ++--
 client.c | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/calmwm.h b/calmwm.h
index e029dfd..05e56a3 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.170 2012/12/17 18:34:06 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.171 2012/12/17 18:35:26 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -132,7 +132,7 @@ struct client_ctx {
 	struct screen_ctx	*sc;
 	Window			 win;
 	XSizeHints		*size;
-	Colormap		 cmap;
+	Colormap		 colormap;
 	u_int			 bwidth; /* border width */
 	struct geom		 geom, savegeom;
 	struct {
diff --git a/client.c b/client.c
index 5ff06fa..1dd246d 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.106 2012/12/17 17:48:57 okan Exp $
+ * $OpenBSD: client.c,v 1.107 2012/12/17 18:35:26 okan Exp $
  */
 
 #include <sys/param.h>
@@ -92,7 +92,7 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
 	cc->geom.y = wattr.y;
 	cc->geom.w = wattr.width;
 	cc->geom.h = wattr.height;
-	cc->cmap = wattr.colormap;
+	cc->colormap = wattr.colormap;
 
 	if (wattr.map_state != IsViewable) {
 		client_placecalc(cc);
@@ -202,7 +202,7 @@ client_setactive(struct client_ctx *cc, int fg)
 	sc = cc->sc;
 
 	if (fg) {
-		XInstallColormap(X_Dpy, cc->cmap);
+		XInstallColormap(X_Dpy, cc->colormap);
 		XSetInputFocus(X_Dpy, cc->win,
 		    RevertToPointerRoot, CurrentTime);
 		conf_grab_mouse(cc);
-- 
cgit v1.2.3-2-gb3c3