mraber/xmenu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add normalizekeysym()

Browse Source 
Also, when no item matches the typed string and a new key is pressed,
rub out the memory first and then include the character corresponding
to the typed key.
This commit is contained in:
phillbush 2020-12-31 05:35:15 -03:00
parent 693735f7eb
commit 8239f1f155
1 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
xmenu.c
View File

@ -1208,6 +1208,25 @@ matchitem(struct Menu *menu, char *text, int dir)
return NULL; return NULL;
} }
/* check keysyms defined on config.h */
static KeySym
normalizeksym(KeySym ksym)
{
if (ksym == KSYMFIRST)
return XK_Home;
if (ksym == KSYMLAST)
return XK_End;
if (ksym == KSYMUP)
return XK_Up;
if (ksym == KSYMDOWN)
return XK_Down;
if (ksym == KSYMLEFT)
return XK_Left;
if (ksym == KSYMRIGHT)
return XK_Right;
return ksym;
}
/* run event loop */ /* run event loop */
static void static void
run(struct Menu *currmenu) run(struct Menu *currmenu)
@ -1223,6 +1242,7 @@ run(struct Menu *currmenu)
XEvent ev; XEvent ev;
int action; int action;
int len; int len;
int i;
text[0] = '\0'; text[0] = '\0';
mapmenu(currmenu); mapmenu(currmenu);
@ -1296,27 +1316,37 @@ enteritem:
/* cycle through menu */ /* cycle through menu */
item = NULL; item = NULL;
if (ksym == XK_Home || ksym == KSYMFIRST) { ksym = normalizeksym(ksym);
switch (ksym) {
case XK_Home:
item = itemcycle(currmenu, ITEMFIRST); item = itemcycle(currmenu, ITEMFIRST);
action = ACTION_CLEAR; action = ACTION_CLEAR;
} else if (ksym == XK_End || ksym == KSYMLAST) { break;
case XK_End:
item = itemcycle(currmenu, ITEMLAST); item = itemcycle(currmenu, ITEMLAST);
action = ACTION_CLEAR; action = ACTION_CLEAR;
} else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) { break;
case XK_ISO_Left_Tab:
if (*text) { if (*text) {
item = matchitem(currmenu, text, -1); item = matchitem(currmenu, text, -1);
} else { break;
item = itemcycle(currmenu, ITEMPREV);
action = ACTION_CLEAR;
} }
} else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) { /* FALLTHROUGH */
case XK_Up:
item = itemcycle(currmenu, ITEMPREV);
action = ACTION_CLEAR;
break;
case XK_Tab:
if (*text) { if (*text) {
item = matchitem(currmenu, text, 1); item = matchitem(currmenu, text, 1);
} else { break;
item = itemcycle(currmenu, ITEMNEXT);
action = ACTION_CLEAR;
} }
} else if (ksym >= XK_1 && ksym <= XK_9){ /* FALLTHROUGH */
case XK_Down:
item = itemcycle(currmenu, ITEMNEXT);
action = ACTION_CLEAR;
break;
case XK_1: case XK_2: case XK_3: case XK_4: case XK_5: case XK_6: case XK_7: case XK_8: case XK_9:
item = itemcycle(currmenu, ITEMFIRST); item = itemcycle(currmenu, ITEMFIRST);
lastitem = itemcycle(currmenu, ITEMLAST); lastitem = itemcycle(currmenu, ITEMLAST);
for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) { for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) {
@ -1324,27 +1354,32 @@ enteritem:
item = itemcycle(currmenu, ITEMNEXT); item = itemcycle(currmenu, ITEMNEXT);
} }
action = ACTION_CLEAR; action = ACTION_CLEAR;
} else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) && break;
currmenu->selected != NULL) { case XK_Return: case XK_Right:
item = currmenu->selected; if (currmenu->selected) {
goto enteritem; item = currmenu->selected;
} else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) && goto enteritem;
currmenu->parent != NULL) { }
item = currmenu->parent->selected; break;
currmenu = currmenu->parent; case XK_Escape: case XK_Left:
action = ACTION_CLEAR | ACTION_MAP; if (currmenu->parent) {
} else if (ksym == XK_BackSpace || ksym == XK_Clear || ksym == XK_Delete) { item = currmenu->parent->selected;
currmenu = currmenu->parent;
action = ACTION_CLEAR | ACTION_MAP;
}
break;
case XK_BackSpace: case XK_Clear: case XK_Delete:
action = ACTION_CLEAR; action = ACTION_CLEAR;
break; break;
} else { default:
append: append:
if (append(text, buf, sizeof text, len)) { for (i = 0; i < 2; i++) {
if (!(item = matchitem(currmenu, text, 0))) { append(text, buf, sizeof text, len);
item = NULL; if ((item = matchitem(currmenu, text, 0)))
} break;
} else if (len == 0) { text[0] = '\0';
break; /* we may have pressed a dead key */
} }
break;
} }
select = item; select = item;
action |= ACTION_SELECT | ACTION_DRAW; action |= ACTION_SELECT | ACTION_DRAW;