X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=cd7952f860545e90cdf1245035b0b7b69868a57a;hp=fd90419bcbc99eabd417cc78bd93c2b6d5d081c1;hb=4e30f260106ac5f7007e213db1d1e54298393290;hpb=67d0ca0764e5ab9a0d0e5baa5bf062d0ac5c8596 diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index fd90419..cd7952f 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "log/log.h" @@ -32,6 +31,7 @@ #include "talloc/talloc.h" #include "waiter/waiter.h" #include "process/process.h" +#include "i18n/i18n.h" #include "ui/common/discover-client.h" #include "ui/common/ui-system.h" #include "nc-cui.h" @@ -58,6 +58,11 @@ static void cui_start(void) 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; } @@ -112,7 +117,7 @@ int cui_run_cmd(struct pmenu_item *item) struct cui *cui = cui_from_item(item); const char **cmd_argv = item->data; - nc_scr_status_printf(cui->current, "Running %s...", cmd_argv[0]); + nc_scr_status_printf(cui->current, _("Running %s..."), cmd_argv[0]); def_prog_mode(); @@ -123,7 +128,8 @@ int cui_run_cmd(struct pmenu_item *item) if (result) { pb_log("%s: failed: '%s'\n", __func__, cmd_argv[0]); - nc_scr_status_printf(cui->current, "Failed: %s", cmd_argv[0]); + nc_scr_status_printf(cui->current, _("Failed: %s"), + cmd_argv[0]); } return result; @@ -143,13 +149,13 @@ static int cui_boot(struct pmenu_item *item) pb_debug("%s: %s\n", __func__, cod->name); - nc_scr_status_printf(cui->current, "Booting %s...", cod->name); + nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name); result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd); if (result) { nc_scr_status_printf(cui->current, - "Failed: boot %s", cod->bd->image); + _("Failed: boot %s"), cod->bd->image); } return 0; @@ -161,6 +167,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, { struct pmenu *menu = cui->main; struct cui_opt_data *cod; + static int user_idx = 0; /* Was the edit cancelled? */ if (!bd) { @@ -174,19 +181,27 @@ static void cui_boot_editor_on_exit(struct cui *cui, 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:", insert_pt); - pmenu_item_setup(menu, item, insert_pt, - talloc_strdup(item, cod->name)); + pmenu_item_insert(menu, item, insert_pt); /* Re-attach the items array. */ set_menu_items(menu->ncm, menu->items); @@ -198,6 +213,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, cod->bd = talloc_steal(cod, bd); 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; @@ -254,7 +270,8 @@ static void cui_help_exit(struct cui *cui) cui->help_screen = NULL; } -void cui_show_help(struct cui *cui, const char *title, const char *text) +void cui_show_help(struct cui *cui, const char *title, + const struct help_text *text) { if (!cui->current) return; @@ -312,10 +329,6 @@ static int cui_process_key(void *arg) assert(cui->current); - if (!cui->has_input) - discover_client_cancel_default(cui->client); - cui->has_input = true; - for (;;) { int c = getch(); @@ -324,6 +337,13 @@ static int cui_process_key(void *arg) 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; @@ -387,12 +407,14 @@ static void cui_handle_resize(struct cui *cui) static int cui_boot_option_add(struct device *dev, struct boot_option *opt, void *arg) { + struct pmenu_item *i, *dev_hdr = NULL; struct cui *cui = cui_from_arg(arg); struct cui_opt_data *cod; + const char *tab = " "; unsigned int insert_pt; int result, rows, cols; - struct pmenu_item *i; ITEM *selected; + char *name; pb_debug("%s: %p %s\n", __func__, opt, opt->id); @@ -402,19 +424,18 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, if (cui->current == &cui->main->scr) nc_scr_unpost(cui->current); - /* This disconnects items array from menu. */ + /* Check if the boot device is new */ + dev_hdr = pmenu_find_device(cui->main, dev, opt); - 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); + /* All actual boot entries are 'tabbed' across */ + name = talloc_asprintf(cui->main, "%s%s", + tab, opt->name ? : "Unknown Name"); /* 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, name); + talloc_free(name); + if (!i) + return -1; i->on_edit = cui_item_edit; i->on_execute = cui_boot; @@ -431,7 +452,23 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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. */ + if (dev_hdr) { + insert_pt = pmenu_grow(cui->main, 2); + pmenu_item_insert(cui->main, dev_hdr, insert_pt); + pb_log("%s: adding new device hierarchy %s\n", + __func__,opt->device_id); + pmenu_item_insert(cui->main, i, insert_pt+1); + } else { + insert_pt = pmenu_grow(cui->main, 1); + pmenu_item_add(cui->main, i, insert_pt); + } pb_log("%s: adding opt '%s'\n", __func__, cod->name); pb_log(" image '%s'\n", cod->bd->image); @@ -481,8 +518,9 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, static void cui_device_remove(struct device *dev, void *arg) { struct cui *cui = cui_from_arg(arg); - int result; struct boot_option *opt; + unsigned int i; + int result; pb_log("%s: %p %s\n", __func__, dev, dev->id); @@ -497,10 +535,21 @@ static void cui_device_remove(struct device *dev, void *arg) pb_log("%s: set_menu_items failed: %d\n", __func__, result); list_for_each_entry(&dev->boot_options, opt, list) { - struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info); + struct pmenu_item *item = pmenu_item_from_arg(opt->ui_info); + + assert(pb_protocol_device_cmp(dev, cod_from_item(item)->dev)); + pmenu_remove(cui->main, item); + } - assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev)); - pmenu_remove(cui->main, i); + /* Manually remove remaining device hierarchy item */ + for (i=0; i < cui->main->item_count; i++) { + struct pmenu_item *item = item_userptr(cui->main->items[i]); + if (!item || !item->data ) + continue; + + struct cui_opt_data *data = item->data; + if (data && data->dev && data->dev == dev) + pmenu_remove(cui->main,item); } /* Re-attach the items array. */ @@ -526,7 +575,8 @@ static void cui_update_status(struct boot_status *status, void *arg) nc_scr_status_printf(cui->current, "%s: %s", - status->type == BOOT_STATUS_ERROR ? "Error" : "Info", + status->type == BOOT_STATUS_ERROR ? + _("Error") : _("Info"), status->message); } @@ -574,6 +624,11 @@ static void cui_update_config(struct config *config, void *arg) if (cui->config_screen) config_screen_update(cui->config_screen, config, cui->sysinfo); + + if (config->safe_mode) + nc_scr_status_printf(cui->current, + "SAFE MODE: select '%s' to continue", + "Rescan devices"); } int cui_send_config(struct cui *cui, struct config *config) @@ -581,6 +636,11 @@ int cui_send_config(struct cui *cui, struct config *config) return discover_client_send_config(cui->client, config); } +void cui_send_reinit(struct cui *cui) +{ + discover_client_send_reinit(cui->client); +} + static struct discover_client_ops cui_client_ops = { .device_add = NULL, .boot_option_add = cui_boot_option_add, @@ -610,7 +670,7 @@ struct cui *cui_init(void* platform_info, if (!cui) { pb_log("%s: alloc cui failed.\n", __func__); - fprintf(stderr, "%s: alloc cui failed.\n", __func__); + fprintf(stderr, _("%s: alloc cui failed.\n"), __func__); goto fail_alloc; } @@ -620,8 +680,6 @@ struct cui *cui_init(void* platform_info, process_init(cui, cui->waitset, false); - setlocale(LC_ALL, ""); - /* Loop here for scripts that just started the server. */ retry_start: @@ -645,23 +703,24 @@ retry_start: goto retry_start; pb_log("%s: discover_client_init failed.\n", __func__); - fprintf(stderr, "%s: error: discover_client_init failed.\n", + fprintf(stderr, _("%s: error: discover_client_init failed.\n"), __func__); - fprintf(stderr, "could not start pb-discover, the petitboot " - "daemon.\n"); + fprintf(stderr, _("could not start pb-discover, the petitboot " + "daemon.\n")); goto fail_client_init; } if (!cui->client) { pb_log("%s: discover_client_init failed.\n", __func__); - fprintf(stderr, "%s: error: discover_client_init failed.\n", + fprintf(stderr, _("%s: error: discover_client_init failed.\n"), __func__); - fprintf(stderr, "check that pb-discover, " - "the petitboot daemon is running.\n"); + fprintf(stderr, _("check that pb-discover, " + "the petitboot daemon is running.\n")); goto fail_client_init; } atexit(cui_atexit); + talloc_steal(cui, cui->client); cui_start(); waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,