#include "pb-protocol/pb-protocol.h"
#include "talloc/talloc.h"
#include "waiter/waiter.h"
+#include "process/process.h"
#include "ui/common/discover-client.h"
#include "nc-cui.h"
return item->data;
}
+static void cui_start(void)
+{
+ 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);
+
+ while (getch() != ERR) /* flush stdin */
+ (void)0;
+}
+
+static void cui_atexit(void)
+{
+ clear();
+ refresh();
+ endwin();
+}
+
/**
* cui_abort - Signal the main cui program loop to exit.
*
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]);
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);
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;
- }
+ pb_debug("%s: %s\n", __func__, cod->name);
nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
* 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 boot_editor *boot_editor,
+ enum boot_editor_result boot_editor_result,
+ struct pb_boot_data *bd)
{
- struct cui *cui = cui_from_arg(boot_editor->scr.ui_ctx);
+ struct cui *cui = cui_from_pmenu(boot_editor->original_pmenu);
+ struct pmenu_item *item = boot_editor->data;
+ struct cui_opt_data *cod;
- 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);
+ if (boot_editor_result != boot_editor_update) {
+ cui_set_current(cui, &cui->main->scr);
+ talloc_free(boot_editor);
+ return;
+ }
- assert(bd);
+ assert(bd);
- talloc_steal(i, bd);
- talloc_free(cod->bd);
- cod->bd = bd;
+ /* Is this was a new item, we'll need to update the menu */
+ if (!item) {
+ struct pmenu *menu = boot_editor->original_pmenu;
+ int insert_pt;
- pmenu_item_replace(i, cod->name);
+ /* Detach the items array. */
+ set_menu_items(menu->ncm, NULL);
- /* FIXME: need to make item visible somehow */
- set_current_item(cui->main->ncm, i->nci);
+ /* 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);
- 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);
+ cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
+ pmenu_item_setup(menu, item, insert_pt,
+ talloc_strdup(item, cod->name));
+
+ /* Re-attach the items array. */
+ set_menu_items(menu->ncm, menu->items);
+ menu->scr.post(&menu->scr);
+ } else {
+ cod = item->data;
}
- cui_set_current(cui, &cui->main->scr);
+ cod->bd = talloc_steal(cod, bd);
+ /* FIXME: need to make item visible somehow */
+ set_current_item(item->pmenu->ncm, item->nci);
+ cui_set_current(cui, &cui->main->scr);
talloc_free(boot_editor);
}
-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;
- boot_editor = boot_editor_init(cui, cod->bd, cui_boot_editor_on_exit);
+ boot_editor = boot_editor_init(item->pmenu, cod->bd,
+ cui_boot_editor_on_exit);
+ boot_editor->data = item;
cui_set_current(cui, &boot_editor->scr);
+}
- return 0;
+void cui_item_new(struct pmenu *menu)
+{
+ struct cui *cui = cui_from_pmenu(menu);
+ struct boot_editor *boot_editor;
+
+ boot_editor = boot_editor_init(menu, NULL,
+ cui_boot_editor_on_exit);
+ cui_set_current(cui, &boot_editor->scr);
}
/**
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.
*
ITEM *selected;
int result;
- 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);
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);
}
+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)
+ cui->current->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);
+ cui_update_mm_title(cui);
+}
+
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,
};
/**
cui->platform_info = platform_info;
cui->waitset = waitset_create(cui);
+ process_init(cui, cui->waitset, false);
+
setlocale(LC_ALL, "");
/* 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;
goto fail_client_init;
}
- atexit(nc_atexit);
- nc_start();
+ atexit(cui_atexit);
+ cui_start();
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
cui_process_key, cui);
}
}
- nc_atexit();
+ cui_atexit();
return cui->abort ? 0 : -1;
}
projects / petitboot / blobdiff