]> git.ozlabs.org Git - petitboot/blobdiff - ui/ncurses/nc-cui.c
ui/ncurses: Fix discover_client leak
[petitboot] / ui / ncurses / nc-cui.c
index 47c09e2e73e1326d43d39c354af81135bc9635b4..18604c9e04a06a2435f956a6b1b89bc897d05986 100644 (file)
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #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 "ui/common/ui-system.h"
 #include "nc-cui.h"
+#include "nc-boot-editor.h"
+#include "nc-config.h"
+#include "nc-sysinfo.h"
+#include "nc-helpscreen.h"
 
-static struct cui_opt_data *cod_from_item(struct pmenu_item *item)
+static void cui_start(void)
 {
-       return item->data;
+       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();
 }
 
 /**
@@ -55,12 +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_on_exit - A generic main menu ESC callback.
+ * cui_on_exit - A generic main menu exit callback.
  */
 
 void cui_on_exit(struct pmenu *menu)
@@ -76,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);
+       result = process_run_simple_argv(item, cmd_argv);
 
        reset_prog_mode();
        redrawwin(cui->current->main_ncw);
@@ -96,86 +130,153 @@ int cui_run_cmd(struct pmenu_item *item)
 }
 
 /**
- * cui_run_kexec - A generic cb to run kexec.
+ * cui_boot - A generic cb to run kexec.
  */
 
-static int cui_run_kexec(struct pmenu_item *item)
+static int cui_boot(struct pmenu_item *item)
 {
        int result;
        struct cui *cui = cui_from_item(item);
        struct cui_opt_data *cod = cod_from_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);
 
-       def_prog_mode();
+       pb_debug("%s: %s\n", __func__, cod->name);
 
-       result = cui->on_kexec(cui, cod);
+       nc_scr_status_printf(cui->current, "Booting %s...", cod->name);
 
-       reset_prog_mode();
-       redrawwin(cui->current->main_ncw);
+       result = discover_client_boot(cui->client, NULL, cod->opt, cod->bd);
 
-       if (!result) {
-               clear();
-               mvaddstr(1, 0, "system is going down now...");
-               refresh();
-               sleep(60);
+       if (result) {
+               nc_scr_status_printf(cui->current,
+                               "Failed: boot %s", cod->bd->image);
        }
 
-       pb_log("%s: failed: %s\n", __func__, cod->kd->image);
-       nc_scr_status_printf(cui->current, "Failed: kexec %s", cod->kd->image);
-
        return 0;
 }
 
-/**
- * cui_ked_on_exit - The ked on_exit callback.
- */
-
-static void cui_ked_on_exit(struct ked *ked, enum ked_result ked_result,
-       struct pb_kexec_data *kd)
+static void cui_boot_editor_on_exit(struct cui *cui,
+               struct pmenu_item *item,
+               struct pb_boot_data *bd)
 {
-       struct cui *cui = cui_from_arg(ked->scr.ui_ctx);
+       struct pmenu *menu = cui->main;
+       struct cui_opt_data *cod;
+       static int user_idx = 0;
+
+       /* Was the edit cancelled? */
+       if (!bd) {
+               cui_set_current(cui, &cui->main->scr);
+               talloc_free(cui->boot_editor);
+               cui->boot_editor = NULL;
+               return;
+       }
 
-       if (ked_result == ked_update || ked_result == ked_boot) {
-               struct pmenu_item *i = pmenu_find_selected(cui->main);
-               struct cui_opt_data *cod = cod_from_item(i);
+       /* Is this was a new item, we'll need to update the menu */
+       if (!item) {
+               int insert_pt;
 
-               assert(kd);
+               cod = talloc_zero(NULL, struct cui_opt_data);
+               cod->name = talloc_asprintf(cod, "User item %u", ++user_idx);
 
-               talloc_steal(i, kd);
-               talloc_free(cod->kd);
-               cod->kd = kd;
+               item = pmenu_item_create(menu, cod->name);
+               if (!item) {
+                       talloc_free(cod);
+                       goto out;
+               }
 
-               pb_log("%s: updating opt '%s'\n", __func__, cod->opt->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);
-       }
+               item->on_edit = cui_item_edit;
+               item->on_execute = cui_boot;
+               item->data = cod;
 
-       cui_set_current(cui, &cui->main->scr);
+               talloc_steal(item, cod);
+
+               /* Detach the items array. */
+               set_menu_items(menu->ncm, NULL);
 
-       talloc_free(ked);
+               /* Insert new item at insert_pt. */
+               insert_pt = pmenu_grow(menu, 1);
+               pmenu_item_insert(menu, item, insert_pt);
 
-       if (ked_result == ked_boot) {
-               struct pmenu_item *i = pmenu_find_selected(cui->main);
-               i->on_execute(i);
+               /* Re-attach the items array. */
+               set_menu_items(menu->ncm, menu->items);
+               nc_scr_post(&menu->scr);
+       } else {
+               cod = item->data;
        }
+
+       cod->bd = talloc_steal(cod, bd);
+
+       set_current_item(item->pmenu->ncm, item->nci);
+out:
+       cui_set_current(cui, &cui->main->scr);
+       talloc_free(cui->boot_editor);
+       cui->boot_editor = NULL;
 }
 
-int cui_ked_run(struct pmenu_item *item)
+void cui_item_edit(struct pmenu_item *item)
 {
        struct cui *cui = cui_from_item(item);
-       struct ked *ked;
+       cui->boot_editor = boot_editor_init(cui, item, cui->sysinfo,
+                                       cui_boot_editor_on_exit);
+       cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
 
-       ked = ked_init(cui, cod_from_item(item)->kd, cui_ked_on_exit);
+void cui_item_new(struct pmenu *menu)
+{
+       struct cui *cui = cui_from_pmenu(menu);
+       cui->boot_editor = boot_editor_init(cui, NULL, cui->sysinfo,
+                                       cui_boot_editor_on_exit);
+       cui_set_current(cui, boot_editor_scr(cui->boot_editor));
+}
 
-       cui_set_current(cui, &ked->scr);
+static void cui_sysinfo_exit(struct cui *cui)
+{
+       cui_set_current(cui, &cui->main->scr);
+       talloc_free(cui->sysinfo_screen);
+       cui->sysinfo_screen = NULL;
+}
 
-       return 0;
+void cui_show_sysinfo(struct cui *cui)
+{
+       cui->sysinfo_screen = sysinfo_screen_init(cui, cui->sysinfo,
+                       cui_sysinfo_exit);
+       cui_set_current(cui, sysinfo_screen_scr(cui->sysinfo_screen));
+}
+
+static void cui_config_exit(struct cui *cui)
+{
+       cui_set_current(cui, &cui->main->scr);
+       talloc_free(cui->config_screen);
+       cui->config_screen = NULL;
+}
+
+void cui_show_config(struct cui *cui)
+{
+       cui->config_screen = config_screen_init(cui, cui->config,
+                       cui->sysinfo, cui_config_exit);
+       cui_set_current(cui, config_screen_scr(cui->config_screen));
+}
+
+static void cui_help_exit(struct cui *cui)
+{
+       cui_set_current(cui, help_screen_return_scr(cui->help_screen));
+       talloc_free(cui->help_screen);
+       cui->help_screen = NULL;
+}
+
+void cui_show_help(struct cui *cui, const char *title, const char *text)
+{
+       if (!cui->current)
+               return;
+
+       if (cui->help_screen)
+               return;
+
+       cui->help_screen = help_screen_init(cui, cui->current,
+                       title, text, cui_help_exit);
+
+       if (cui->help_screen)
+               cui_set_current(cui, help_screen_scr(cui->help_screen));
 }
 
 /**
@@ -191,54 +292,74 @@ 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)
+                       wrefresh(curscr);
+               return true;
+       }
+       return false;
+}
+
+/**
+ * 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);
+       if (!cui->has_input)
+               discover_client_cancel_default(cui->client);
+       cui->has_input = true;
 
-       return 0;
-}
+       for (;;) {
+               int c = getch();
 
-/**
- * cui_client_process_socket - Process a socket event from the discover server.
- */
+               pb_debug("%s: got key %d\n", __func__, c);
 
-static int cui_client_process_socket(void *arg)
-{
-       struct discover_client *client = arg;
+               if (c == ERR)
+                       break;
+
+               if (process_global_keys(cui, c))
+                       continue;
+
+               cui->current->process_key(cui->current, c);
+       }
 
-       discover_client_process(client);
        return 0;
 }
 
 /**
- * cui_handle_timeout - Handle the timeout.
+ * cui_process_js - Process joystick events.
  */
 
-static void cui_handle_timeout(struct ui_timer *timer)
+static int cui_process_js(void *arg)
 {
-       struct cui *cui = cui_from_timer(timer);
-       struct pmenu_item *i = pmenu_find_selected(cui->main);
+       struct cui *cui = cui_from_arg(arg);
+       int c;
+
+       c = pjs_process_event(cui->pjs);
 
-#if defined(DEBUG)
-       {
-               struct cui_opt_data *cod = cod_from_item(i);
-               assert(cod && (cod->opt_hash == cui->default_item));
+       if (c) {
+               ungetch(c);
+               cui_process_key(arg);
        }
-#endif
-       i->on_execute(i);
+
+       return 0;
 }
 
 /**
@@ -254,7 +375,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);
@@ -273,88 +394,61 @@ static void cui_handle_resize(struct cui *cui)
  * menu_items into the main menu.  Redraws the main menu if it is active.
  */
 
-static int cui_device_add(struct device *dev, void *arg)
+static int cui_boot_option_add(struct device *dev, struct boot_option *opt,
+               void *arg)
 {
        struct cui *cui = cui_from_arg(arg);
-       int result;
-       struct boot_option *opt;
-       unsigned int o_count; /* device opts */
+       struct cui_opt_data *cod;
        unsigned int insert_pt;
+       int result, rows, cols;
+       struct pmenu_item *i;
        ITEM *selected;
 
-       pb_log("%s: %p %s\n", __func__, dev, dev->id);
+       pb_debug("%s: %p %s\n", __func__, opt, opt->id);
 
        selected = current_item(cui->main->ncm);
+       menu_format(cui->main->ncm, &rows, &cols);
 
        if (cui->current == &cui->main->scr)
-               cui->current->unpost(cui->current);
+               nc_scr_unpost(cui->current);
 
-       /* This disconnects items array from menu. */
+       /* Save the item in opt->ui_info for cui_device_remove() */
 
-       result = set_menu_items(cui->main->ncm, NULL);
+       opt->ui_info = i = pmenu_item_create(cui->main, opt->name);
+       if (!i)
+               return -1;
 
-       if (result)
-               pb_log("%s: set_menu_items failed: %d\n", __func__, result);
-
-       o_count = 0;
-       list_for_each_entry(&dev->boot_options, opt, list)
-               o_count++;
-
-       /* Insert new items at insert_pt. */
-
-       insert_pt = pmenu_grow(cui->main, o_count);
-
-       list_for_each_entry(&dev->boot_options, opt, list) {
-               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);
+       i->on_edit = cui_item_edit;
+       i->on_execute = cui_boot;
+       i->data = cod = talloc(i, struct cui_opt_data);
 
-               description = talloc_asprintf(i,
-                       " kexec: image='%s' initrd='%s' args='%s'",
-                       opt->boot_image_file,
-                       opt->initrd_file,
-                       opt->boot_args);
+       cod->opt = opt;
+       cod->dev = dev;
+       cod->opt_hash = pb_opt_hash(dev, opt);
+       cod->name = opt->name;
+       cod->bd = talloc(i, struct pb_boot_data);
 
-               pmenu_item_setup(cui->main, i, insert_pt, name, description);
+       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);
 
-               i->on_edit = cui_ked_run;
-               i->on_execute = cui_run_kexec;
-               i->data = cod = talloc(i, struct cui_opt_data);
-
-               cod->dev = dev;
-               cod->opt = opt;
-               cod->opt_hash = pb_opt_hash(dev, opt);
-               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++;
+       /* This disconnects items array from menu. */
+       result = set_menu_items(cui->main->ncm, NULL);
 
-               pb_log("%s: adding opt '%s'\n", __func__, cod->opt->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 (result)
+               pb_log("%s: set_menu_items failed: %d\n", __func__, result);
 
-               /* If this is the default_item select it and start timer. */
+       /* Insert new items at insert_pt. */
+       insert_pt = pmenu_grow(cui->main, 1);
+       pmenu_item_insert(cui->main, i, insert_pt);
 
-               if (cod->opt_hash == cui->default_item) {
-                       selected = i->nci;
-                       ui_timer_kick(&cui->timer);
-               }
-       }
+       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);
 
        /* Re-attach the items array. */
-
        result = set_menu_items(cui->main->ncm, cui->main->items);
 
        if (result)
@@ -366,10 +460,23 @@ static int cui_device_add(struct device *dev, void *arg)
                        item_count(cui->main->ncm) + 1);
        }
 
