diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/Makefile | 13 | ||||
| -rw-r--r-- | core/api/clipboard.h (renamed from core/desktop/gui_clipboard.h) | 2 | ||||
| -rw-r--r-- | core/api/download.h (renamed from core/desktop/gui_download.h) | 0 | ||||
| -rw-r--r-- | core/api/fetch.h (renamed from core/desktop/gui_fetch.h) | 0 | ||||
| -rw-r--r-- | core/api/misc.h (renamed from core/desktop/gui_misc.h) | 0 | ||||
| -rw-r--r-- | core/api/netsurf.h (renamed from core/desktop/netsurf.h) | 2 | ||||
| -rw-r--r-- | core/api/search.h (renamed from core/desktop/gui_search.h) | 0 | ||||
| -rw-r--r-- | core/api/table.h (renamed from core/desktop/gui_table.h) | 2 | ||||
| -rw-r--r-- | core/api/utf8.h (renamed from core/desktop/gui_utf8.h) | 0 | ||||
| -rw-r--r-- | core/api/window.h (renamed from core/desktop/gui_window.h) | 0 | ||||
| -rw-r--r-- | core/browser/Makefile | 17 | ||||
| -rw-r--r-- | core/browser/api_internal.h (renamed from core/desktop/gui_internal.h) | 2 | ||||
| -rw-r--r-- | core/browser/browser.c (renamed from core/desktop/browser.c) | 90 | ||||
| -rw-r--r-- | core/browser/browser.h (renamed from core/desktop/browser.h) | 6 | ||||
| -rw-r--r-- | core/browser/browser_history.c (renamed from core/desktop/browser_history.c) | 52 | ||||
| -rw-r--r-- | core/browser/browser_history.h (renamed from core/desktop/browser_history.h) | 0 | ||||
| -rw-r--r-- | core/browser/browser_private.h (renamed from core/desktop/browser_private.h) | 2 | ||||
| -rw-r--r-- | core/browser/core_window.h (renamed from core/desktop/core_window.h) | 0 | ||||
| -rw-r--r-- | core/browser/download.c (renamed from core/desktop/download.c) | 8 | ||||
| -rw-r--r-- | core/browser/download.h (renamed from core/desktop/download.h) | 2 | ||||
| -rw-r--r-- | core/browser/font.h (renamed from core/desktop/font.h) | 2 | ||||
| -rw-r--r-- | core/browser/font_haru.c (renamed from core/desktop/font_haru.c) | 4 | ||||
| -rw-r--r-- | core/browser/font_haru.h (renamed from core/desktop/font_haru.h) | 4 | ||||
| -rw-r--r-- | core/browser/frame_types.h (renamed from core/desktop/frame_types.h) | 0 | ||||
| -rw-r--r-- | core/browser/frames.c (renamed from core/desktop/frames.c) | 14 | ||||
| -rw-r--r-- | core/browser/frames.h (renamed from core/desktop/frames.h) | 0 | ||||
| -rw-r--r-- | core/browser/gui_factory.c (renamed from core/desktop/gui_factory.c) | 24 | ||||
| -rw-r--r-- | core/browser/knockout.c (renamed from core/desktop/knockout.c) | 6 | ||||
| -rw-r--r-- | core/browser/knockout.h (renamed from core/desktop/knockout.h) | 2 | ||||
| -rw-r--r-- | core/browser/mouse.c (renamed from core/desktop/mouse.c) | 2 | ||||
| -rw-r--r-- | core/browser/mouse.h (renamed from core/desktop/mouse.h) | 0 | ||||
| -rw-r--r-- | core/browser/netsurf.c (renamed from core/desktop/netsurf.c) | 18 | ||||
| -rw-r--r-- | core/browser/options.h (renamed from core/desktop/options.h) | 2 | ||||
| -rw-r--r-- | core/browser/plot_style.c (renamed from core/desktop/plot_style.c) | 4 | ||||
| -rw-r--r-- | core/browser/plot_style.h (renamed from core/desktop/plot_style.h) | 0 | ||||
| -rw-r--r-- | core/browser/plotters.h (renamed from core/desktop/plotters.h) | 4 | ||||
| -rw-r--r-- | core/browser/print.c (renamed from core/desktop/print.c) | 6 | ||||
| -rw-r--r-- | core/browser/print.h (renamed from core/desktop/print.h) | 0 | ||||
| -rw-r--r-- | core/browser/printer.h (renamed from core/desktop/printer.h) | 4 | ||||
| -rw-r--r-- | core/browser/save_complete.c (renamed from core/desktop/save_complete.c) | 6 | ||||
| -rw-r--r-- | core/browser/save_complete.h (renamed from core/desktop/save_complete.h) | 0 | ||||
| -rw-r--r-- | core/browser/save_pdf.c (renamed from core/desktop/save_pdf.c) | 8 | ||||
| -rw-r--r-- | core/browser/save_pdf.h (renamed from core/desktop/save_pdf.h) | 2 | ||||
| -rw-r--r-- | core/browser/save_text.c (renamed from core/desktop/save_text.c) | 10 | ||||
| -rw-r--r-- | core/browser/save_text.h (renamed from core/desktop/save_text.h) | 0 | ||||
| -rw-r--r-- | core/browser/scrollbar.c (renamed from core/desktop/scrollbar.c) | 12 | ||||
| -rw-r--r-- | core/browser/scrollbar.h (renamed from core/desktop/scrollbar.h) | 0 | ||||
| -rw-r--r-- | core/browser/search.c (renamed from core/desktop/search.c) | 8 | ||||
| -rw-r--r-- | core/browser/search.h (renamed from core/desktop/search.h) | 0 | ||||
| -rw-r--r-- | core/browser/searchweb.c (renamed from core/desktop/searchweb.c) | 16 | ||||
| -rw-r--r-- | core/browser/searchweb.h (renamed from core/desktop/searchweb.h) | 2 | ||||
| -rw-r--r-- | core/browser/selection.c (renamed from core/desktop/selection.c) | 28 | ||||
| -rw-r--r-- | core/browser/selection.h (renamed from core/desktop/selection.h) | 2 | ||||
| -rw-r--r-- | core/browser/sslcert_viewer.c (renamed from core/desktop/sslcert_viewer.c) | 4 | ||||
| -rw-r--r-- | core/browser/sslcert_viewer.h (renamed from core/desktop/sslcert_viewer.h) | 2 | ||||
| -rw-r--r-- | core/browser/system_colour.c (renamed from core/desktop/system_colour.c) | 2 | ||||
| -rw-r--r-- | core/browser/system_colour.h (renamed from core/desktop/system_colour.h) | 2 | ||||
| -rw-r--r-- | core/browser/textinput.c (renamed from core/desktop/textinput.c) | 24 | ||||
| -rw-r--r-- | core/browser/textinput.h (renamed from core/desktop/textinput.h) | 0 | ||||
| -rw-r--r-- | core/browser/theme.h (renamed from core/desktop/theme.h) | 0 | ||||
| -rw-r--r-- | core/browser/version.c (renamed from core/desktop/version.c) | 2 | ||||
| -rw-r--r-- | core/browser/version.h (renamed from core/desktop/version.h) | 0 | ||||
| -rw-r--r-- | core/content/content.c | 8 | ||||
| -rw-r--r-- | core/content/content.h | 6 | ||||
| -rw-r--r-- | core/content/fetch.c | 4 | ||||
| -rw-r--r-- | core/content/fetchers/curl.c | 4 | ||||
| -rw-r--r-- | core/content/fetchers/file.c | 4 | ||||
| -rw-r--r-- | core/content/fetchers/resource.c | 4 | ||||
| -rw-r--r-- | core/content/fs_backing_store.c | 4 | ||||
| -rw-r--r-- | core/content/hlcache.c | 4 | ||||
| -rw-r--r-- | core/content/llcache.c | 4 | ||||
| -rw-r--r-- | core/content/urldb.c | 4 | ||||
| -rw-r--r-- | core/css/css.c | 2 | ||||
| -rw-r--r-- | core/css/select.c | 2 | ||||
| -rw-r--r-- | core/css/utils.h | 2 | ||||
| -rw-r--r-- | core/desktop/Makefile | 19 | ||||
| -rw-r--r-- | core/html/Makefile (renamed from core/render/Makefile) | 2 | ||||
| -rw-r--r-- | core/html/box.c (renamed from core/render/box.c) | 8 | ||||
| -rw-r--r-- | core/html/box.h (renamed from core/render/box.h) | 0 | ||||
| -rw-r--r-- | core/html/box_construct.c (renamed from core/render/box_construct.c) | 12 | ||||
| -rw-r--r-- | core/html/box_normalise.c (renamed from core/render/box_normalise.c) | 6 | ||||
| -rw-r--r-- | core/html/box_textarea.c (renamed from core/render/box_textarea.c) | 12 | ||||
| -rw-r--r-- | core/html/box_textarea.h (renamed from core/render/box_textarea.h) | 4 | ||||
| -rw-r--r-- | core/html/font.c (renamed from core/render/font.c) | 4 | ||||
| -rw-r--r-- | core/html/font.h (renamed from core/render/font.h) | 0 | ||||
| -rw-r--r-- | core/html/form.c (renamed from core/render/form.c) | 50 | ||||
| -rw-r--r-- | core/html/form.h (renamed from core/render/form.h) | 0 | ||||
| -rw-r--r-- | core/html/form_internal.h (renamed from core/render/form_internal.h) | 2 | ||||
| -rw-r--r-- | core/html/html.c (renamed from core/render/html.c) | 32 | ||||
| -rw-r--r-- | core/html/html.h (renamed from core/render/html.h) | 8 | ||||
| -rw-r--r-- | core/html/html_css.c (renamed from core/render/html_css.c) | 14 | ||||
| -rw-r--r-- | core/html/html_css_fetcher.c (renamed from core/render/html_css_fetcher.c) | 2 | ||||
| -rw-r--r-- | core/html/html_forms.c (renamed from core/render/html_forms.c) | 6 | ||||
| -rw-r--r-- | core/html/html_interaction.c (renamed from core/render/html_interaction.c) | 36 | ||||
| -rw-r--r-- | core/html/html_internal.h (renamed from core/render/html_internal.h) | 18 | ||||
| -rw-r--r-- | core/html/html_object.c (renamed from core/render/html_object.c) | 12 | ||||
| -rw-r--r-- | core/html/html_redraw.c (renamed from core/render/html_redraw.c) | 26 | ||||
| -rw-r--r-- | core/html/html_script.c (renamed from core/render/html_script.c) | 8 | ||||
| -rw-r--r-- | core/html/imagemap.c (renamed from core/render/imagemap.c) | 6 | ||||
| -rw-r--r-- | core/html/imagemap.h (renamed from core/render/imagemap.h) | 0 | ||||
| -rw-r--r-- | core/html/layout.c (renamed from core/render/layout.c) | 22 | ||||
| -rw-r--r-- | core/html/layout.h (renamed from core/render/layout.h) | 0 | ||||
| -rw-r--r-- | core/html/search.c (renamed from core/render/search.c) | 18 | ||||
| -rw-r--r-- | core/html/search.h (renamed from core/render/search.h) | 2 | ||||
| -rw-r--r-- | core/html/table.c (renamed from core/render/table.c) | 4 | ||||
| -rw-r--r-- | core/html/table.h (renamed from core/render/table.h) | 0 | ||||
| -rw-r--r-- | core/html/textplain.c (renamed from core/render/textplain.c) | 22 | ||||
| -rw-r--r-- | core/html/textplain.h (renamed from core/render/textplain.h) | 2 | ||||
| -rw-r--r-- | core/image/bmp.c | 4 | ||||
| -rw-r--r-- | core/image/gif.c | 4 | ||||
| -rw-r--r-- | core/image/ico.c | 2 | ||||
| -rw-r--r-- | core/image/image.c | 4 | ||||
| -rw-r--r-- | core/image/image_cache.c | 4 | ||||
| -rw-r--r-- | core/image/jpeg.c | 2 | ||||
| -rw-r--r-- | core/image/nssprite.c | 4 | ||||
| -rw-r--r-- | core/image/png.c | 2 | ||||
| -rw-r--r-- | core/image/rsvg.c | 4 | ||||
| -rw-r--r-- | core/image/svg.c | 2 | ||||
| -rw-r--r-- | core/javascript/duktape/Document.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/duktape/Location.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/duktape/Window.bnd | 6 | ||||
| -rw-r--r-- | core/javascript/duktape/duktape.c | 6 | ||||
| -rw-r--r-- | core/javascript/jsapi/comment.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/htmlcollection.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/htmldocument.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/htmlelement.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/jsapi.c | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/location.bnd | 4 | ||||
| -rw-r--r-- | core/javascript/jsapi/navigator.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/nodelist.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/text.bnd | 2 | ||||
| -rw-r--r-- | core/javascript/jsapi/window.bnd | 2 | ||||
| -rw-r--r-- | core/widgets/Makefile | 6 | ||||
| -rw-r--r-- | core/widgets/cookie_manager.c (renamed from core/desktop/cookie_manager.c) | 4 | ||||
| -rw-r--r-- | core/widgets/cookie_manager.h (renamed from core/desktop/cookie_manager.h) | 4 | ||||
| -rw-r--r-- | core/widgets/global_history.c (renamed from core/desktop/global_history.c) | 6 | ||||
| -rw-r--r-- | core/widgets/global_history.h (renamed from core/desktop/global_history.h) | 4 | ||||
| -rw-r--r-- | core/widgets/hotlist.c (renamed from core/desktop/hotlist.c) | 6 | ||||
| -rw-r--r-- | core/widgets/hotlist.h (renamed from core/desktop/hotlist.h) | 4 | ||||
| -rw-r--r-- | core/widgets/textarea.c (renamed from core/desktop/textarea.c) | 18 | ||||
| -rw-r--r-- | core/widgets/textarea.h (renamed from core/desktop/textarea.h) | 0 | ||||
| -rw-r--r-- | core/widgets/tree.c (renamed from core/desktop/tree.c) | 14 | ||||
| -rw-r--r-- | core/widgets/tree.h (renamed from core/desktop/tree.h) | 2 | ||||
| -rw-r--r-- | core/widgets/treeview.c (renamed from core/desktop/treeview.c) | 18 | ||||
| -rw-r--r-- | core/widgets/treeview.h (renamed from core/desktop/treeview.h) | 6 |
145 files changed, 501 insertions, 494 deletions
diff --git a/core/Makefile b/core/Makefile index 97981d9fa..235bdc340 100644 --- a/core/Makefile +++ b/core/Makefile @@ -9,11 +9,14 @@ include core/content/fetchers/Makefile # CSS sources include core/css/Makefile -# render sources -include core/render/Makefile +# HTML render sources +include core/html/Makefile -# Desktop sources -include core/desktop/Makefile +# Widget sources +include core/widgets/Makefile + +# Browser sources +include core/browser/Makefile # Javascript source include core/javascript/Makefile @@ -22,7 +25,7 @@ include core/javascript/Makefile include core/image/Makefile # S_CORE are sources common to all builds -S_CORE := $(addprefix core/,$(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_DESKTOP) $(S_JAVASCRIPT)) $(S_JAVASCRIPT_BINDING) +S_CORE := $(addprefix core/,$(S_CONTENT) $(S_FETCHERS) $(S_CSS) $(S_RENDER) $(S_WIDGETS) $(S_DESKTOP) $(S_JAVASCRIPT)) $(S_JAVASCRIPT_BINDING) S_BROWSER := $(addprefix core/,$(S_BROWSER)) diff --git a/core/desktop/gui_clipboard.h b/core/api/clipboard.h index 6feea2404..1cade8eaa 100644 --- a/core/desktop/gui_clipboard.h +++ b/core/api/clipboard.h @@ -28,7 +28,7 @@ #include <stddef.h> #include "utils/errors.h" -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" typedef struct nsnsclipboard_styles { size_t start; /**< Start of run */ diff --git a/core/desktop/gui_download.h b/core/api/download.h index 55e115d52..55e115d52 100644 --- a/core/desktop/gui_download.h +++ b/core/api/download.h diff --git a/core/desktop/gui_fetch.h b/core/api/fetch.h index 20db39d20..20db39d20 100644 --- a/core/desktop/gui_fetch.h +++ b/core/api/fetch.h diff --git a/core/desktop/gui_misc.h b/core/api/misc.h index a35ee513f..a35ee513f 100644 --- a/core/desktop/gui_misc.h +++ b/core/api/misc.h diff --git a/core/desktop/netsurf.h b/core/api/netsurf.h index ee6e53a7f..685ae4d6e 100644 --- a/core/desktop/netsurf.h +++ b/core/api/netsurf.h @@ -26,7 +26,7 @@ #define _NETSURF_DESKTOP_NETSURF_H_ #include "utils/errors.h" -#include "desktop/gui_table.h" +#include "core/api/table.h" /** * Register operation table. diff --git a/core/desktop/gui_search.h b/core/api/search.h index 0b02ac8bb..0b02ac8bb 100644 --- a/core/desktop/gui_search.h +++ b/core/api/search.h diff --git a/core/desktop/gui_table.h b/core/api/table.h index 52cdde2ea..89f3e7a1c 100644 --- a/core/desktop/gui_table.h +++ b/core/api/table.h @@ -21,7 +21,7 @@ * top level interface table. * * \note This should probably not be included directly but rather - * through netsurf.h or gui_internal.h + * through netsurf.h or api_internal.h */ #ifndef _NETSURF_DESKTOP_GUI_TABLE_H_ diff --git a/core/desktop/gui_utf8.h b/core/api/utf8.h index c40c4c1b3..c40c4c1b3 100644 --- a/core/desktop/gui_utf8.h +++ b/core/api/utf8.h diff --git a/core/desktop/gui_window.h b/core/api/window.h index 7ecd3c21d..7ecd3c21d 100644 --- a/core/desktop/gui_window.h +++ b/core/api/window.h diff --git a/core/browser/Makefile b/core/browser/Makefile new file mode 100644 index 000000000..9030669c4 --- /dev/null +++ b/core/browser/Makefile @@ -0,0 +1,17 @@ +# Sources for desktop + +S_DESKTOP := knockout.c mouse.c plot_style.c print.c search.c searchweb.c \ + scrollbar.c sslcert_viewer.c version.c system_colour.c + +S_DESKTOP := $(addprefix browser/,$(S_DESKTOP)) + +# version.c needs the testament +core/browser/version.c: testament $(OBJROOT)/testament.h + +# S_BROWSER are sources related to full browsers but are common +# between RISC OS, GTK, BeOS and AmigaOS builds +S_BROWSER := browser.c browser_history.c download.c frames.c netsurf.c \ + save_complete.c save_text.c selection.c textinput.c gui_factory.c \ + save_pdf.c font_haru.c + +S_BROWSER := $(addprefix browser/,$(S_BROWSER)) diff --git a/core/desktop/gui_internal.h b/core/browser/api_internal.h index c54caa4c6..c7cafba93 100644 --- a/core/desktop/gui_internal.h +++ b/core/browser/api_internal.h @@ -27,7 +27,7 @@ #ifndef _NETSURF_DESKTOP_GUI_INTERNAL_H_ #define _NETSURF_DESKTOP_GUI_INTERNAL_H_ -#include "desktop/gui_table.h" +#include "core/api/table.h" /** * The global operation table. diff --git a/core/desktop/browser.c b/core/browser/browser.c index 938ef51e5..f7983c8d5 100644 --- a/core/desktop/browser.c +++ b/core/browser/browser.c @@ -50,27 +50,27 @@ #include "content/fetch.h" #include "content/hlcache.h" #include "content/urldb.h" -#include "render/form_internal.h" -#include "render/html.h" -#include "render/box.h" +#include "core/html/form_internal.h" +#include "core/html/html.h" +#include "core/html/box.h" #include "curl/curl.h" #include "css/utils.h" #include "javascript/js.h" -#include "desktop/browser_history.h" -#include "desktop/browser_private.h" -#include "desktop/download.h" -#include "desktop/frames.h" -#include "desktop/global_history.h" -#include "desktop/hotlist.h" -#include "desktop/knockout.h" -#include "desktop/scrollbar.h" -#include "desktop/selection.h" -#include "desktop/plotters.h" -#include "desktop/theme.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_window.h" -#include "desktop/gui_internal.h" +#include "core/browser/browser_history.h" +#include "core/browser/browser_private.h" +#include "core/browser/download.h" +#include "core/browser/frames.h" +#include "core/widgets/global_history.h" +#include "core/widgets/hotlist.h" +#include "core/browser/knockout.h" +#include "core/browser/scrollbar.h" +#include "core/browser/selection.h" +#include "core/browser/plotters.h" +#include "core/browser/theme.h" +#include "core/api/misc.h" +#include "core/api/window.h" +#include "core/browser/api_internal.h" /** maximum frame depth */ @@ -495,7 +495,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 core/browser/browser.h */ bool browser_window_can_search(struct browser_window *bw) { if (bw == NULL || bw->current_content == NULL) @@ -513,14 +513,14 @@ bool browser_window_can_search(struct browser_window *bw) } -/* exported interface, documented in desktop/browser.h */ +/* exported interface, documented in core/browser/browser.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 core/browser/browser.h */ nserror browser_window_get_scrollbar_type(struct browser_window *bw, browser_scrolling *h, browser_scrolling *v) { @@ -760,7 +760,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 core/browser/browser.h */ void browser_window_set_gadget_filename(struct browser_window *bw, struct form_control *gadget, const char *fn) { @@ -800,7 +800,7 @@ static bool slow_script(void *ctx) return true; } -/* exported interface, documented in desktop/browser.h */ +/* exported interface, documented in core/browser/browser.h */ nserror browser_window_create(enum browser_window_create_flags flags, nsurl *url, nsurl *referrer, struct browser_window *existing, @@ -881,7 +881,7 @@ nserror browser_window_create(enum browser_window_create_flags flags, } -/* exported internal interface, documented in desktop/browser_private.h */ +/* exported internal interface, documented in core/browser/browser_private.h */ nserror browser_window_initialise_common(enum browser_window_create_flags flags, struct browser_window *bw, struct browser_window *existing) { @@ -1865,7 +1865,7 @@ browser_window_refresh_url_bar_internal(struct browser_window *bw, nsurl *url) } -/* exported interface, documented in desktop/browser.h */ +/* exported interface, documented in core/browser/browser.h */ void browser_window_destroy(struct browser_window *bw) { /* can't destoy child windows on their own */ @@ -1876,7 +1876,7 @@ void browser_window_destroy(struct browser_window *bw) free(bw); } -/* exported interface, documented in desktop/browser.h */ +/* exported interface, documented in core/browser/browser.h */ nserror browser_window_refresh_url_bar(struct browser_window *bw) { nserror ret; @@ -1912,7 +1912,7 @@ nserror browser_window_refresh_url_bar(struct browser_window *bw) } -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ nserror browser_window_navigate(struct browser_window *bw, nsurl *url, nsurl *referrer, @@ -2220,7 +2220,7 @@ nserror browser_window_get_extents(struct browser_window *bw, bool scaled, } -/* exported internal interface, documented in desktop/browser_private.h */ +/* exported internal interface, documented in core/browser/browser_private.h */ void browser_window_get_dimensions(struct browser_window *bw, int *width, int *height, bool scaled) { @@ -2336,7 +2336,7 @@ void browser_window_update(struct browser_window *bw, bool scroll_to_top) } } -/* Exported interface, documented in desktop/browser.h */ +/* Exported interface, documented in core/browser/browser.h */ void browser_window_update_box(struct browser_window *bw, struct rect *rect) { int pos_x; @@ -2363,7 +2363,7 @@ void browser_window_update_box(struct browser_window *bw, struct rect *rect) } } -/* Exported interface, documented in desktop/browser.h */ +/* Exported interface, documented in core/browser/browser.h */ void browser_window_stop(struct browser_window *bw) { int children, index; @@ -2404,7 +2404,7 @@ void browser_window_stop(struct browser_window *bw) } -/* Exported interface, documented in desktop/browser.h */ +/* Exported interface, documented in core/browser/browser.h */ void browser_window_reload(struct browser_window *bw, bool all) { hlcache_handle *c; @@ -2450,7 +2450,7 @@ void browser_window_reload(struct browser_window *bw, bool all) } -/* Exported interface, documented in desktop/browser.h */ +/* Exported interface, documented in core/browser/browser.h */ void browser_window_set_status(struct browser_window *bw, const char *text) { int text_len; @@ -2484,7 +2484,7 @@ void browser_window_set_status(struct browser_window *bw, const char *text) } -/* Exported interface, documented in desktop/browser.h */ +/* Exported interface, documented in core/browser/browser.h */ void browser_window_set_pointer(struct browser_window *bw, browser_pointer_shape shape) { @@ -2519,7 +2519,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 core/browser/browser.h */ nserror browser_window_schedule_reformat(struct browser_window *bw) { /* The ugly cast here is so the reformat function can be @@ -2530,7 +2530,7 @@ nserror browser_window_schedule_reformat(struct browser_window *bw) } -/* exported function documented in desktop/browser.h */ +/* exported function documented in core/browser/browser.h */ void browser_window_reformat(struct browser_window *bw, bool background, int width, int height) { @@ -2590,7 +2590,7 @@ static void browser_window_set_scale_internal(struct browser_window *bw, } -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ void browser_window_set_scale(struct browser_window *bw, float scale, bool all) { while (bw->parent && all) @@ -2605,7 +2605,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 core/browser/browser.h */ float browser_window_get_scale(struct browser_window *bw) { if (bw == NULL) { @@ -2670,7 +2670,7 @@ static void browser_window_find_target_internal(struct browser_window *bw, } -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ struct browser_window *browser_window_find_target(struct browser_window *bw, const char *target, browser_mouse_state mouse) { @@ -2864,7 +2864,7 @@ static void browser_window_mouse_drag_end(struct browser_window *bw, } -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ void browser_window_mouse_track(struct browser_window *bw, browser_mouse_state mouse, int x, int y) { @@ -3012,7 +3012,7 @@ void browser_window_mouse_track(struct browser_window *bw, } -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ void browser_window_mouse_click(struct browser_window *bw, browser_mouse_state mouse, int x, int y) { @@ -3137,7 +3137,7 @@ void browser_window_mouse_click(struct browser_window *bw, -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.h */ void browser_window_redraw_rect(struct browser_window *bw, int x, int y, int width, int height) { @@ -3145,7 +3145,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 core/browser/browser.h */ void browser_window_page_drag_start(struct browser_window *bw, int x, int y) { assert(bw != NULL); @@ -3170,7 +3170,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 core/browser/browser.h */ bool browser_window_back_available(struct browser_window *bw) { return (bw && bw->history && @@ -3179,21 +3179,21 @@ bool browser_window_back_available(struct browser_window *bw) -/* exported interface documented in desktop/browser.h */ +/* exported interface documented in core/browser/browser.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 core/browser/browser.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 core/browser/browser.h */ bool browser_window_stop_available(struct browser_window *bw) { return (bw && (bw->loading_content || diff --git a/core/desktop/browser.h b/core/browser/browser.h index a1ec37a4b..bf8f56707 100644 --- a/core/desktop/browser.h +++ b/core/browser/browser.h @@ -28,9 +28,9 @@ #include <stdio.h> #include "utils/errors.h" -#include "desktop/plot_style.h" -#include "desktop/frame_types.h" -#include "desktop/mouse.h" +#include "core/browser/plot_style.h" +#include "core/browser/frame_types.h" +#include "core/browser/mouse.h" struct browser_window; struct hlcache_handle; diff --git a/core/desktop/browser_history.c b/core/browser/browser_history.c index 1ee800019..3eae2ae01 100644 --- a/core/desktop/browser_history.c +++ b/core/browser/browser_history.c @@ -37,11 +37,11 @@ #include "css/css.h" #include "image/bitmap.h" -#include "desktop/gui_internal.h" -#include "desktop/browser_history.h" -#include "desktop/browser_private.h" -#include "desktop/plotters.h" -#include "desktop/font.h" +#include "core/browser/api_internal.h" +#include "core/browser/browser_history.h" +#include "core/browser/browser_private.h" +#include "core/browser/plotters.h" +#include "core/browser/font.h" #define WIDTH 100 #define HEIGHT 86 @@ -407,7 +407,7 @@ static bool browser_window_history__enumerate_entry( /* -------------------------------------------------------------------------- */ -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_create(struct browser_window *bw) { struct history *history; @@ -427,7 +427,7 @@ nserror browser_window_history_create(struct browser_window *bw) } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_clone(const struct browser_window *existing, struct browser_window *clone) { @@ -461,7 +461,7 @@ nserror browser_window_history_clone(const struct browser_window *existing, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_add(struct browser_window *bw, struct hlcache_handle *content, lwc_string *frag_id) { @@ -545,7 +545,7 @@ nserror browser_window_history_add(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_update(struct browser_window *bw, struct hlcache_handle *content) { @@ -578,7 +578,7 @@ nserror browser_window_history_update(struct browser_window *bw, -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ void browser_window_history_destroy(struct browser_window *bw) { assert(bw != NULL); @@ -594,7 +594,7 @@ void browser_window_history_destroy(struct browser_window *bw) -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_back(struct browser_window *bw, bool new_window) { if (!bw || !bw->history || !bw->history->current || @@ -607,7 +607,7 @@ nserror browser_window_history_back(struct browser_window *bw, bool new_window) -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_forward(struct browser_window *bw, bool new_window) { @@ -620,7 +620,7 @@ nserror browser_window_history_forward(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ bool browser_window_history_back_available(struct browser_window *bw) { return (bw && bw->history && bw->history->current && @@ -628,7 +628,7 @@ bool browser_window_history_back_available(struct browser_window *bw) } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ bool browser_window_history_forward_available(struct browser_window *bw) { return (bw && bw->history && bw->history->current && @@ -636,7 +636,7 @@ bool browser_window_history_forward_available(struct browser_window *bw) } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ nserror browser_window_history_go(struct browser_window *bw, struct history_entry *entry, bool new_window) { @@ -678,7 +678,7 @@ nserror browser_window_history_go(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ void browser_window_history_size(struct browser_window *bw, int *width, int *height) { @@ -690,7 +690,7 @@ void browser_window_history_size(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ bool browser_window_history_redraw(struct browser_window *bw, const struct redraw_context *ctx) { @@ -711,7 +711,7 @@ bool browser_window_history_redraw(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ bool browser_window_history_redraw_rectangle(struct browser_window *bw, int x0, int y0, int x1, int y1, int x, int y, const struct redraw_context *ctx) @@ -728,7 +728,7 @@ bool browser_window_history_redraw_rectangle(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ bool browser_window_history_click(struct browser_window *bw, int x, int y, bool new_window) { @@ -750,7 +750,7 @@ bool browser_window_history_click(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ const char *browser_window_history_position_url(struct browser_window *bw, int x, int y) { @@ -768,7 +768,7 @@ const char *browser_window_history_position_url(struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ void browser_window_history_enumerate_forward(const struct browser_window *bw, browser_window_history_enumerate_cb cb, void *user_data) { @@ -786,7 +786,7 @@ void browser_window_history_enumerate_forward(const struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ void browser_window_history_enumerate_back(const struct browser_window *bw, browser_window_history_enumerate_cb cb, void *user_data) { @@ -803,7 +803,7 @@ void browser_window_history_enumerate_back(const struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ void browser_window_history_enumerate(const struct browser_window *bw, browser_window_history_enumerate_cb cb, void *user_data) { @@ -814,7 +814,7 @@ void browser_window_history_enumerate(const struct browser_window *bw, } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ const char *browser_window_history_entry_get_url( const struct history_entry *entry) { @@ -822,7 +822,7 @@ const char *browser_window_history_entry_get_url( } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ const char *browser_window_history_entry_get_fragment_id( const struct history_entry *entry) { @@ -830,7 +830,7 @@ const char *browser_window_history_entry_get_fragment_id( } -/* exported interface documented in desktop/browser_history.h */ +/* exported interface documented in core/browser/browser_history.h */ const char *browser_window_history_entry_get_title( const struct history_entry *entry) { diff --git a/core/desktop/browser_history.h b/core/browser/browser_history.h index 8ffb6125b..8ffb6125b 100644 --- a/core/desktop/browser_history.h +++ b/core/browser/browser_history.h diff --git a/core/desktop/browser_private.h b/core/browser/browser_private.h index 43f4402cf..c76607378 100644 --- a/core/desktop/browser_private.h +++ b/core/browser/browser_private.h @@ -26,7 +26,7 @@ #include <libwapcaplet/libwapcaplet.h> -#include "desktop/browser.h" +#include "core/browser/browser.h" struct box; diff --git a/core/desktop/core_window.h b/core/browser/core_window.h index 38045a3e8..38045a3e8 100644 --- a/core/desktop/core_window.h +++ b/core/browser/core_window.h diff --git a/core/desktop/download.c b/core/browser/download.c index 131bc806e..369064c19 100644 --- a/core/desktop/download.c +++ b/core/browser/download.c @@ -17,7 +17,7 @@ */ /** - * \file desktop/download.c + * \file core/browser/download.c * \brief Core download context implementation */ @@ -29,9 +29,9 @@ #include "utils/corestrings.h" #include "utils/http.h" #include "utils/utils.h" -#include "desktop/download.h" -#include "desktop/gui_download.h" -#include "desktop/gui_internal.h" +#include "core/browser/download.h" +#include "core/api/download.h" +#include "core/browser/api_internal.h" /** * A context for a download diff --git a/core/desktop/download.h b/core/browser/download.h index dc2befd90..fb0fed638 100644 --- a/core/desktop/download.h +++ b/core/browser/download.h @@ -17,7 +17,7 @@ */ /** - * \file desktop/download.h + * \file core/browser/download.h * \brief Core download context (interface) */ diff --git a/core/desktop/font.h b/core/browser/font.h index 4ebd75d73..549ecd2b5 100644 --- a/core/desktop/font.h +++ b/core/browser/font.h @@ -35,7 +35,7 @@ #include <stdbool.h> #include <stddef.h> -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" struct font_functions { diff --git a/core/desktop/font_haru.c b/core/browser/font_haru.c index d2d7efdaf..80155e1f3 100644 --- a/core/desktop/font_haru.c +++ b/core/browser/font_haru.c @@ -40,8 +40,8 @@ #include "css/utils.h" #include "utils/nsoption.h" -#include "desktop/save_pdf/font_haru.h" -#include "desktop/font.h" +#include "core/browser/save_pdf/font_haru.h" +#include "core/browser/font.h" #include "utils/log.h" diff --git a/core/desktop/font_haru.h b/core/browser/font_haru.h index 479f7deb0..690350d70 100644 --- a/core/desktop/font_haru.h +++ b/core/browser/font_haru.h @@ -26,8 +26,8 @@ #include <hpdf.h> -#include "desktop/plot_style.h" -#include "desktop/font.h" +#include "core/browser/plot_style.h" +#include "core/browser/font.h" bool haru_nsfont_apply_style(const plot_font_style_t *fstyle, HPDF_Doc doc, HPDF_Page page, diff --git a/core/desktop/frame_types.h b/core/browser/frame_types.h index 7008e98d4..7008e98d4 100644 --- a/core/desktop/frame_types.h +++ b/core/browser/frame_types.h diff --git a/core/desktop/frames.c b/core/browser/frames.c index 253e84225..e5143b662 100644 --- a/core/desktop/frames.c +++ b/core/browser/frames.c @@ -31,15 +31,15 @@ #include "utils/config.h" #include "content/hlcache.h" -#include "desktop/browser_private.h" -#include "desktop/frames.h" -#include "desktop/scrollbar.h" -#include "desktop/selection.h" +#include "core/browser/browser_private.h" +#include "core/browser/frames.h" +#include "core/browser/scrollbar.h" +#include "core/browser/selection.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" -#include "render/html.h" -#include "render/box.h" +#include "core/html/html.h" +#include "core/html/box.h" /** maximum frame resize margin */ #define FRAME_RESIZE 6 @@ -180,7 +180,7 @@ void browser_window_handle_scrollbars(struct browser_window *bw) } -/* exported function documented in desktop/frames.h */ +/* exported function documented in core/browser/frames.h */ nserror browser_window_create_iframes(struct browser_window *bw, struct content_html_iframe *iframe) { diff --git a/core/desktop/frames.h b/core/browser/frames.h index 02c513c22..02c513c22 100644 --- a/core/desktop/frames.h +++ b/core/browser/frames.h diff --git a/core/desktop/gui_factory.c b/core/browser/gui_factory.c index 22364ab97..bed6948eb 100644 --- a/core/desktop/gui_factory.c +++ b/core/browser/gui_factory.c @@ -26,17 +26,17 @@ #include "content/hlcache.h" #include "content/backing_store.h" -#include "desktop/save_pdf.h" -#include "desktop/download.h" -#include "desktop/searchweb.h" -#include "desktop/gui_download.h" -#include "desktop/gui_fetch.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_window.h" -#include "desktop/gui_search.h" -#include "desktop/gui_clipboard.h" -#include "desktop/gui_utf8.h" -#include "desktop/netsurf.h" +#include "core/browser/save_pdf.h" +#include "core/browser/download.h" +#include "core/browser/searchweb.h" +#include "core/api/download.h" +#include "core/api/fetch.h" +#include "core/api/misc.h" +#include "core/api/window.h" +#include "core/api/search.h" +#include "core/api/clipboard.h" +#include "core/api/utf8.h" +#include "core/api/netsurf.h" /** * The global interface table. @@ -709,7 +709,7 @@ static nserror verify_browser_register(struct gui_browser_table *gbt) } -/* exported interface documented in desktop/netsurf.h */ +/* exported interface documented in core/api/netsurf.h */ nserror netsurf_register(struct netsurf_table *gt) { nserror err; diff --git a/core/desktop/knockout.c b/core/browser/knockout.c index b2139986a..b601a7f9a 100644 --- a/core/desktop/knockout.c +++ b/core/browser/knockout.c @@ -71,9 +71,9 @@ #include "image/bitmap.h" #include "content/content.h" -#include "desktop/gui_internal.h" -#include "desktop/knockout.h" -#include "desktop/plotters.h" +#include "core/browser/api_internal.h" +#include "core/browser/knockout.h" +#include "core/browser/plotters.h" /* Define to enable knockout debug */ #undef KNOCKOUT_DEBUG diff --git a/core/desktop/knockout.h b/core/browser/knockout.h index a6b61d836..fa17855a0 100644 --- a/core/desktop/knockout.h +++ b/core/browser/knockout.h @@ -23,7 +23,7 @@ #ifndef _NETSURF_DESKTOP_KNOCKOUT_H_ #define _NETSURF_DESKTOP_KNOCKOUT_H_ -#include "desktop/plotters.h" +#include "core/browser/plotters.h" bool knockout_plot_start(const struct redraw_context *ctx, diff --git a/core/desktop/mouse.c b/core/browser/mouse.c index ea627ac82..20cbd36d0 100644 --- a/core/desktop/mouse.c +++ b/core/browser/mouse.c @@ -20,7 +20,7 @@ * Browser window creation and manipulation (implementation). */ -#include "desktop/browser.h" +#include "core/browser/browser.h" #include "utils/log.h" /** diff --git a/core/desktop/mouse.h b/core/browser/mouse.h index 083bd1731..083bd1731 100644 --- a/core/desktop/mouse.h +++ b/core/browser/mouse.h diff --git a/core/desktop/netsurf.c b/core/browser/netsurf.c index d6b5abe6e..f0930b78e 100644 --- a/core/desktop/netsurf.c +++ b/core/browser/netsurf.c @@ -41,15 +41,15 @@ #include "image/image.h" #include "image/image_cache.h" #include "javascript/js.h" -#include "render/html.h" -#include "render/textplain.h" +#include "core/html/html.h" +#include "core/html/textplain.h" -#include "desktop/browser.h" -#include "desktop/system_colour.h" -#include "desktop/searchweb.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" -#include "desktop/netsurf.h" +#include "core/browser/browser.h" +#include "core/browser/system_colour.h" +#include "core/browser/searchweb.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" +#include "core/api/netsurf.h" /** speculative pre-conversion small image size * @@ -121,7 +121,7 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query, return NSERROR_OK; } -/* exported interface documented in desktop/netsurf.h */ +/* exported interface documented in core/api/netsurf.h */ nserror netsurf_init(const char *store_path) { nserror ret; diff --git a/core/desktop/options.h b/core/browser/options.h index 2f3688750..a85c580e7 100644 --- a/core/desktop/options.h +++ b/core/browser/options.h @@ -30,7 +30,7 @@ #ifndef _NETSURF_DESKTOP_OPTIONS_H_ #define _NETSURF_DESKTOP_OPTIONS_H_ -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" /* defines for system colour table */ #define NSOPTION_SYS_COLOUR_START NSOPTION_sys_colour_ActiveBorder diff --git a/core/desktop/plot_style.c b/core/browser/plot_style.c index 05e42baad..5310abe2b 100644 --- a/core/desktop/plot_style.c +++ b/core/browser/plot_style.c @@ -17,13 +17,13 @@ */ /** - * \file desktop/plot_style.c + * \file core/browser/plot_style.c * \brief Plotter global styles. * * These plot styles are globaly available and used in many places. */ -#include "desktop/plotters.h" +#include "core/browser/plotters.h" static plot_style_t plot_style_fill_white_static = { .fill_type = PLOT_OP_TYPE_SOLID, diff --git a/core/desktop/plot_style.h b/core/browser/plot_style.h index 45813d40d..45813d40d 100644 --- a/core/desktop/plot_style.h +++ b/core/browser/plot_style.h diff --git a/core/desktop/plotters.h b/core/browser/plotters.h index d764de2d2..5af63952b 100644 --- a/core/desktop/plotters.h +++ b/core/browser/plotters.h @@ -26,7 +26,7 @@ #include <stdbool.h> #include <stdio.h> -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" struct bitmap; struct rect; @@ -86,7 +86,7 @@ enum path_command { * Plotter options: * option_knockout - Optimisation particularly for unaccelerated screen * redraw. It tries to avoid plotting to the same area - * more than once. See desktop/knockout.c + * more than once. See core/browser/knockout.c * * Coordinates are from top left of canvas and (0,0) is the top left grid * denomination. If a "fill" is drawn from (0,0) to (4,3), the result is: diff --git a/core/desktop/print.c b/core/browser/print.c index f3a1a69f9..1cc8ef58f 100644 --- a/core/desktop/print.c +++ b/core/browser/print.c @@ -32,10 +32,10 @@ #include "content/content.h" #include "content/hlcache.h" #include "css/utils.h" -#include "render/box.h" +#include "core/html/box.h" -#include "desktop/print.h" -#include "desktop/printer.h" +#include "core/browser/print.h" +#include "core/browser/printer.h" /* Default print settings */ #define DEFAULT_PAGE_WIDTH 595 diff --git a/core/desktop/print.h b/core/browser/print.h index 63c2935f1..63c2935f1 100644 --- a/core/desktop/print.h +++ b/core/browser/print.h diff --git a/core/desktop/printer.h b/core/browser/printer.h index 7fda8bdb0..559ca14ca 100644 --- a/core/desktop/printer.h +++ b/core/browser/printer.h @@ -26,8 +26,8 @@ #ifndef NETSURF_DESKTOP_PRINTER_H #define NETSURF_DESKTOP_PRINTER_H -#include "desktop/plotters.h" -#include "desktop/print.h" +#include "core/browser/plotters.h" +#include "core/browser/print.h" /** Printer interface */ struct printer{ diff --git a/core/desktop/save_complete.c b/core/browser/save_complete.c index 58c1d210a..148deb38f 100644 --- a/core/desktop/save_complete.c +++ b/core/browser/save_complete.c @@ -42,10 +42,10 @@ #include "content/content.h" #include "content/hlcache.h" #include "css/css.h" -#include "render/box.h" -#include "render/html.h" +#include "core/html/box.h" +#include "core/html/html.h" -#include "desktop/save_complete.h" +#include "core/browser/save_complete.h" regex_t save_complete_import_re; diff --git a/core/desktop/save_complete.h b/core/browser/save_complete.h index 3c389a56f..3c389a56f 100644 --- a/core/desktop/save_complete.h +++ b/core/browser/save_complete.h diff --git a/core/desktop/save_pdf.c b/core/browser/save_pdf.c index aeec9ce2e..0c3f2e061 100644 --- a/core/desktop/save_pdf.c +++ b/core/browser/save_pdf.c @@ -45,7 +45,7 @@ #include "utils/config.h" -#include "desktop/save_pdf.h" +#include "core/browser/save_pdf.h" #ifdef WITH_PDF_EXPORT @@ -57,9 +57,9 @@ #include "content/hlcache.h" #include "utils/nsoption.h" -#include "desktop/plotters.h" -#include "desktop/print.h" -#include "desktop/printer.h" +#include "core/browser/plotters.h" +#include "core/browser/print.h" +#include "core/browser/printer.h" #include "image/bitmap.h" #include "utils/log.h" #include "utils/utils.h" diff --git a/core/desktop/save_pdf.h b/core/browser/save_pdf.h index d02c356e8..777d0c1b8 100644 --- a/core/desktop/save_pdf.h +++ b/core/browser/save_pdf.h @@ -23,7 +23,7 @@ #ifndef NETSURF_PDF_PLOTTERS_H #define NETSURF_PDF_PLOTTERS_H -#include "desktop/print.h" +#include "core/browser/print.h" extern const struct printer pdf_printer; diff --git a/core/desktop/save_text.c b/core/browser/save_text.c index 81c3db604..05b6c8e0d 100644 --- a/core/desktop/save_text.c +++ b/core/browser/save_text.c @@ -33,12 +33,12 @@ #include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" -#include "render/box.h" -#include "render/html.h" +#include "core/html/box.h" +#include "core/html/html.h" -#include "desktop/gui_utf8.h" -#include "desktop/gui_internal.h" -#include "desktop/save_text.h" +#include "core/api/utf8.h" +#include "core/browser/api_internal.h" +#include "core/browser/save_text.h" static void extract_text(struct box *box, bool *first, save_text_whitespace *before, struct save_text_state *save); diff --git a/core/desktop/save_text.h b/core/browser/save_text.h index 06446cd58..06446cd58 100644 --- a/core/desktop/save_text.h +++ b/core/browser/save_text.h diff --git a/core/desktop/scrollbar.c b/core/browser/scrollbar.c index caed13fbc..a2eabc8f9 100644 --- a/core/desktop/scrollbar.c +++ b/core/browser/scrollbar.c @@ -30,12 +30,12 @@ #include "utils/utils.h" #include "utils/nsoption.h" -#include "desktop/browser.h" -#include "desktop/system_colour.h" -#include "desktop/mouse.h" -#include "desktop/scrollbar.h" -#include "desktop/plotters.h" -#include "desktop/plot_style.h" +#include "core/browser/browser.h" +#include "core/browser/system_colour.h" +#include "core/browser/mouse.h" +#include "core/browser/scrollbar.h" +#include "core/browser/plotters.h" +#include "core/browser/plot_style.h" struct scrollbar { diff --git a/core/desktop/scrollbar.h b/core/browser/scrollbar.h index bfe90d9b5..bfe90d9b5 100644 --- a/core/desktop/scrollbar.h +++ b/core/browser/scrollbar.h diff --git a/core/desktop/search.c b/core/browser/search.c index 201d416dd..868b94058 100644 --- a/core/desktop/search.c +++ b/core/browser/search.c @@ -24,10 +24,10 @@ #include "content/content.h" -#include "desktop/browser_private.h" -#include "desktop/search.h" +#include "core/browser/browser_private.h" +#include "core/browser/search.h" -/* exported function documented in desktop/search.h */ +/* exported function documented in core/browser/search.h */ void browser_window_search(struct browser_window *bw, void *context, search_flags_t flags, const char *string) { @@ -37,7 +37,7 @@ void browser_window_search(struct browser_window *bw, void *context, } } -/* exported function documented in desktop/search.h */ +/* exported function documented in core/browser/search.h */ void browser_window_search_clear(struct browser_window *bw) { if ((bw != NULL) && diff --git a/core/desktop/search.h b/core/browser/search.h index baf382e77..baf382e77 100644 --- a/core/desktop/search.h +++ b/core/browser/search.h diff --git a/core/desktop/searchweb.c b/core/browser/searchweb.c index 4033f8ef0..145b2a420 100644 --- a/core/desktop/searchweb.c +++ b/core/browser/searchweb.c @@ -17,7 +17,7 @@ */ /** - * \file desktop/searchweb.c + * \file core/browser/searchweb.c * \brief core web search facilities implementation. */ @@ -26,8 +26,8 @@ #include "utils/nsoption.h" #include "content/hlcache.h" -#include "desktop/searchweb.h" -#include "desktop/gui_internal.h" +#include "core/browser/searchweb.h" +#include "core/browser/api_internal.h" struct search_provider { char *name; /**< readable name such as 'google', 'yahoo', etc */ @@ -304,7 +304,7 @@ search_web_ico_callback(hlcache_handle *ico, return NSERROR_OK; } -/* exported interface documented in desktop/searchweb.h */ +/* exported interface documented in core/browser/searchweb.h */ nserror search_web_omni(const char *term, enum search_web_omni_flags flags, @@ -357,7 +357,7 @@ search_web_omni(const char *term, return NSERROR_OK; } -/* exported interface documented in desktop/searchweb.h */ +/* exported interface documented in core/browser/searchweb.h */ nserror search_web_select_provider(int selection) { struct search_provider *provider; @@ -458,7 +458,7 @@ default_ico_callback(hlcache_handle *ico, return NSERROR_OK; } -/* exported interface documented in desktop/searchweb.h */ +/* exported interface documented in core/browser/searchweb.h */ ssize_t search_web_iterate_providers(ssize_t from, const char **name) { if (from < 0) @@ -473,7 +473,7 @@ ssize_t search_web_iterate_providers(ssize_t from, const char **name) } -/* exported interface documented in desktop/searchweb.h */ +/* exported interface documented in core/browser/searchweb.h */ nserror search_web_init(const char *provider_fname) { nserror ret; @@ -526,7 +526,7 @@ nserror search_web_init(const char *provider_fname) return NSERROR_OK; } -/* exported interface documented in desktop/searchweb.h */ +/* exported interface documented in core/browser/searchweb.h */ nserror search_web_finalise(void) { size_t pidx; diff --git a/core/desktop/searchweb.h b/core/browser/searchweb.h index a96e7787b..61004fb2a 100644 --- a/core/desktop/searchweb.h +++ b/core/browser/searchweb.h @@ -17,7 +17,7 @@ */ /** - * \file desktop/searchweb.h + * \file core/browser/searchweb.h * \brief core web search facilities interface. */ diff --git a/core/desktop/selection.c b/core/browser/selection.c index e2bd74722..a51387693 100644 --- a/core/desktop/selection.c +++ b/core/browser/selection.c @@ -31,20 +31,20 @@ #include "utils/log.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "render/box.h" -#include "render/form.h" -#include "render/html_internal.h" -#include "render/font.h" -#include "render/textplain.h" - -#include "desktop/mouse.h" -#include "desktop/browser_private.h" -#include "desktop/plotters.h" -#include "desktop/save_text.h" -#include "desktop/selection.h" -#include "desktop/gui_clipboard.h" -#include "desktop/gui_window.h" -#include "desktop/gui_internal.h" +#include "core/html/box.h" +#include "core/html/form.h" +#include "core/html/html_internal.h" +#include "core/html/font.h" +#include "core/html/textplain.h" + +#include "core/browser/mouse.h" +#include "core/browser/browser_private.h" +#include "core/browser/plotters.h" +#include "core/browser/save_text.h" +#include "core/browser/selection.h" +#include "core/api/clipboard.h" +#include "core/api/window.h" +#include "core/browser/api_internal.h" /** * Text selection works by labelling each node in the box tree with its diff --git a/core/desktop/selection.h b/core/browser/selection.h index 7e620fc46..ad288b69b 100644 --- a/core/desktop/selection.h +++ b/core/browser/selection.h @@ -24,7 +24,7 @@ #define _NETSURF_DESKTOP_SELECTION_H_ #include <stdbool.h> -#include "desktop/mouse.h" +#include "core/browser/mouse.h" struct box; diff --git a/core/desktop/sslcert_viewer.c b/core/browser/sslcert_viewer.c index f3eb1694d..b19f0df4d 100644 --- a/core/desktop/sslcert_viewer.c +++ b/core/browser/sslcert_viewer.c @@ -27,8 +27,8 @@ #include "content/fetch.h" #include "content/urldb.h" #include "content/hlcache.h" -#include "desktop/sslcert_viewer.h" -#include "desktop/treeview.h" +#include "core/browser/sslcert_viewer.h" +#include "core/widgets/treeview.h" #include "utils/messages.h" #include "utils/log.h" #include "utils/utils.h" diff --git a/core/desktop/sslcert_viewer.h b/core/browser/sslcert_viewer.h index 92f402f74..4ffe18408 100644 --- a/core/desktop/sslcert_viewer.h +++ b/core/browser/sslcert_viewer.h @@ -22,7 +22,7 @@ #define _NETSURF_DESKTOP_SSLCERT_VIEWER_H_ #include "content/llcache.h" -#include "desktop/mouse.h" +#include "core/browser/mouse.h" struct sslcert_session_data; struct redraw_context; diff --git a/core/desktop/system_colour.c b/core/browser/system_colour.c index 178c03536..f1cabb674 100644 --- a/core/desktop/system_colour.c +++ b/core/browser/system_colour.c @@ -27,7 +27,7 @@ #include "utils/utils.h" #include "utils/log.h" #include "css/utils.h" -#include "desktop/system_colour.h" +#include "core/browser/system_colour.h" #include "utils/nsoption.h" diff --git a/core/desktop/system_colour.h b/core/browser/system_colour.h index b5d4baad4..1cc080ebf 100644 --- a/core/desktop/system_colour.h +++ b/core/browser/system_colour.h @@ -26,7 +26,7 @@ #include <libcss/libcss.h> #include "utils/errors.h" -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" /** css callback to obtain named system colours. */ css_error ns_system_colour(void *pw, lwc_string *name, css_color *color); diff --git a/core/desktop/textinput.c b/core/browser/textinput.c index bd51d5a0a..07ed2da12 100644 --- a/core/desktop/textinput.c +++ b/core/browser/textinput.c @@ -33,22 +33,22 @@ #include "utils/talloc.h" #include "utils/utf8.h" #include "utils/utils.h" -#include "render/box.h" -#include "render/form.h" -#include "render/html_internal.h" -#include "render/layout.h" +#include "core/html/box.h" +#include "core/html/form.h" +#include "core/html/html_internal.h" +#include "core/html/layout.h" -#include "desktop/mouse.h" -#include "desktop/browser_private.h" -#include "desktop/textinput.h" -#include "desktop/gui_window.h" -#include "desktop/gui_internal.h" +#include "core/browser/mouse.h" +#include "core/browser/browser_private.h" +#include "core/browser/textinput.h" +#include "core/api/window.h" +#include "core/browser/api_internal.h" /* Define to enable textinput debug */ #undef TEXTINPUT_DEBUG -/* exported interface documented in desktop/textinput.h */ +/* exported interface documented in core/browser/textinput.h */ void browser_window_place_caret(struct browser_window *bw, int x, int y, int height, const struct rect *clip) { @@ -83,7 +83,7 @@ void browser_window_place_caret(struct browser_window *bw, int x, int y, root_bw->can_edit = true; } -/* exported interface documented in desktop/textinput.h */ +/* exported interface documented in core/browser/textinput.h */ void browser_window_remove_caret(struct browser_window *bw, bool only_hide) { struct browser_window *root_bw; @@ -101,7 +101,7 @@ void browser_window_remove_caret(struct browser_window *bw, bool only_hide) } } -/* exported interface documented in desktop/textinput.h */ +/* exported interface documented in core/browser/textinput.h */ bool browser_window_key_press(struct browser_window *bw, uint32_t key) { struct browser_window *focus = bw->focus; diff --git a/core/desktop/textinput.h b/core/browser/textinput.h index 0b3593104..0b3593104 100644 --- a/core/desktop/textinput.h +++ b/core/browser/textinput.h diff --git a/core/desktop/theme.h b/core/browser/theme.h index 4eb19ba74..4eb19ba74 100644 --- a/core/desktop/theme.h +++ b/core/browser/theme.h diff --git a/core/desktop/version.c b/core/browser/version.c index e456aac44..c902e04b0 100644 --- a/core/desktop/version.c +++ b/core/browser/version.c @@ -18,7 +18,7 @@ #include "testament.h" -#include "desktop/version.h" +#include "core/browser/version.h" const char * const netsurf_version = "3.5 (Dev" #if defined(CI_BUILD) diff --git a/core/desktop/version.h b/core/browser/version.h index 7ab8eb425..7ab8eb425 100644 --- a/core/desktop/version.h +++ b/core/browser/version.h diff --git a/core/content/content.c b/core/content/content.c index 3d06f8e07..2f44b561e 100644 --- a/core/content/content.c +++ b/core/content/content.c @@ -33,10 +33,10 @@ #include "content/content_protected.h" #include "content/hlcache.h" #include "image/bitmap.h" -#include "desktop/knockout.h" -#include "desktop/browser.h" -#include "desktop/plotters.h" -#include "desktop/gui_internal.h" +#include "core/browser/knockout.h" +#include "core/browser/browser.h" +#include "core/browser/plotters.h" +#include "core/browser/api_internal.h" #include "utils/nsoption.h" #include "utils/http.h" diff --git a/core/content/content.h b/core/content/content.h index 6c05df9c5..40a8dca36 100644 --- a/core/content/content.h +++ b/core/content/content.h @@ -36,9 +36,9 @@ #include "utils/http.h" #include "content/content_factory.h" #include "content/content_type.h" -#include "desktop/search.h" -#include "desktop/mouse.h" -#include "desktop/plot_style.h" +#include "core/browser/search.h" +#include "core/browser/mouse.h" +#include "core/browser/plot_style.h" struct browser_window; struct browser_window_features; diff --git a/core/content/fetch.c b/core/content/fetch.c index 47e6fc88e..0106e37cf 100644 --- a/core/content/fetch.c +++ b/core/content/fetch.c @@ -48,8 +48,8 @@ #include "utils/nsurl.h" #include "utils/utils.h" #include "utils/ring.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" #include "content/fetch.h" #include "content/fetchers.h" diff --git a/core/content/fetchers/curl.c b/core/content/fetchers/curl.c index 88c8bbe41..771bd7f28 100644 --- a/core/content/fetchers/curl.c +++ b/core/content/fetchers/curl.c @@ -49,8 +49,8 @@ #include "utils/ring.h" #include "utils/useragent.h" #include "utils/file.h" -#include "desktop/gui_fetch.h" -#include "desktop/gui_internal.h" +#include "core/api/fetch.h" +#include "core/browser/api_internal.h" #include "content/fetch.h" #include "content/fetchers.h" diff --git a/core/content/fetchers/file.c b/core/content/fetchers/file.c index d42e92a5b..2b8a41615 100644 --- a/core/content/fetchers/file.c +++ b/core/content/fetchers/file.c @@ -54,8 +54,8 @@ #include "utils/utils.h" #include "utils/ring.h" #include "utils/file.h" -#include "desktop/gui_fetch.h" -#include "desktop/gui_internal.h" +#include "core/api/fetch.h" +#include "core/browser/api_internal.h" #include "content/dirlist.h" #include "content/fetch.h" diff --git a/core/content/fetchers/resource.c b/core/content/fetchers/resource.c index 6472dc506..b3caedb16 100644 --- a/core/content/fetchers/resource.c +++ b/core/content/fetchers/resource.c @@ -44,8 +44,8 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/ring.h" -#include "desktop/gui_fetch.h" -#include "desktop/gui_internal.h" +#include "core/api/fetch.h" +#include "core/browser/api_internal.h" #include "content/fetch.h" #include "content/fetchers.h" diff --git a/core/content/fs_backing_store.c b/core/content/fs_backing_store.c index b9490ddcc..12188fa87 100644 --- a/core/content/fs_backing_store.c +++ b/core/content/fs_backing_store.c @@ -49,8 +49,8 @@ #include "utils/log.h" #include "utils/utils.h" #include "utils/messages.h" -#include "desktop/gui_internal.h" -#include "desktop/gui_misc.h" +#include "core/browser/api_internal.h" +#include "core/api/misc.h" #include "content/backing_store.h" diff --git a/core/content/hlcache.c b/core/content/hlcache.c index 3f0e810a5..a22cda961 100644 --- a/core/content/hlcache.c +++ b/core/content/hlcache.c @@ -29,8 +29,8 @@ #include "utils/messages.h" #include "utils/ring.h" #include "utils/utils.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" #include "content/content.h" #include "content/mimesniff.h" diff --git a/core/content/llcache.c b/core/content/llcache.c index 9745734f4..3daca174c 100644 --- a/core/content/llcache.c +++ b/core/content/llcache.c @@ -48,8 +48,8 @@ #include "utils/nsurl.h" #include "utils/utils.h" #include "utils/time.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" #include "content/fetch.h" #include "content/backing_store.h" diff --git a/core/content/urldb.c b/core/content/urldb.c index edb49b549..37648abfb 100644 --- a/core/content/urldb.c +++ b/core/content/urldb.c @@ -104,8 +104,8 @@ #include "utils/utils.h" #include "utils/bloom.h" #include "image/bitmap.h" -#include "desktop/cookie_manager.h" -#include "desktop/gui_internal.h" +#include "core/widgets/cookie_manager.h" +#include "core/browser/api_internal.h" #include "content/content.h" #include "content/urldb.h" diff --git a/core/css/css.c b/core/css/css.c index 66dc6d4ba..04e68ca16 100644 --- a/core/css/css.c +++ b/core/css/css.c @@ -23,7 +23,7 @@ #include "content/content_protected.h" #include "content/fetch.h" #include "content/hlcache.h" -#include "desktop/system_colour.h" +#include "core/browser/system_colour.h" #include "utils/corestrings.h" #include "utils/utils.h" #include "utils/http.h" diff --git a/core/css/select.c b/core/css/select.c index a929cf10a..bcb03eef0 100644 --- a/core/css/select.c +++ b/core/css/select.c @@ -21,7 +21,7 @@ #include <strings.h> #include "content/urldb.h" -#include "desktop/system_colour.h" +#include "core/browser/system_colour.h" #include "utils/nsoption.h" #include "utils/corestrings.h" #include "utils/log.h" diff --git a/core/css/utils.h b/core/css/utils.h index e9650db97..5cbd61d18 100644 --- a/core/css/utils.h +++ b/core/css/utils.h @@ -20,7 +20,7 @@ #define NETSURF_CSS_UTILS_H_ #include "css/css.h" -#include "desktop/plot_style.h" +#include "core/browser/plot_style.h" /* DPI of the screen, in fixed point units */ extern css_fixed nscss_screen_dpi; diff --git a/core/desktop/Makefile b/core/desktop/Makefile deleted file mode 100644 index 836f4437c..000000000 --- a/core/desktop/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Sources for desktop - -S_DESKTOP := cookie_manager.c knockout.c hotlist.c mouse.c \ - plot_style.c print.c search.c searchweb.c scrollbar.c \ - sslcert_viewer.c textarea.c tree.c version.c \ - system_colour.c global_history.c treeview.c - -S_DESKTOP := $(addprefix desktop/,$(S_DESKTOP)) - -# version.c needs the testament -core/desktop/version.c: testament $(OBJROOT)/testament.h - -# S_BROWSER are sources related to full browsers but are common -# between RISC OS, GTK, BeOS and AmigaOS builds -S_BROWSER := browser.c browser_history.c download.c frames.c netsurf.c \ - save_complete.c save_text.c selection.c textinput.c gui_factory.c \ - save_pdf.c font_haru.c - -S_BROWSER := $(addprefix desktop/,$(S_BROWSER)) diff --git a/core/render/Makefile b/core/html/Makefile index 148c2c39d..c12682ffc 100644 --- a/core/render/Makefile +++ b/core/html/Makefile @@ -6,4 +6,4 @@ S_RENDER := box.c box_construct.c box_normalise.c box_textarea.c \ html_interaction.c html_redraw.c html_forms.c html_object.c -S_RENDER := $(addprefix render/,$(S_RENDER)) +S_RENDER := $(addprefix html/,$(S_RENDER)) diff --git a/core/render/box.c b/core/html/box.c index 7111f1a6e..ea085ece3 100644 --- a/core/render/box.c +++ b/core/html/box.c @@ -33,11 +33,11 @@ #include "css/css.h" #include "css/utils.h" #include "css/dump.h" -#include "desktop/scrollbar.h" +#include "core/browser/scrollbar.h" #include "utils/nsoption.h" -#include "render/box.h" -#include "render/form_internal.h" -#include "render/html_internal.h" +#include "core/html/box.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" #include "utils/log.h" #include "utils/talloc.h" #include "utils/utils.h" diff --git a/core/render/box.h b/core/html/box.h index 4ac3453aa..4ac3453aa 100644 --- a/core/render/box.h +++ b/core/html/box.h diff --git a/core/render/box_construct.c b/core/html/box_construct.c index adb450946..4c983323e 100644 --- a/core/render/box_construct.c +++ b/core/html/box_construct.c @@ -46,13 +46,13 @@ #include "utils/messages.h" #include "utils/talloc.h" #include "utils/utils.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" -#include "render/box.h" -#include "render/box_textarea.h" -#include "render/form_internal.h" -#include "render/html_internal.h" +#include "core/html/box.h" +#include "core/html/box_textarea.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" /** * Context for box tree construction diff --git a/core/render/box_normalise.c b/core/html/box_normalise.c index 1010c408b..ec6723f28 100644 --- a/core/render/box_normalise.c +++ b/core/html/box_normalise.c @@ -28,9 +28,9 @@ #include <string.h> #include "css/css.h" #include "css/select.h" -#include "render/box.h" -#include "render/html_internal.h" -#include "render/table.h" +#include "core/html/box.h" +#include "core/html/html_internal.h" +#include "core/html/table.h" #include "utils/log.h" /* Define to enable box normalise debug */ diff --git a/core/render/box_textarea.c b/core/html/box_textarea.c index 4e4adff80..9bd6024fc 100644 --- a/core/render/box_textarea.c +++ b/core/html/box_textarea.c @@ -22,14 +22,14 @@ #include <dom/dom.h> -#include "desktop/browser.h" -#include "desktop/textarea.h" -#include "desktop/textinput.h" +#include "core/browser/browser.h" +#include "core/widgets/textarea.h" +#include "core/browser/textinput.h" #include "utils/log.h" -#include "render/box_textarea.h" -#include "render/font.h" -#include "render/form_internal.h" +#include "core/html/box_textarea.h" +#include "core/html/font.h" +#include "core/html/form_internal.h" bool box_textarea_keypress(html_content *html, struct box *box, uint32_t key) diff --git a/core/render/box_textarea.h b/core/html/box_textarea.h index a7a377076..ead0fe1da 100644 --- a/core/render/box_textarea.h +++ b/core/html/box_textarea.h @@ -26,8 +26,8 @@ #define _NETSURF_RENDER_BOX_TEXTAREA_H_ -#include "render/box.h" -#include "render/html_internal.h" +#include "core/html/box.h" +#include "core/html/html_internal.h" struct dom_node; diff --git a/core/render/font.c b/core/html/font.c index 0b059a218..c959c5b72 100644 --- a/core/render/font.c +++ b/core/html/font.c @@ -26,7 +26,7 @@ #include "css/utils.h" #include "utils/nsoption.h" -#include "render/font.h" +#include "core/html/font.h" /** * Map a generic CSS font family to a generic plot font family @@ -131,7 +131,7 @@ static plot_font_flags_t plot_font_flags(enum css_font_style_e style, } -/* exported function documented in render/font_internal.h */ +/* exported function documented in core/html/font_internal.h */ void font_plot_style_from_css(const css_computed_style *css, plot_font_style_t *fstyle) { diff --git a/core/render/font.h b/core/html/font.h index e4353df64..e4353df64 100644 --- a/core/render/font.h +++ b/core/html/font.h diff --git a/core/render/form.c b/core/html/form.c index 1adce23d8..b55ca1aff 100644 --- a/core/render/form.c +++ b/core/html/form.c @@ -44,20 +44,20 @@ #include "content/hlcache.h" #include "css/css.h" #include "css/utils.h" -#include "desktop/browser.h" -#include "desktop/mouse.h" -#include "desktop/knockout.h" -#include "desktop/plot_style.h" -#include "desktop/plotters.h" -#include "desktop/scrollbar.h" -#include "desktop/textarea.h" - -#include "render/box.h" -#include "render/font.h" -#include "render/form_internal.h" -#include "render/html.h" -#include "render/html_internal.h" -#include "render/layout.h" +#include "core/browser/browser.h" +#include "core/browser/mouse.h" +#include "core/browser/knockout.h" +#include "core/browser/plot_style.h" +#include "core/browser/plotters.h" +#include "core/browser/scrollbar.h" +#include "core/widgets/textarea.h" + +#include "core/html/box.h" +#include "core/html/font.h" +#include "core/html/form_internal.h" +#include "core/html/html.h" +#include "core/html/html_internal.h" +#include "core/html/layout.h" #define MAX_SELECT_HEIGHT 210 #define SELECT_LINE_SPACING 0.2 @@ -96,7 +96,7 @@ static void form_select_menu_clicked(struct form_control *control, static void form_select_menu_scroll_callback(void *client_data, struct scrollbar_msg_data *scrollbar_data); -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ struct form *form_new(void *node, const char *action, const char *target, form_method method, const char *charset, const char *doc_charset) @@ -146,7 +146,7 @@ struct form *form_new(void *node, const char *action, const char *target, } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ void form_free(struct form *form) { struct form_control *c, *d; @@ -165,7 +165,7 @@ void form_free(struct form *form) free(form); } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ struct form_control *form_new_control(void *node, form_control_type type) { struct form_control *control; @@ -324,7 +324,7 @@ bool form_add_option(struct form_control *control, char *value, char *text, } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ bool form_successful_controls_dom(struct form *_form, struct form_control *_submit_button, struct fetch_multipart_data **successful_controls) @@ -1077,7 +1077,7 @@ char *form_encode_item(const char *item, uint32_t len, const char *charset, return ret; } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ bool form_open_select_menu(void *client_data, struct form_control *control, select_menu_redraw_callback callback, @@ -1151,7 +1151,7 @@ bool form_open_select_menu(void *client_data, } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ void form_free_select_menu(struct form_control *control) { if (control->data.select.menu->scrollbar != NULL) @@ -1161,7 +1161,7 @@ void form_free_select_menu(struct form_control *control) } -/* exported interface documented in render/form_internal.h */ +/* exported interface documented in core/html/form_internal.h */ bool form_redraw_select_menu(struct form_control *control, int x, int y, float scale, const struct rect *clip, const struct redraw_context *ctx) @@ -1401,7 +1401,7 @@ static nserror form__select_process_selection(html_content *html, return ret; } -/* exported interface documented in render/form.h */ +/* exported interface documented in core/html/form.h */ nserror form_select_process_selection(struct form_control *control, int item) { assert(control != NULL); @@ -1409,7 +1409,7 @@ nserror form_select_process_selection(struct form_control *control, int item) return form__select_process_selection(control->html, control, item); } -/* exported interface documented in render/form.h */ +/* exported interface documented in core/html/form.h */ struct form_option * form_select_get_option(struct form_control *control, int item) { @@ -1423,13 +1423,13 @@ form_select_get_option(struct form_control *control, int item) return opt; } -/* exported interface documented in render/form.h */ +/* exported interface documented in core/html/form.h */ char *form_control_get_name(struct form_control *control) { return control->name; } -/* exported interface documented in render/form.h */ +/* exported interface documented in core/html/form.h */ nserror form_control_bounding_rect(struct form_control *control, struct rect *r) { box_bounds( control->box, r ); diff --git a/core/render/form.h b/core/html/form.h index 744ac32e7..744ac32e7 100644 --- a/core/render/form.h +++ b/core/html/form.h diff --git a/core/render/form_internal.h b/core/html/form_internal.h index ea46b6a78..cd78cba61 100644 --- a/core/render/form_internal.h +++ b/core/html/form_internal.h @@ -24,7 +24,7 @@ #ifndef _NETSURF_RENDER_FORM_INTERNAL_H_ #define _NETSURF_RENDER_FORM_INTERNAL_H_ -#include "render/form.h" +#include "core/html/form.h" #include <stdbool.h> diff --git a/core/render/html.c b/core/html/html.c index e7d2c4865..178fdd963 100644 --- a/core/render/html.c +++ b/core/html/html.c @@ -40,22 +40,22 @@ #include "content/content_protected.h" #include "content/fetch.h" #include "content/hlcache.h" -#include "desktop/selection.h" -#include "desktop/scrollbar.h" -#include "desktop/textarea.h" +#include "core/browser/selection.h" +#include "core/browser/scrollbar.h" +#include "core/widgets/textarea.h" #include "image/bitmap.h" #include "javascript/js.h" -#include "desktop/browser.h" -#include "desktop/font.h" -#include "desktop/gui_utf8.h" -#include "desktop/gui_internal.h" - -#include "render/box.h" -#include "render/form_internal.h" -#include "render/html_internal.h" -#include "render/imagemap.h" -#include "render/layout.h" -#include "render/search.h" +#include "core/browser/browser.h" +#include "core/browser/font.h" +#include "core/api/utf8.h" +#include "core/browser/api_internal.h" + +#include "core/html/box.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" +#include "core/html/imagemap.h" +#include "core/html/layout.h" +#include "core/html/search.h" #define CHUNK 4096 @@ -563,7 +563,7 @@ static bool html_process_img(html_content *c, dom_node *node) return success; } -/* exported function documented in render/html_internal.h */ +/* exported function documented in core/html/html_internal.h */ void html_finish_conversion(html_content *htmlc) { union content_msg_data msg_data; @@ -2229,7 +2229,7 @@ dom_document *html_get_document(hlcache_handle *h) * \param h HTML content to retrieve tree from * \return Pointer to box tree * - * \todo This API must die, as must all use of the box tree outside render/ + * \todo This API must die, as must all use of the box tree outside core/html/ */ struct box *html_get_box_tree(hlcache_handle *h) { diff --git a/core/render/html.h b/core/html/html.h index ee204d3d6..f29a39655 100644 --- a/core/render/html.h +++ b/core/html/html.h @@ -32,10 +32,10 @@ #include "content/content_type.h" #include "css/css.h" -#include "desktop/browser.h" -#include "desktop/mouse.h" -#include "desktop/plot_style.h" -#include "desktop/frame_types.h" +#include "core/browser/browser.h" +#include "core/browser/mouse.h" +#include "core/browser/plot_style.h" +#include "core/browser/frame_types.h" struct fetch_multipart_data; struct box; diff --git a/core/render/html_css.c b/core/html/html_css.c index a90ea6323..3a24b902e 100644 --- a/core/render/html_css.c +++ b/core/html/html_css.c @@ -32,10 +32,10 @@ #include "utils/corestrings.h" #include "utils/config.h" #include "utils/log.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" static nsurl *html_default_stylesheet_url; static nsurl *html_adblock_stylesheet_url; @@ -426,7 +426,7 @@ no_memory: return false; } -/* exported interface documented in render/html.h */ +/* exported interface documented in core/html/html.h */ struct html_stylesheet *html_get_stylesheets(hlcache_handle *h, unsigned int *n) { html_content *c = (html_content *) hlcache_handle_get_content(h); @@ -440,7 +440,7 @@ struct html_stylesheet *html_get_stylesheets(hlcache_handle *h, unsigned int *n) } -/* exported interface documented in render/html_internal.h */ +/* exported interface documented in core/html/html_internal.h */ nserror html_css_free_stylesheets(html_content *html) { unsigned int i; @@ -460,7 +460,7 @@ nserror html_css_free_stylesheets(html_content *html) return NSERROR_OK; } -/* exported interface documented in render/html_internal.h */ +/* exported interface documented in core/html/html_internal.h */ nserror html_css_quirks_stylesheets(html_content *c) { nserror ns_error = NSERROR_OK; @@ -488,7 +488,7 @@ nserror html_css_quirks_stylesheets(html_content *c) return ns_error; } -/* exported interface documented in render/html_internal.h */ +/* exported interface documented in core/html/html_internal.h */ nserror html_css_new_stylesheets(html_content *c) { nserror ns_error; diff --git a/core/render/html_css_fetcher.c b/core/html/html_css_fetcher.c index b676fedec..2eef5a321 100644 --- a/core/render/html_css_fetcher.c +++ b/core/html/html_css_fetcher.c @@ -29,7 +29,7 @@ #include "utils/config.h" #include "content/fetch.h" #include "content/fetchers.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "utils/log.h" #include "utils/ring.h" #include "utils/nsurl.h" diff --git a/core/render/html_forms.c b/core/html/html_forms.c index fe289f261..86ada745d 100644 --- a/core/render/html_forms.c +++ b/core/html/html_forms.c @@ -19,10 +19,10 @@ #include "utils/corestrings.h" #include "utils/log.h" -#include "desktop/browser.h" +#include "core/browser/browser.h" -#include "render/form_internal.h" -#include "render/html_internal.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" /** * process form element from dom diff --git a/core/render/html_interaction.c b/core/html/html_interaction.c index 764d58a23..c612ff05e 100644 --- a/core/render/html_interaction.c +++ b/core/html/html_interaction.c @@ -34,26 +34,26 @@ #include "utils/log.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/browser.h" -#include "desktop/frames.h" -#include "desktop/mouse.h" +#include "core/browser/browser.h" +#include "core/browser/frames.h" +#include "core/browser/mouse.h" #include "utils/nsoption.h" -#include "desktop/scrollbar.h" -#include "desktop/selection.h" -#include "desktop/textarea.h" -#include "desktop/textinput.h" -#include "desktop/font.h" +#include "core/browser/scrollbar.h" +#include "core/browser/selection.h" +#include "core/widgets/textarea.h" +#include "core/browser/textinput.h" +#include "core/browser/font.h" #include "javascript/js.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" - -#include "render/box.h" -#include "render/box_textarea.h" -#include "render/font.h" -#include "render/form_internal.h" -#include "render/html_internal.h" -#include "render/imagemap.h" -#include "render/search.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" + +#include "core/html/box.h" +#include "core/html/box_textarea.h" +#include "core/html/font.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" +#include "core/html/imagemap.h" +#include "core/html/search.h" /** * Get pointer shape for given box diff --git a/core/render/html_internal.h b/core/html/html_internal.h index 419fe41b3..418049af3 100644 --- a/core/render/html_internal.h +++ b/core/html/html_internal.h @@ -24,8 +24,8 @@ #define NETSURF_RENDER_HTML_INTERNAL_H_ #include "content/content_protected.h" -#include "desktop/selection.h" -#include "render/html.h" +#include "core/browser/selection.h" +#include "core/html/html.h" typedef enum { HTML_DRAG_NONE, /** No drag */ @@ -247,11 +247,11 @@ bool html_can_begin_conversion(html_content *htmlc); */ bool html_begin_conversion(html_content *htmlc); -/* in render/html_redraw.c */ +/* in core/html/html_redraw.c */ bool html_redraw(struct content *c, struct content_redraw_data *data, const struct rect *clip, const struct redraw_context *ctx); -/* in render/html_interaction.c */ +/* in core/html/html_interaction.c */ void html_mouse_track(struct content *c, struct browser_window *bw, browser_mouse_state mouse, int x, int y); void html_mouse_action(struct content *c, struct browser_window *bw, @@ -264,7 +264,7 @@ void html_search(struct content *c, void *context, void html_search_clear(struct content *c); -/* in render/html_script.c */ +/* in core/html/html_script.c */ dom_hubbub_error html_process_script(void *ctx, dom_node *node); /** @@ -294,12 +294,12 @@ nserror html_script_free(html_content *htmlc); */ nserror html_script_invalidate_ctx(html_content *htmlc); -/* in render/html_forms.c */ +/* in core/html/html_forms.c */ struct form *html_forms_get_forms(const char *docenc, dom_html_document *doc); struct form_control *html_forms_get_control_for_node(struct form *forms, dom_node *node); -/* in render/html_css.c */ +/* in core/html/html_css.c */ nserror html_css_init(void); void html_css_fini(void); @@ -319,7 +319,7 @@ bool html_css_update_style(html_content *c, dom_node *style); nserror html_css_new_selection_context(html_content *c, css_select_ctx **ret_select_ctx); -/* in render/html_css_fetcher.c */ +/* in core/html/html_css_fetcher.c */ /** * Register the fetcher for the pseudo x-ns-css scheme. * @@ -329,7 +329,7 @@ nserror html_css_fetcher_register(void); nserror html_css_fetcher_add_item(dom_string *data, nsurl *base_url, uint32_t *key); -/* in render/html_object.c */ +/* in core/html/html_object.c */ /** * Start a fetch for an object required by a page. diff --git a/core/render/html_object.c b/core/html/html_object.c index 933950ec3..2bb585724 100644 --- a/core/render/html_object.c +++ b/core/html/html_object.c @@ -33,12 +33,12 @@ #include "utils/nsoption.h" #include "content/hlcache.h" #include "css/utils.h" -#include "desktop/scrollbar.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/browser/scrollbar.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" -#include "render/box.h" -#include "render/html_internal.h" +#include "core/html/box.h" +#include "core/html/html_internal.h" /* break reference loop */ static void html_object_refresh(void *p); @@ -649,7 +649,7 @@ nserror html_object_free_objects(html_content *html) -/* exported interface documented in render/html_internal.h */ +/* exported interface documented in core/html/html_internal.h */ bool html_fetch_object(html_content *c, nsurl *url, struct box *box, content_type permitted_types, int available_width, int available_height, diff --git a/core/render/html_redraw.c b/core/html/html_redraw.c index 091ece0f5..80514cf72 100644 --- a/core/render/html_redraw.c +++ b/core/html/html_redraw.c @@ -43,21 +43,21 @@ #include "content/content_protected.h" #include "css/css.h" #include "css/utils.h" -#include "desktop/browser.h" -#include "desktop/plotters.h" -#include "desktop/selection.h" -#include "desktop/print.h" -#include "desktop/scrollbar.h" -#include "desktop/textarea.h" -#include "desktop/font.h" +#include "core/browser/browser.h" +#include "core/browser/plotters.h" +#include "core/browser/selection.h" +#include "core/browser/print.h" +#include "core/browser/scrollbar.h" +#include "core/widgets/textarea.h" +#include "core/browser/font.h" #include "image/bitmap.h" -#include "render/box.h" -#include "render/font.h" -#include "render/form_internal.h" -#include "render/html_internal.h" -#include "render/layout.h" -#include "render/search.h" +#include "core/html/box.h" +#include "core/html/font.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" +#include "core/html/layout.h" +#include "core/html/search.h" bool html_redraw_debug = false; diff --git a/core/render/html_script.c b/core/html/html_script.c index fe3455d9f..67361dabe 100644 --- a/core/render/html_script.c +++ b/core/html/html_script.c @@ -36,7 +36,7 @@ #include "content/content_protected.h" #include "content/fetch.h" #include "content/hlcache.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" typedef bool (script_handler_t)(struct jscontext *jscontext, const char *data, size_t size) ; @@ -50,7 +50,7 @@ static script_handler_t *select_script_handler(content_type ctype) } -/* exported internal interface documented in render/html_internal.h */ +/* exported internal interface documented in core/html/html_internal.h */ nserror html_script_exec(html_content *c) { unsigned int i; @@ -552,7 +552,7 @@ html_process_script(void *ctx, dom_node *node) return err; } -/* exported internal interface documented in render/html_internal.h */ +/* exported internal interface documented in core/html/html_internal.h */ nserror html_script_free(html_content *html) { unsigned int i; @@ -579,7 +579,7 @@ nserror html_script_free(html_content *html) return NSERROR_OK; } -/* exported internal interface documented in render/html_internal.h */ +/* exported internal interface documented in core/html/html_internal.h */ nserror html_script_invalidate_ctx(html_content *htmlc) { htmlc->jscontext = NULL; diff --git a/core/render/imagemap.c b/core/html/imagemap.c index b1cb8241c..2ca780700 100644 --- a/core/render/imagemap.c +++ b/core/html/imagemap.c @@ -29,9 +29,9 @@ #include "content/content_protected.h" #include "content/hlcache.h" -#include "render/box.h" -#include "render/html_internal.h" -#include "render/imagemap.h" +#include "core/html/box.h" +#include "core/html/html_internal.h" +#include "core/html/imagemap.h" #include "utils/corestrings.h" #include "utils/log.h" #include "utils/utils.h" diff --git a/core/render/imagemap.h b/core/html/imagemap.h index 3ae6819da..3ae6819da 100644 --- a/core/render/imagemap.h +++ b/core/html/imagemap.h diff --git a/core/render/layout.c b/core/html/layout.c index 45d905fa4..0101bee36 100644 --- a/core/render/layout.c +++ b/core/html/layout.c @@ -49,17 +49,17 @@ #include "css/utils.h" #include "content/content_protected.h" #include "utils/nsoption.h" -#include "desktop/browser.h" -#include "desktop/scrollbar.h" -#include "desktop/textarea.h" -#include "desktop/font.h" - -#include "render/box.h" -#include "render/font.h" -#include "render/form_internal.h" -#include "render/html_internal.h" -#include "render/layout.h" -#include "render/table.h" +#include "core/browser/browser.h" +#include "core/browser/scrollbar.h" +#include "core/widgets/textarea.h" +#include "core/browser/font.h" + +#include "core/html/box.h" +#include "core/html/font.h" +#include "core/html/form_internal.h" +#include "core/html/html_internal.h" +#include "core/html/layout.h" +#include "core/html/table.h" /* Define to enable layout debugging */ diff --git a/core/render/layout.h b/core/html/layout.h index f4117e286..f4117e286 100644 --- a/core/render/layout.h +++ b/core/html/layout.h diff --git a/core/render/search.c b/core/html/search.c index b586ff55f..5f04773af 100644 --- a/core/render/search.c +++ b/core/html/search.c @@ -32,15 +32,15 @@ #include "utils/utils.h" #include "content/content.h" #include "content/hlcache.h" -#include "desktop/selection.h" -#include "desktop/gui_search.h" -#include "desktop/gui_internal.h" - -#include "render/box.h" -#include "render/html.h" -#include "render/html_internal.h" -#include "render/search.h" -#include "render/textplain.h" +#include "core/browser/selection.h" +#include "core/api/search.h" +#include "core/browser/api_internal.h" + +#include "core/html/box.h" +#include "core/html/html.h" +#include "core/html/html_internal.h" +#include "core/html/search.h" +#include "core/html/textplain.h" #ifndef NOF_ELEMENTS #define NOF_ELEMENTS(array) (sizeof(array)/sizeof(*(array))) diff --git a/core/render/search.h b/core/html/search.h index 79d1ee3d3..f5dc0fd1f 100644 --- a/core/render/search.h +++ b/core/html/search.h @@ -22,7 +22,7 @@ #include <ctype.h> #include <string.h> -#include "desktop/search.h" +#include "core/browser/search.h" struct search_context; diff --git a/core/render/table.c b/core/html/table.c index 656386491..e359bc079 100644 --- a/core/render/table.c +++ b/core/html/table.c @@ -27,8 +27,8 @@ #include "css/css.h" #include "css/utils.h" -#include "render/box.h" -#include "render/table.h" +#include "core/html/box.h" +#include "core/html/table.h" #include "utils/log.h" #include "utils/talloc.h" diff --git a/core/render/table.h b/core/html/table.h index ecd3043b5..ecd3043b5 100644 --- a/core/render/table.h +++ b/core/html/table.h diff --git a/core/render/textplain.c b/core/html/textplain.c index c9f83f9ac..4528b6919 100644 --- a/core/render/textplain.c +++ b/core/html/textplain.c @@ -41,18 +41,18 @@ #include "content/hlcache.h" #include "css/css.h" #include "css/utils.h" -#include "desktop/browser.h" +#include "core/browser/browser.h" #include "utils/nsoption.h" -#include "desktop/plotters.h" -#include "desktop/search.h" -#include "desktop/selection.h" -#include "desktop/textinput.h" -#include "desktop/font.h" - -#include "render/search.h" -#include "render/textplain.h" -#include "render/html.h" -#include "render/search.h" +#include "core/browser/plotters.h" +#include "core/browser/search.h" +#include "core/browser/selection.h" +#include "core/browser/textinput.h" +#include "core/browser/font.h" + +#include "core/html/search.h" +#include "core/html/textplain.h" +#include "core/html/html.h" +#include "core/html/search.h" struct textplain_line { size_t start; diff --git a/core/render/textplain.h b/core/html/textplain.h index c3f2a0f6a..cdcc7dff9 100644 --- a/core/render/textplain.h +++ b/core/html/textplain.h @@ -25,7 +25,7 @@ #define _NETSURF_RENDER_TEXTPLAIN_H_ #include <stddef.h> -#include "desktop/mouse.h" +#include "core/browser/mouse.h" struct content; struct hlcache_handle; diff --git a/core/image/bmp.c b/core/image/bmp.c index 7e992ae43..42d85df17 100644 --- a/core/image/bmp.c +++ b/core/image/bmp.c @@ -28,8 +28,8 @@ #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/gui_internal.h" -#include "desktop/plotters.h" +#include "core/browser/api_internal.h" +#include "core/browser/plotters.h" #include "image/bitmap.h" #include "image/bmp.h" diff --git a/core/image/gif.c b/core/image/gif.c index fb0985a45..bd2c80c20 100644 --- a/core/image/gif.c +++ b/core/image/gif.c @@ -39,8 +39,8 @@ #include "utils/messages.h" #include "utils/nsoption.h" #include "content/content_protected.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" #include "image/image.h" #include "image/bitmap.h" diff --git a/core/image/ico.c b/core/image/ico.c index cf74592a8..236dcce58 100644 --- a/core/image/ico.c +++ b/core/image/ico.c @@ -27,7 +27,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/gui_internal.h" +#include "core/browser/api_internal.h" #include "image/image.h" #include "image/bitmap.h" diff --git a/core/image/image.c b/core/image/image.c index 1dac313df..db7b29fc7 100644 --- a/core/image/image.c +++ b/core/image/image.c @@ -22,8 +22,8 @@ #include "utils/log.h" #include "utils/messages.h" #include "content/content.h" -#include "desktop/plotters.h" -#include "desktop/gui_internal.h" +#include "core/browser/plotters.h" +#include "core/browser/api_internal.h" #include "image/bitmap.h" #include "image/bmp.h" diff --git a/core/image/image_cache.c b/core/image/image_cache.c index 046a399ed..1ceb0cead 100644 --- a/core/image/image_cache.c +++ b/core/image/image_cache.c @@ -24,8 +24,8 @@ #include "utils/log.h" #include "content/content_protected.h" -#include "desktop/gui_misc.h" -#include "desktop/gui_internal.h" +#include "core/api/misc.h" +#include "core/browser/api_internal.h" #include "image/bitmap.h" #include "image/image_cache.h" diff --git a/core/image/jpeg.c b/core/image/jpeg.c index 8e6ac8528..515949844 100644 --- a/core/image/jpeg.c +++ b/core/image/jpeg.c @@ -30,7 +30,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/gui_internal.h" +#include "core/browser/api_internal.h" #include "image/image_cache.h" #include "image/bitmap.h" diff --git a/core/image/nssprite.c b/core/image/nssprite.c index c0c6ff1b9..60422b61c 100644 --- a/core/image/nssprite.c +++ b/core/image/nssprite.c @@ -28,8 +28,8 @@ #include "utils/log.h" #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/gui_internal.h" -#include "desktop/plotters.h" +#include "core/browser/api_internal.h" +#include "core/browser/plotters.h" #include "image/bitmap.h" #include "image/nssprite.h" diff --git a/core/image/png.c b/core/image/png.c index 5d68d2f8a..086d34f7d 100644 --- a/core/image/png.c +++ b/core/image/png.c @@ -25,7 +25,7 @@ #include "utils/log.h" #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/gui_internal.h" +#include "core/browser/api_internal.h" #include "image/image_cache.h" #include "image/bitmap.h" diff --git a/core/image/rsvg.c b/core/image/rsvg.c index 4ffb43aa8..84b53de14 100644 --- a/core/image/rsvg.c +++ b/core/image/rsvg.c @@ -41,8 +41,8 @@ #include "utils/utils.h" #include "utils/messages.h" #include "content/content_protected.h" -#include "desktop/plotters.h" -#include "desktop/gui_internal.h" +#include "core/browser/plotters.h" +#include "core/browser/api_internal.h" #include "image/bitmap.h" #include "image/rsvg.h" diff --git a/core/image/svg.c b/core/image/svg.c index 0bffbe836..30d15883e 100644 --- a/core/image/svg.c +++ b/core/image/svg.c @@ -30,7 +30,7 @@ #include "utils/utils.h" #include "content/content_protected.h" #include "css/css.h" -#include "desktop/plotters.h" +#include "core/browser/plotters.h" #include "image/svg.h" diff --git a/core/javascript/duktape/Document.bnd b/core/javascript/duktape/Document.bnd index e15f75f48..ae181d161 100644 --- a/core/javascript/duktape/Document.bnd +++ b/core/javascript/duktape/Document.bnd @@ -14,7 +14,7 @@ prologue Document() #include "utils/libdom.h" #include "utils/utils.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "content/urldb.h" #define HANDLER_MAGIC MAGIC(HANDLER_MAP) diff --git a/core/javascript/duktape/Location.bnd b/core/javascript/duktape/Location.bnd index fbb0e4a06..6a9fdb158 100644 --- a/core/javascript/duktape/Location.bnd +++ b/core/javascript/duktape/Location.bnd @@ -15,7 +15,7 @@ class Location { prologue Location() %{ -#include "desktop/browser.h" +#include "core/browser/browser.h" %} init Location(nsurl *url) diff --git a/core/javascript/duktape/Window.bnd b/core/javascript/duktape/Window.bnd index 81d52809a..fd14aa87d 100644 --- a/core/javascript/duktape/Window.bnd +++ b/core/javascript/duktape/Window.bnd @@ -13,9 +13,9 @@ class Window { private struct html_content * htmlc; prologue %{ #include "utils/nsurl.h" -#include "desktop/browser.h" -#include "render/html.h" -#include "render/html_internal.h" +#include "core/browser/browser.h" +#include "core/html/html.h" +#include "core/html/html_internal.h" %}; }; diff --git a/core/javascript/duktape/duktape.c b/core/javascript/duktape/duktape.c index a215d13dc..52e5fc913 100644 --- a/core/javascript/duktape/duktape.c +++ b/core/javascript/duktape/duktape.c @@ -29700,7 +29700,7 @@ DUK_INTERNAL duk_bool_t duk_bi_date_format_parts_strftime(duk_context *ctx, duk_ * * Platform specific links: * - * - http://msdn.microsoft.com/en-us/library/windows/desktop/ms725473(v=vs.85).aspx + * - http://msdn.microsoft.com/en-us/library/windows/core/browser/ms725473(v=vs.85).aspx */ /* include removed: duk_internal.h */ @@ -29735,7 +29735,7 @@ DUK_LOCAL void duk__set_systime_jan1970(SYSTEMTIME *st) { #ifdef DUK_USE_DATE_NOW_WINDOWS DUK_INTERNAL duk_double_t duk_bi_date_get_now_windows(duk_context *ctx) { /* Suggested step-by-step method from documentation of RtlTimeToSecondsSince1970: - * http://msdn.microsoft.com/en-us/library/windows/desktop/ms724928(v=vs.85).aspx + * http://msdn.microsoft.com/en-us/library/windows/core/browser/ms724928(v=vs.85).aspx */ SYSTEMTIME st1, st2; ULARGE_INTEGER tmp1, tmp2; @@ -29772,7 +29772,7 @@ DUK_INTERNAL_DECL duk_int_t duk_bi_date_get_local_tzoffset_windows(duk_double_t */ /* Use the approach described in "Remarks" of FileTimeToLocalFileTime: - * http://msdn.microsoft.com/en-us/library/windows/desktop/ms724277(v=vs.85).aspx + * http://msdn.microsoft.com/en-us/library/windows/core/browser/ms724277(v=vs.85).aspx */ duk__set_systime_jan1970(&st1); diff --git a/core/javascript/jsapi/comment.bnd b/core/javascript/jsapi/comment.bnd index 580f5cbed..ee1878698 100644 --- a/core/javascript/jsapi/comment.bnd +++ b/core/javascript/jsapi/comment.bnd @@ -22,7 +22,7 @@ preamble %{ #include "utils/config.h" #include "utils/log.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "javascript/jsapi.h" #include "comment.h" diff --git a/core/javascript/jsapi/htmlcollection.bnd b/core/javascript/jsapi/htmlcollection.bnd index 38e14ed1d..1f72253aa 100644 --- a/core/javascript/jsapi/htmlcollection.bnd +++ b/core/javascript/jsapi/htmlcollection.bnd @@ -24,7 +24,7 @@ preamble %{ #include "utils/config.h" #include "utils/log.h" #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "htmlelement.h" #include "htmlcollection.h" diff --git a/core/javascript/jsapi/htmldocument.bnd b/core/javascript/jsapi/htmldocument.bnd index 705f56d85..a16d7bec9 100644 --- a/core/javascript/jsapi/htmldocument.bnd +++ b/core/javascript/jsapi/htmldocument.bnd @@ -26,7 +26,7 @@ preamble %{ #include "content/urldb.h" #include "javascript/js.h" #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "htmldocument.h" #include "htmlelement.h" diff --git a/core/javascript/jsapi/htmlelement.bnd b/core/javascript/jsapi/htmlelement.bnd index 33b495195..427423c37 100644 --- a/core/javascript/jsapi/htmlelement.bnd +++ b/core/javascript/jsapi/htmlelement.bnd @@ -24,7 +24,7 @@ preamble %{ #include "utils/corestrings.h" #include "javascript/js.h" #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "htmlelement.h" #include "text.h" diff --git a/core/javascript/jsapi/jsapi.c b/core/javascript/jsapi/jsapi.c index 8724d9be8..26eec5d4d 100644 --- a/core/javascript/jsapi/jsapi.c +++ b/core/javascript/jsapi/jsapi.c @@ -20,7 +20,7 @@ #include <signal.h> #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "content/content.h" #include "javascript/content.h" #include "javascript/js.h" diff --git a/core/javascript/jsapi/location.bnd b/core/javascript/jsapi/location.bnd index f64f6330e..000c16789 100644 --- a/core/javascript/jsapi/location.bnd +++ b/core/javascript/jsapi/location.bnd @@ -17,12 +17,12 @@ hdrcomment " http://www.opensource.org/licenses/mit-license"; preamble %{ -#include "desktop/browser.h" +#include "core/browser/browser.h" #include "utils/config.h" #include "utils/log.h" #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "location.h" diff --git a/core/javascript/jsapi/navigator.bnd b/core/javascript/jsapi/navigator.bnd index dee2cc23f..b4bf7bca9 100644 --- a/core/javascript/jsapi/navigator.bnd +++ b/core/javascript/jsapi/navigator.bnd @@ -21,7 +21,7 @@ preamble %{ #include <assert.h> #include <stdlib.h> -#include "desktop/version.h" +#include "core/browser/version.h" #include "utils/config.h" #include "utils/nsoption.h" #include "utils/useragent.h" diff --git a/core/javascript/jsapi/nodelist.bnd b/core/javascript/jsapi/nodelist.bnd index 379809659..2061dd998 100644 --- a/core/javascript/jsapi/nodelist.bnd +++ b/core/javascript/jsapi/nodelist.bnd @@ -21,7 +21,7 @@ preamble %{ #include "utils/config.h" #include "utils/log.h" #include "javascript/jsapi.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "nodelist.h" #include "htmlelement.h" diff --git a/core/javascript/jsapi/text.bnd b/core/javascript/jsapi/text.bnd index eb17a943e..787a1d02f 100644 --- a/core/javascript/jsapi/text.bnd +++ b/core/javascript/jsapi/text.bnd @@ -22,7 +22,7 @@ preamble %{ #include "utils/config.h" #include "utils/log.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "javascript/jsapi.h" #include "text.h" diff --git a/core/javascript/jsapi/window.bnd b/core/javascript/jsapi/window.bnd index 0439bc0a1..5819aad22 100644 --- a/core/javascript/jsapi/window.bnd +++ b/core/javascript/jsapi/window.bnd @@ -25,7 +25,7 @@ preamble %{ #include "utils/config.h" #include "utils/log.h" #include "utils/corestrings.h" -#include "render/html_internal.h" +#include "core/html/html_internal.h" #include "javascript/jsapi.h" #include "console.h" diff --git a/core/widgets/Makefile b/core/widgets/Makefile new file mode 100644 index 000000000..f513072c6 --- /dev/null +++ b/core/widgets/Makefile @@ -0,0 +1,6 @@ +# Sources for widgets + +S_WIDGETS := cookie_manager.c global_history.c hotlist.c textarea.c tree.c \ + treeview.c + +S_WIDGETS := $(addprefix widgets/,$(S_WIDGETS)) diff --git a/core/desktop/cookie_manager.c b/core/widgets/cookie_manager.c index 6731e8edb..2e8c77ec8 100644 --- a/core/desktop/cookie_manager.c +++ b/core/widgets/cookie_manager.c @@ -29,8 +29,8 @@ #include "utils/log.h" #include "content/urldb.h" -#include "desktop/cookie_manager.h" -#include "desktop/treeview.h" +#include "core/widgets/cookie_manager.h" +#include "core/widgets/treeview.h" enum cookie_manager_field { COOKIE_M_NAME, diff --git a/core/desktop/cookie_manager.h b/core/widgets/cookie_manager.h index b7acfe9fc..003ecd2f3 100644 --- a/core/desktop/cookie_manager.h +++ b/core/widgets/cookie_manager.h @@ -26,8 +26,8 @@ #include <stdbool.h> #include <stdint.h> -#include "desktop/core_window.h" -#include "desktop/textinput.h" +#include "core/browser/core_window.h" +#include "core/browser/textinput.h" #include "utils/errors.h" struct redraw_context; diff --git a/core/desktop/global_history.c b/core/widgets/global_history.c index 9fa1d6de7..555b150d9 100644 --- a/core/desktop/global_history.c +++ b/core/widgets/global_history.c @@ -27,9 +27,9 @@ #include "utils/log.h" #include "content/urldb.h" -#include "desktop/global_history.h" -#include "desktop/treeview.h" -#include "desktop/browser.h" +#include "core/widgets/global_history.h" +#include "core/widgets/treeview.h" +#include "core/browser/browser.h" #define N_DAYS 28 #define N_SEC_PER_DAY (60 * 60 * 24) diff --git a/core/desktop/global_history.h b/core/widgets/global_history.h index bfbd13258..1271e5069 100644 --- a/core/desktop/global_history.h +++ b/core/widgets/global_history.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdint.h> -#include "desktop/core_window.h" -#include "desktop/textinput.h" +#include "core/browser/core_window.h" +#include "core/browser/textinput.h" #include "utils/errors.h" struct redraw_context; diff --git a/core/desktop/hotlist.c b/core/widgets/hotlist.c index e6e11e4ba..5dba8ec1e 100644 --- a/core/desktop/hotlist.c +++ b/core/widgets/hotlist.c @@ -26,9 +26,9 @@ #include <dom/bindings/hubbub/parser.h> #include "content/urldb.h" -#include "desktop/hotlist.h" -#include "desktop/treeview.h" -#include "desktop/browser.h" +#include "core/widgets/hotlist.h" +#include "core/widgets/treeview.h" +#include "core/browser/browser.h" #include "utils/corestrings.h" #include "utils/messages.h" #include "utils/utils.h" diff --git a/core/desktop/hotlist.h b/core/widgets/hotlist.h index 2733d589f..45b306c3a 100644 --- a/core/desktop/hotlist.h +++ b/core/widgets/hotlist.h @@ -22,8 +22,8 @@ #include <stdbool.h> #include <stdint.h> -#include "desktop/core_window.h" -#include "desktop/textinput.h" +#include "core/browser/core_window.h" +#include "core/browser/textinput.h" #include "utils/errors.h" struct redraw_context; diff --git a/core/desktop/textarea.c b/core/widgets/textarea.c index 9970bd6ab..27b5f60c2 100644 --- a/core/desktop/textarea.c +++ b/core/widgets/textarea.c @@ -31,15 +31,15 @@ #include "utils/utf8.h" #include "utils/utils.h" -#include "desktop/browser.h" -#include "desktop/mouse.h" -#include "desktop/textarea.h" -#include "desktop/textinput.h" -#include "desktop/plotters.h" -#include "desktop/scrollbar.h" -#include "desktop/font.h" -#include "desktop/gui_clipboard.h" -#include "desktop/gui_internal.h" +#include "core/browser/browser.h" +#include "core/browser/mouse.h" +#include "core/widgets/textarea.h" +#include "core/browser/textinput.h" +#include "core/browser/plotters.h" +#include "core/browser/scrollbar.h" +#include "core/browser/font.h" +#include "core/api/clipboard.h" +#include "core/browser/api_internal.h" #define CARET_COLOR 0x0000FF #define TA_ALLOC_STEP 512 diff --git a/core/desktop/textarea.h b/core/widgets/textarea.h index 66d5cbc5e..66d5cbc5e 100644 --- a/core/desktop/textarea.h +++ b/core/widgets/textarea.h diff --git a/core/desktop/tree.c b/core/widgets/tree.c index eac9201cf..25302b03b 100644 --- a/core/desktop/tree.c +++ b/core/widgets/tree.c @@ -35,8 +35,8 @@ #include "css/utils.h" #include "utils/nsoption.h" -#include "desktop/browser.h" -#include "desktop/tree.h" +#include "core/browser/browser.h" +#include "core/widgets/tree.h" struct tree { unsigned int flags; /* Tree flags */ @@ -45,11 +45,11 @@ struct tree { void *client_data; /* User assigned data for the callbacks */ }; -#include "desktop/treeview.h" -#include "desktop/hotlist.h" -#include "desktop/cookie_manager.h" -#include "desktop/global_history.h" -#include "desktop/sslcert_viewer.h" +#include "core/widgets/treeview.h" +#include "core/widgets/hotlist.h" +#include "core/widgets/cookie_manager.h" +#include "core/widgets/global_history.h" +#include "core/browser/sslcert_viewer.h" struct sslcert_session_data *ssl_current_session = NULL; const char *tree_hotlist_path = NULL; diff --git a/core/desktop/tree.h b/core/widgets/tree.h index b4e0f66b7..17bc81d1b 100644 --- a/core/desktop/tree.h +++ b/core/widgets/tree.h @@ -27,7 +27,7 @@ #include <stdbool.h> #include <stdint.h> -#include "desktop/mouse.h" +#include "core/browser/mouse.h" struct sslcert_session_data; struct tree; diff --git a/core/desktop/treeview.c b/core/widgets/treeview.c index 210c6f97e..2dc84d447 100644 --- a/core/desktop/treeview.c +++ b/core/widgets/treeview.c @@ -27,14 +27,14 @@ #include "image/bitmap.h" #include "content/hlcache.h" -#include "desktop/system_colour.h" -#include "desktop/knockout.h" -#include "desktop/plotters.h" -#include "desktop/textarea.h" -#include "desktop/treeview.h" -#include "desktop/font.h" -#include "desktop/gui_clipboard.h" -#include "desktop/gui_internal.h" +#include "core/browser/system_colour.h" +#include "core/browser/knockout.h" +#include "core/browser/plotters.h" +#include "core/widgets/textarea.h" +#include "core/widgets/treeview.h" +#include "core/browser/font.h" +#include "core/api/clipboard.h" +#include "core/browser/api_internal.h" /** @todo get rid of REDRAW_MAX -- need to be able to know window size */ #define REDRAW_MAX 8000 @@ -2942,7 +2942,7 @@ static bool treeview_set_move_indicator(treeview *tree, bool need_redraw, /** - * Callback for textarea_create, in desktop/treeview.h + * Callback for textarea_create, in core/widgets/treeview.h */ static void treeview_textarea_callback(void *data, struct textarea_msg *msg) { diff --git a/core/desktop/treeview.h b/core/widgets/treeview.h index d4d4ce9a7..5db7a307b 100644 --- a/core/desktop/treeview.h +++ b/core/widgets/treeview.h @@ -26,9 +26,9 @@ #include <stdbool.h> #include <stdint.h> -#include "desktop/mouse.h" -#include "desktop/core_window.h" -#include "desktop/textinput.h" +#include "core/browser/mouse.h" +#include "core/browser/core_window.h" +#include "core/browser/textinput.h" struct redraw_context; |