- item = NULL;
- if (ksym == XK_Home || ksym == KSYMFIRST) {
- item = itemcycle(currmenu, ITEMFIRST);
- } else if (ksym == XK_End || ksym == KSYMLAST) {
- item = itemcycle(currmenu, ITEMLAST);
- } else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) {
- item = itemcycle(currmenu, ITEMPREV);
- } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
- item = itemcycle(currmenu, ITEMNEXT);
- } else if (ksym >= XK_1 && ksym <= XK_9){
+ select = NULL;
+ ksym = normalizeksym(ksym);
+ switch (ksym) {
+ case XK_Home:
+ select = itemcycle(currmenu, ITEMFIRST);
+ action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+ break;
+ case XK_End:
+ select = itemcycle(currmenu, ITEMLAST);
+ action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+ break;
+ case XK_ISO_Left_Tab:
+ if (*text) {
+ select = matchitem(currmenu, text, -1);
+ action = ACTION_SELECT | ACTION_DRAW;
+ break;
+ }
+ /* FALLTHROUGH */
+ case XK_Up:
+ select = itemcycle(currmenu, ITEMPREV);
+ action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+ break;
+ case XK_Tab:
+ if (*text) {
+ select = matchitem(currmenu, text, 1);
+ action = ACTION_SELECT | ACTION_DRAW;
+ break;
+ }
+ /* FALLTHROUGH */
+ case XK_Down:
+ select = itemcycle(currmenu, ITEMNEXT);
+ action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+ 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: