ui/ncurses: Defer item creation until boot editor is done

[petitboot] / ui / ncurses / nc-cui.h

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 14e4e0661ac42484c5ba759b5dc4ec226c63c6ff..730e7216559ba2239cdb4da119bd92aa9d2de564 100644 (file)
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -22,7 +22,6 @@
 #include <signal.h>
 
 #include "ui/common/joystick.h"
-#include "ui/common/timer.h"
 #include "nc-menu.h"
 #include "nc-boot-editor.h"
 
@@ -49,14 +48,14 @@ struct cui_opt_data {
 
 struct cui {
        enum pb_nc_sig c_sig;
+       bool has_input;
        sig_atomic_t abort;
        sig_atomic_t resize;
-       int dry_run;
        struct nc_scr *current;
        struct pmenu *main;
-       struct ui_timer timer;
        struct waitset *waitset;
        struct discover_client *client;
+       struct system_info *sysinfo;
        struct pjs *pjs;
        void *platform_info;
        unsigned int default_item;
@@ -64,11 +63,12 @@ struct cui {
 };
 
 struct cui *cui_init(void* platform_info,
-       int (*on_boot)(struct cui *, struct cui_opt_data *),
-       int (*js_map)(const struct js_event *e), int start_deamon, int dry_run);
+               int (*js_map)(const struct js_event *e),
+               int start_deamon);
 struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr);
 int cui_run(struct cui *cui, struct pmenu *main, unsigned int default_item);
-int cui_boot_editor_run(struct pmenu_item *item);
+void cui_item_edit(struct pmenu_item *item);
+void cui_item_new(struct pmenu *menu);
 
 /* convenience routines */
 
@@ -96,15 +96,4 @@ static inline struct cui *cui_from_item(struct pmenu_item *item)
        return cui_from_pmenu(item->pmenu);
 }
 
-static inline struct cui *cui_from_timer(struct ui_timer *timer)
-{
-       struct cui *cui;
-
-       cui = (struct cui *)((char *)timer
-               - (size_t)&((struct cui *)0)->timer);
-       assert(cui->c_sig == pb_cui_sig);
-
-       return cui;
-}
-
 #endif