From 0f86dbbd38ab71c45557b98c63a1c0952b2cfda1 Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 29 Sep 2016 00:21:55 +0000
Subject: Mechanical change: move screen menu bits to their own struct.

---
 calmwm.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'calmwm.h')

diff --git a/calmwm.h b/calmwm.h
index 31961fd..3ad75e4 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.315 2016/09/28 17:06:33 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.316 2016/09/29 00:21:55 okan Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -228,7 +228,6 @@ struct screen_ctx {
 	TAILQ_ENTRY(screen_ctx)	 entry;
 	int			 which;
 	Window			 rootwin;
-	Window			 menuwin;
 	int			 cycling;
 	int			 hideall;
 	int			 snapdist;
@@ -240,8 +239,11 @@ struct screen_ctx {
 #define CALMWM_NGROUPS		 10
 	struct group_ctx_q	 groupq;
 	struct group_ctx	*group_active;
+	struct {
+		Window		 win;
+		XftDraw		*xftdraw;
+	} menu;
 	XftColor		 xftcolor[CWM_COLOR_NITEMS];
-	XftDraw			*xftdraw;
 	XftFont			*xftfont;
 };
 TAILQ_HEAD(screen_ctx_q, screen_ctx);
-- 
cgit v1.2.3-2-gb3c3