X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=5af11717e42915017b95cc8eaf97555db6e95283;hp=e02c6a66b2a19669a9d6de229a18ee348a2069ed;hb=504b84c7a37ba8656bceb80fa37138751b7a6702;hpb=089d0a6eb769d531129a7cd1061493a1a24b4bef diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index e02c6a6..5af1171 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -34,12 +34,43 @@ #include "process/process.h" #include "ui/common/discover-client.h" #include "nc-cui.h" +#include "nc-config.h" +#include "nc-sysinfo.h" static struct cui_opt_data *cod_from_item(struct pmenu_item *item) { 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. * @@ -116,13 +147,8 @@ static int cui_boot(struct pmenu_item *item) 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); @@ -172,7 +198,7 @@ static void cui_boot_editor_on_exit(struct boot_editor *boot_editor, /* Re-attach the items array. */ set_menu_items(menu->ncm, menu->items); - menu->scr.post(&menu->scr); + nc_scr_post(&menu->scr); } else { cod = item->data; } @@ -207,6 +233,34 @@ void cui_item_new(struct pmenu *menu) cui_set_current(cui, &boot_editor->scr); } +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)); +} + /** * cui_set_current - Set the currently active screen and redraw it. */ @@ -220,10 +274,11 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr) 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; } @@ -336,7 +391,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, selected = current_item(cui->main->ncm); if (cui->current == &cui->main->scr) - cui->current->unpost(cui->current); + nc_scr_unpost(cui->current); /* This disconnects items array from menu. */ @@ -392,7 +447,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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; } @@ -413,7 +468,7 @@ static void cui_device_remove(struct device *dev, void *arg) 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. */ @@ -443,7 +498,7 @@ static void cui_device_remove(struct device *dev, void *arg) } 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) @@ -469,22 +524,47 @@ static void cui_update_mm_title(struct cui *cui) " %s", cui->sysinfo->identifier); if (cui->current == &cui->main->scr) - cui->current->post(cui->current); + 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); + 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); +} + 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, }; /** @@ -558,8 +638,8 @@ 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); @@ -599,7 +679,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) 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); @@ -618,7 +698,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) } } - nc_atexit(); + cui_atexit(); return cui->abort ? 0 : -1; }