ui/ncurses: Update cui_run_cmd() to pass display to command

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

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 4470ef44badee98fb9050d90db4d82b4ff316962..d8a5f8b5f5a16e99ca62dc79eecccca1a2b606aa 100644 (file)
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -22,13 +22,12 @@
 #include <signal.h>
 
 #include "ui/common/joystick.h"
 #include <signal.h>
 
 #include "ui/common/joystick.h"

-#include "ui/common/timer.h"

 #include "nc-menu.h"
 #include "nc-menu.h"

-#include "nc-boot-editor.h"
+#include "nc-helpscreen.h"

 
 struct cui_opt_data {
        const char *name;
 
 struct cui_opt_data {
        const char *name;

-       struct pb_kexec_data *kd;
+       struct pb_boot_data *bd;

 
        /* optional data */
        const struct device *dev;
 
        /* optional data */
        const struct device *dev;


@@ -49,25 +48,49 @@ struct cui_opt_data {
 
 struct cui {
        enum pb_nc_sig c_sig;
 
 struct cui {
        enum pb_nc_sig c_sig;

+       bool has_input;

        sig_atomic_t abort;
        sig_atomic_t resize;
        sig_atomic_t abort;
        sig_atomic_t resize;

-       int dry_run;

        struct nc_scr *current;
        struct pmenu *main;
        struct nc_scr *current;
        struct pmenu *main;

-       struct ui_timer timer;

        struct waitset *waitset;
        struct waitset *waitset;

+       struct discover_client *client;
+       struct system_info *sysinfo;
+       struct statuslog *statuslog;
+       struct sysinfo_screen *sysinfo_screen;
+       struct config *config;
+       struct config_screen *config_screen;
+       struct add_url_screen *add_url_screen;
+       struct boot_editor *boot_editor;
+       struct lang_screen *lang_screen;
+       struct help_screen *help_screen;
+       struct subset_screen *subset_screen;
+       struct statuslog_screen *statuslog_screen;

        struct pjs *pjs;
        void *platform_info;
        unsigned int default_item;
        struct pjs *pjs;
        void *platform_info;
        unsigned int default_item;

-       int (*on_kexec)(struct cui *cui, struct cui_opt_data *cod);
+       int (*on_boot)(struct cui *cui, struct cui_opt_data *cod);

 };
 
 struct cui *cui_init(void* platform_info,
 };
 
 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, int dry_run);
+               int (*js_map)(const struct js_event *e),
+               int start_daemon, int timeout);

 struct nc_scr *cui_set_current(struct cui *cui, struct nc_scr *scr);
 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);
+int cui_run(struct cui *cui);
+void cui_item_edit(struct pmenu_item *item);
+void cui_item_new(struct pmenu *menu);
+void cui_show_sysinfo(struct cui *cui);
+void cui_show_config(struct cui *cui);
+void cui_show_lang(struct cui *cui);
+void cui_show_statuslog(struct cui *cui);
+void cui_show_help(struct cui *cui, const char *title,
+               const struct help_text *text);
+void cui_show_subset(struct cui *cui, const char *title,
+               void *arg);
+void cui_show_add_url(struct cui *cui);
+int cui_send_config(struct cui *cui, struct config *config);
+int cui_send_url(struct cui *cui, char *url);
+void cui_send_reinit(struct cui *cui);

 
 /* convenience routines */
 
 
 /* convenience routines */
 


@@ -75,7 +98,8 @@ void cui_abort(struct cui *cui);
 void cui_resize(struct cui *cui);
 void cui_on_exit(struct pmenu *menu);
 void cui_on_open(struct pmenu *menu);
 void cui_resize(struct cui *cui);
 void cui_on_exit(struct pmenu *menu);
 void cui_on_open(struct pmenu *menu);

-int cui_run_cmd(struct pmenu_item *item);
+int cui_run_cmd(struct cui *cui, const char **cmd_argv);
+int cui_run_cmd_from_item(struct pmenu_item *item);

 
 static inline struct cui *cui_from_arg(void *arg)
 {
 
 static inline struct cui *cui_from_arg(void *arg)
 {


@@ -95,15 +119,4 @@ static inline struct cui *cui_from_item(struct pmenu_item *item)
        return cui_from_pmenu(item->pmenu);
 }
 
        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
 #endif