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 8632806fcb52d4d2ca38f30f2a1288c39025ea70..d8a5f8b5f5a16e99ca62dc79eecccca1a2b606aa 100644 (file)
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -23,6 +23,7 @@
 
 #include "ui/common/joystick.h"
 #include "nc-menu.h"
+#include "nc-helpscreen.h"
 
 struct cui_opt_data {
        const char *name;
@@ -55,11 +56,16 @@ struct cui {
        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;
@@ -68,15 +74,22 @@ struct cui {
 
 struct cui *cui_init(void* platform_info,
                int (*js_map)(const struct js_event *e),
-               int start_deamon);
+               int start_daemon, int timeout);
 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_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_help(struct cui *cui, const char *title, const char *text);
+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 */
@@ -85,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);
-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)
 {