summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/browser.c42
-rw-r--r--desktop/download.c5
-rw-r--r--desktop/gui_factory.c19
-rw-r--r--desktop/netsurf.c12
-rw-r--r--desktop/save_complete.c1
-rw-r--r--desktop/save_text.c3
-rw-r--r--desktop/searchweb.c2
-rw-r--r--desktop/selection.c4
-rw-r--r--desktop/textarea.c9
-rw-r--r--desktop/textinput.c6
10 files changed, 57 insertions, 46 deletions
diff --git a/desktop/browser.c b/desktop/browser.c
index 3ae506bcf..42c8edaff 100644
--- a/desktop/browser.c
+++ b/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 "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/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 "desktop/gui_misc.h"
+#include "desktop/gui_window.h"
+#include "desktop/gui_internal.h"
/** maximum frame depth */
diff --git a/desktop/download.c b/desktop/download.c
index 0f3fcb6f5..a124c8909 100644
--- a/desktop/download.c
+++ b/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
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index b978210e8..c0cf0ffc5 100644
--- a/desktop/gui_factory.c
+++ b/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;
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 39cee2e2b..328035ff5 100644
--- a/desktop/netsurf.c
+++ b/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
*
@@ -118,13 +119,6 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
}
/* 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)
{
nserror ret;
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index 71187eb10..fd58f5f8b 100644
--- a/desktop/save_complete.c
+++ b/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;
diff --git a/desktop/save_text.c b/desktop/save_text.c
index bc4d4c57a..d19d9c783 100644
--- a/desktop/save_text.c
+++ b/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,
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index dc12170c1..abd11a7d6 100644
--- a/desktop/searchweb.c
+++ b/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 */
diff --git a/desktop/selection.c b/desktop/selection.c
index ec01e5b81..8ed850a59 100644
--- a/desktop/selection.c
+++ b/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
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 8b84f3279..625a58f9c 100644
--- a/desktop/textarea.c
+++ b/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
diff --git a/desktop/textinput.c b/desktop/textinput.c
index cf0697a2e..852fb3fc8 100644
--- a/desktop/textinput.c
+++ b/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