mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

Mechanical change: move screen menu bits to their own struct.

Browse Source
This commit is contained in:
okan 2016-09-29 00:21:55 +00:00
parent 92b81d3df5
commit 0e8c706633
5 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calmwm.c
View File

@ -161,10 +161,10 @@ x_teardown(void)
XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which), XftColorFree(X_Dpy, DefaultVisual(X_Dpy, sc->which),
DefaultColormap(X_Dpy, sc->which), DefaultColormap(X_Dpy, sc->which),
&sc->xftcolor[i]); &sc->xftcolor[i]);
XftDrawDestroy(sc->xftdraw); XftDrawDestroy(sc->menu.xftdraw);
XftFontClose(X_Dpy, sc->xftfont); XftFontClose(X_Dpy, sc->xftfont);
XUnmapWindow(X_Dpy, sc->menuwin); XUnmapWindow(X_Dpy, sc->menu.win);
XDestroyWindow(X_Dpy, sc->menuwin); XDestroyWindow(X_Dpy, sc->menu.win);
XUngrabKey(X_Dpy, AnyKey, AnyModifier, sc->rootwin); XUngrabKey(X_Dpy, AnyKey, AnyModifier, sc->rootwin);
} }
XUngrabPointer(X_Dpy, CurrentTime); XUngrabPointer(X_Dpy, CurrentTime);

6
calmwm.h
View File

@ -228,7 +228,6 @@ struct screen_ctx {
TAILQ_ENTRY(screen_ctx) entry; TAILQ_ENTRY(screen_ctx) entry;
int which; int which;
Window rootwin; Window rootwin;
Window menuwin;
int cycling; int cycling;
int hideall; int hideall;
int snapdist; int snapdist;
@ -240,8 +239,11 @@ struct screen_ctx {
#define CALMWM_NGROUPS 10 #define CALMWM_NGROUPS 10
struct group_ctx_q groupq; struct group_ctx_q groupq;
struct group_ctx *group_active; struct group_ctx *group_active;
XftColor xftcolor[CWM_COLOR_NITEMS]; struct {
Window win;
XftDraw *xftdraw; XftDraw *xftdraw;
} menu;
XftColor xftcolor[CWM_COLOR_NITEMS];
XftFont *xftfont; XftFont *xftfont;
}; };
TAILQ_HEAD(screen_ctx_q, screen_ctx); TAILQ_HEAD(screen_ctx_q, screen_ctx);

6
conf.c
View File

@ -162,13 +162,13 @@ conf_screen(struct screen_ctx *sc)
} }
} }
sc->menuwin = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1, sc->menu.win = XCreateSimpleWindow(X_Dpy, sc->rootwin, 0, 0, 1, 1,
Conf.bwidth, Conf.bwidth,
sc->xftcolor[CWM_COLOR_MENU_FG].pixel, sc->xftcolor[CWM_COLOR_MENU_FG].pixel,
sc->xftcolor[CWM_COLOR_MENU_BG].pixel); sc->xftcolor[CWM_COLOR_MENU_BG].pixel);
sc->xftdraw = XftDrawCreate(X_Dpy, sc->menuwin, visual, colormap); sc->menu.xftdraw = XftDrawCreate(X_Dpy, sc->menu.win, visual, colormap);
if (sc->xftdraw == NULL) if (sc->menu.xftdraw == NULL)
errx(1, "XftDrawCreate"); errx(1, "XftDrawCreate");
conf_grab_kbd(sc->rootwin); conf_grab_kbd(sc->rootwin);

30
menu.c
View File

