X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=aed5ff7befdcbdec665b3cfea0f344ea00321e94;hp=2a4c971165963bb60fc66a3afb3aa49f9db3ec92;hb=944bccf5409ce2ea8333423416128bb97eb10d6f;hpb=3752d1949cd3fb15593b2397d6af14b83a4aa6b4 diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 2a4c971..aed5ff7 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -30,7 +30,6 @@ #include "ui/common/discover-client.h" #include "nc-cui.h" - static struct cui_opt_data *cod_from_item(struct pmenu_item *item) { return item->data; @@ -60,6 +59,35 @@ void cui_resize(struct cui *cui) cui->resize = 1; } +/** + * cui_make_item_name - Format the menu item name srting. + * + * Returns a talloc string. + */ + +static char *cui_make_item_name(struct pmenu_item *i, struct cui_opt_data *cod) +{ + char *name; + + assert(cod->name); + assert(cod->kd); + + name = talloc_asprintf(i, "%s:", cod->name); + + if (cod->kd->image) + name = talloc_asprintf_append(name, " %s", cod->kd->image); + + if (cod->kd->initrd) + name = talloc_asprintf_append(name, " initrd=%s", + cod->kd->initrd); + + if (cod->kd->args) + name = talloc_asprintf_append(name, " %s", cod->kd->args); + + DBGS("@%s@\n", name); + return name; +} + /** * cui_on_exit - A generic main menu ESC callback. */ @@ -109,8 +137,8 @@ static int cui_run_kexec(struct pmenu_item *item) assert(cui->current == &cui->main->scr); assert(cui->on_kexec); - pb_log("%s: %s\n", __func__, cod->dev->name, cod->opt->name); - nc_scr_status_printf(cui->current, "Booting %s...", cod->opt->name); + pb_log("%s: %s\n", __func__, cod->name); + nc_scr_status_printf(cui->current, "Booting %s...", cod->name); def_prog_mode(); @@ -141,9 +169,10 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result, { struct cui *cui = cui_from_arg(ked->scr.ui_ctx); - if (ked_result == ked_update || ked_result == ked_boot) { + if (ked_result == ked_update) { struct pmenu_item *i = pmenu_find_selected(cui->main); struct cui_opt_data *cod = cod_from_item(i); + char *name; assert(kd); @@ -151,7 +180,13 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result, talloc_free(cod->kd); cod->kd = kd; - pb_log("%s: updating opt '%s'\n", __func__, cod->opt->name); + name = cui_make_item_name(i, cod); + pmenu_item_replace(i, name); + + /* FIXME: need to make item visible somehow */ + set_current_item(cui->main->ncm, i->nci); + + pb_log("%s: updating opt '%s'\n", __func__, cod->name); pb_log(" image '%s'\n", cod->kd->image); pb_log(" initrd '%s'\n", cod->kd->initrd); pb_log(" args '%s'\n", cod->kd->args); @@ -160,20 +195,15 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result, cui_set_current(cui, &cui->main->scr); talloc_free(ked); - - if (ked_result == ked_boot) { - struct pmenu_item *i = pmenu_find_selected(cui->main); - i->on_execute(i); - } } int cui_ked_run(struct pmenu_item *item) { struct cui *cui = cui_from_item(item); + struct cui_opt_data *cod = cod_from_item(item); struct ked *ked; - ked = ked_init(cui, cod_from_item(item)->kd, cui_ked_on_exit); - + ked = ked_init(cui, cod->kd, cui_ked_on_exit); cui_set_current(cui, &ked->scr); return 0; @@ -200,14 +230,43 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr) return old; } +/** + * cui_process_key - Process input on stdin. + */ + static int cui_process_key(void *arg) { struct cui *cui = cui_from_arg(arg); assert(cui->current); + + ui_timer_disable(&cui->timer); cui->current->process_key(cui->current); + + return 0; +} + +/** + * cui_process_js - Process joystick events. + */ + +static int cui_process_js(void *arg) +{ + struct cui *cui = cui_from_arg(arg); + int c; + + c = pjs_process_event(cui->pjs); + + if (c) { + ungetch(c); + cui_process_key(arg); + } + return 0; } +/** + * cui_client_process_socket - Process a socket event from the discover server. + */ static int cui_client_process_socket(void *arg) { @@ -217,6 +276,24 @@ static int cui_client_process_socket(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. */ @@ -242,6 +319,46 @@ 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_ked_run; + i->on_execute = cui_run_kexec; + i->data = cod = talloc_zero(i, struct cui_opt_data); + + cod->name = talloc_asprintf(i, "User item %u:", insert_pt); + cod->kd = talloc_zero(i, struct pb_kexec_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. * @@ -284,23 +401,11 @@ static int cui_device_add(struct device *dev, void *arg) struct pmenu_item *i; struct cui_opt_data *cod; char *name; - char *description; /* Save the item in opt->ui_info for cui_device_remove() */ opt->ui_info = i = pmenu_item_alloc(cui->main); - name = talloc_asprintf(i, "%s: %s", opt->name, - opt->description); - - description = talloc_asprintf(i, - " kexec: image='%s' initrd='%s' args='%s'", - opt->boot_image_file, - opt->initrd_file, - opt->boot_args); - - pmenu_item_setup(cui->main, i, insert_pt, name, description); - i->on_edit = cui_ked_run; i->on_execute = cui_run_kexec; i->data = cod = talloc(i, struct cui_opt_data); @@ -308,23 +413,29 @@ static int cui_device_add(struct device *dev, void *arg) cod->dev = dev; cod->opt = opt; cod->opt_hash = pb_opt_hash(dev, opt); + cod->name = opt->name; cod->kd = talloc(i, struct pb_kexec_data); cod->kd->image = talloc_strdup(cod->kd, opt->boot_image_file); cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file); cod->kd->args = talloc_strdup(cod->kd, opt->boot_args); - insert_pt++; - - /* If this is the default_item select it. */ + name = cui_make_item_name(i, cod); + pmenu_item_setup(cui->main, i, insert_pt, name); - if (cod->opt_hash == cui->default_item) - selected = i->nci; + insert_pt++; - pb_log("%s: adding opt '%s'\n", __func__, cod->opt->name); + pb_log("%s: adding opt '%s'\n", __func__, cod->name); pb_log(" image '%s'\n", cod->kd->image); pb_log(" initrd '%s'\n", cod->kd->initrd); pb_log(" args '%s'\n", cod->kd->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. */ @@ -340,6 +451,9 @@ static int cui_device_add(struct device *dev, void *arg) 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 (cui->current == &cui->main->scr) @@ -375,9 +489,15 @@ 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_from_item(i)->dev)); + assert(pb_protocol_device_cmp(dev, cod->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. */ @@ -397,10 +517,6 @@ static void cui_device_remove(struct device *dev, void *arg) cui->current->post(cui->current); } -/** - * cui_client_process_socket - Process a socket event from the discover server. - */ - static struct discover_client_ops cui_client_ops = { .device_add = cui_device_add, .device_remove = cui_device_remove, @@ -417,7 +533,8 @@ static struct discover_client_ops cui_client_ops = { */ struct cui *cui_init(void* platform_info, - int (*on_kexec)(struct cui *, struct cui_opt_data *)) + int (*on_kexec)(struct cui *, struct cui_opt_data *), + int (*js_map)(const struct js_event *e)) { struct cui *cui; struct discover_client *client; @@ -434,6 +551,7 @@ struct cui *cui_init(void* platform_info, cui->c_sig = pb_cui_sig; cui->platform_info = platform_info; cui->on_kexec = on_kexec; + cui->timer.handle_timeout = cui_handle_timeout; /* Loop here for scripts that just started the server. */ @@ -462,6 +580,15 @@ struct cui *cui_init(void* platform_info, waiter_register(STDIN_FILENO, WAIT_IN, cui_process_key, cui); + if (js_map) { + + cui->pjs = pjs_init(cui, js_map); + + if (cui->pjs) + waiter_register(pjs_get_fd(cui->pjs), WAIT_IN, + cui_process_js, cui); + } + return cui; fail_client_init: @@ -501,6 +628,8 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item) if (cui->abort) break; + ui_timer_process_sig(&cui->timer); + while (cui->resize) { cui->resize = 0; cui_handle_resize(cui);