define_key("\x7f", KEY_BACKSPACE);
define_key("\x08", KEY_BACKSPACE);
+ /* we need backtab too, for form navigation. vt220 doesn't include
+ * this (kcbt), but we don't want to require a full linux/xterm termcap
+ */
+ define_key("\x1b[Z", KEY_BTAB);
+
while (getch() != ERR) /* flush stdin */
(void)0;
}
if (!item) {
int insert_pt;
+ cod = talloc_zero(NULL, struct cui_opt_data);
+ cod->name = talloc_asprintf(cod, "User item %u", ++user_idx);
+
+ item = pmenu_item_create(menu, cod->name);
+ if (!item) {
+ talloc_free(cod);
+ goto out;
+ }
+
+ item->on_edit = cui_item_edit;
+ item->on_execute = cui_boot;
+ item->data = cod;
+
+ talloc_steal(item, cod);
+
/* Detach the items array. */
set_menu_items(menu->ncm, NULL);
/* Insert new item at insert_pt. */
insert_pt = pmenu_grow(menu, 1);
- item = pmenu_item_alloc(menu);
- item->on_edit = cui_item_edit;
- item->on_execute = cui_boot;
- item->data = cod = talloc_zero(item, struct cui_opt_data);
-
- cod->name = talloc_asprintf(cod, "User item %u:", ++user_idx);
- if (pmenu_item_setup(menu, item, insert_pt,
- talloc_strdup(item, cod->name)) == NULL) {
- talloc_free(item);
- item = NULL;
- }
+ pmenu_item_insert(menu, item, insert_pt);
/* Re-attach the items array. */
set_menu_items(menu->ncm, menu->items);
cod->bd = talloc_steal(cod, bd);
- if (item)
- set_current_item(item->pmenu->ncm, item->nci);
+ set_current_item(item->pmenu->ncm, item->nci);
+out:
cui_set_current(cui, &cui->main->scr);
talloc_free(cui->boot_editor);
cui->boot_editor = NULL;
assert(cui->current);
- if (!cui->has_input)
- discover_client_cancel_default(cui->client);
- cui->has_input = true;
-
for (;;) {
int c = getch();
if (c == ERR)
break;
+ if (!cui->has_input) {
+ pb_log("UI input received (key = %d), aborting "
+ "default boot\n", c);
+ discover_client_cancel_default(cui->client);
+ cui->has_input = true;
+ }
+
if (process_global_keys(cui, c))
continue;
if (cui->current == &cui->main->scr)
nc_scr_unpost(cui->current);
- /* This disconnects items array from menu. */
-
- result = set_menu_items(cui->main->ncm, NULL);
-
- if (result)
- pb_log("%s: set_menu_items failed: %d\n", __func__, result);
-
- /* Insert new items at insert_pt. */
- insert_pt = pmenu_grow(cui->main, 1);
-
/* Save the item in opt->ui_info for cui_device_remove() */
- opt->ui_info = i = pmenu_item_alloc(cui->main);
+ opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+ if (!i)
+ return -1;
i->on_edit = cui_item_edit;
i->on_execute = cui_boot;
cod->bd->dtb = talloc_strdup(cod->bd, opt->dtb_file);
cod->bd->args = talloc_strdup(cod->bd, opt->boot_args);
- pmenu_item_setup(cui->main, i, insert_pt, cod->name);
+ /* This disconnects items array from menu. */
+ result = set_menu_items(cui->main->ncm, NULL);
+
+ if (result)
+ pb_log("%s: set_menu_items failed: %d\n", __func__, result);
+
+ /* Insert new items at insert_pt. */
+ insert_pt = pmenu_grow(cui->main, 1);
+ pmenu_item_insert(cui->main, i, insert_pt);
pb_log("%s: adding opt '%s'\n", __func__, cod->name);
pb_log(" image '%s'\n", cod->bd->image);
}
atexit(cui_atexit);
+ talloc_steal(cui, cui->client);
cui_start();
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,