From 7fc0a4c481d7adad14a42740037d50b2f9e1cdc1 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 30 May 2016 17:32:57 +0100 Subject: [PATCH] move desktop window header into public API --- content/content.c | 2 +- desktop/browser.c | 52 +++++++++---------- desktop/browser_private.h | 4 +- desktop/frame_types.h | 5 +- desktop/frames.h | 2 + desktop/global_history.c | 2 +- desktop/hotlist.c | 2 +- desktop/mouse.c | 2 +- desktop/netsurf.c | 2 +- desktop/scrollbar.c | 2 +- desktop/textarea.c | 2 +- desktop/textarea.h | 4 ++ desktop/tree.c | 2 +- frontends/amiga/arexx.c | 2 +- frontends/amiga/clipboard.c | 2 +- frontends/amiga/ctxmenu.c | 2 +- frontends/amiga/download.c | 2 +- frontends/amiga/drag.h | 2 +- frontends/amiga/file.c | 2 +- frontends/amiga/font.c | 2 +- frontends/amiga/gui.c | 2 +- frontends/amiga/gui_options.c | 2 +- frontends/amiga/history_local.c | 2 +- frontends/amiga/menu.c | 2 +- frontends/amiga/search.c | 2 +- frontends/amiga/tree.c | 2 +- frontends/atari/about.c | 2 +- frontends/atari/ctxmenu.c | 2 +- frontends/atari/deskmenu.c | 2 +- frontends/atari/download.c | 2 +- frontends/atari/gui.c | 2 +- frontends/atari/rootwin.c | 2 +- frontends/atari/search.c | 2 +- frontends/atari/toolbar.c | 2 +- frontends/beos/bitmap.cpp | 2 +- frontends/beos/gui.cpp | 2 +- frontends/beos/login.cpp | 2 +- frontends/beos/scaffolding.cpp | 2 +- frontends/beos/schedule.cpp | 2 +- frontends/beos/window.cpp | 2 +- frontends/cocoa/BookmarksController.m | 2 +- frontends/cocoa/BrowserView.m | 2 +- frontends/cocoa/BrowserViewController.m | 2 +- frontends/cocoa/BrowserWindowController.m | 2 +- frontends/cocoa/FormSelectMenu.m | 2 +- frontends/cocoa/NetSurfAppDelegate.m | 2 +- frontends/cocoa/PreferencesWindowController.m | 2 +- frontends/cocoa/SearchWindowController.m | 2 +- frontends/cocoa/bitmap.m | 2 +- frontends/cocoa/coordinates.h | 2 +- frontends/cocoa/gui.m | 2 +- frontends/cocoa/plotter.m | 2 +- frontends/framebuffer/clipboard.c | 2 +- frontends/framebuffer/fbtk/bitmap.c | 2 +- frontends/framebuffer/fbtk/event.c | 2 +- frontends/framebuffer/fbtk/fbtk.c | 2 +- frontends/framebuffer/fbtk/fill.c | 2 +- frontends/framebuffer/fbtk/osk.c | 2 +- frontends/framebuffer/fbtk/scroll.c | 2 +- frontends/framebuffer/fbtk/text.c | 2 +- frontends/framebuffer/fbtk/window.c | 2 +- frontends/framebuffer/font_freetype.c | 2 +- frontends/framebuffer/framebuffer.c | 2 +- frontends/framebuffer/gui.c | 2 +- frontends/gtk/about.c | 2 +- frontends/gtk/completion.c | 2 +- frontends/gtk/gui.c | 2 +- frontends/gtk/preferences.c | 2 +- frontends/gtk/scaffolding.c | 2 +- frontends/gtk/search.c | 2 +- frontends/gtk/selection.c | 2 +- frontends/gtk/tabs.c | 2 +- frontends/gtk/toolbar.c | 2 +- frontends/gtk/viewdata.c | 2 +- frontends/gtk/viewsource.c | 2 +- frontends/gtk/window.c | 2 +- frontends/monkey/browser.c | 2 +- frontends/riscos/401login.c | 1 - frontends/riscos/dialog.c | 2 +- frontends/riscos/gui.c | 2 +- frontends/riscos/gui/url_bar.c | 2 +- frontends/riscos/iconbar.c | 7 +-- frontends/riscos/menus.c | 1 - frontends/riscos/print.c | 2 +- frontends/riscos/save.c | 2 +- frontends/riscos/search.c | 3 +- frontends/riscos/sslcert.c | 1 - frontends/riscos/textarea.c | 1 - frontends/riscos/textselection.c | 9 ++-- frontends/riscos/theme_install.c | 1 - frontends/riscos/treeview.c | 1 - frontends/riscos/uri.c | 7 ++- frontends/riscos/url_complete.c | 7 +-- frontends/riscos/url_protocol.c | 7 +-- frontends/riscos/window.c | 2 +- frontends/windows/drawable.c | 2 +- frontends/windows/file.c | 2 +- frontends/windows/gui.c | 2 +- frontends/windows/main.c | 2 +- frontends/windows/pointers.c | 2 +- frontends/windows/window.c | 2 +- .../netsurf/browser_window.h | 7 ++- javascript/duktape/Location.bnd | 2 +- javascript/duktape/Window.bnd | 2 +- javascript/jsapi/location.bnd | 2 +- render/box_textarea.c | 1 - render/form.c | 2 +- render/html.c | 2 +- render/html.h | 2 +- render/html_forms.c | 2 - render/html_interaction.c | 2 +- render/html_redraw.c | 2 +- render/layout.c | 2 +- render/textplain.c | 2 +- 114 files changed, 158 insertions(+), 153 deletions(-) rename desktop/browser.h => include/netsurf/browser_window.h (99%) diff --git a/content/content.c b/content/content.c index ad130a550..36e3e7948 100644 --- a/content/content.c +++ b/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" diff --git a/desktop/browser.c b/desktop/browser.c index f69acc5f2..6b3746f4a 100644 --- a/desktop/browser.c +++ b/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 || diff --git a/desktop/browser_private.h b/desktop/browser_private.h index efd875f7b..2641a0e44 100644 --- a/desktop/browser_private.h +++ b/desktop/browser_private.h @@ -26,8 +26,8 @@ #include -#include "desktop/browser.h" - +#include "netsurf/browser_window.h" +#include "desktop/frame_types.h" struct box; struct hlcache_handle; diff --git a/desktop/frame_types.h b/desktop/frame_types.h index 7008e98d4..416c8888e 100644 --- a/desktop/frame_types.h +++ b/desktop/frame_types.h @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -/** \file - * Browser window creation and manipulation (interface). +/** + * \file + * Interface to browser frames. */ #ifndef _NETSURF_DESKTOP_FRAME_TYPES_H_ diff --git a/desktop/frames.h b/desktop/frames.h index b39c8a807..063e2c558 100644 --- a/desktop/frames.h +++ b/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. diff --git a/desktop/global_history.c b/desktop/global_history.c index 9fa1d6de7..01b7dee25 100644 --- a/desktop/global_history.c +++ b/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) diff --git a/desktop/hotlist.c b/desktop/hotlist.c index f9a1f41be..eae5ad81a 100644 --- a/desktop/hotlist.c +++ b/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) diff --git a/desktop/mouse.c b/desktop/mouse.c index ea627ac82..6d22fd461 100644 --- a/desktop/mouse.c +++ b/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" /** diff --git a/desktop/netsurf.c b/desktop/netsurf.c index fd4cacf9e..1ca2ea936 100644 --- a/desktop/netsurf.c +++ b/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" diff --git a/desktop/scrollbar.c b/desktop/scrollbar.c index 64b767192..740fd33ae 100644 --- a/desktop/scrollbar.c +++ b/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" diff --git a/desktop/textarea.c b/desktop/textarea.c index 804c78ca0..8c9efe14d 100644 --- a/desktop/textarea.c +++ b/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" diff --git a/desktop/textarea.h b/desktop/textarea.h index 66d5cbc5e..74652f3a1 100644 --- a/desktop/textarea.h +++ b/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 { diff --git a/desktop/tree.c b/desktop/tree.c index 91fd0b9d7..d1af7664b 100644 --- a/desktop/tree.c +++ b/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 { diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index 38274f1ae..8436fdc55 100644 --- a/frontends/amiga/arexx.c +++ b/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" diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index 2322f0e87..2d8630726 100644 --- a/frontends/amiga/clipboard.c +++ b/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" diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c index 5951a10ae..2b6691fde 100644 --- a/frontends/amiga/ctxmenu.c +++ b/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" diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index b1526b994..fb020cee6 100644 --- a/frontends/amiga/download.c +++ b/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" diff --git a/frontends/amiga/drag.h b/frontends/amiga/drag.h index b8ccec160..f8a165576 100644 --- a/frontends/amiga/drag.h +++ b/frontends/amiga/drag.h @@ -19,7 +19,7 @@ #ifndef AMIGA_DRAG_H #define AMIGA_DRAG_H #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/window.h" #define AMI_DRAG_THRESHOLD 10 diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c index 3b5d5410b..595a981f9 100644 --- a/frontends/amiga/file.c +++ b/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" diff --git a/frontends/amiga/font.c b/frontends/amiga/font.c index af62652e8..d3b9c321d 100644 --- a/frontends/amiga/font.c +++ b/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" diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index ebc7f8721..3ccb2eb4b 100644 --- a/frontends/amiga/gui.c +++ b/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" diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index f921b093a..d700eafeb 100755 --- a/frontends/amiga/gui_options.c +++ b/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" diff --git a/frontends/amiga/history_local.c b/frontends/amiga/history_local.c index 3be097fa5..a1ada5b00 100755 --- a/frontends/amiga/history_local.c +++ b/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" diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index 0743bc7ba..4fa5ba19f 100644 --- a/frontends/amiga/menu.c +++ b/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" diff --git a/frontends/amiga/search.c b/frontends/amiga/search.c index 86a27cf41..aaf54b06d 100755 --- a/frontends/amiga/search.c +++ b/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" diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c index 05c2fa7c5..52d5899c9 100644 --- a/frontends/amiga/tree.c +++ b/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" diff --git a/frontends/atari/about.c b/frontends/atari/about.c index 105037aab..c541b0fb8 100644 --- a/frontends/atari/about.c +++ b/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" diff --git a/frontends/atari/ctxmenu.c b/frontends/atari/ctxmenu.c index 0343b20c7..e7420351e 100644 --- a/frontends/atari/ctxmenu.c +++ b/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" diff --git a/frontends/atari/deskmenu.c b/frontends/atari/deskmenu.c index 723835873..2bb65cf4a 100644 --- a/frontends/atari/deskmenu.c +++ b/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" diff --git a/frontends/atari/download.c b/frontends/atari/download.c index c763ed2de..ebe3cc4a0 100644 --- a/frontends/atari/download.c +++ b/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" diff --git a/frontends/atari/gui.c b/frontends/atari/gui.c index 0e349ab7e..24caa7c51 100644 --- a/frontends/atari/gui.c +++ b/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" diff --git a/frontends/atari/rootwin.c b/frontends/atari/rootwin.c index ca25a0751..5a5bdcc25 100644 --- a/frontends/atari/rootwin.c +++ b/frontends/atari/rootwin.c @@ -37,7 +37,7 @@ #include #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" diff --git a/frontends/atari/search.c b/frontends/atari/search.c index 11fd67e4b..4da7f16a3 100644 --- a/frontends/atari/search.c +++ b/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" diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c index d2182c5fa..2a5053847 100644 --- a/frontends/atari/toolbar.c +++ b/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" diff --git a/frontends/beos/bitmap.cpp b/frontends/beos/bitmap.cpp index c9c786a94..3287fd0f7 100644 --- a/frontends/beos/bitmap.cpp +++ b/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" } diff --git a/frontends/beos/gui.cpp b/frontends/beos/gui.cpp index 58b9f9b36..c52fa81f3 100644 --- a/frontends/beos/gui.cpp +++ b/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" diff --git a/frontends/beos/login.cpp b/frontends/beos/login.cpp index de2370d33..ad09d86af 100644 --- a/frontends/beos/login.cpp +++ b/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" diff --git a/frontends/beos/scaffolding.cpp b/frontends/beos/scaffolding.cpp index 82ae2afde..75ef241f7 100644 --- a/frontends/beos/scaffolding.cpp +++ b/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" diff --git a/frontends/beos/schedule.cpp b/frontends/beos/schedule.cpp index a9da53501..171d74545 100644 --- a/frontends/beos/schedule.cpp +++ b/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" diff --git a/frontends/beos/window.cpp b/frontends/beos/window.cpp index 5e75a0256..4fd682365 100644 --- a/frontends/beos/window.cpp +++ b/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" diff --git a/frontends/cocoa/BookmarksController.m b/frontends/cocoa/BookmarksController.m index 0bd51b273..e11cb3f84 100644 --- a/frontends/cocoa/BookmarksController.m +++ b/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" diff --git a/frontends/cocoa/BrowserView.m b/frontends/cocoa/BrowserView.m index fc50dbc64..5d82c8526 100644 --- a/frontends/cocoa/BrowserView.m +++ b/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" diff --git a/frontends/cocoa/BrowserViewController.m b/frontends/cocoa/BrowserViewController.m index 5fa8b642d..354015194 100644 --- a/frontends/cocoa/BrowserViewController.m +++ b/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" diff --git a/frontends/cocoa/BrowserWindowController.m b/frontends/cocoa/BrowserWindowController.m index bfb8be05e..aa7375a0e 100644 --- a/frontends/cocoa/BrowserWindowController.m +++ b/frontends/cocoa/BrowserWindowController.m @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -#import "desktop/browser.h" +#import "netsurf/browser_window.h" #import "utils/nsoption.h" #import "utils/messages.h" #import "utils/utils.h" diff --git a/frontends/cocoa/FormSelectMenu.m b/frontends/cocoa/FormSelectMenu.m index 84e04cd25..b0ea0e62d 100644 --- a/frontends/cocoa/FormSelectMenu.m +++ b/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) diff --git a/frontends/cocoa/NetSurfAppDelegate.m b/frontends/cocoa/NetSurfAppDelegate.m index f42856380..0939a1149 100644 --- a/frontends/cocoa/NetSurfAppDelegate.m +++ b/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" diff --git a/frontends/cocoa/PreferencesWindowController.m b/frontends/cocoa/PreferencesWindowController.m index f314736e3..752218626 100644 --- a/frontends/cocoa/PreferencesWindowController.m +++ b/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" diff --git a/frontends/cocoa/SearchWindowController.m b/frontends/cocoa/SearchWindowController.m index d07fd0413..95372fc19 100644 --- a/frontends/cocoa/SearchWindowController.m +++ b/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 ); diff --git a/frontends/cocoa/bitmap.m b/frontends/cocoa/bitmap.m index 14394d087..f7c28f0ad 100644 --- a/frontends/cocoa/bitmap.m +++ b/frontends/cocoa/bitmap.m @@ -23,7 +23,7 @@ #import -#import "desktop/browser.h" +#import "netsurf/browser_window.h" #import "desktop/plotters.h" #import "netsurf/bitmap.h" #import "content/urldb.h" diff --git a/frontends/cocoa/coordinates.h b/frontends/cocoa/coordinates.h index a43db0b65..4bd92220f 100644 --- a/frontends/cocoa/coordinates.h +++ b/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; diff --git a/frontends/cocoa/gui.m b/frontends/cocoa/gui.m index 7f39459b6..310e196a3 100644 --- a/frontends/cocoa/gui.m +++ b/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" diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m index dbc9460c4..472857dbe 100644 --- a/frontends/cocoa/plotter.m +++ b/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" diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c index 1d41622cf..1254c36f3 100644 --- a/frontends/framebuffer/clipboard.c +++ b/frontends/framebuffer/clipboard.c @@ -26,7 +26,7 @@ #include #include "utils/log.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/clipboard.h" #include "framebuffer/gui.h" diff --git a/frontends/framebuffer/fbtk/bitmap.c b/frontends/framebuffer/fbtk/bitmap.c index 1f147be00..759b626d9 100644 --- a/frontends/framebuffer/fbtk/bitmap.c +++ b/frontends/framebuffer/fbtk/bitmap.c @@ -24,7 +24,7 @@ #include #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c index c0894921e..dab035530 100644 --- a/frontends/framebuffer/fbtk/event.c +++ b/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" diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c index db1c1f1a9..fa861b11b 100644 --- a/frontends/framebuffer/fbtk/fbtk.c +++ b/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" diff --git a/frontends/framebuffer/fbtk/fill.c b/frontends/framebuffer/fbtk/fill.c index 07397b2df..9377933cc 100644 --- a/frontends/framebuffer/fbtk/fill.c +++ b/frontends/framebuffer/fbtk/fill.c @@ -24,7 +24,7 @@ #include #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/fbtk/osk.c b/frontends/framebuffer/fbtk/osk.c index 1d57f157f..628fe9abd 100644 --- a/frontends/framebuffer/fbtk/osk.c +++ b/frontends/framebuffer/fbtk/osk.c @@ -27,7 +27,7 @@ #include #include "utils/log.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c index c86c8a6de..cc98fb2dd 100644 --- a/frontends/framebuffer/fbtk/scroll.c +++ b/frontends/framebuffer/fbtk/scroll.c @@ -28,7 +28,7 @@ #include #include "utils/log.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c index 258e9dff9..703a10b99 100644 --- a/frontends/framebuffer/fbtk/text.c +++ b/frontends/framebuffer/fbtk/text.c @@ -28,7 +28,7 @@ #include #include "utils/log.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/plotters.h" #include "framebuffer/gui.h" diff --git a/frontends/framebuffer/fbtk/window.c b/frontends/framebuffer/fbtk/window.c index 787dac720..b385e8e3f 100644 --- a/frontends/framebuffer/fbtk/window.c +++ b/frontends/framebuffer/fbtk/window.c @@ -24,7 +24,7 @@ #include #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c index bf96cab50..9235ad476 100644 --- a/frontends/framebuffer/font_freetype.c +++ b/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" diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c index 16e9dd736..00bd6a15a 100644 --- a/frontends/framebuffer/framebuffer.c +++ b/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" diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c index 6313481c3..7559648d5 100644 --- a/frontends/framebuffer/gui.c +++ b/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" diff --git a/frontends/gtk/about.c b/frontends/gtk/about.c index d57afea7f..f003faf32 100644 --- a/frontends/gtk/about.c +++ b/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" diff --git a/frontends/gtk/completion.c b/frontends/gtk/completion.c index 8444c8333..9b76411b6 100644 --- a/frontends/gtk/completion.c +++ b/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" diff --git a/frontends/gtk/gui.c b/frontends/gtk/gui.c index 120142420..27b73b175 100644 --- a/frontends/gtk/gui.c +++ b/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" diff --git a/frontends/gtk/preferences.c b/frontends/gtk/preferences.c index 3efb9eddd..e51e77014 100644 --- a/frontends/gtk/preferences.c +++ b/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" diff --git a/frontends/gtk/scaffolding.c b/frontends/gtk/scaffolding.c index 777256703..6873b8997 100644 --- a/frontends/gtk/scaffolding.c +++ b/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" diff --git a/frontends/gtk/search.c b/frontends/gtk/search.c index 1124c6816..2c73814e3 100644 --- a/frontends/gtk/search.c +++ b/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" diff --git a/frontends/gtk/selection.c b/frontends/gtk/selection.c index ae44e7803..228d65dbe 100644 --- a/frontends/gtk/selection.c +++ b/frontends/gtk/selection.c @@ -21,7 +21,7 @@ #include #include "utils/log.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/clipboard.h" #include "gtk/window.h" diff --git a/frontends/gtk/tabs.c b/frontends/gtk/tabs.c index e8be7eea1..56a1ed6a5 100644 --- a/frontends/gtk/tabs.c +++ b/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" diff --git a/frontends/gtk/toolbar.c b/frontends/gtk/toolbar.c index b7bf07f88..6866f008a 100644 --- a/frontends/gtk/toolbar.c +++ b/frontends/gtk/toolbar.c @@ -21,7 +21,7 @@ #include #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/searchweb.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/frontends/gtk/viewdata.c b/frontends/gtk/viewdata.c index 55b25467e..90a2366e9 100644 --- a/frontends/gtk/viewdata.c +++ b/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" diff --git a/frontends/gtk/viewsource.c b/frontends/gtk/viewsource.c index 554cfbf39..b0907a3a5 100644 --- a/frontends/gtk/viewsource.c +++ b/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" diff --git a/frontends/gtk/window.c b/frontends/gtk/window.c index 5c5d682ee..7cff9ee6b 100644 --- a/frontends/gtk/window.c +++ b/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" diff --git a/frontends/monkey/browser.c b/frontends/monkey/browser.c index 638dcdb26..5c1d15723 100644 --- a/frontends/monkey/browser.c +++ b/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" diff --git a/frontends/riscos/401login.c b/frontends/riscos/401login.c index e95a74809..476d631a2 100644 --- a/frontends/riscos/401login.c +++ b/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" diff --git a/frontends/riscos/dialog.c b/frontends/riscos/dialog.c index d4356086d..2b258bbca 100644 --- a/frontends/riscos/dialog.c +++ b/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" diff --git a/frontends/riscos/gui.c b/frontends/riscos/gui.c index 531b81694..e0e8e4e3b 100644 --- a/frontends/riscos/gui.c +++ b/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" diff --git a/frontends/riscos/gui/url_bar.c b/frontends/riscos/gui/url_bar.c index 053014784..37c4de111 100644 --- a/frontends/riscos/gui/url_bar.c +++ b/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" diff --git a/frontends/riscos/iconbar.c b/frontends/riscos/iconbar.c index 9cff116a1..8582a4539 100644 --- a/frontends/riscos/iconbar.c +++ b/frontends/riscos/iconbar.c @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -/** \file - * Iconbar icon and menus (implementation). +/** + * \file + * Iconbar icon and menus implementation. */ #include @@ -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" diff --git a/frontends/riscos/menus.c b/frontends/riscos/menus.c index 37285c9d1..0b1ac1a2b 100644 --- a/frontends/riscos/menus.c +++ b/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" diff --git a/frontends/riscos/print.c b/frontends/riscos/print.c index 95730d6be..26b50f65f 100644 --- a/frontends/riscos/print.c +++ b/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" diff --git a/frontends/riscos/save.c b/frontends/riscos/save.c index 6eab31533..325dbbb79 100644 --- a/frontends/riscos/save.c +++ b/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" diff --git a/frontends/riscos/search.c b/frontends/riscos/search.c index 2e869bb43..544630e2e 100644 --- a/frontends/riscos/search.c +++ b/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" diff --git a/frontends/riscos/sslcert.c b/frontends/riscos/sslcert.c index 9e43f2db1..7ab909dfa 100644 --- a/frontends/riscos/sslcert.c +++ b/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" diff --git a/frontends/riscos/textarea.c b/frontends/riscos/textarea.c index ecf3e0c3d..d9872927c 100644 --- a/frontends/riscos/textarea.c +++ b/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" diff --git a/frontends/riscos/textselection.c b/frontends/riscos/textselection.c index 81ccc3a68..81274484a 100644 --- a/frontends/riscos/textselection.c +++ b/frontends/riscos/textselection.c @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -/** \file - * Text selection code (platform-dependent implementation) - */ +/** + * \file + * RISC OS text selection implementation. + */ #include #include @@ -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" diff --git a/frontends/riscos/theme_install.c b/frontends/riscos/theme_install.c index 5c11ffb83..3448e742f 100644 --- a/frontends/riscos/theme_install.c +++ b/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" diff --git a/frontends/riscos/treeview.c b/frontends/riscos/treeview.c index 3428ad3d4..83f60660f 100644 --- a/frontends/riscos/treeview.c +++ b/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" diff --git a/frontends/riscos/uri.c b/frontends/riscos/uri.c index 9c384c9c0..a2f126b31 100644 --- a/frontends/riscos/uri.c +++ b/frontends/riscos/uri.c @@ -16,6 +16,11 @@ * along with this program. If not, see . */ +/** + * \file + * RISC OS URI message handling implementation. + */ + #include "utils/config.h" #include @@ -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" diff --git a/frontends/riscos/url_complete.c b/frontends/riscos/url_complete.c index 3cf7f9228..eebb76443 100644 --- a/frontends/riscos/url_complete.c +++ b/frontends/riscos/url_complete.c @@ -16,8 +16,9 @@ * along with this program. If not, see . */ -/** \file - * GUI URL auto-completion (implementation). +/** + * \file + * GUI URL auto-completion implementation. */ #include @@ -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" diff --git a/frontends/riscos/url_protocol.c b/frontends/riscos/url_protocol.c index 2b9ef3556..9a7ae062c 100644 --- a/frontends/riscos/url_protocol.c +++ b/frontends/riscos/url_protocol.c @@ -18,8 +18,9 @@ * along with this program. If not, see . */ -/** \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" diff --git a/frontends/riscos/window.c b/frontends/riscos/window.c index 2e012da99..1fc6edfbf 100644 --- a/frontends/riscos/window.c +++ b/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" diff --git a/frontends/windows/drawable.c b/frontends/windows/drawable.c index 4480eeaaa..9c26d8e9b 100644 --- a/frontends/windows/drawable.c +++ b/frontends/windows/drawable.c @@ -23,7 +23,7 @@ #include #include -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/textinput.h" #include "desktop/plotters.h" #include "utils/errors.h" diff --git a/frontends/windows/file.c b/frontends/windows/file.c index e9eb9caf9..5c5b1f061 100644 --- a/frontends/windows/file.c +++ b/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" diff --git a/frontends/windows/gui.c b/frontends/windows/gui.c index cb75cdfc4..0ab1e32ee 100644 --- a/frontends/windows/gui.c +++ b/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" diff --git a/frontends/windows/main.c b/frontends/windows/main.c index c410de90b..49aa431a8 100644 --- a/frontends/windows/main.c +++ b/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" diff --git a/frontends/windows/pointers.c b/frontends/windows/pointers.c index abb4fe760..b796a30ec 100644 --- a/frontends/windows/pointers.c +++ b/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" diff --git a/frontends/windows/window.c b/frontends/windows/window.c index afc741ff1..bbe0e96f0 100644 --- a/frontends/windows/window.c +++ b/frontends/windows/window.c @@ -30,7 +30,7 @@ #include "utils/nsurl.h" #include "utils/messages.h" #include "content/content.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/window.h" #include "desktop/browser_history.h" #include "desktop/textinput.h" diff --git a/desktop/browser.h b/include/netsurf/browser_window.h similarity index 99% rename from desktop/browser.h rename to include/netsurf/browser_window.h index 35eab0ea7..36ed65a49 100644 --- a/desktop/browser.h +++ b/include/netsurf/browser_window.h @@ -17,8 +17,9 @@ * along with this program. If not, see . */ -/** \file - * Browser window creation and manipulation (interface). +/** + * \file + * Browser window creation and manipulation interface. */ #ifndef _NETSURF_DESKTOP_BROWSER_H_ @@ -28,8 +29,6 @@ #include #include "utils/errors.h" -#include "desktop/plot_style.h" -#include "desktop/frame_types.h" #include "netsurf/mouse.h" struct browser_window; diff --git a/javascript/duktape/Location.bnd b/javascript/duktape/Location.bnd index fbb0e4a06..ca7e90509 100644 --- a/javascript/duktape/Location.bnd +++ b/javascript/duktape/Location.bnd @@ -15,7 +15,7 @@ class Location { prologue Location() %{ -#include "desktop/browser.h" +#include "netsurf/browser_window.h" %} init Location(nsurl *url) diff --git a/javascript/duktape/Window.bnd b/javascript/duktape/Window.bnd index 81d52809a..c9fc3ca4d 100644 --- a/javascript/duktape/Window.bnd +++ b/javascript/duktape/Window.bnd @@ -13,7 +13,7 @@ class Window { private struct html_content * htmlc; prologue %{ #include "utils/nsurl.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "render/html.h" #include "render/html_internal.h" %}; diff --git a/javascript/jsapi/location.bnd b/javascript/jsapi/location.bnd index f64f6330e..96c0a30d5 100644 --- a/javascript/jsapi/location.bnd +++ b/javascript/jsapi/location.bnd @@ -17,7 +17,7 @@ hdrcomment " http://www.opensource.org/licenses/mit-license"; preamble %{ -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "utils/config.h" #include "utils/log.h" diff --git a/render/box_textarea.c b/render/box_textarea.c index 4e4adff80..7f0765430 100644 --- a/render/box_textarea.c +++ b/render/box_textarea.c @@ -22,7 +22,6 @@ #include -#include "desktop/browser.h" #include "desktop/textarea.h" #include "desktop/textinput.h" #include "utils/log.h" diff --git a/render/form.c b/render/form.c index b3a8c5114..b07acdb8a 100644 --- a/render/form.c +++ b/render/form.c @@ -43,7 +43,7 @@ #include "content/fetch.h" #include "content/hlcache.h" #include "content/handlers/css/utils.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "desktop/knockout.h" #include "desktop/plot_style.h" diff --git a/render/html.c b/render/html.c index 8307cdcf7..7e2f27143 100644 --- a/render/html.c +++ b/render/html.c @@ -48,7 +48,7 @@ #include "desktop/textarea.h" #include "netsurf/bitmap.h" #include "javascript/js.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/utf8.h" #include "netsurf/layout.h" #include "netsurf/misc.h" diff --git a/render/html.h b/render/html.h index 2900e8983..5d2e45906 100644 --- a/render/html.h +++ b/render/html.h @@ -31,7 +31,7 @@ #include #include "content/content_type.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "desktop/plot_style.h" #include "desktop/frame_types.h" diff --git a/render/html_forms.c b/render/html_forms.c index fe289f261..0d56e1c75 100644 --- a/render/html_forms.c +++ b/render/html_forms.c @@ -19,8 +19,6 @@ #include "utils/corestrings.h" #include "utils/log.h" -#include "desktop/browser.h" - #include "render/form_internal.h" #include "render/html_internal.h" diff --git a/render/html_interaction.c b/render/html_interaction.c index 9513d0f0a..3a548250a 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -35,7 +35,7 @@ #include "utils/log.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/frames.h" #include "netsurf/mouse.h" #include "utils/nsoption.h" diff --git a/render/html_redraw.c b/render/html_redraw.c index e70f9bead..40783c302 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -42,7 +42,7 @@ #include "utils/nsoption.h" #include "content/content_protected.h" #include "content/handlers/css/utils.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/plotters.h" #include "desktop/selection.h" #include "desktop/print.h" diff --git a/render/layout.c b/render/layout.c index c86ccd75b..48c8677d7 100644 --- a/render/layout.c +++ b/render/layout.c @@ -49,7 +49,7 @@ #include "utils/nsoption.h" #include "content/content_protected.h" #include "content/handlers/css/utils.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "desktop/scrollbar.h" #include "desktop/textarea.h" #include "netsurf/layout.h" diff --git a/render/textplain.c b/render/textplain.c index 9fe560d72..2323f431b 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -40,7 +40,7 @@ #include "content/content_protected.h" #include "content/hlcache.h" #include "content/handlers/css/utils.h" -#include "desktop/browser.h" +#include "netsurf/browser_window.h" #include "utils/nsoption.h" #include "desktop/plotters.h" #include "desktop/search.h"