move desktop window header into public API

content/content.c

@@ -31,7 +31,7 @@
 #include "desktop/plotters.h"
 #include "desktop/knockout.h"
 #include "desktop/gui_internal.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "netsurf/bitmap.h"
 #include "content/content_protected.h"

desktop/browser.c

@@ -497,7 +497,7 @@ char * browser_window_get_selection(struct browser_window *bw)
 	return content_get_selection(bw->selection.bw->current_content);
 }
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 bool browser_window_can_search(struct browser_window *bw)
 {
 	if (bw == NULL || bw->current_content == NULL)
@@ -515,14 +515,14 @@ bool browser_window_can_search(struct browser_window *bw)
 }
 
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 bool browser_window_is_frameset(struct browser_window *bw)
 {
 	return (bw->children != NULL);
 }
 
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 nserror browser_window_get_scrollbar_type(struct browser_window *bw,
 		browser_scrolling *h, browser_scrolling *v)
 {
@@ -762,7 +762,7 @@ bool browser_window_drop_file_at_point(struct browser_window *bw,
 	return false;
 }
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 void browser_window_set_gadget_filename(struct browser_window *bw,
 		struct form_control *gadget, const char *fn)
 {
@@ -802,7 +802,7 @@ static bool slow_script(void *ctx)
 	return true;
 }
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 nserror browser_window_create(enum browser_window_create_flags flags,
 		nsurl *url, nsurl *referrer,
 		struct browser_window *existing,
@@ -1872,7 +1872,7 @@ browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url)
 }
 
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 void browser_window_destroy(struct browser_window *bw)
 {
 	/* can't destoy child windows on their own */
@@ -1883,7 +1883,7 @@ void browser_window_destroy(struct browser_window *bw)
 	free(bw);
 }
 
-/* exported interface, documented in desktop/browser.h */
+/* exported interface, documented in netsurf/browser_window.h */
 nserror browser_window_refresh_url_bar(struct browser_window *bw)
 {
 	nserror ret;
@@ -1919,7 +1919,7 @@ nserror browser_window_refresh_url_bar(struct browser_window *bw)
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 nserror browser_window_navigate(struct browser_window *bw,
 			     nsurl *url,
 			     nsurl *referrer,
@@ -2343,7 +2343,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top)
 	}
 }
 
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
 void browser_window_update_box(struct browser_window *bw, struct rect *rect)
 {
 	int pos_x;
@@ -2370,7 +2370,7 @@ void browser_window_update_box(struct browser_window *bw, struct rect *rect)
 	}
 }
 
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
 void browser_window_stop(struct browser_window *bw)
 {
 	int children, index;
@@ -2411,7 +2411,7 @@ void browser_window_stop(struct browser_window *bw)
 }
 
 
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
 void browser_window_reload(struct browser_window *bw, bool all)
 {
 	hlcache_handle *c;
@@ -2457,7 +2457,7 @@ void browser_window_reload(struct browser_window *bw, bool all)
 }
 
 
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
 void browser_window_set_status(struct browser_window *bw, const char *text)
 {
 	int text_len;
@@ -2491,7 +2491,7 @@ void browser_window_set_status(struct browser_window *bw, const char *text)
 }
 
 
