X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=18604c9e04a06a2435f956a6b1b89bc897d05986;hp=df727bc7af56092264a1f6281c595ba5be6a972c;hb=6c7cf0a58b0e4be046b2367c93925e1c4895dd6c;hpb=04b0f95866d735313d7aeb4bcb07552e1799ab6d diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index df727bc..18604c9 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -16,9 +16,9 @@ * 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 #include @@ -38,6 +38,7 @@ #include "nc-boot-editor.h" #include "nc-config.h" #include "nc-sysinfo.h" +#include "nc-helpscreen.h" static void cui_start(void) { @@ -160,6 +161,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, { struct pmenu *menu = cui->main; struct cui_opt_data *cod; + static int user_idx = 0; /* Was the edit cancelled? */ if (!bd) { @@ -173,19 +175,27 @@ static void cui_boot_editor_on_exit(struct cui *cui, if (!item) { 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); @@ -197,6 +207,7 @@ static void cui_boot_editor_on_exit(struct cui *cui, cod->bd = talloc_steal(cod, bd); 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; @@ -246,6 +257,28 @@ void cui_show_config(struct cui *cui) 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)); +} + /** * cui_set_current - Set the currently active screen and redraw it. */ @@ -296,6 +329,8 @@ static int cui_process_key(void *arg) for (;;) { int c = getch(); + pb_debug("%s: got key %d\n", __func__, c); + if (c == ERR) break; @@ -365,30 +400,23 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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; @@ -405,7 +433,15 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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); @@ -424,10 +460,20 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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); @@ -545,6 +591,11 @@ 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, @@ -626,6 +677,7 @@ retry_start: } atexit(cui_atexit); + talloc_steal(cui, cui->client); cui_start(); waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,