From b7736bae2f37675be55b1c89d33b03e8603b2946 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 12 Jan 2014 17:07:34 +0000
Subject: split gui operations into core and window and move more operations
 into tables

---
 desktop/gui.h | 76 +++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 51 insertions(+), 25 deletions(-)

(limited to 'desktop/gui.h')

diff --git a/desktop/gui.h b/desktop/gui.h
index 26e1792f8..96062ddae 100644
--- a/desktop/gui.h
+++ b/desktop/gui.h
@@ -65,43 +65,75 @@ struct gui_download_window;
 struct browser_window;
 struct form_control;
 
-/** Graphical user interface function table
+/** Graphical user interface window function table
  *
- * function table implementing GUI interface to browser core
+ * function table implementing window operations
  */
-struct gui_table {
+struct gui_window_table {
 
 	/* Mandantory entries */
 
-	/** called to let the frontend update its state and run any
-	 * I/O operations.
-	 */
-	void (*poll)(bool active);
-
 	/** create a gui window for a browsing context */
-	struct gui_window *(*window_create)(struct browser_window *bw, struct browser_window *clone, bool new_tab);
+	struct gui_window *(*create)(struct browser_window *bw, struct browser_window *clone, bool new_tab);
 
 	/** destroy previously created gui window */
-	void (*window_destroy)(struct gui_window *g);
+	void (*destroy)(struct gui_window *g);
 
 
 	/* Optional entries */
 
-	/** called to allow the gui to cleanup */
-	void (*quit)(void);
-
 	/** set the window title. */
-	void (*window_set_title)(struct gui_window *g, const char *title);
+	void (*set_title)(struct gui_window *g, const char *title);
 
 	/** set the navigation url. */
-	void (*window_set_url)(struct gui_window *g, const char *url);
+	void (*set_url)(struct gui_window *g, const char *url);
 
 	/** start the navigation throbber. */
-	void (*window_start_throbber)(struct gui_window *g);
+	void (*start_throbber)(struct gui_window *g);
 
 	/** stop the navigation throbber. */
-	void (*window_stop_throbber)(struct gui_window *g);
+	void (*stop_throbber)(struct gui_window *g);
 
+	/** start a drag operation within a window */
+	bool (*drag_start)(struct gui_window *g, gui_drag_type type, const struct rect *rect);
+
+	/** save link operation */
+	void (*save_link)(struct gui_window *g, const char *url, const char *title);
+
+	/** set favicon */
+	void (*set_icon)(struct gui_window *g, hlcache_handle *icon);
+};
+
+/** Graphical user interface function table
+ *
+ * function table implementing GUI interface to browser core
+ */
+struct gui_table {
+
+	/* Mandantory entries */
+
+	/* sub tables */
+	struct gui_window_table *window; /* window sub table */
+
+	/** called to let the frontend update its state and run any
+	 * I/O operations.
+	 */
+	void (*poll)(bool active);
+
+
+	/* Optional entries */
+
+	/** called to allow the gui to cleanup */
+	void (*quit)(void);
+
+	/**
+	 * set gui display of a retrieved favicon representing the
+	 * search provider
+	 *
+	 * \param ico may be NULL for local calls; then access current
+	 * cache from search_web_ico()
+	 */
+	void (*set_search_ico)(hlcache_handle *ico);
 };
 
 extern struct gui_table *guit; /* the gui vtable */
@@ -119,19 +151,12 @@ void gui_window_update_extent(struct gui_window *g);
 void gui_window_set_status(struct gui_window *g, const char *text);
 void gui_window_set_pointer(struct gui_window *g, gui_pointer_shape shape);
 void gui_window_hide_pointer(struct gui_window *g);
-void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon);
-void gui_window_set_search_ico(hlcache_handle *ico);
 void gui_window_place_caret(struct gui_window *g, int x, int y, int height,
 		const struct rect *clip);
 void gui_window_remove_caret(struct gui_window *g);
 void gui_window_new_content(struct gui_window *g);
 bool gui_window_scroll_start(struct gui_window *g);
 
-bool gui_window_drag_start(struct gui_window *g, gui_drag_type type,
-		const struct rect *rect);
-
-void gui_window_save_link(struct gui_window *g, const char *url,
-		const char *title);
 
 struct gui_download_window *gui_download_window_create(download_context *ctx,
 		struct gui_window *parent);
@@ -150,6 +175,8 @@ void gui_clear_selection(struct gui_window *g);
 void gui_file_gadget_open(struct gui_window *g, hlcache_handle *hl,
 	struct form_control *gadget);
 
+void gui_launch_url(const char *url);
+
 /**
  * Core asks front end for clipboard contents.
  *
@@ -179,7 +206,6 @@ void gui_set_clipboard(const char *buffer, size_t length,
 void gui_create_form_select_menu(struct browser_window *bw,
 		struct form_control *control);
 
-void gui_launch_url(const char *url);
 
 struct ssl_cert_info;
 
-- 
cgit v1.2.3