瀏覽代碼

add lastitem and adapt code to general code style

master
phillbush 5 年之前
父節點
當前提交
c2959cf439
共有 1 個檔案被更改,包括 3 行新增3 行删除
  1. +3
    -3
      xmenu.c

+ 3
- 3
xmenu.c 查看文件

@@ -1209,6 +1209,7 @@ run(struct Menu *currmenu)
struct Menu *menu; struct Menu *menu;
struct Item *item; struct Item *item;
struct Item *previtem = NULL; struct Item *previtem = NULL;
struct Item *lastitem;
KeySym ksym; KeySym ksym;
XEvent ev; XEvent ev;


@@ -1282,11 +1283,10 @@ selectitem:
item = itemcycle(currmenu, ITEMNEXT); item = itemcycle(currmenu, ITEMNEXT);
} else if (ksym >= XK_1 && ksym <= XK_9){ } else if (ksym >= XK_1 && ksym <= XK_9){
item = itemcycle(currmenu, ITEMFIRST); item = itemcycle(currmenu, ITEMFIRST);
for(int i = ksym-XK_1; i > 0; i-=1){
lastitem = itemcycle(currmenu, ITEMLAST);
for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) {
currmenu->selected = item; currmenu->selected = item;
item = itemcycle(currmenu, ITEMNEXT); item = itemcycle(currmenu, ITEMNEXT);
if (item == itemcycle(currmenu, ITEMLAST))
break;
} }
} else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) && } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) &&
currmenu->selected != NULL) { currmenu->selected != NULL) {


Loading…
取消
儲存