int entry; /* Entry number inside menu */
enum menu_action action;
unsigned char hotkey;
+ bool immediate; /* Hotkey action does not require Enter */
bool save; /* Save this entry if selected */
};
int timeout;
bool allowedit;
+ bool immediate; /* MENU IMMEDIATE default for this menu */
bool save; /* MENU SAVE default for this menu */
int curentry;
const char *cmdline = NULL;
volatile clock_t key_timeout, timeout_left, this_timeout;
const struct menu_entry *me;
+ bool hotkey = false;
/* Note: for both key_timeout and timeout == 0 means no limit */
timeout_left = key_timeout = cm->timeout;
to_clear = 0;
}
- this_timeout = min(min(key_timeout, timeout_left), (clock_t) CLK_TCK);
- key = mygetkey(this_timeout);
+ if (hotkey && me->immediate) {
+ /* If the hotkey was flagged immediate, simulate pressing ENTER */
+ key = KEY_ENTER;
+ } else {
+ this_timeout = min(min(key_timeout, timeout_left),
+ (clock_t) CLK_TCK);
+ key = mygetkey(this_timeout);
- if (key != KEY_NONE) {
- timeout_left = key_timeout;
- if (to_clear)
- printf("\033[%d;1H\1#0\033[K", TIMEOUT_ROW);
+ if (key != KEY_NONE) {
+ timeout_left = key_timeout;
+ if (to_clear)
+ printf("\033[%d;1H\1#0\033[K", TIMEOUT_ROW);
+ }
}
+ hotkey = false;
+
switch (key) {
case KEY_NONE: /* Timeout */
/* This is somewhat hacky, but this at least lets the user
key_timeout = 0;
entry = cm->menu_hotkeys[key]->entry;
/* Should we commit at this point? */
+ hotkey = true;
}
}
break;
m->allowedit = parent->allowedit;
m->timeout = parent->timeout;
m->save = parent->save;
+ m->immediate = parent->immediate;
m->ontimeout = refstr_get(parent->ontimeout);
m->onerror = refstr_get(parent->onerror);
unsigned int menuindent;
enum menu_action action;
int save;
+ int immediate;
struct menu *submenu;
};
me->hotkey = 0;
me->action = ld->action ? ld->action : MA_CMD;
me->save = ld->save ? (ld->save > 0) : m->save;
+ me->immediate = ld->immediate ? (ld->immediate > 0) : m->immediate;
if (ld->menuindent) {
const char *dn;
ld.save = -1;
else
m->save = false;
+ } else if (looking_at(p, "immediate")) {
+ if (ld.label)
+ ld.immediate = 1;
+ else
+ m->immediate = true;
+ } else if (looking_at(p, "noimmediate")) {
+ if (ld.label)
+ ld.immediate = -1;
+ else
+ m->immediate = false;
} else if (looking_at(p, "onerror")) {
refstr_put(m->onerror);
m->onerror = refstrdup(skipspace(p + 7));