-/* Exported interface, documented in desktop/browser.h */
+/* Exported interface, documented in netsurf/browser_window.h */
 void browser_window_set_pointer(struct browser_window *bw,
 		browser_pointer_shape shape)
 {
@@ -2530,7 +2530,7 @@ void browser_window_set_pointer(struct browser_window *bw,
 	guit->window->set_pointer(root->window, gui_shape);
 }
 
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
 nserror browser_window_schedule_reformat(struct browser_window *bw)
 {
 	/* The ugly cast here is so the reformat function can be
@@ -2541,7 +2541,7 @@ nserror browser_window_schedule_reformat(struct browser_window *bw)
 }
 
 
-/* exported function documented in desktop/browser.h */
+/* exported function documented in netsurf/browser_window.h */
 void browser_window_reformat(struct browser_window *bw, bool background,
 		int width, int height)
 {
@@ -2601,7 +2601,7 @@ static void browser_window_set_scale_internal(struct browser_window *bw,
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
 {
 	while (bw->parent && all)
@@ -2616,7 +2616,7 @@ void browser_window_set_scale(struct browser_window *bw, float scale, bool all)
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 float browser_window_get_scale(struct browser_window *bw)
 {
 	if (bw == NULL) {
@@ -2681,7 +2681,7 @@ static void browser_window_find_target_internal(struct browser_window *bw,
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 struct browser_window *browser_window_find_target(struct browser_window *bw,
 		const char *target, browser_mouse_state mouse)
 {
@@ -2875,7 +2875,7 @@ static void browser_window_mouse_drag_end(struct browser_window *bw,
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 void browser_window_mouse_track(struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y)
 {
@@ -3023,7 +3023,7 @@ void browser_window_mouse_track(struct browser_window *bw,
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 void browser_window_mouse_click(struct browser_window *bw,
 		browser_mouse_state mouse, int x, int y)
 {
@@ -3148,7 +3148,7 @@ void browser_window_mouse_click(struct browser_window *bw,
 
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
 		int width, int height)
 {
@@ -3156,7 +3156,7 @@ void browser_window_redraw_rect(struct browser_window *bw, int x, int y,
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
 {
 	assert(bw != NULL);
@@ -3181,7 +3181,7 @@ void browser_window_page_drag_start(struct browser_window *bw, int x, int y)
 
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 bool browser_window_back_available(struct browser_window *bw)
 {
 	return (bw && bw->history &&
@@ -3190,21 +3190,21 @@ bool browser_window_back_available(struct browser_window *bw)
 
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 bool browser_window_forward_available(struct browser_window *bw)
 {
 	return (bw && bw->history &&
 			browser_window_history_forward_available(bw));
 }
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 bool browser_window_reload_available(struct browser_window *bw)
 {
 	return (bw && bw->current_content && !bw->loading_content);
 }
 
 
-/* exported interface documented in desktop/browser.h */
+/* exported interface documented in netsurf/browser_window.h */
 bool browser_window_stop_available(struct browser_window *bw)
 {
 	return (bw && (bw->loading_content ||

desktop/browser_private.h

@@ -26,8 +26,8 @@
 
 #include <libwapcaplet/libwapcaplet.h>
 
-#include "desktop/browser.h"
-
+#include "netsurf/browser_window.h"
+#include "desktop/frame_types.h"
 
 struct box;
 struct hlcache_handle;

desktop/frame_types.h

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Browser window creation and manipulation (interface).
+/**
+ * \file
+ * Interface to browser frames.
  */
 
 #ifndef _NETSURF_DESKTOP_FRAME_TYPES_H_

desktop/frames.h

@@ -24,6 +24,8 @@
 #define _NETSURF_DESKTOP_FRAMES_H_
 
 struct scrollbar_msg_data;
+struct content_html_iframe;
+struct content_html_frames;
 
 /**
  * Create and open iframes for a browser window.

desktop/global_history.c

@@ -29,7 +29,7 @@
 
 #include "desktop/global_history.h"
 #include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #define N_DAYS 28
 #define N_SEC_PER_DAY (60 * 60 * 24)

desktop/hotlist.c

@@ -37,7 +37,7 @@
 #include "desktop/gui_internal.h"
 #include "desktop/hotlist.h"
 #include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #define N_DAYS 28
 #define N_SEC_PER_DAY (60 * 60 * 24)

desktop/mouse.c

@@ -20,7 +20,7 @@
  * Browser window creation and manipulation (implementation).
  */
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "utils/log.h"
 
 /**

desktop/netsurf.c

@@ -44,7 +44,7 @@
 #include "render/html.h"
 #include "render/textplain.h"
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/system_colour.h"
 #include "desktop/searchweb.h"
 #include "netsurf/misc.h"

desktop/scrollbar.c

@@ -30,7 +30,7 @@
 #include "utils/utils.h"
 #include "utils/nsoption.h"
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/system_colour.h"
 #include "netsurf/mouse.h"
 #include "desktop/scrollbar.h"

desktop/textarea.c

@@ -31,7 +31,7 @@
 #include "utils/utils.h"
 #include "content/handlers/css/utils.h"
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/textarea.h"
 #include "desktop/textinput.h"

desktop/textarea.h

@@ -29,7 +29,11 @@
 
 #include "utils/utils.h"
 
+#include "desktop/plot_style.h"
+#include "netsurf/mouse.h"
+
 struct textarea;
+struct redraw_context;
 
 /* Text area flags */
 typedef enum {

desktop/tree.c

@@ -34,7 +34,7 @@
 #include "content/hlcache.h"
 #include "utils/nsoption.h"
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/tree.h"
 
 struct tree {

frontends/amiga/arexx.c

@@ -34,7 +34,7 @@
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/window.h"
 #include "desktop/version.h"
 

frontends/amiga/clipboard.c

@@ -31,7 +31,7 @@
 #include "utils/utf8.h"
 #include "utils/nsurl.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 #include "desktop/textinput.h"
 #include "netsurf/window.h"

frontends/amiga/ctxmenu.c

@@ -41,7 +41,7 @@
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/browser_history.h"
 #include "netsurf/mouse.h"
 #include "desktop/searchweb.h"

frontends/amiga/download.c

@@ -50,7 +50,7 @@
 #include "utils/string.h"
 #include "desktop/download.h"
 #include "desktop/save_complete.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "netsurf/download.h"

frontends/amiga/drag.h

@@ -19,7 +19,7 @@
 #ifndef AMIGA_DRAG_H
 #define AMIGA_DRAG_H
 #include <exec/types.h>
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/window.h"
 
 #define AMI_DRAG_THRESHOLD 10

frontends/amiga/file.c

@@ -29,7 +29,7 @@
 #include "content/hlcache.h"
 #include "content/content.h"
 #include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf.h"
 #include "desktop/save_text.h"

frontends/amiga/font.c

@@ -24,7 +24,7 @@
 
 #include "utils/log.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/layout.h"
 
 #include "amiga/font.h"

frontends/amiga/gui.c

@@ -102,7 +102,7 @@
 #include "content/urldb.h"
 #include "content/handlers/image/ico.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/hotlist.h"
 #include "netsurf/mouse.h"
 #include "netsurf/netsurf.h"

frontends/amiga/gui_options.c

@@ -61,7 +61,7 @@
 #include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/searchweb.h"
 #include "netsurf/window.h"
 

frontends/amiga/history_local.c

@@ -45,7 +45,7 @@
 #include "utils/utils.h"
 #include "utils/messages.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 #include "netsurf/window.h"
 #include "graphics/rpattr.h"

frontends/amiga/menu.c

@@ -49,7 +49,7 @@
 #include "utils/nsurl.h"
 #include "content/hlcache.h"
 #include "desktop/hotlist.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
 #include "desktop/textinput.h"

frontends/amiga/search.c

@@ -48,7 +48,7 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/search.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"

frontends/amiga/tree.c

@@ -55,7 +55,7 @@
 #include "utils/messages.h"
 #include "content/urldb.h"
 #include "content/llcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/global_history.h"
 #include "desktop/hotlist.h"

frontends/atari/about.c

@@ -28,7 +28,7 @@
 #include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "curl/curlver.h"
 

frontends/atari/ctxmenu.c

@@ -19,7 +19,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
 #include "content/hlcache.h"
 

frontends/atari/deskmenu.c

@@ -23,7 +23,7 @@
 #include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/save_complete.h"
 #include "desktop/textinput.h"
 

frontends/atari/download.c

@@ -35,7 +35,7 @@
 #include "desktop/save_complete.h"
 #include "desktop/textinput.h"
 #include "desktop/download.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/download.h"
 
 #include "atari/gui.h"

frontends/atari/gui.c

@@ -34,7 +34,7 @@
 #include "content/backing_store.h"
 #include "content/hlcache.h"
 #include "desktop/treeview.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/layout.h"
 #include "netsurf/window.h"
 #include "netsurf/clipboard.h"

frontends/atari/rootwin.c

@@ -37,7 +37,7 @@
 #include <mt_gem.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/plotters.h"
 #include "desktop/textinput.h"

frontends/atari/search.c

@@ -27,7 +27,7 @@
 
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/search.h"
 #include "netsurf/search.h"
 

frontends/atari/toolbar.c

@@ -32,7 +32,7 @@
 #include "utils/nsurl.h"
 #include "utils/utf8.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/plot_style.h"
 #include "desktop/plotters.h"

frontends/beos/bitmap.cpp

@@ -41,7 +41,7 @@ extern "C" {
 #include "content/content.h"
 #include "content/urldb.h"
 #include "desktop/plotters.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/bitmap.h"
 }
 

frontends/beos/gui.cpp

@@ -62,7 +62,7 @@ extern "C" {
 #include "content/fetchers/resource.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/misc.h"
 #include "netsurf/clipboard.h"
 #include "netsurf/search.h"

frontends/beos/login.cpp

@@ -30,7 +30,7 @@ extern "C" {
 #include "utils/log.h"
 #include "content/content.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "utils/messages.h"
 #include "utils/url.h"
 #include "utils/utils.h"

frontends/beos/scaffolding.cpp

@@ -54,7 +54,7 @@
 extern "C" {
 #include "content/content.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/netsurf.h"
 #include "desktop/version.h"
 #include "desktop/searchweb.h"

frontends/beos/schedule.cpp

@@ -26,7 +26,7 @@ extern "C" {
 #include "utils/errors.h"
 #include "beos/schedule.h"
 #include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #ifdef DEBUG_BEOS_SCHEDULE
 #include "utils/log.h"

frontends/beos/window.cpp

@@ -29,7 +29,7 @@ extern "C" {
 #include "utils/utils.h"
 #include "content/content.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/textinput.h"
 #include "desktop/plotters.h"

frontends/cocoa/BookmarksController.m

@@ -18,7 +18,7 @@
 
 #import "utils/messages.h"
 #import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/hotlist.h"
 #import "desktop/tree.h"
 #import "content/hlcache.h"

frontends/cocoa/BrowserView.m

@@ -18,7 +18,7 @@
 
 #import "utils/nsoption.h"
 #import "utils/messages.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/plotters.h"
 #import "desktop/textinput.h"
 #import "content/hlcache.h"

frontends/cocoa/BrowserViewController.m

@@ -23,7 +23,7 @@
 #import "utils/messages.h"
 #import "utils/url.h"
 #import "desktop/browser_history.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/textinput.h"
 #import "content/hlcache.h"
 

frontends/cocoa/BrowserWindowController.m

@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "utils/nsoption.h"
 #import "utils/messages.h"
 #import "utils/utils.h"

frontends/cocoa/FormSelectMenu.m

@@ -19,7 +19,7 @@
 #import "cocoa/FormSelectMenu.h"
 #import "cocoa/coordinates.h"
 
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "render/form.h"
 
 static inline NSRect cocoa_rect_for_control( struct browser_window *bw, struct form_control *control)

frontends/cocoa/NetSurfAppDelegate.m

@@ -20,7 +20,7 @@
 #import "utils/messages.h"
 #import "utils/utils.h"
 #import "utils/nsurl.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 
 #import "cocoa/gui.h"
 #import "cocoa/NetSurfAppDelegate.h"

frontends/cocoa/PreferencesWindowController.m

@@ -17,7 +17,7 @@
  */
 
 #import "utils/nsoption.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "content/content.h"
 #import "content/hlcache.h"
 

frontends/cocoa/SearchWindowController.m

@@ -21,7 +21,7 @@
 #import "cocoa/BrowserViewController.h"
 
 #import "netsurf/search.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/search.h"
 
 static void cocoa_search_set_back( bool active, void *p );

frontends/cocoa/bitmap.m

@@ -23,7 +23,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/plotters.h"
 #import "netsurf/bitmap.h"
 #import "content/urldb.h"

frontends/cocoa/coordinates.h

@@ -20,7 +20,7 @@
 #define COCOA_COORDINATES_H
 
 #include "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 
 extern CGFloat cocoa_scale_factor;
 

frontends/cocoa/gui.m

@@ -24,7 +24,7 @@
 #import "netsurf/mouse.h"
 #import "netsurf/window.h"
 #import "netsurf/misc.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/textinput.h"
 #import "content/handlers/image/ico.h"
 #import "content/fetchers/resource.h"

frontends/cocoa/plotter.m

@@ -20,7 +20,7 @@
 
 #import "utils/log.h"
 #import "utils/utils.h"
-#import "desktop/browser.h"
+#import "netsurf/browser_window.h"
 #import "desktop/plotters.h"
 #import "desktop/plot_style.h"
 

frontends/framebuffer/clipboard.c

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/clipboard.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/fbtk/bitmap.c

@@ -24,7 +24,7 @@
 #include <libnsfb.h>
 #include <libnsfb_plot.h>
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/fbtk/event.c

@@ -31,7 +31,7 @@
 
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/fbtk/fbtk.c

@@ -34,7 +34,7 @@
 
 #include "utils/utils.h"
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/fbtk/fill.c

@@ -24,7 +24,7 @@
 #include <libnsfb.h>
 #include <libnsfb_plot.h>
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/fbtk/osk.c

@@ -27,7 +27,7 @@
 #include <libnsfb_cursor.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/fbtk/scroll.c

@@ -28,7 +28,7 @@
 #include <libnsfb_cursor.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/fbtk/text.c

@@ -28,7 +28,7 @@
 #include <libnsfb_event.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 
 #include "framebuffer/gui.h"

frontends/framebuffer/fbtk/window.c

@@ -24,7 +24,7 @@
 #include <libnsfb.h>
 #include <libnsfb_plot.h>
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/fbtk.h"

frontends/framebuffer/font_freetype.c

@@ -29,7 +29,7 @@
 #include "utils/nsoption.h"
 #include "netsurf/utf8.h"
 #include "netsurf/layout.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "framebuffer/gui.h"
 #include "framebuffer/font.h"

frontends/framebuffer/framebuffer.c

@@ -31,7 +31,7 @@
 #include "utils/utils.h"
 #include "utils/log.h"
 #include "utils/utf8.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 #include "netsurf/bitmap.h"
 

frontends/framebuffer/gui.c

@@ -34,7 +34,7 @@
 #include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
 #include "desktop/browser_history.h"
 #include "desktop/plotters.h"

frontends/gtk/about.c

@@ -28,7 +28,7 @@
 #include "utils/messages.h"
 #include "utils/nsoption.h"
 #include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/version.h"
 
 #include "gtk/warn.h"

frontends/gtk/completion.c

@@ -28,7 +28,7 @@
 #include "utils/nsoption.h"
 #include "content/urldb.h"
 #include "desktop/searchweb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "gtk/warn.h"
 #include "gtk/scaffolding.h"

frontends/gtk/gui.c

@@ -42,7 +42,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "content/backing_store.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/save_complete.h"
 #include "desktop/save_pdf.h"
 #include "desktop/searchweb.h"

frontends/gtk/preferences.c

@@ -26,7 +26,7 @@
 #include "utils/file.h"
 #include "utils/log.h"
 #include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/searchweb.h"
 
 #include "gtk/compat.h"

frontends/gtk/scaffolding.c

@@ -34,7 +34,7 @@
 #include "utils/nsoption.h"
 #include "utils/file.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/hotlist.h"
 #include "desktop/plotters.h"
 #include "desktop/print.h"

frontends/gtk/search.c

@@ -30,7 +30,7 @@
 #include "utils/messages.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/search.h"
 #include "desktop/searchweb.h"
 #include "netsurf/search.h"

frontends/gtk/selection.c

@@ -21,7 +21,7 @@
 #include <stdlib.h>
 
 #include "utils/log.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/clipboard.h"
 
 #include "gtk/window.h"

frontends/gtk/tabs.c

@@ -21,7 +21,7 @@
 
 #include "utils/nsoption.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "content/content.h"
 #include "desktop/search.h"
 

frontends/gtk/toolbar.c

@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <gtk/gtk.h>
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/searchweb.h"
 #include "utils/log.h"
 #include "utils/messages.h"

frontends/gtk/viewdata.c

@@ -41,7 +41,7 @@
 #include "utils/file.h"
 #include "utils/filepath.h"
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "content/hlcache.h"
 #include "content/content.h"
 

frontends/gtk/viewsource.c

@@ -23,7 +23,7 @@
 #include "utils/utf8.h"
 #include "utils/nsurl.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "content/content.h"
 
 #include "gtk/viewdata.h"

frontends/gtk/window.c

@@ -39,7 +39,7 @@
 #include "content/hlcache.h"
 #include "gtk/window.h"
 #include "gtk/selection.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/mouse.h"
 #include "desktop/searchweb.h"
 #include "desktop/textinput.h"

frontends/monkey/browser.c

@@ -27,7 +27,7 @@
 #include "utils/messages.h"
 #include "netsurf/mouse.h"
 #include "netsurf/window.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 #include "content/hlcache.h"
 

frontends/riscos/401login.c

@@ -28,7 +28,6 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
 
 #include "riscos/gui.h"
 #include "riscos/dialog.h"

frontends/riscos/dialog.c

@@ -39,7 +39,7 @@
 #include "utils/messages.h"
 #include "utils/nsurl.h"
 #include "desktop/version.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/configure.h"
 #include "riscos/cookies.h"

frontends/riscos/gui.c

@@ -52,7 +52,7 @@
 #include "desktop/save_complete.h"
 #include "desktop/treeview.h"
 #include "netsurf/netsurf.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "content/urldb.h"
 #include "content/hlcache.h"
 #include "content/backing_store.h"

frontends/riscos/gui/url_bar.c

@@ -37,7 +37,7 @@
 #include "utils/utils.h"
 #include "content/hlcache.h"
 #include "content/content.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 
 #include "riscos/gui.h"

frontends/riscos/iconbar.c

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * Iconbar icon and menus (implementation).
+/**
+ * \file
+ * Iconbar icon and menus implementation.
  */
 
 #include <assert.h>
@@ -36,7 +37,7 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/nsurl.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/gui.h"
 #include "riscos/configure.h"

frontends/riscos/menus.c

@@ -40,7 +40,6 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/cookie_manager.h"
-#include "desktop/browser.h"
 #include "desktop/textinput.h"
 
 #include "riscos/dialog.h"

frontends/riscos/print.c

@@ -38,7 +38,7 @@
 #include "utils/nsoption.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/plotters.h"
 
 #include "riscos/gui.h"

frontends/riscos/save.c

@@ -42,7 +42,7 @@
 #include "utils/utf8.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/hotlist.h"
 #include "desktop/global_history.h"
 #include "desktop/version.h"

frontends/riscos/search.c

@@ -33,9 +33,8 @@
 #include "utils/messages.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/search.h"
-#include "desktop/browser.h"
 #include "desktop/search.h"
 
 #include "riscos/gui.h"

frontends/riscos/sslcert.c

@@ -34,7 +34,6 @@
 #include "content/hlcache.h"
 #include "content/fetch.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
 #include "desktop/sslcert_viewer.h"
 #include "desktop/tree.h"
 

frontends/riscos/textarea.c

@@ -33,7 +33,6 @@
 
 #include "utils/log.h"
 #include "utils/utf8.h"
-#include "desktop/browser.h"
 
 #include "riscos/gui.h"
 #include "riscos/oslib_pre7.h"

frontends/riscos/textselection.c

@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
-  * Text selection code (platform-dependent implementation)
-  */
+/**
+ * \file
+ * RISC OS text selection implementation.
+ */
 
 #include <assert.h>
 #include <stdio.h>
@@ -34,7 +35,7 @@
 #include "netsurf/clipboard.h"
 #include "netsurf/window.h"
 #include "desktop/textinput.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/gui.h"
 #include "riscos/menus.h"

frontends/riscos/theme_install.c

@@ -30,7 +30,6 @@
 #include "utils/messages.h"
 #include "content/content.h"
 #include "content/hlcache.h"
-#include "desktop/browser.h"
 #include "desktop/theme.h"
 
 #include "riscos/dialog.h"

frontends/riscos/treeview.c

@@ -40,7 +40,6 @@
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
 #include "desktop/plotters.h"
 #include "desktop/textinput.h"
 #include "desktop/tree.h"

frontends/riscos/uri.c

@@ -16,6 +16,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/**
+ * \file
+ * RISC OS URI message handling implementation.
+ */
+
 #include "utils/config.h"
 
 #include <stdbool.h>
@@ -29,7 +34,7 @@
 #include "utils/messages.h"
 #include "utils/nsurl.h"
 #include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/gui.h"
 #include "riscos/uri.h"

frontends/riscos/url_complete.c

@@ -16,8 +16,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * GUI URL auto-completion (implementation).
+/**
+ * \file
+ * GUI URL auto-completion implementation.
  */
 
 #include <assert.h>
@@ -30,7 +31,7 @@
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "content/urldb.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/global_history.h"
 #include "riscos/gui.h"

frontends/riscos/url_protocol.c

@@ -18,8 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/** \file
- * ANT URL launching protocol (implementation).
+/**
+ * \file
+ * ANT URL launching protocol implementation.
  *
  * See http://www.vigay.com/inet/inet_url.html
  */
@@ -38,7 +39,7 @@
 #include "utils/nsurl.h"
 #include "utils/config.h"
 #include "content/fetch.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "riscos/gui.h"
 #include "riscos/uri.h"

frontends/riscos/window.c

@@ -56,7 +56,7 @@
 #include "content/hlcache.h"
 #include "content/urldb.h"
 #include "desktop/browser_history.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/cookie_manager.h"
 #include "desktop/scrollbar.h"
 #include "desktop/frames.h"

frontends/windows/drawable.c

@@ -23,7 +23,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "desktop/textinput.h"
 #include "desktop/plotters.h"
 #include "utils/errors.h"

frontends/windows/file.c

@@ -35,7 +35,7 @@
 #include "utils/url.h"
 #include "utils/file.h"
 #include "utils/string.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 
 #include "windows/file.h"
 

frontends/windows/gui.c

@@ -31,7 +31,7 @@
 #include "utils/url.h"
 #include "utils/file.h"
 #include "utils/messages.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/clipboard.h"
 
 #include "windows/schedule.h"

frontends/windows/main.c

@@ -30,7 +30,7 @@
 #include "utils/file.h"
 #include "utils/nsurl.h"
 #include "utils/nsoption.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/fetch.h"
 #include "netsurf/misc.h"
 #include "netsurf/netsurf.h"

frontends/windows/pointers.c

@@ -29,7 +29,7 @@
 #include "utils/corestrings.h"
 #include "utils/url.h"
 #include "utils/file.h"
-#include "desktop/browser.h"
+#include "netsurf/browser_window.h"
 #include "netsurf/clipboard.h"
 
 #include "windows/schedule.h"