* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#if defined(HAVE_CONFIG_H)
#include "config.h"
-
-#define _GNU_SOURCE
+#endif
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
-#include <locale.h>
#include <sys/ioctl.h>
#include "log/log.h"
#include "pb-protocol/pb-protocol.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-boot-editor.h"
+#include "nc-config.h"
+#include "nc-sysinfo.h"
+#include "nc-helpscreen.h"
-static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
+static void cui_start(void)
{
- return item->data;
+ initscr(); /* Initialize ncurses. */
+ cbreak(); /* Disable line buffering. */
+ noecho(); /* Disable getch() echo. */
+ keypad(stdscr, TRUE); /* Enable num keypad keys. */
+ nonl(); /* Disable new-line translation. */
+ intrflush(stdscr, FALSE); /* Disable interrupt flush. */
+ curs_set(0); /* Make cursor invisible */
+ nodelay(stdscr, TRUE); /* Enable non-blocking getch() */
+
+ /* We may be operating with an incorrect $TERM type; in this case
+ * the keymappings will be slightly broken. We want at least
+ * backspace to work though, so we'll define both DEL and ^H to
+ * map to backspace */
+ 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;
+}
+
+static void cui_atexit(void)
+{
+ clear();
+ refresh();
+ endwin();
}
/**
void cui_resize(struct cui *cui)
{
- pb_log("%s: resizing\n", __func__);
+ pb_debug("%s: resizing\n", __func__);
cui->resize = 1;
}
/**
- * cui_on_exit - A generic main menu ESC callback.
+ * cui_on_exit - A generic main menu exit callback.
*/
void cui_on_exit(struct pmenu *menu)
{
int result;
struct cui *cui = cui_from_item(item);
- const char *const *cmd_argv = item->data;
+ 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();
- result = pb_run_cmd(cmd_argv, 1, 0);
+ result = process_run_simple_argv(item, cmd_argv);
reset_prog_mode();
redrawwin(cui->current->main_ncw);
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;
assert(cui->current == &cui->main->scr);
- pb_log("%s: %s\n", __func__, cod->name);
- if (!cod->opt) {
- pb_log("%s: missing opt?\n", __func__);
- return -1;
- }
-
- nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
+ pb_debug("%s: %s\n", __func__, cod->name);
- def_prog_mode();
+ nc_scr_status_printf(cui->current, _("Booting %s..."), cod->name);
result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
- reset_prog_mode();
- redrawwin(cui->current->main_ncw);
-
if (result) {
nc_scr_status_printf(cui->current,
- "Failed: boot %s", cod->bd->image);
+ _("Failed: boot %s"), cod->bd->image);
}
return 0;
}
-/**
- * cui_boot_editor_on_exit - The boot_editor on_exit callback.
- */
-
-static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, enum boot_editor_result boot_editor_result,
- struct pb_boot_data *bd)
+static void cui_boot_editor_on_exit(struct cui *cui,
+ struct pmenu_item *item,
+ struct pb_boot_data *bd)
{
- struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
+ struct pmenu *menu = cui->main;
+ struct cui_opt_data *cod;
+ static int user_idx = 0;
- if (boot_editor_result == boot_editor_update) {
- struct pmenu_item *i = pmenu_find_selected(cui->main);
- struct cui_opt_data *cod = cod_from_item(i);
+ /* Was the edit cancelled? */
+ if (!bd) {
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->boot_editor);
+ cui->boot_editor = NULL;
+ return;
+ }
- assert(bd);
+ /* Is this was a new item, we'll need to update the menu */
+ if (!item) {
+ int insert_pt;
- talloc_steal(i, bd);
- talloc_free(cod->bd);
- cod->bd = bd;
+ cod = talloc_zero(NULL, struct cui_opt_data);
+ cod->name = talloc_asprintf(cod, _("User item %u"), ++user_idx);
- pmenu_item_replace(i, cod->name);
+ item = pmenu_item_create(menu, cod->name);
+ if (!item) {
+ talloc_free(cod);
+ goto out;
+ }
- /* FIXME: need to make item visible somehow */
- set_current_item(cui->main->ncm, i->nci);
+ item->on_edit = cui_item_edit;
+ item->on_execute = cui_boot;
+ item->data = cod;
- pb_log("%s: updating opt '%s'\n", __func__, cod->name);
- pb_log(" image '%s'\n", cod->bd->image);
- pb_log(" initrd '%s'\n", cod->bd->initrd);
- pb_log(" dtb '%s'\n", cod->bd->dtb);
- pb_log(" args '%s'\n", cod->bd->args);
+ 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);
+ pmenu_item_insert(menu, item, insert_pt);
+
+ /* Re-attach the items array. */
+ set_menu_items(menu->ncm, menu->items);
+ nc_scr_post(&menu->scr);
+ } else {
+ cod = item->data;
}
- cui_set_current(cui, &cui->main->scr);
+ cod->bd = talloc_steal(cod, bd);
- talloc_free(boot_editor);
+ 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;
}
-int cui_boot_editor_run(struct pmenu_item *item)
+void cui_item_edit(struct pmenu_item *item)
{
struct cui *cui = cui_from_item(item);
- struct cui_opt_data *cod = cod_from_item(item);
- struct boot_editor *boot_editor;
+ cui->boot_editor = boot_editor_init(cui, item, cui->sysinfo,
+ cui_boot_editor_on_exit);
+ cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
- boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
- cui_set_current(cui, &boot_editor->scr);
+void cui_item_new(struct pmenu *menu)
+{
+ struct cui *cui = cui_from_pmenu(menu);
+ cui->boot_editor = boot_editor_init(cui, NULL, cui->sysinfo,
+ cui_boot_editor_on_exit);
+ cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
- return 0;
+static void cui_sysinfo_exit(struct cui *cui)
+{
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->sysinfo_screen);
+ cui->sysinfo_screen = NULL;
+}
+
+void cui_show_sysinfo(struct cui *cui)
+{
+ cui->sysinfo_screen = sysinfo_screen_init(cui, cui->sysinfo,
+ cui_sysinfo_exit);
+ cui_set_current(cui, sysinfo_screen_scr(cui->sysinfo_screen));
+}
+
+static void cui_config_exit(struct cui *cui)
+{
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(cui->config_screen);
+ cui->config_screen = NULL;
+}
+
+void cui_show_config(struct cui *cui)
+{
+ cui->config_screen = config_screen_init(cui, cui->config,
+ cui->sysinfo, cui_config_exit);
+ cui_set_current(cui, config_screen_scr(cui->config_screen));
+}
+
+static void cui_help_exit(struct cui *cui)
+{
+ cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+ talloc_free(cui->help_screen);
+ cui->help_screen = NULL;
+}
+
+void cui_show_help(struct cui *cui, const char *title, const char *text)
+{
+ if (!cui->current)
+ return;
+
+ if (cui->help_screen)
+ return;
+
+ cui->help_screen = help_screen_init(cui, cui->current,
+ title, text, cui_help_exit);
+
+ if (cui->help_screen)
+ cui_set_current(cui, help_screen_scr(cui->help_screen));
}
/**
assert(cui->current != scr);
old = cui->current;
- old->unpost(old);
+ nc_scr_unpost(old);
cui->current = scr;
- cui->current->post(cui->current);
+
+ nc_scr_post(cui->current);
return old;
}
{
switch (key) {
case 0xc:
- if (cui->current && cui->current->main_ncw) {
- redrawwin(cui->current->main_ncw);
- wrefresh(cui->current->main_ncw);
- }
+ if (cui->current && cui->current->main_ncw)
+ wrefresh(curscr);
return true;
}
return false;
assert(cui->current);
- if (!cui->has_input)
- discover_client_cancel_default(cui->client);
- cui->has_input = true;
-
for (;;) {
int c = getch();
+ pb_debug("%s: got key %d\n", __func__, c);
+
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;
return;
}
- pb_log("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
+ pb_debug("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
wclear(cui->current->main_ncw);
resize_term(ws.ws_row, ws.ws_col);
wrefresh(cui->current->main_ncw);
}
-/**
- * cui_on_open - Open new item callback.
- */
-
-void cui_on_open(struct pmenu *menu)
-{
- unsigned int insert_pt;
- struct pmenu_item *i;
- struct cui_opt_data *cod;
-
- menu->scr.unpost(&menu->scr);
-
- /* This disconnects items array from menu. */
-
- set_menu_items(menu->ncm, NULL);
-
- /* Insert new items at insert_pt. */
-
- insert_pt = pmenu_grow(menu, 1);
- i = pmenu_item_alloc(menu);
-
- i->on_edit = cui_boot_editor_run;
- i->on_execute = cui_boot;
- i->data = cod = talloc_zero(i, struct cui_opt_data);
-
- cod->name = talloc_asprintf(i, "User item %u:", insert_pt);
- cod->bd = talloc_zero(i, struct pb_boot_data);
-
- pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name));
-
- /* Re-attach the items array. */
-
- set_menu_items(menu->ncm, menu->items);
-
- menu->scr.post(&menu->scr);
- set_current_item(menu->ncm, i->nci);
-
- i->on_edit(i);
-}
-
/**
* cui_device_add - Client device_add callback.
*
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;
- struct pmenu_item *i;
+ int result, rows, cols;
ITEM *selected;
- int result;
+ char *name;
- pb_log("%s: %p %s\n", __func__, opt, opt->id);
+ pb_debug("%s: %p %s\n", __func__, opt, opt->id);
selected = current_item(cui->main->ncm);
+ menu_format(cui->main->ncm, &rows, &cols);
if (cui->current == &cui->main->scr)
- cui->current->unpost(cui->current);
+ 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_create(cui->main, name);
+ talloc_free(name);
+ if (!i)
+ return -1;
- opt->ui_info = i = pmenu_item_alloc(cui->main);
-
- i->on_edit = cui_boot_editor_run;
+ i->on_edit = cui_item_edit;
i->on_execute = cui_boot;
i->data = cod = talloc(i, struct cui_opt_data);
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);
item_count(cui->main->ncm) + 1);
}
- /* FIXME: need to make item visible somehow */
- menu_driver(cui->main->ncm, REQ_SCR_UPAGE);
- menu_driver(cui->main->ncm, REQ_SCR_DPAGE);
- set_current_item(cui->main->ncm, selected);
+ if (!item_visible(selected)) {
+ int idx, top;
+
+ top = top_row(cui->main->ncm);
+ idx = item_index(selected);
+
+ /* 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;
+
+ set_top_row(cui->main->ncm, top);
+ set_current_item(cui->main->ncm, selected);
+ }
if (cui->current == &cui->main->scr)
- cui->current->post(cui->current);
+ nc_scr_post(cui->current);
return 0;
}
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);
if (cui->current == &cui->main->scr)
- cui->current->unpost(cui->current);
+ nc_scr_unpost(cui->current);
/* This disconnects items array from menu. */
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. */
}
if (cui->current == &cui->main->scr)
- cui->current->post(cui->current);
+ nc_scr_post(cui->current);
}
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);
}
+static void cui_update_mm_title(struct cui *cui)
+{
+ struct nc_frame *frame = &cui->main->scr.frame;
+
+ talloc_free(frame->rtitle);
+
+ frame->rtitle = talloc_strdup(cui->main, cui->sysinfo->type);
+ if (cui->sysinfo->identifier)
+ frame->rtitle = talloc_asprintf_append(frame->rtitle,
+ " %s", cui->sysinfo->identifier);
+
+ if (cui->current == &cui->main->scr)
+ nc_scr_post(cui->current);
+}
+
+static void cui_update_sysinfo(struct system_info *sysinfo, void *arg)
+{
+ struct cui *cui = cui_from_arg(arg);
+ cui->sysinfo = talloc_steal(cui, sysinfo);
+
+ /* if we're currently displaying the system info screen, inform it
+ * of the updated information. */
+ if (cui->sysinfo_screen)
+ sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
+
+ /* ... and do the same with the config screen... */
+ if (cui->config_screen)
+ config_screen_update(cui->config_screen, cui->config, sysinfo);
+
+ /* ... and the boot editor. */
+ if (cui->boot_editor)
+ boot_editor_update(cui->boot_editor, sysinfo);
+
+ cui_update_mm_title(cui);
+}
+
+static void cui_update_config(struct config *config, void *arg)
+{
+ struct cui *cui = cui_from_arg(arg);
+ cui->config = talloc_steal(cui, config);
+
+ 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)
+{
+ 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,
.device_remove = cui_device_remove,
.update_status = cui_update_status,
+ .update_sysinfo = cui_update_sysinfo,
+ .update_config = cui_update_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;
}
cui->platform_info = platform_info;
cui->waitset = waitset_create(cui);
- setlocale(LC_ALL, "");
+ process_init(cui, cui->waitset, false);
/* Loop here for scripts that just started the server. */
start_deamon = 0;
- result = pb_start_daemon();
+ result = pb_start_daemon(cui);
if (!result)
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(nc_atexit);
- nc_start();
+ atexit(cui_atexit);
+ talloc_steal(cui, cui->client);
+ cui_start();
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
cui_process_key, cui);
cui->current = &cui->main->scr;
cui->default_item = default_item;
- cui->current->post(cui->current);
+ nc_scr_post(cui->current);
while (1) {
int result = waiter_poll(cui->waitset);
- if (result < 0 && errno != EINTR) {
+ if (result < 0) {
pb_log("%s: poll: %s\n", __func__, strerror(errno));
break;
}
}
}
- nc_atexit();
+ cui_atexit();
return cui->abort ? 0 : -1;
}
projects / petitboot / blobdiff