X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.c;h=b9d8d79048639300b6d4d7667983be7b463627ed;hp=752b10a5517d2e1e6e61393d4f4e48560d99752b;hb=f4c558294089f7449e6f536300ddd1aa94d2cf20;hpb=ac0f1324b64f7310c31aecb5dbf23b3ae0d5a3e0 diff --git a/ui/ncurses/nc-cui.c b/ui/ncurses/nc-cui.c index 752b10a..b9d8d79 100644 --- a/ui/ncurses/nc-cui.c +++ b/ui/ncurses/nc-cui.c @@ -59,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. */ @@ -82,7 +111,7 @@ int cui_run_cmd(struct pmenu_item *item) def_prog_mode(); - result = pb_run_cmd(cmd_argv); + result = pb_run_cmd(cmd_argv, 1, 0); reset_prog_mode(); redrawwin(cui->current->main_ncw); @@ -122,7 +151,7 @@ static int cui_run_kexec(struct pmenu_item *item) clear(); mvaddstr(1, 0, "system is going down now..."); refresh(); - sleep(60); + sleep(cui->dry_run ? 1 : 60); } pb_log("%s: failed: %s\n", __func__, cod->kd->image); @@ -140,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); @@ -150,6 +180,12 @@ static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result, talloc_free(cod->kd); cod->kd = kd; + 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); @@ -159,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; @@ -199,6 +230,10 @@ 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); @@ -211,6 +246,24 @@ static int cui_process_key(void *arg) 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. */ @@ -275,7 +328,6 @@ void cui_on_open(struct pmenu *menu) unsigned int insert_pt; struct pmenu_item *i; struct cui_opt_data *cod; - char *name; menu->scr.unpost(&menu->scr); @@ -288,23 +340,21 @@ void cui_on_open(struct pmenu *menu) insert_pt = pmenu_grow(menu, 1); i = pmenu_item_alloc(menu); - name = talloc_asprintf(i, "User item %u:", insert_pt); - pmenu_item_setup(menu, i, insert_pt, name); - 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); - cod->name = name; + + pmenu_item_setup(menu, i, insert_pt, talloc_strdup(i, cod->name)); /* Re-attach the items array. */ set_menu_items(menu->ncm, menu->items); - set_current_item(menu->ncm, i->nci); menu->scr.post(&menu->scr); - pos_menu_cursor(menu->ncm); + set_current_item(menu->ncm, i->nci); i->on_edit(i); } @@ -356,11 +406,6 @@ static int cui_device_add(struct device *dev, void *arg) opt->ui_info = i = pmenu_item_alloc(cui->main); - name = talloc_asprintf(i, "%s: %s", opt->name, - opt->description); - - pmenu_item_setup(cui->main, i, insert_pt, name); - i->on_edit = cui_ked_run; i->on_execute = cui_run_kexec; i->data = cod = talloc(i, struct cui_opt_data); @@ -375,6 +420,9 @@ static int cui_device_add(struct device *dev, void *arg) cod->kd->initrd = talloc_strdup(cod->kd, opt->initrd_file); cod->kd->args = talloc_strdup(cod->kd, opt->boot_args); + name = cui_make_item_name(i, cod); + pmenu_item_setup(cui->main, i, insert_pt, name); + insert_pt++; pb_log("%s: adding opt '%s'\n", __func__, cod->name); @@ -485,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), int start_deamon, int dry_run) { struct cui *cui; struct discover_client *client; @@ -503,17 +552,37 @@ struct cui *cui_init(void* platform_info, cui->platform_info = platform_info; cui->on_kexec = on_kexec; cui->timer.handle_timeout = cui_handle_timeout; + cui->dry_run = dry_run; /* Loop here for scripts that just started the server. */ - for (i = 10; i; i--) { +retry_start: + for (i = start_deamon ? 2 : 10; i; i--) { client = discover_client_init(&cui_client_ops, cui); - if (client) + if (client || !i) break; pb_log("%s: waiting for server %d\n", __func__, i); sleep(1); } + if (!client && start_deamon) { + int result; + + start_deamon = 0; + + result = pb_start_daemon(); + + if (!result) + goto retry_start; + + pb_log("%s: discover_client_init failed.\n", __func__); + fprintf(stderr, "%s: error: discover_client_init failed.\n", + __func__); + fprintf(stderr, "could not start pb-discover, the petitboot " + "daemon.\n"); + goto fail_client_init; + } + if (!client) { pb_log("%s: discover_client_init failed.\n", __func__); fprintf(stderr, "%s: error: discover_client_init failed.\n", @@ -531,6 +600,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: