fixed missing lines

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 90e7906..465d405 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -1158,22 +1158,75 @@ append(char *text, char *buf, size_t textsize, size_t buflen)
        return 1;
 }
 
        return 1;
 }
 

-/* get item in menu matching text */
+/* get item in menu matching text from given direction (or from beginning, if dir = 0) */

 static struct Item *
 static struct Item *

-matchitem(struct Menu *menu, char *text)
+matchitem(struct Menu *menu, char *text, int dir)

 {
 {

-       struct Item *item;
+       struct Item *item, *lastitem;

        char *s;
        size_t textlen;
 
        char *s;
        size_t textlen;
 

+       for (lastitem = menu->list; lastitem && lastitem->next; lastitem = lastitem->next)
+               ;

        textlen = strlen(text);
        textlen = strlen(text);

-       for (item = menu->list; item; item = item->next)
+       if (dir < 0) {
+               if (menu->selected && menu->selected->prev)
+                       item = menu->selected->prev;
+               else
+                       item = lastitem;
+       } else if (dir > 0) {
+               if (menu->selected && menu->selected->next)
+                       item = menu->selected->next;
+               else
+                       item = menu->list;
+       } else {
+               item = menu->list;
+       }
+       /* find next item from selected item */
+       for ( ; item; item = (dir < 0) ? item->prev : item->next)

                for (s = item->label; s && *s; s++)
                        if (strncasecmp(s, text, textlen) == 0)
                                return item;
                for (s = item->label; s && *s; s++)
                        if (strncasecmp(s, text, textlen) == 0)
                                return item;

+       /* if not found, try to find from the beginning/end of list */
+       if (dir > 0) {
+               for (item = menu->list ; item; item = item->next) {
+                       for (s = item->label; s && *s; s++) {
+                               if (strncasecmp(s, text, textlen) == 0) {
+                                       return item;
+                               }
+                       }
+               }
+       } else {
+               for (item = lastitem ; item; item = item->prev) {
+                       for (s = item->label; s && *s; s++) {
+                               if (strncasecmp(s, text, textlen) == 0) {
+                                       return item;
+                               }
+                       }
+               }
+       }

        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 */
 static void
 run(struct Menu *currmenu)
 /* run event loop */
 static void
 run(struct Menu *currmenu)


@@ -1189,6 +1242,7 @@ run(struct Menu *currmenu)
        XEvent ev;
        int action;
        int len;
        XEvent ev;
        int action;
        int len;

+       int i;

 
        text[0] = '\0';
        mapmenu(currmenu);
 
        text[0] = '\0';
        mapmenu(currmenu);


@@ -1214,7 +1268,7 @@ run(struct Menu *currmenu)
                        } else {
                                currmenu = menu;
                        }
                        } else {
                                currmenu = menu;
                        }

-                       action = ACTION_SELECT | ACTION_MAP | ACTION_DRAW;
+                       action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW;

                        break;
                case ButtonRelease:
                        if (!isclickbutton(ev.xbutton.button))
                        break;
                case ButtonRelease:
                        if (!isclickbutton(ev.xbutton.button))


@@ -1233,7 +1287,7 @@ enteritem:
                                return;
                        }
                        select = currmenu->list;
                                return;
                        }
                        select = currmenu->list;

-                       action = ACTION_SELECT | ACTION_MAP | ACTION_DRAW;
+                       action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW;

                        break;
                case ButtonPress:
                        menu = getmenu(currmenu, ev.xbutton.window);
                        break;
                case ButtonPress:
                        menu = getmenu(currmenu, ev.xbutton.window);


@@ -1262,48 +1316,84 @@ enteritem:
 
                        /* cycle through menu */
                        item = NULL;
 
                        /* cycle through menu */
                        item = NULL;

-                       if (ksym == XK_Home || ksym == KSYMFIRST) {
+                       ksym = normalizeksym(ksym);
+                       switch (ksym) {
+                       case XK_Home:

                                item = itemcycle(currmenu, ITEMFIRST);
                                item = itemcycle(currmenu, ITEMFIRST);

-                       } else if (ksym == XK_End || ksym == KSYMLAST) {
+                               action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_End:

                                item = itemcycle(currmenu, ITEMLAST);
                                item = itemcycle(currmenu, ITEMLAST);

-                       } else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) {
+                               action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_ISO_Left_Tab:
+                               if (*text) {
+                                       item = matchitem(currmenu, text, -1);
+                                       action = ACTION_SELECT | ACTION_DRAW;
+                                       break;
+                               }
+                               /* FALLTHROUGH */
+                       case XK_Up:

                                item = itemcycle(currmenu, ITEMPREV);
                                item = itemcycle(currmenu, ITEMPREV);

-                       } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
+                               action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_Tab:
+                               if (*text) {
+                                       item = matchitem(currmenu, text, 1);
+                                       action = ACTION_SELECT | ACTION_DRAW;
+                                       break;
+                               }
+                               /* FALLTHROUGH */
+                       case XK_Down:

                                item = itemcycle(currmenu, ITEMNEXT);
                                item = itemcycle(currmenu, ITEMNEXT);

