diff options
| author | okan | 2016-09-29 00:21:55 +0000 |
|---|---|---|
| committer | okan | 2016-09-29 00:21:55 +0000 |
| commit | 0f86dbbd38ab71c45557b98c63a1c0952b2cfda1 (patch) | |
| tree | e079fb602ba41fa9c3ade6d09b4c6bc282153b43 /mousefunc.c | |
| parent | 5f5374eb8ec00ff4d793c6a037f20dd2a1a91cd8 (diff) | |
| download | cwm-0f86dbbd38ab71c45557b98c63a1c0952b2cfda1.tar.gz | |
Mechanical change: move screen menu bits to their own struct.
Diffstat (limited to 'mousefunc.c')
| -rw-r--r-- | mousefunc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mousefunc.c b/mousefunc.c index c351e72..805a100 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.107 2016/09/28 17:06:33 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.108 2016/09/29 00:21:55 okan Exp $ */ #include <sys/types.h> @@ -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. */ |