* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#define _GNU_SOURCE
#include <assert.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#include <sys/ioctl.h>
#include "log/log.h"
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->bd);
-
- name = talloc_asprintf(i, "%s:", cod->name);
-
- if (cod->bd->image)
- name = talloc_asprintf_append(name, " %s", cod->bd->image);
-
- if (cod->bd->initrd)
- name = talloc_asprintf_append(name, " initrd=%s",
- cod->bd->initrd);
-
- if (cod->bd->args)
- name = talloc_asprintf_append(name, " %s", cod->bd->args);
-
- DBGS("@%s@\n", name);
- return name;
-}
-
/**
* cui_on_exit - A generic main menu ESC callback.
*/
assert(cui->current == &cui->main->scr);
pb_log("%s: %s\n", __func__, cod->name);
+ if (!cod->opt) {
+ pb_log("%s: missing opt?\n", __func__);
+ return -1;
+ }
+
nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
def_prog_mode();
reset_prog_mode();
redrawwin(cui->current->main_ncw);
- if (!result) {
- clear();
- mvaddstr(1, 0, "system is going down now...");
- refresh();
- } else {
+ if (result) {
nc_scr_status_printf(cui->current,
"Failed: boot %s", cod->bd->image);
}
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);
- char *name;
assert(bd);
talloc_free(cod->bd);
cod->bd = bd;
- name = cui_make_item_name(i, cod);
- pmenu_item_replace(i, name);
+ pmenu_item_replace(i, cod->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->bd->image);
pb_log(" initrd '%s'\n", cod->bd->initrd);
+ pb_log(" dtb '%s'\n", cod->bd->dtb);
pb_log(" args '%s'\n", cod->bd->args);
}
return old;
}
+static bool process_global_keys(struct cui *cui, int key)
+{
+ switch (key) {
+ case 0xc:
+ if (cui->current && cui->current->main_ncw) {
+ redrawwin(cui->current->main_ncw);
+ wrefresh(cui->current->main_ncw);
+ }
+ return true;
+ }
+ return false;
+}
+
/**
* cui_process_key - Process input on stdin.
*/
assert(cui->current);
- ui_timer_disable(&cui->timer);
- cui->current->process_key(cui->current);
+ if (!cui->has_input)
+ discover_client_cancel_default(cui->client);
+ cui->has_input = true;
+
+ for (;;) {
+ int c = getch();
+
+ if (c == ERR)
+ break;
+
+ if (process_global_keys(cui, c))
+ continue;
+
+ cui->current->process_key(cui->current, c);
+ }
return 0;
}
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.
*/
unsigned int insert_pt;
struct pmenu_item *i;
ITEM *selected;
- char *name;
int result;
pb_log("%s: %p %s\n", __func__, opt, opt->id);
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);
- name = cui_make_item_name(i, cod);
- pmenu_item_setup(cui->main, i, insert_pt, name);
+ pmenu_item_setup(cui->main, i, insert_pt, cod->name);
pb_log("%s: adding 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);
- /* 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);
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. */
cui->current->post(cui->current);
}
+static void cui_update_status(struct boot_status *status, void *arg)
+{
+ struct cui *cui = cui_from_arg(arg);
+
+ nc_scr_status_printf(cui->current,
+ "%s: %s",
+ status->type == BOOT_STATUS_ERROR ? "Error" : "Info",
+ status->message);
+
+}
+
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,
};
/**
cui->c_sig = pb_cui_sig;
cui->platform_info = platform_info;
- cui->timer.handle_timeout = cui_handle_timeout;
cui->waitset = waitset_create(cui);
+ setlocale(LC_ALL, "");
+
/* Loop here for scripts that just started the server. */
retry_start:
atexit(nc_atexit);
nc_start();
- waiter_register(cui->waitset, STDIN_FILENO, WAIT_IN,
+ waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
cui_process_key, cui);
if (js_map) {
cui->pjs = pjs_init(cui, js_map);
if (cui->pjs)
- waiter_register(cui->waitset, pjs_get_fd(cui->pjs),
+ waiter_register_io(cui->waitset, pjs_get_fd(cui->pjs),
WAIT_IN, cui_process_js, cui);
}
if (cui->abort)
break;
- ui_timer_process_sig(&cui->timer);
-
while (cui->resize) {
cui->resize = 0;
cui_handle_resize(cui);
projects / petitboot / blobdiff