-                       } else if (ksym >= XK_1 && ksym <= XK_9){
+                               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:

                                item = itemcycle(currmenu, ITEMFIRST);
                                lastitem = itemcycle(currmenu, ITEMLAST);
                                for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) {
                                        currmenu->selected = item;
                                        item = itemcycle(currmenu, ITEMNEXT);
                                }
                                item = itemcycle(currmenu, ITEMFIRST);
                                lastitem = itemcycle(currmenu, ITEMLAST);
                                for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) {
                                        currmenu->selected = item;
                                        item = itemcycle(currmenu, ITEMNEXT);
                                }

-                       } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
-                                   currmenu->selected != NULL) {
-                               item = currmenu->selected;
-                               goto enteritem;
-                       } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&
-                                  currmenu->parent != NULL) {
-                               item = currmenu->parent->selected;
-                               currmenu = currmenu->parent;
-                               action = ACTION_MAP;
-                       } else {
+                               action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_Return: case XK_Right:
+                               if (currmenu->selected) {
+                                       item = currmenu->selected;
+                                       goto enteritem;
+                               }
+                               action = ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_Escape: case XK_Left:
+                               if (currmenu->parent) {
+                                       item = currmenu->parent->selected;
+                                       currmenu = currmenu->parent;
+                                       action = ACTION_CLEAR | ACTION_MAP;
+                               }
+                               action = ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       case XK_BackSpace: case XK_Clear: case XK_Delete:
+                               action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;
+                               break;
+                       default:

 append:
 append:

-                               if (append(text, buf, sizeof text, len)) {
-                                       currmenu->selected = matchitem(currmenu, text);
-                                       action = ACTION_DRAW;
-                               } else {
-                                       select = NULL;
-                                       action = ACTION_SELECT | ACTION_DRAW;
+                               if (*buf == '\0' || iscntrl(*buf))
+                                       break;
+                               for (i = 0; i < 2; i++) {
+                                       append(text, buf, sizeof text, len);
+                                       if ((item = matchitem(currmenu, text, 0)))
+                                               break;
+                                       text[0] = '\0';

                                }
                                }

+                               action = ACTION_SELECT | ACTION_DRAW;

                                break;
                        }
                        select = item;
                                break;
                        }
                        select = item;

-                       action |= ACTION_SELECT | ACTION_DRAW;

                        break;
                case LeaveNotify:
                        previtem = NULL;
                        select = NULL;
                        break;
                case LeaveNotify:
                        previtem = NULL;
                        select = NULL;

-                       action = ACTION_SELECT | ACTION_DRAW;
+                       action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW;

                        break;
                case ConfigureNotify:
                        menu = getmenu(currmenu, ev.xconfigure.window);
                        break;
                case ConfigureNotify:
                        menu = getmenu(currmenu, ev.xconfigure.window);


@@ -1323,10 +1413,10 @@ append:
                        action = ACTION_MAP;
                        break;
                }
                        action = ACTION_MAP;
                        break;
                }

-               if (action & ACTION_SELECT) {
-                       currmenu->selected = select;
+               if (action & ACTION_CLEAR)

                        text[0] = '\0';
                        text[0] = '\0';

-               }
+               if (action & ACTION_SELECT)
+                       currmenu->selected = select;

                if (action & ACTION_MAP)
                        mapmenu(currmenu);
                if (action & ACTION_DRAW)
                if (action & ACTION_MAP)
                        mapmenu(currmenu);
                if (action & ACTION_DRAW)


@@ -1401,7 +1491,7 @@ main(int argc, char *argv[])
        if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
                errx(1, "XOpenIM: could not open input device");
 
        if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
                errx(1, "XOpenIM: could not open input device");
 

-       /* get configuration */
+       /* process configuration and window class */

        getresources();
        classh.res_class = PROGNAME;
        classh.res_name = getoptions(argc, argv);
        getresources();
        classh.res_class = PROGNAME;
        classh.res_name = getoptions(argc, argv);