Update the core to use the split operations table headers

Second in the series to decouple the core API usage from the frontends.

content/fetch.c

@@ -40,7 +40,6 @@
 #include <curl/curl.h>
 
 #include "utils/config.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
@@ -48,6 +47,8 @@
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"

content/fetchers/curl.c

@@ -41,7 +41,6 @@
 #include <libwapcaplet/libwapcaplet.h>
 
 #include "utils/config.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/log.h"
@@ -50,6 +49,8 @@
 #include "utils/ring.h"
 #include "utils/useragent.h"
 #include "utils/file.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"

content/fetchers/file.c

@@ -16,7 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* file: URL handling. Based on the data fetcher by Rob Kendrick */
+/**
+ * \file
+ *
+ * file scheme URL handling. Based on the data fetcher by Rob Kendrick
+ */
 
 #include "utils/config.h"
 
@@ -42,7 +46,6 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/nsoption.h"
 #include "utils/errors.h"
@@ -51,6 +54,8 @@
 #include "utils/utils.h"
 #include "utils/ring.h"
 #include "utils/file.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/dirlist.h"
 #include "content/fetch.h"

content/fetchers/resource.c

@@ -44,7 +44,8 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"

content/fs_backing_store.c

@@ -43,7 +43,6 @@
 #include "utils/log.h"
 #include "utils/utils.h"
 #include "utils/messages.h"
-#include "desktop/gui.h"
 
 #include "content/backing_store.h"
 

content/hlcache.c

@@ -24,12 +24,13 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "desktop/gui_factory.h"
 #include "utils/http.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/ring.h"
 #include "utils/utils.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/content.h"
 #include "content/mimesniff.h"

content/llcache.c

@@ -16,7 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
+/**
+ * \file
+ *
  * Low-level resource cache implementation
  *
  * This is the implementation of the low level cache. This cache
@@ -43,7 +45,8 @@
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 #include "utils/time.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "content/fetch.h"
 #include "content/backing_store.h"

desktop/browser.c

@@ -22,10 +22,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Browser window creation and manipulation (implementation).
+/**
+ * \file
+ *
+ * Browser window creation and manipulation implementation.
  */
 
+#include "utils/config.h"
+
 #include <assert.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -35,37 +39,37 @@
 #include <strings.h>
 #include <math.h>
 
-#include "curl/curl.h"
-#include "utils/config.h"
-#include "content/content.h"
-#include "content/fetch.h"
-#include "content/hlcache.h"
-#include "content/urldb.h"
-#include "desktop/browser_history.h"
-#include "desktop/browser_private.h"
-#include "desktop/download.h"
-#include "desktop/frames.h"
-#include "desktop/global_history.h"
-#include "desktop/gui_factory.h"
-#include "desktop/hotlist.h"
-#include "desktop/knockout.h"
-#include "utils/nsoption.h"
-#include "desktop/scrollbar.h"
-#include "desktop/selection.h"
-#include "desktop/plotters.h"
-#include "css/utils.h"
-
-#include "javascript/js.h"
-
-#include "render/form.h"
-#include "render/html.h"
-#include "render/box.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 #include "utils/utf8.h"
+#include "utils/nsoption.h"
+#include "content/content.h"
+#include "content/fetch.h"
+#include "content/hlcache.h"
+#include "content/urldb.h"
+#include "render/form.h"
+#include "render/html.h"
+#include "render/box.h"
+#include "curl/curl.h"
+#include "css/utils.h"
+#include "javascript/js.h"
+
+#include "desktop/browser_history.h"
+#include "desktop/browser_private.h"
+#include "desktop/download.h"
+#include "desktop/frames.h"
+#include "desktop/global_history.h"
+#include "desktop/hotlist.h"
+#include "desktop/knockout.h"
+#include "desktop/scrollbar.h"
+#include "desktop/selection.h"
+#include "desktop/plotters.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_internal.h"
 
 
 /** maximum frame depth */

desktop/download.c

@@ -26,12 +26,13 @@
 #include <string.h>
 
 #include "content/llcache.h"
-#include "desktop/download.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/http.h"
 #include "utils/url.h"
 #include "utils/utils.h"