-       set_current_item(cui->main->ncm, selected);
+       if (!item_visible(selected)) {
+               int idx, top;
+
+               top = top_row(cui->main->ncm);
+               idx = item_index(selected);
+
+               /* If our index is above the current top row, align
+                * us to the new top. Otherwise, align us to the new
+                * bottom */
+               top = top < idx ? idx - rows : idx;
+
+               set_top_row(cui->main->ncm, top);
+               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;
 }
@@ -390,7 +497,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. */
 
@@ -401,15 +508,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. */
@@ -426,12 +527,82 @@ 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)
+{
+       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 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);
+
+       /* if we're currently displaying the system info screen, inform it
+        * of the updated information. */
+       if (cui->sysinfo_screen)
+               sysinfo_screen_update(cui->sysinfo_screen, sysinfo);
+
+       /* ... and do the same with the config screen... */
+       if (cui->config_screen)
+               config_screen_update(cui->config_screen, cui->config, sysinfo);
+
+       /* ... and the boot editor. */
+       if (cui->boot_editor)
+               boot_editor_update(cui->boot_editor, sysinfo);
+
+       cui_update_mm_title(cui);
+}
+
+static void cui_update_config(struct config *config, void *arg)
+{
+       struct cui *cui = cui_from_arg(arg);
+       cui->config = talloc_steal(cui, config);
+
+       if (cui->config_screen)
+               config_screen_update(cui->config_screen, config, cui->sysinfo);
+}
+
+int cui_send_config(struct cui *cui, struct config *config)
+{
+       return discover_client_send_config(cui->client, config);
+}
+
+void cui_send_reinit(struct cui *cui)
+{
+       discover_client_send_reinit(cui->client);
 }
 
 static struct discover_client_ops cui_client_ops = {
-       .device_add = cui_device_add,
+       .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,
+       .update_config = cui_update_config,
 };
 
 /**
@@ -445,10 +616,9 @@ 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 (*js_map)(const struct js_event *e), int start_deamon)
 {
        struct cui *cui;
-       struct discover_client *client;
        unsigned int i;
 
        cui = talloc_zero(NULL, struct cui);
@@ -461,20 +631,43 @@ 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;
+       cui->waitset = waitset_create(cui);
+
+       process_init(cui, cui->waitset, false);
+
+       setlocale(LC_ALL, "");
 
        /* Loop here for scripts that just started the server. */
 
