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

---
 mousefunc.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'mousefunc.c')

diff --git a/mousefunc.c b/mousefunc.c
index 3366bf1..5b795cc 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -46,13 +46,13 @@ mousefunc_sweep_draw(struct client_ctx *cc)
 	XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)s,
 	    strlen(s), &extents);
 
-	XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0);
-	XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0,
+	XReparentWindow(X_Dpy, sc->menu.win, cc->win, 0, 0);
+	XMoveResizeWindow(X_Dpy, sc->menu.win, 0, 0,
 	    extents.xOff, sc->xftfont->height);
-	XMapWindow(X_Dpy, sc->menuwin);
-	XClearWindow(X_Dpy, sc->menuwin);
+	XMapWindow(X_Dpy, sc->menu.win);
+	XClearWindow(X_Dpy, sc->menu.win);
 
-	XftDrawStringUtf8(sc->xftdraw, &sc->xftcolor[CWM_COLOR_MENU_FONT],
+	XftDrawStringUtf8(sc->menu.xftdraw, &sc->xftcolor[CWM_COLOR_MENU_FONT],
 	    sc->xftfont, 0, sc->xftfont->ascent + 1,
 	    (const FcChar8*)s, strlen(s));
 }
@@ -93,8 +93,8 @@ mousefunc_client_resize(struct client_ctx *cc, union arg *arg)
 			break;
 		case ButtonRelease:
 			client_resize(cc, 1);
-			XUnmapWindow(X_Dpy, sc->menuwin);
-			XReparentWindow(X_Dpy, sc->menuwin, sc->rootwin, 0, 0);
+			XUnmapWindow(X_Dpy, sc->menu.win);
+			XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
 			xu_ptr_ungrab();
 
 			/* Make sure the pointer stays within the window. */
-- 
cgit 1.4.1