X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=85558481b52956a2005e1017a0f0456649aae3ad;hp=bd4f6b8ae84a175699d9f312555bdd23f2c11205;hb=6d1eff1e8e1db12e7aa179e8dc9c65050c045536;hpb=293fca73b2fe077e7780c1a42216a3db41a6e737 diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index bd4f6b8..8555848 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -16,18 +16,22 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "config.h" + #define _GNU_SOURCE #include #include #include #include +#include #include #include "log/log.h" #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" @@ -77,13 +81,13 @@ int cui_run_cmd(struct pmenu_item *item) { 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); @@ -135,47 +139,76 @@ static int cui_boot(struct pmenu_item *item) * 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) { + cui_set_current(cui, &cui->main->scr); + talloc_free(boot_editor); + return; + } - 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); + assert(bd); - 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; - talloc_steal(i, bd); - talloc_free(cod->bd); - cod->bd = bd; + /* Detach the items array. */ + set_menu_items(menu->ncm, NULL); - pmenu_item_replace(i, cod->name); + /* 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); - /* FIXME: need to make item visible somehow */ - set_current_item(cui->main->ncm, i->nci); + cod->name = talloc_asprintf(cod, "User item %u:", insert_pt); + pmenu_item_setup(menu, item, insert_pt, + talloc_strdup(item, cod->name)); - 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(" args '%s'\n", cod->bd->args); + /* 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); } /** @@ -222,7 +255,10 @@ static int cui_process_key(void *arg) assert(cui->current); - ui_timer_disable(&cui->timer); + if (!cui->has_input) + discover_client_cancel_default(cui->client); + cui->has_input = true; + for (;;) { int c = getch(); @@ -257,24 +293,6 @@ static int cui_process_js(void *arg) return 0; } -/** - * cui_handle_timeout - Handle the timeout. - */ - -static void cui_handle_timeout(struct ui_timer *timer) -{ - struct cui *cui = cui_from_timer(timer); - struct pmenu_item *i = pmenu_find_selected(cui->main); - -#if defined(DEBUG) - { - struct cui_opt_data *cod = cod_from_item(i); - assert(cod && (cod->opt_hash == cui->default_item)); - } -#endif - i->on_execute(i); -} - /** * cui_handle_resize - Handle the term resize. */ @@ -300,46 +318,6 @@ static void cui_handle_resize(struct cui *cui) 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. * @@ -378,7 +356,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, 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); @@ -390,6 +368,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, cod->bd->image = talloc_strdup(cod->bd, opt->boot_image_file); cod->bd->initrd = talloc_strdup(cod->bd, opt->initrd_file); + 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); @@ -399,12 +378,6 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt, pb_log(" initrd '%s'\n", cod->bd->initrd); pb_log(" args '%s'\n", cod->bd->args); - /* If this is the default_item select it and start timer. */ - if (cod->opt_hash == cui->default_item) { - selected = i->nci; - ui_timer_kick(&cui->timer); - } - /* Re-attach the items array. */ result = set_menu_items(cui->main->ncm, cui->main->items); @@ -455,15 +428,9 @@ static void cui_device_remove(struct device *dev, void *arg) list_for_each_entry(&dev->boot_options, opt, list) { struct pmenu_item *i = pmenu_item_from_arg(opt->ui_info); - struct cui_opt_data *cod = cod_from_item(i); - assert(pb_protocol_device_cmp(dev, cod->dev)); + assert(pb_protocol_device_cmp(dev, cod_from_item(i)->dev)); pmenu_remove(cui->main, i); - - /* If this is the default_item disable timer. */ - - if (cod->opt_hash == cui->default_item) - ui_timer_disable(&cui->timer); } /* Re-attach the items array. */ @@ -494,11 +461,34 @@ static void cui_update_status(struct boot_status *status, void *arg) } +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, }; /** @@ -527,9 +517,12 @@ struct cui *cui_init(void* platform_info, cui->c_sig = pb_cui_sig; cui->platform_info = platform_info; - cui->timer.handle_timeout = cui_handle_timeout; cui->waitset = waitset_create(cui); + process_init(cui, cui->waitset, false); + + setlocale(LC_ALL, ""); + /* Loop here for scripts that just started the server. */ retry_start: @@ -547,7 +540,7 @@ retry_start: start_deamon = 0; - result = pb_start_daemon(); + result = pb_start_daemon(cui); if (!result) goto retry_start; @@ -615,7 +608,7 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) 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; }