-       for (i = 10; i; i--) {
-               client = discover_client_init(&cui_client_ops, cui);
-               if (client)
+retry_start:
+       for (i = start_deamon ? 2 : 10; i; i--) {
+               cui->client = discover_client_init(cui->waitset,
+                               &cui_client_ops, cui);
+               if (cui->client || !i)
                        break;
                pb_log("%s: waiting for server %d\n", __func__, i);
                sleep(1);
        }
 
-       if (!client) {
+       if (!cui->client && start_deamon) {
+               int result;
+
+               start_deamon = 0;
+
+               result = pb_start_daemon(cui);
+
+               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 (!cui->client) {
                pb_log("%s: discover_client_init failed.\n", __func__);
                fprintf(stderr, "%s: error: discover_client_init failed.\n",
                        __func__);
@@ -483,13 +676,21 @@ struct cui *cui_init(void* platform_info,
                goto fail_client_init;
        }
 
-       atexit(nc_atexit);
-       nc_start();
+       atexit(cui_atexit);
+       talloc_steal(cui, cui->client);
+       cui_start();
 
-       waiter_register(discover_client_get_fd(client), WAIT_IN,
-               cui_client_process_socket, client);
+       waiter_register_io(cui->waitset, STDIN_FILENO, WAIT_IN,
+                       cui_process_key, cui);
 
-       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_io(cui->waitset, pjs_get_fd(cui->pjs),
+                                       WAIT_IN, cui_process_js, cui);
+       }
 
        return cui;
 
@@ -517,12 +718,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();
+               int result = waiter_poll(cui->waitset);
 
-               if (result < 0 && errno != EINTR) {
+               if (result < 0) {
                        pb_log("%s: poll: %s\n", __func__, strerror(errno));
                        break;
                }
@@ -530,15 +731,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;
 }