+#include "desktop/download.h"
+#include "desktop/gui_download.h"
+#include "desktop/gui_internal.h"
 
 /**
  * A context for a download

desktop/gui_factory.c

@@ -19,12 +19,21 @@
 #include "content/hlcache.h"
 #include "content/backing_store.h"
 
+#include "utils/file.h"
 #include "desktop/download.h"
 #include "desktop/searchweb.h"
-#include "desktop/gui_factory.h"
-#include "utils/file.h"
+#include "desktop/gui_download.h"
+#include "desktop/gui_fetch.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_search.h"
+#include "desktop/gui_clipboard.h"
+#include "desktop/gui_utf8.h"
+#include "desktop/netsurf.h"
 
-/** The global interface table */
+/**
+ * The global interface table.
+ */
 struct netsurf_table *guit = NULL;
 
 
@@ -593,8 +602,8 @@ static nserror verify_browser_register(struct gui_browser_table *gbt)
 }
 
 
-/* exported interface documented in desktop/gui_factory.h */
-nserror gui_factory_register(struct netsurf_table *gt)
+/* exported interface documented in desktop/netsurf.h */
+nserror netsurf_register(struct netsurf_table *gt)
 {
 	nserror err;
 

desktop/netsurf.c

@@ -46,12 +46,13 @@
 #include "render/html.h"
 #include "render/textplain.h"
 
-#include "desktop/netsurf.h"
 #include "desktop/version.h"
 #include "desktop/browser.h"
 #include "desktop/system_colour.h"
 #include "desktop/searchweb.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
+#include "desktop/netsurf.h"
 
 /** speculative pre-conversion small image size
  *
@@ -117,13 +118,6 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
 	return NSERROR_OK;
 }
 
-/* exported interface documented in desktop/netsurf.h */
-nserror netsurf_register(struct netsurf_table *table)
-{
-	/* register the operation handlers */
-	return gui_factory_register(table);
-}
-
 /* exported interface documented in desktop/netsurf.h */
 nserror netsurf_init(const char *messages, const char *store_path)
 {

desktop/save_complete.c

@@ -44,7 +44,6 @@
 #include "render/box.h"
 #include "render/html.h"
 
-#include "desktop/gui_factory.h"
 #include "desktop/save_complete.h"
 
 regex_t save_complete_import_re;

desktop/save_text.c

@@ -36,7 +36,8 @@
 #include "render/box.h"
 #include "render/html.h"
 
-#include "desktop/gui_factory.h"
+#include "desktop/gui_utf8.h"
+#include "desktop/gui_internal.h"
 #include "desktop/save_text.h"
 
 static void extract_text(struct box *box, bool *first,

desktop/searchweb.c

@@ -26,8 +26,8 @@
 #include "utils/nsoption.h"
 #include "content/hlcache.h"
 
-#include "desktop/gui_factory.h"
 #include "desktop/searchweb.h"
+#include "desktop/gui_internal.h"
 
 struct search_provider {
 	char *name; /**< readable name such as 'google', 'yahoo', etc */

desktop/selection.c

@@ -38,11 +38,13 @@
 #include "render/textplain.h"
 
 #include "desktop/browser_private.h"
-#include "desktop/gui_factory.h"
 #include "desktop/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/save_text.h"
 #include "desktop/selection.h"
+#include "desktop/gui_clipboard.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_internal.h"
 
 /**
  * Text selection works by labelling each node in the box tree with its

desktop/textarea.c

@@ -17,8 +17,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Single/Multi-line UTF-8 text area (implementation)
+/**
+ * \file
+ *
+ * Single/Multi-line UTF-8 text area implementation.
  */
 
 #include <stdint.h>
@@ -35,7 +37,8 @@
 #include "desktop/plotters.h"
 #include "desktop/scrollbar.h"
 #include "desktop/font.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_clipboard.h"
+#include "desktop/gui_internal.h"
 
 #define CARET_COLOR 0x0000FF
 #define TA_ALLOC_STEP 512

desktop/textinput.c

@@ -39,11 +39,9 @@
 #include "render/layout.h"
 
 #include "desktop/browser_private.h"
-#include "desktop/gui_factory.h"
-#include "desktop/mouse.h"
-#include "desktop/scrollbar.h"
-#include "desktop/selection.h"
 #include "desktop/textinput.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_internal.h"
 
 /* Define to enable textinput debug */
 #undef TEXTINPUT_DEBUG

image/gif.c

@@ -18,8 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Content for image/gif (implementation)
+/**
+ * \file
+ *
+ * Content for image/gif implementation
  *
  * All GIFs are dynamically decompressed using the routines that gifread.c
  * provides. Whilst this allows support for progressive decoding, it is
@@ -35,14 +37,15 @@
 #include <libnsgif.h>
 
 #include "utils/config.h"
-#include "content/content_protected.h"
-#include "content/hlcache.h"
-#include "utils/nsoption.h"
-#include "desktop/plotters.h"
-#include "desktop/gui_factory.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
+#include "utils/nsoption.h"
+#include "content/content_protected.h"
+#include "content/hlcache.h"
+#include "desktop/plotters.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "image/image.h"
 #include "image/bitmap.h"

image/image_cache.c

@@ -22,9 +22,10 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "desktop/gui_factory.h"
 #include "utils/log.h"
 #include "content/content_protected.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "image/image_cache.h"
 #include "image/image.h"

javascript/fetcher.c

@@ -48,7 +48,6 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/ring.h"
-#include "desktop/gui_factory.h"
 
 #include "content/fetch.h"
 #include "content/fetchers.h"

render/box_construct.c

@@ -37,7 +37,6 @@
 #include "css/css.h"
 #include "css/utils.h"
 #include "css/select.h"
-#include "desktop/gui_factory.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/locale.h"
@@ -45,6 +44,8 @@
 #include "utils/messages.h"
 #include "utils/talloc.h"
 #include "utils/utils.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "render/box.h"
 #include "render/box_textarea.h"

render/html.c

@@ -46,8 +46,9 @@
 #include "desktop/textarea.h"
 #include "image/bitmap.h"
 #include "javascript/js.h"
-#include "desktop/gui_factory.h"
 #include "desktop/font.h"
+#include "desktop/gui_utf8.h"
+#include "desktop/gui_internal.h"
 
 #include "render/box.h"
 #include "render/form.h"

render/html_css.c

@@ -28,11 +28,12 @@
 #include <stdlib.h>
 
 #include "content/hlcache.h"
-#include "desktop/gui_factory.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/config.h"
 #include "utils/log.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "render/html_internal.h"
 

render/html_interaction.c

@@ -35,7 +35,6 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "desktop/browser.h"
-#include "desktop/gui_factory.h"
 #include "desktop/frames.h"
 #include "desktop/mouse.h"
 #include "utils/nsoption.h"
@@ -45,6 +44,8 @@
 #include "desktop/textinput.h"
 #include "desktop/font.h"
 #include "javascript/js.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "render/box.h"
 #include "render/box_textarea.h"

render/html_object.c

@@ -27,14 +27,15 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "content/hlcache.h"
-#include "css/utils.h"
-#include "utils/nsoption.h"
-#include "desktop/scrollbar.h"
-#include "desktop/gui_factory.h"
 #include "utils/corestrings.h"
 #include "utils/config.h"
 #include "utils/log.h"
+#include "utils/nsoption.h"
+#include "content/hlcache.h"
+#include "css/utils.h"
+#include "desktop/scrollbar.h"
+#include "desktop/gui_misc.h"
+#include "desktop/gui_internal.h"
 
 #include "render/box.h"
 #include "render/html_internal.h"

render/search.c

@@ -33,7 +33,8 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "desktop/selection.h"
-#include "desktop/gui_factory.h"
+#include "desktop/gui_search.h"
+#include "desktop/gui_internal.h"
 
 #include "render/box.h"
 #include "render/html.h"

test/llcache.c

@@ -123,7 +123,6 @@ char *url_to_path(const char *url)
  ******************************************************************************/
 
 #include "desktop/cookie_manager.h"
-#include "desktop/gui.h"
 #include "desktop/tree.h"
 
 /* desktop/cookie_manager.h -- used by urldb 
@@ -170,11 +169,6 @@ void fetch_file_register(void)
 {
 }
 
-/* desktop/gui.h -- used by image_cache through about: handler */
-nsurl* gui_get_resource_url(const char *path)
-{
-	return NULL;
-}
 
 /******************************************************************************
  * test: protocol handler                                                     *

utils/file.c

@@ -27,7 +27,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "desktop/gui_factory.h"
+#include "desktop/gui_internal.h"
 
 #include "utils/utils.h"
 #include "utils/corestrings.h"

utils/utf8.c

@@ -26,15 +26,16 @@
 #include <string.h>
 #include <strings.h>
 #include <iconv.h>
-
 #include <parserutils/charset/utf8.h>
 
-#include "desktop/gui_factory.h"
-
 #include "utils/config.h"
 #include "utils/log.h"
 #include "utils/utf8.h"
 
+#include "desktop/gui_utf8.h"
+#include "desktop/gui_internal.h"
+
+
 /* exported interface documented in utils/utf8.h */
 uint32_t utf8_to_ucs4(const char *s_in, size_t l)
 {