#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"
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;
}
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;
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;
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);
- opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+ /* 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_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(i)->dev));
- pmenu_remove(cui->main, i);
+ 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;
+
+ 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 (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)
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;
}
atexit(cui_atexit);
+ talloc_steal(cui, cui->client);
cui_start();
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
projects / petitboot / blobdiff