* 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 "waiter/waiter.h"
#include "process/process.h"
#include "ui/common/discover-client.h"
+#include "ui/common/ui-system.h"
#include "nc-cui.h"
-
-static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
-{
- return item->data;
-}
+#include "nc-boot-editor.h"
+#include "nc-config.h"
+#include "nc-sysinfo.h"
+#include "nc-helpscreen.h"
static void cui_start(void)
{
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;
}
nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
- def_prog_mode();
-
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);
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,
+static void cui_boot_editor_on_exit(struct cui *cui,
+ struct pmenu_item *item,
struct pb_boot_data *bd)
{
- struct cui *cui = cui_from_pmenu(boot_editor->original_pmenu);
- struct pmenu_item *item = boot_editor->data;
+ struct pmenu *menu = cui->main;
struct cui_opt_data *cod;
+ static int user_idx = 0;
- if (boot_editor_result != boot_editor_update) {
+ /* Was the edit cancelled? */
+ if (!bd) {
cui_set_current(cui, &cui->main->scr);
- talloc_free(boot_editor);
+ 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) {
- struct pmenu *menu = boot_editor->original_pmenu;
int insert_pt;
+ cod = talloc_zero(NULL, struct cui_opt_data);
+ cod->name = talloc_asprintf(cod, "User item %u", ++user_idx);
+
+ item = pmenu_item_create(menu, cod->name);
+ if (!item) {
+ talloc_free(cod);
+ goto out;
+ }
+
+ item->on_edit = cui_item_edit;
+ item->on_execute = cui_boot;
+ item->data = cod;
+
+ 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);
- 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);
-
- cod->name = talloc_asprintf(cod, "User item %u:", insert_pt);
- pmenu_item_setup(menu, item, insert_pt,
- talloc_strdup(item, cod->name));
+ pmenu_item_insert(menu, item, insert_pt);
/* Re-attach the items array. */
set_menu_items(menu->ncm, menu->items);
cod->bd = talloc_steal(cod, bd);
- /* FIXME: need to make item visible somehow */
set_current_item(item->pmenu->ncm, item->nci);
+out:
cui_set_current(cui, &cui->main->scr);
- talloc_free(boot_editor);
+ talloc_free(cui->boot_editor);
+ cui->boot_editor = NULL;
}
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(item->pmenu, cod->bd,
- cui_boot_editor_on_exit);
- boot_editor->data = item;
- cui_set_current(cui, &boot_editor->scr);
+ 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));
}
void cui_item_new(struct pmenu *menu)
{
struct cui *cui = cui_from_pmenu(menu);
- struct boot_editor *boot_editor;
+ 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));
+}
+
+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));
+}
- boot_editor = boot_editor_init(menu, NULL,
- cui_boot_editor_on_exit);
- cui_set_current(cui, &boot_editor->scr);
+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));
}
/**
{
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;
struct cui *cui = cui_from_arg(arg);
struct cui_opt_data *cod;
unsigned int insert_pt;
+ int result, rows, cols;
struct pmenu_item *i;
ITEM *selected;
- int result;
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)
nc_scr_unpost(cui->current);
- /* 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. */
- insert_pt = pmenu_grow(cui->main, 1);
-
/* Save the item in opt->ui_info for cui_device_remove() */
- opt->ui_info = i = pmenu_item_alloc(cui->main);
+ opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+ if (!i)
+ return -1;
i->on_edit = cui_item_edit;
i->on_execute = cui_boot;
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. */
+ insert_pt = pmenu_grow(cui->main, 1);
+ pmenu_item_insert(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)
nc_scr_post(cui->current);
{
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);
+}
+
+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,
};
/**
}
atexit(cui_atexit);
+ talloc_steal(cui, cui->client);
cui_start();
waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,