add lastitem and adapt code to general code style

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index e74c3c7..76761cc 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -1209,6 +1209,7 @@ run(struct Menu *currmenu)
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;

+       struct Item *lastitem;

        KeySym ksym;
        XEvent ev;
 
        KeySym ksym;
        XEvent ev;
 


@@ -1281,14 +1282,14 @@ selectitem:
                        } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
                                item = itemcycle(currmenu, ITEMNEXT);
                        } else if (ksym >= XK_1 && ksym <= XK_9){
                        } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) {
                                item = itemcycle(currmenu, ITEMNEXT);
                        } else if (ksym >= XK_1 && ksym <= XK_9){

-                                item = itemcycle(currmenu, ITEMFIRST);
-                                currmenu->selected = item;
-                                for(int i = ksym-XK_1; i > 0; i-=1){
-                                    item = itemcycle(currmenu, ITEMNEXT);
-                                    currmenu->selected = item;
-                                }
-                        } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
-                                  currmenu->selected != NULL) {
+                               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 selectitem;
                        } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&
                                item = currmenu->selected;
                                goto selectitem;
                        } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) &&