#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
#include <sys/ioctl.h>
#include "log/log.h"
#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-sysinfo.h"
#include "nc-helpscreen.h"
+extern const struct help_text main_menu_help_text;
+
static void cui_start(void)
{
initscr(); /* Initialize ncurses. */
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();
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;
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;
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) {
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;
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);
if (cui->current == &cui->main->scr)
nc_scr_unpost(cui->current);
- /* Save the item in opt->ui_info for cui_device_remove() */
+ /* Check if the boot device is new */
+ dev_hdr = pmenu_find_device(cui->main, dev, opt);
+
+ /* All actual boot entries are 'tabbed' across */
+ name = talloc_asprintf(cui->main, "%s%s",
+ tab, opt->name ? : "Unknown Name");
- opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+ /* Save the item in opt->ui_info for cui_device_remove() */
+ opt->ui_info = i = pmenu_item_create(cui->main, name);
+ talloc_free(name);
if (!i)
return -1;
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);
+ 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);
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);
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);
+ }
+
+ /* 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;
- assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev));
- pmenu_remove(cui->main, i);
+ struct cui_opt_data *data = item->data;
+ if (data && data->dev && data->dev == dev)
+ pmenu_remove(cui->main,item);
}
/* Re-attach the items array. */
nc_scr_status_printf(cui->current,
"%s: %s",
- status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+ status->type == BOOT_STATUS_ERROR ?
+ _("Error") : _("Info"),
status->message);
}
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)
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_reinit_execute(struct pmenu_item *item)
+{
+ cui_send_reinit(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, 5, 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, 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);
+
+ i = pmenu_item_create(m, _("Rescan devices"));
+ i->on_execute = menu_reinit_execute;
+ pmenu_item_insert(m, i, 3);
+
+ i = pmenu_item_create(m, _("Exit to shell"));
+ i->on_execute = pmenu_exit_cb;
+ pmenu_item_insert(m, i, 4);
+
+ 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,
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;
}
process_init(cui, cui->waitset, false);
- setlocale(LC_ALL, "");
-
/* Loop here for scripts that just started the server. */
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;
}
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);
* 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);
projects / petitboot / blobdiff