ui/ncurses: Add nc_scr_{un,}post()
[petitboot] / ui / ncurses / nc-cui.c
index f1656370310fc969a201d2848ea196db4e750a2e..b734cdcd46c2bd2a6868cd8c25ba831568aa47a5 100644 (file)
  *  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"
 #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"
 
@@ -36,6 +40,35 @@ static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
        return item->data;
 }
 
+static void cui_start(void)
+{
+       initscr();                      /* Initialize ncurses. */
+       cbreak();                       /* Disable line buffering. */
+       noecho();                       /* Disable getch() echo. */
+       keypad(stdscr, TRUE);           /* Enable num keypad keys. */
+       nonl();                         /* Disable new-line translation. */
+       intrflush(stdscr, FALSE);       /* Disable interrupt flush. */
+       curs_set(0);                    /* Make cursor invisible */
+       nodelay(stdscr, TRUE);          /* Enable non-blocking getch() */
+
+       /* We may be operating with an incorrect $TERM type; in this case
+        * the keymappings will be slightly broken. We want at least
+        * backspace to work though, so we'll define both DEL and ^H to
+        * map to backspace */
+       define_key("\x7f", KEY_BACKSPACE);
+       define_key("\x08", KEY_BACKSPACE);
+
+       while (getch() != ERR)          /* flush stdin */
+               (void)0;
+}
+
+static void cui_atexit(void)
+{
+       clear();
+       refresh();
+       endwin();
+}
+
 /**
  * cui_abort - Signal the main cui program loop to exit.
  *
@@ -56,41 +89,12 @@ void cui_abort(struct cui *cui)
 
 void cui_resize(struct cui *cui)
 {
-       pb_log("%s: resizing\n", __func__);
+       pb_debug("%s: resizing\n", __func__);
        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.
+ * cui_on_exit - A generic main menu exit callback.
  */
 
 void cui_on_exit(struct pmenu *menu)
@@ -106,13 +110,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);
@@ -137,7 +141,8 @@ static int cui_boot(struct pmenu_item *item)
 
        assert(cui->current == &cui->main->scr);
 
-       pb_log("%s: %s\n", __func__, cod->name);
+       pb_debug("%s: %s\n", __func__, cod->name);
+
        nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
        def_prog_mode();
@@ -159,49 +164,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);
-               char *name;
+       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);
 
-               name = cui_make_item_name(i, cod);
-               pmenu_item_replace(i, 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);
+               nc_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);
 }
 
 /**
@@ -217,14 +249,28 @@ struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr)
        assert(cui->current != scr);
 
        old = cui->current;
-       old->unpost(old);
+       nc_scr_unpost(old);
 
        cui->current = scr;
-       cui->current->post(cui->current);
+
+       nc_scr_post(cui->current);
 
        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.
  */
@@ -235,8 +281,21 @@ static int cui_process_key(void *arg)
 
        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;
 }
@@ -260,24 +319,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.
  */
@@ -291,7 +332,7 @@ static void cui_handle_resize(struct cui *cui)
                return;
        }
 
-       pb_log("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
+       pb_debug("%s: {%u,%u}\n", __func__, ws.ws_row, ws.ws_col);
 
        wclear(cui->current->main_ncw);
        resize_term(ws.ws_row, ws.ws_col);
@@ -303,46 +344,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.
  *
@@ -358,15 +359,14 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
        unsigned int insert_pt;
        struct pmenu_item *i;
        ITEM *selected;
-       char *name;
        int result;
 
-       pb_log("%s: %p %s\n", __func__, opt, opt->id);
+       pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
        selected = current_item(cui->main->ncm);
 
        if (cui->current == &cui->main->scr)
-               cui->current->unpost(cui->current);
+               nc_scr_unpost(cui->current);
 
        /* This disconnects items array from menu. */
 
@@ -382,7 +382,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);
 
@@ -394,22 +394,16 @@ 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);
 
-       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);
 
@@ -428,7 +422,7 @@ static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
        set_current_item(cui->main->ncm, selected);
 
        if (cui->current == &cui->main->scr)
-               cui->current->post(cui->current);
+               nc_scr_post(cui->current);
 
        return 0;
 }
@@ -449,7 +443,7 @@ static void cui_device_remove(struct device *dev, void *arg)
        pb_log("%s: %p %s\n", __func__, dev, dev->id);
 
        if (cui->current == &cui->main->scr)
-               cui->current->unpost(cui->current);
+               nc_scr_unpost(cui->current);
 
        /* This disconnects items array from menu. */
 
@@ -460,15 +454,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. */
@@ -485,7 +473,7 @@ static void cui_device_remove(struct device *dev, void *arg)
        }
 
        if (cui->current == &cui->main->scr)
-               cui->current->post(cui->current);
+               nc_scr_post(cui->current);
 }
 
 static void cui_update_status(struct boot_status *status, void *arg)
@@ -499,11 +487,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)
+               nc_scr_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,
 };
 
 /**
@@ -532,9 +543,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:
@@ -552,7 +566,7 @@ retry_start:
 
                start_deamon = 0;
 
-               result = pb_start_daemon();
+               result = pb_start_daemon(cui);
 
                if (!result)
                        goto retry_start;
@@ -574,10 +588,10 @@ retry_start:
                goto fail_client_init;
        }
 
-       atexit(nc_atexit);
-       nc_start();
+       atexit(cui_atexit);
+       cui_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) {
@@ -585,7 +599,7 @@ retry_start:
                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);
        }
 
@@ -615,12 +629,12 @@ int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item)
        cui->current = &cui->main->scr;
        cui->default_item = default_item;
 
-       cui->current->post(cui->current);
+       nc_scr_post(cui->current);
 
        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;
                }
@@ -628,15 +642,13 @@ 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);
                }
        }
 
-       nc_atexit();
+       cui_atexit();
 
        return cui->abort ? 0 : -1;
 }