@ -118,26 +118,26 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
mc.hasprompt = 1; mc.hasprompt = 1;
} }
XSelectInput(X_Dpy, sc->menuwin, evmask); XSelectInput(X_Dpy, sc->menu.win, evmask);
XMapRaised(X_Dpy, sc->menuwin); XMapRaised(X_Dpy, sc->menu.win);
if (xu_ptr_grab(sc->menuwin, MENUGRABMASK, if (xu_ptr_grab(sc->menu.win, MENUGRABMASK,
Conf.cursor[CF_QUESTION]) < 0) { Conf.cursor[CF_QUESTION]) < 0) {
XUnmapWindow(X_Dpy, sc->menuwin); XUnmapWindow(X_Dpy, sc->menu.win);
return(NULL); return(NULL);
} }
XGetInputFocus(X_Dpy, &focuswin, &focusrevert); XGetInputFocus(X_Dpy, &focuswin, &focusrevert);
XSetInputFocus(X_Dpy, sc->menuwin, RevertToPointerRoot, CurrentTime); XSetInputFocus(X_Dpy, sc->menu.win, RevertToPointerRoot, CurrentTime);
/* make sure keybindings don't remove keys from the menu stream */ /* make sure keybindings don't remove keys from the menu stream */
XGrabKeyboard(X_Dpy, sc->menuwin, True, XGrabKeyboard(X_Dpy, sc->menu.win, True,
GrabModeAsync, GrabModeAsync, CurrentTime); GrabModeAsync, GrabModeAsync, CurrentTime);
for (;;) { for (;;) {
mc.changed = 0; mc.changed = 0;
XWindowEvent(X_Dpy, sc->menuwin, evmask, &e); XWindowEvent(X_Dpy, sc->menu.win, evmask, &e);
switch (e.type) { switch (e.type) {
case KeyPress: case KeyPress:
@ -174,8 +174,8 @@ out:
xu_ptr_setpos(sc->rootwin, xsave, ysave); xu_ptr_setpos(sc->rootwin, xsave, ysave);
xu_ptr_ungrab(); xu_ptr_ungrab();
XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, 1, 1); XMoveResizeWindow(X_Dpy, sc->menu.win, 0, 0, 1, 1);
XUnmapWindow(X_Dpy, sc->menuwin); XUnmapWindow(X_Dpy, sc->menu.win);
XUngrabKeyboard(X_Dpy, CurrentTime); XUngrabKeyboard(X_Dpy, CurrentTime);
return(mi); return(mi);
@ -402,12 +402,12 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
if (mc->geom.x != xsave || mc->geom.y != ysave) if (mc->geom.x != xsave || mc->geom.y != ysave)
xu_ptr_setpos(sc->rootwin, mc->geom.x, mc->geom.y); xu_ptr_setpos(sc->rootwin, mc->geom.x, mc->geom.y);
XClearWindow(X_Dpy, sc->menuwin); XClearWindow(X_Dpy, sc->menu.win);
XMoveResizeWindow(X_Dpy, sc->menuwin, mc->geom.x, mc->geom.y, XMoveResizeWindow(X_Dpy, sc->menu.win, mc->geom.x, mc->geom.y,
mc->geom.w, mc->geom.h); mc->geom.w, mc->geom.h);
if (mc->hasprompt) { if (mc->hasprompt) {
XftDrawStringUtf8(sc->xftdraw, XftDrawStringUtf8(sc->menu.xftdraw,
&sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont, &sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont,
0, sc->xftfont->ascent, 0, sc->xftfont->ascent,
(const FcChar8*)mc->dispstr, strlen(mc->dispstr)); (const FcChar8*)mc->dispstr, strlen(mc->dispstr));
@ -422,7 +422,7 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
if (mc->geom.y + y > area.h) if (mc->geom.y + y > area.h)
break; break;
XftDrawStringUtf8(sc->xftdraw, XftDrawStringUtf8(sc->menu.xftdraw,
&sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont, &sc->xftcolor[CWM_COLOR_MENU_FONT], sc->xftfont,
0, y, 0, y,
(const FcChar8*)mi->print, strlen(mi->print)); (const FcChar8*)mi->print, strlen(mi->print));
@ -450,11 +450,11 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq,
return; return;
color = (active) ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG; color = (active) ? CWM_COLOR_MENU_FG : CWM_COLOR_MENU_BG;
XftDrawRect(sc->xftdraw, &sc->xftcolor[color], 0, XftDrawRect(sc->menu.xftdraw, &sc->xftcolor[color], 0,
(sc->xftfont->height + 1) * entry, mc->geom.w, (sc->xftfont->height + 1) * entry, mc->geom.w,
(sc->xftfont->height + 1) + sc->xftfont->descent); (sc->xftfont->height + 1) + sc->xftfont->descent);
color = (active) ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT; color = (active) ? CWM_COLOR_MENU_FONT_SEL : CWM_COLOR_MENU_FONT;
XftDrawStringUtf8(sc->xftdraw, XftDrawStringUtf8(sc->menu.xftdraw,
&sc->xftcolor[color], sc->xftfont, &sc->xftcolor[color], sc->xftfont,
0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1, 0, (sc->xftfont->height + 1) * entry + sc->xftfont->ascent + 1,
(const FcChar8*)mi->print, strlen(mi->print)); (const FcChar8*)mi->print, strlen(mi->print));

14
mousefunc.c
View File

@ -46,13 +46,13 @@ mousefunc_sweep_draw(struct client_ctx *cc)
XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)s, XftTextExtentsUtf8(X_Dpy, sc->xftfont, (const FcChar8*)s,
strlen(s), &extents); strlen(s), &extents);
XReparentWindow(X_Dpy, sc->menuwin, cc->win, 0, 0); XReparentWindow(X_Dpy, sc->menu.win, cc->win, 0, 0);
XMoveResizeWindow(X_Dpy, sc->menuwin, 0, 0, XMoveResizeWindow(X_Dpy, sc->menu.win, 0, 0,
extents.xOff, sc->xftfont->height); extents.xOff, sc->xftfont->height);
XMapWindow(X_Dpy, sc->menuwin); XMapWindow(X_Dpy, sc->menu.win);
XClearWindow(X_Dpy, sc->menuwin); 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, sc->xftfont, 0, sc->xftfont->ascent + 1,
(const FcChar8*)s, strlen(s)); (const FcChar8*)s, strlen(s));
} }
@ -93,8 +93,8 @@ mousefunc_client_resize(struct client_ctx *cc, union arg *arg)
break; break;
case ButtonRelease: case ButtonRelease:
client_resize(cc, 1); client_resize(cc, 1);
XUnmapWindow(X_Dpy, sc->menuwin); XUnmapWindow(X_Dpy, sc->menu.win);
XReparentWindow(X_Dpy, sc->menuwin, sc->rootwin, 0, 0); XReparentWindow(X_Dpy, sc->menu.win, sc->rootwin, 0, 0);
xu_ptr_ungrab(); xu_ptr_ungrab();
/* Make sure the pointer stays within the window. */ /* Make sure the pointer stays within the window. */