X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=c975c0f126e0095bc0f65db3b29d2dadd65835e0;hp=6a6169431c8cedbc47e95b0b90559a024746a1ea;hb=b6f99a457cb906277b172a0332a1e16ddba99228;hpb=08bc314efca8bbde9e9461c4d425caf1e0ad0e5f diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 6a61694..c975c0f 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -31,13 +31,21 @@ #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" #include "nc-boot-editor.h" #include "nc-config.h" +#include "nc-add-url.h" #include "nc-sysinfo.h" +#include "nc-lang.h" #include "nc-helpscreen.h" +#include "nc-subset.h" + +extern const struct help_text main_menu_help_text; + +static struct pmenu *main_menu_init(struct cui *cui); static void cui_start(void) { @@ -62,6 +70,16 @@ static void cui_start(void) */ define_key("\x1b[Z", KEY_BTAB); + /* We'll define a few other keys too since they're commonly + * used for navigation but the escape character will cause + * Petitboot to exit if they're left undefined */ + define_key("\x1b\x5b\x35\x7e", KEY_PPAGE); + define_key("\x1b\x5b\x36\x7e", KEY_NPAGE); + define_key("\x1b\x4f\x48", KEY_HOME); + define_key("\x1b\x4f\x46", KEY_END); + define_key("OH", KEY_HOME); + define_key("OF", KEY_END); + while (getch() != ERR) /* flush stdin */ (void)0; } @@ -116,7 +134,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(); @@ -127,7 +145,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; @@ -147,13 +166,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; @@ -165,6 +184,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, { struct pmenu *menu = cui->main; struct cui_opt_data *cod; + int idx, top, rows, cols; static int user_idx = 0; /* Was the edit cancelled? */ @@ -180,7 +200,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, int insert_pt; cod = talloc_zero(NULL, struct cui_opt_data); - cod->name = talloc_asprintf(cod, "User item %u", ++user_idx); + cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx); item = pmenu_item_create(menu, cod->name); if (!item) { @@ -203,6 +223,22 @@ static void cui_boot_editor_on_exit(struct cui *cui, /* Re-attach the items array. */ set_menu_items(menu->ncm, menu->items); + + /* If our index is above the current top row, align + * us to the new top. Otherwise, align us to the new + * bottom */ + menu_format(cui->main->ncm, &rows, &cols); + top = top_row(cui->main->ncm); + idx = item_index(item->nci); + + if (top >= idx) + top = idx; + else + top = idx < rows ? 0 : idx - rows + 1; + + set_top_row(cui->main->ncm, top); + set_current_item(item->pmenu->ncm, item->nci); + nc_scr_post(&menu->scr); } else { cod = item->data; @@ -210,7 +246,6 @@ 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); @@ -261,6 +296,32 @@ void cui_show_config(struct cui *cui) cui_set_current(cui, config_screen_scr(cui->config_screen)); } +static void cui_lang_exit(struct cui *cui) +{ + cui_set_current(cui, &cui->main->scr); + talloc_free(cui->lang_screen); + cui->lang_screen = NULL; +} + +void cui_show_lang(struct cui *cui) +{ + cui->lang_screen = lang_screen_init(cui, cui->config, cui_lang_exit); + cui_set_current(cui, lang_screen_scr(cui->lang_screen)); +} + +static void cui_add_url_exit(struct cui *cui) +{ + cui_set_current(cui, &cui->main->scr); + talloc_free(cui->add_url_screen); + cui->add_url_screen = NULL; +} + +void cui_show_add_url(struct cui *cui) +{ + cui->add_url_screen = add_url_screen_init(cui, cui_add_url_exit); + cui_set_current(cui, add_url_screen_scr(cui->add_url_screen)); +} + static void cui_help_exit(struct cui *cui) { cui_set_current(cui, help_screen_return_scr(cui->help_screen)); @@ -268,7 +329,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; @@ -283,6 +345,29 @@ void cui_show_help(struct cui *cui, const char *title, const char *text) cui_set_current(cui, help_screen_scr(cui->help_screen)); } +static void cui_subset_exit(struct cui *cui) +{ + cui_set_current(cui, subset_screen_return_scr(cui->subset_screen)); + talloc_free(cui->subset_screen); + cui->subset_screen = NULL; +} + +void cui_show_subset(struct cui *cui, const char *title, + void *arg) +{ + if (!cui->current) + return; + + if (cui->subset_screen) + return; + + cui->subset_screen = subset_screen_init(cui, cui->current, + title, arg, cui_subset_exit); + + if (cui->subset_screen) + cui_set_current(cui, subset_screen_scr(cui->subset_screen)); +} + /** * cui_set_current - Set the currently active screen and redraw it. */ @@ -493,7 +578,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, /* If our index is above the current top row, align * us to the new top. Otherwise, align us to the new * bottom */ - top = top < idx ? idx - rows : idx; + top = top < idx ? idx - rows + 1 : idx; set_top_row(cui->main->ncm, top); set_current_item(cui->main->ncm, selected); @@ -517,6 +602,7 @@ static void cui_device_remove(struct device *dev, void *arg) struct cui *cui = cui_from_arg(arg); struct boot_option *opt; unsigned int i; + int rows, cols, top, last; int result; pb_log("%s: %p %s\n", __func__, dev, dev->id); @@ -553,6 +639,15 @@ static void cui_device_remove(struct device *dev, void *arg) result = set_menu_items(cui->main->ncm, cui->main->items); + /* Move cursor to 'Exit' menu entry */ + menu_format(cui->main->ncm, &rows, &cols); + last = cui->main->item_count - 1; + set_current_item(cui->main->ncm, cui->main->items[last]); + if (!item_visible(cui->main->items[last])) { + top = last < rows ? 0 : last - rows + 1; + set_top_row(cui->main->ncm, top); + } + if (result) pb_log("%s: set_menu_items failed: %d\n", __func__, result); @@ -572,7 +667,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); } @@ -602,6 +698,9 @@ static void cui_update_sysinfo(struct system_info *sysinfo, void *arg) if (cui->sysinfo_screen) sysinfo_screen_update(cui->sysinfo_screen, sysinfo); + if (cui->subset_screen) + subset_screen_update(cui->subset_screen); + /* ... and do the same with the config screen... */ if (cui->config_screen) config_screen_update(cui->config_screen, cui->config, sysinfo); @@ -613,18 +712,51 @@ static void cui_update_sysinfo(struct system_info *sysinfo, void *arg) cui_update_mm_title(cui); } +static void cui_update_language(struct cui *cui, char *lang) +{ + bool repost_menu; + char *cur_lang; + + cur_lang = setlocale(LC_ALL, NULL); + if (cur_lang && !strcmp(cur_lang, lang)) + return; + + setlocale(LC_ALL, lang); + + /* we'll need to update the menu: drop all items and repopulate */ + repost_menu = cui->current == &cui->main->scr; + if (repost_menu) + nc_scr_unpost(cui->current); + + talloc_free(cui->main); + cui->main = main_menu_init(cui); + + if (repost_menu) { + cui->current = &cui->main->scr; + nc_scr_post(cui->current); + } + + discover_client_enumerate(cui->client); +} + static void cui_update_config(struct config *config, void *arg) { struct cui *cui = cui_from_arg(arg); cui->config = talloc_steal(cui, config); + if (config->lang) + cui_update_language(cui, config->lang); + + if (cui->subset_screen) + subset_screen_update(cui->subset_screen); + 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"); + _("SAFE MODE: select '%s' to continue"), + _("Rescan devices")); } int cui_send_config(struct cui *cui, struct config *config) @@ -632,11 +764,123 @@ int cui_send_config(struct cui *cui, struct config *config) return discover_client_send_config(cui->client, config); } +int cui_send_url(struct cui *cui, char * url) +{ + return discover_client_send_url(cui->client, url); +} + void cui_send_reinit(struct cui *cui) { discover_client_send_reinit(cui->client); } +static int menu_sysinfo_execute(struct pmenu_item *item) +{ + cui_show_sysinfo(cui_from_item(item)); + return 0; +} + +static int menu_config_execute(struct pmenu_item *item) +{ + cui_show_config(cui_from_item(item)); + return 0; +} + +static int menu_lang_execute(struct pmenu_item *item) +{ + cui_show_lang(cui_from_item(item)); + return 0; +} + +static int menu_reinit_execute(struct pmenu_item *item) +{ + cui_send_reinit(cui_from_item(item)); + return 0; +} + +static int menu_add_url_execute(struct pmenu_item *item) +{ + cui_show_add_url(cui_from_item(item)); + return 0; +} + +/** + * pb_mm_init - Setup the main menu instance. + */ +static struct pmenu *main_menu_init(struct cui *cui) +{ + struct pmenu_item *i; + struct pmenu *m; + int result; + + m = pmenu_init(cui, 7, cui_on_exit); + if (!m) { + pb_log("%s: failed\n", __func__); + return NULL; + } + + m->on_new = cui_item_new; + + m->scr.frame.ltitle = talloc_asprintf(m, + "Petitboot (" PACKAGE_VERSION ")"); + m->scr.frame.rtitle = NULL; + m->scr.frame.help = talloc_strdup(m, + _("Enter=accept, e=edit, n=new, x=exit, l=language, h=help")); + m->scr.frame.status = talloc_strdup(m, _("Welcome to Petitboot")); + + /* add a separator */ + i = pmenu_item_create(m, " "); + item_opts_off(i->nci, O_SELECTABLE); + pmenu_item_insert(m, i, 0); + + /* add system items */ + i = pmenu_item_create(m, _("System information")); + i->on_execute = menu_sysinfo_execute; + pmenu_item_insert(m, i, 1); + + i = pmenu_item_create(m, _("System configuration")); + i->on_execute = menu_config_execute; + pmenu_item_insert(m, i, 2); + + /* this label isn't translated, so we don't want a gettext() here */ + i = pmenu_item_create(m, "Language"); + i->on_execute = menu_lang_execute; + pmenu_item_insert(m, i, 3); + + i = pmenu_item_create(m, _("Rescan devices")); + i->on_execute = menu_reinit_execute; + pmenu_item_insert(m, i, 4); + + i = pmenu_item_create(m, _("Retrieve config from URL")); + i->on_execute = menu_add_url_execute; + pmenu_item_insert(m, i, 5); + + i = pmenu_item_create(m, _("Exit to shell")); + i->on_execute = pmenu_exit_cb; + pmenu_item_insert(m, i, 6); + + result = pmenu_setup(m); + + if (result) { + pb_log("%s:%d: pmenu_setup failed: %s\n", __func__, __LINE__, + strerror(errno)); + goto fail_setup; + } + + m->help_title = _("main menu"); + m->help_text = &main_menu_help_text; + + menu_opts_off(m->ncm, O_SHOWDESC); + set_menu_mark(m->ncm, " *"); + set_current_item(m->ncm, i->nci); + + return m; + +fail_setup: + talloc_free(m); + return NULL; +} + static struct discover_client_ops cui_client_ops = { .device_add = NULL, .boot_option_add = cui_boot_option_add, @@ -663,10 +907,9 @@ struct cui *cui_init(void* platform_info, unsigned int i; cui = talloc_zero(NULL, struct cui); - 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; } @@ -699,19 +942,19 @@ 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; } @@ -719,6 +962,10 @@ retry_start: talloc_steal(cui, cui->client); cui_start(); + cui->main = main_menu_init(cui); + if (!cui->main) + goto fail_client_init; + waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN, cui_process_key, cui); @@ -749,13 +996,12 @@ fail_alloc: * Returns 0 on success (return to shell), -1 on error (should restart). */ -int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) +int cui_run(struct cui *cui) { assert(main); - cui->main = main; cui->current = &cui->main->scr; - cui->default_item = default_item; + cui->default_item = 0; nc_scr_post(cui->current);