split browser gui operations up

3 files changed, 15 insertions, 9 deletions

diff --git a/riscos/download.c b/riscos/download.c
index aeeeeffbd..3a02c9c90 100644
--- a/riscos/download.c
+++ b/riscos/download.c
@@ -1632,11 +1632,11 @@ bool ro_gui_download_prequit(void)
 	return true;
 }
 
-static struct gui_download_table gui_download_table = {
+static struct gui_download_table download_table = {
 	.create = gui_download_window_create,
 	.data = gui_download_window_data,
 	.error = gui_download_window_error,
 	.done = gui_download_window_done,
 };
 
-struct gui_download_table *riscos_gui_download_table = &gui_download_table;
+struct gui_download_table *riscos_download_table = &download_table;
diff --git a/riscos/gui.c b/riscos/gui.c
index ccf07e5d9..50c1bdf62 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -2348,14 +2348,17 @@ bool path_add_part(char *path, int length, const char *newpart)
 	return true;
 }
 
-static struct gui_table riscos_gui_table = {
+static struct gui_clipboard_table riscos_clipboard_table = {
+	.get = gui_get_clipboard,
+	.set = gui_set_clipboard,
+};
+
+static struct gui_browser_table riscos_browser_table = {
 	.poll = gui_poll,
 	.quit = gui_quit,
 	.get_resource_url = gui_get_resource_url,
 	.launch_url = gui_launch_url,
 	.create_form_select_menu = gui_create_form_select_menu,
-	.get_clipboard = gui_get_clipboard,
-	.set_clipboard = gui_set_clipboard,
 	.cert_verify = gui_cert_verify,
 };
 
@@ -2370,6 +2373,12 @@ int main(int argc, char** argv)
 	int used = -1;  /* slightly better with older OSLib versions */
 	os_error *error;
 	nserror ret;
+	struct gui_table riscos_gui_table = {
+		.browser = &riscos_browser_table,
+		.window = riscos_window_table,
+		.clipboard = &riscos_clipboard_table,
+		.download = riscos_download_table,
+	};
 
 	/* Consult NetSurf$Logging environment variable to decide if logging
 	 * is required. */
@@ -2414,9 +2423,6 @@ int main(int argc, char** argv)
 	}
 
 	/* common initialisation */
-	riscos_gui_table.window = riscos_gui_window_table;
-	riscos_gui_table.download = riscos_gui_download_table;
-
 	ret = netsurf_init(path, &riscos_gui_table);
 	if (ret != NSERROR_OK) {
 		die("NetSurf failed to initialise");
diff --git a/riscos/gui.h b/riscos/gui.h
index 9fbc2eb28..b45bd472c 100644
--- a/riscos/gui.h
+++ b/riscos/gui.h
@@ -123,7 +123,7 @@ const char *ro_gui_default_language(void);
 void ro_gui_download_init(void);
 void ro_gui_download_datasave_ack(wimp_message *message);
 bool ro_gui_download_prequit(void);
-extern struct gui_download_table *riscos_gui_download_table;
+extern struct gui_download_table *riscos_download_table;
 
 /* in 401login.c */
 void ro_gui_401login_init(void);