X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-cui.h;h=d8a5f8b5f5a16e99ca62dc79eecccca1a2b606aa;hp=14e4e0661ac42484c5ba759b5dc4ec226c63c6ff;hb=d90efe9e2bbfb18ee05ec2032b5723dbfa902d82;hpb=9a960821e54b0794b1c519b493294b7222dd98d4

diff --git a/ui/ncurses/nc-cui.h b/ui/ncurses/nc-cui.h
index 14e4e06..d8a5f8b 100644
--- a/ui/ncurses/nc-cui.h
+++ b/ui/ncurses/nc-cui.h
@@ -22,9 +22,8 @@
 #include <signal.h>
 
 #include "ui/common/joystick.h"
-#include "ui/common/timer.h"
 #include "nc-menu.h"
-#include "nc-boot-editor.h"
+#include "nc-helpscreen.h"
 
 struct cui_opt_data {
 	const char *name;
@@ -49,14 +48,24 @@ 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 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;
@@ -64,11 +73,24 @@ 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_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_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 */
 
@@ -76,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)
 {
@@ -96,15 +119,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