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

Start simplifying menu code; and in turn, remove a cursor no longer

Browse Source 
needed.
This commit is contained in:
okan 2016-10-03 18:43:49 +00:00
parent 03f5dc219e
commit 8aa5033d12
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calmwm.h
View File

@ -96,11 +96,10 @@ union press {
}; };
enum cursor_font { enum cursor_font {
CF_DEFAULT,
CF_MOVE,
CF_NORMAL, CF_NORMAL,
CF_QUESTION, CF_MOVE,
CF_RESIZE, CF_RESIZE,
CF_QUESTION,
CF_NITEMS CF_NITEMS
}; };
enum color { enum color {

5
conf.c
View File

@ -640,11 +640,10 @@ conf_unbind_mouse(struct conf *c, struct binding *unbind)
} }
static int cursor_binds[] = { static int cursor_binds[] = {
XC_X_cursor, /* CF_DEFAULT */
XC_fleur, /* CF_MOVE */
XC_left_ptr, /* CF_NORMAL */ XC_left_ptr, /* CF_NORMAL */
XC_question_arrow, /* CF_QUESTION */ XC_fleur, /* CF_MOVE */
XC_bottom_right_corner, /* CF_RESIZE */ XC_bottom_right_corner, /* CF_RESIZE */
XC_question_arrow, /* CF_QUESTION */
}; };
void void

39
menu.c
View File

@ -63,10 +63,10 @@ struct menu_ctx {
}; };
static struct menu *menu_handle_key(XEvent *, struct menu_ctx *, static struct menu *menu_handle_key(XEvent *, struct menu_ctx *,
struct menu_q *, struct menu_q *); struct menu_q *, struct menu_q *);
static void menu_handle_move(XEvent *, struct menu_ctx *, static void menu_handle_move(struct menu_ctx *,
struct menu_q *); struct menu_q *, int, int);
static struct menu *menu_handle_release(XEvent *, struct menu_ctx *, static struct menu *menu_handle_release(struct menu_ctx *,
struct menu_q *); struct menu_q *, int, int);
static void menu_draw(struct menu_ctx *, struct menu_q *, static void menu_draw(struct menu_ctx *, struct menu_q *,
struct menu_q *); struct menu_q *);
static void menu_draw_entry(struct menu_ctx *, struct menu_q *, static void menu_draw_entry(struct menu_ctx *, struct menu_q *,
@ -151,11 +151,12 @@ menu_filter(struct screen_ctx *sc, struct menu_q *menuq, const char *prompt,
menu_draw(&mc, menuq, &resultq); menu_draw(&mc, menuq, &resultq);
break; break;
case MotionNotify: case MotionNotify:
menu_handle_move(&e, &mc, &resultq); menu_handle_move(&mc, &resultq,
e.xbutton.x, e.xbutton.y);
break; break;
case ButtonRelease: case ButtonRelease:
if ((mi = menu_handle_release(&e, &mc, &resultq)) if ((mi = menu_handle_release(&mc, &resultq,
!= NULL) e.xbutton.x, e.xbutton.y)) != NULL)
goto out; goto out;
break; break;
default: default:
@ -408,14 +409,14 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
XMoveResizeWindow(X_Dpy, sc->menu.win, 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);
n = 0;
if (mc->hasprompt) { if (mc->hasprompt) {
XftDrawStringUtf8(sc->menu.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));
n = 1; n++;
} else }
n = 0;
TAILQ_FOREACH(mi, resultq, resultentry) { TAILQ_FOREACH(mi, resultq, resultentry) {
int y = n * (sc->xftfont->height + 1) + sc->xftfont->ascent + 1; int y = n * (sc->xftfont->height + 1) + sc->xftfont->ascent + 1;
@ -463,10 +464,10 @@ menu_draw_entry(struct menu_ctx *mc, struct menu_q *resultq,
} }
static void static void
menu_handle_move(XEvent *e, struct menu_ctx *mc, struct menu_q *resultq) menu_handle_move(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
{ {
mc->prev = mc->entry; mc->prev = mc->entry;
mc->entry = menu_calc_entry(mc, e->xbutton.x, e->xbutton.y); mc->entry = menu_calc_entry(mc, x, y);
if (mc->prev == mc->entry) if (mc->prev == mc->entry)
return; return;
@ -477,19 +478,16 @@ menu_handle_move(XEvent *e, struct menu_ctx *mc, struct menu_q *resultq)
XChangeActivePointerGrab(X_Dpy, MENUGRABMASK, XChangeActivePointerGrab(X_Dpy, MENUGRABMASK,
Conf.cursor[CF_NORMAL], CurrentTime); Conf.cursor[CF_NORMAL], CurrentTime);
menu_draw_entry(mc, resultq, mc->entry, 1); menu_draw_entry(mc, resultq, mc->entry, 1);
} else {
XChangeActivePointerGrab(X_Dpy, MENUGRABMASK,
Conf.cursor[CF_DEFAULT], CurrentTime);
} }
} }
static struct menu * static struct menu *
menu_handle_release(XEvent *e, struct menu_ctx *mc, struct menu_q *resultq) menu_handle_release(struct menu_ctx *mc, struct menu_q *resultq, int x, int y)
{ {
struct menu *mi; struct menu *mi;
int entry, i = 0; int entry, i = 0;
entry = menu_calc_entry(mc, e->xbutton.x, e->xbutton.y); entry = menu_calc_entry(mc, x, y);
if (mc->hasprompt) if (mc->hasprompt)
i = 1; i = 1;
@ -529,13 +527,12 @@ static int
menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr) menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
{ {
KeySym ks; KeySym ks;
unsigned int state = ev->state;
*ctl = CTL_NONE; *ctl = CTL_NONE;
chr[0] = '\0'; chr[0] = '\0';
ks = XkbKeycodeToKeysym(X_Dpy, ev->keycode, 0, ks = XkbKeycodeToKeysym(X_Dpy, ev->keycode, 0,
(state & ShiftMask) ? 1 : 0); (ev->state & ShiftMask) ? 1 : 0);
/* Look for control characters. */ /* Look for control characters. */
switch (ks) { switch (ks) {
@ -560,7 +557,7 @@ menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
break; break;
} }
if (*ctl == CTL_NONE && (state & ControlMask)) { if (*ctl == CTL_NONE && (ev->state & ControlMask)) {
switch (ks) { switch (ks) {
case XK_s: case XK_s:
case XK_S: case XK_S:
@ -590,7 +587,7 @@ menu_keycode(XKeyEvent *ev, enum ctltype *ctl, char *chr)
} }
} }
if (*ctl == CTL_NONE && (state & Mod1Mask)) { if (*ctl == CTL_NONE && (ev->state & Mod1Mask)) {
switch (ks) { switch (ks) {
case XK_j: case XK_j:
case XK_J: case XK_J: