diff options
author | Vincent Sanders <vince@kyllikki.org> | 2016-06-06 08:59:23 +0100 |
---|---|---|
committer | Vincent Sanders <vince@kyllikki.org> | 2016-06-06 09:01:38 +0100 |
commit | 76a68d7dd02f3819e4e60cd9febfd45e20821e14 (patch) | |
tree | a86fc61314fd53d383cb95a313a2897779984214 /frontends/amiga | |
parent | d923e109cd56c553c8e87cdb8bdab5085e68cc73 (diff) | |
download | netsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.gz netsurf-76a68d7dd02f3819e4e60cd9febfd45e20821e14.tar.bz2 |
Update content to split public and internal API
Diffstat (limited to 'frontends/amiga')
-rw-r--r-- | frontends/amiga/arexx.c | 4 | ||||
-rw-r--r-- | frontends/amiga/bitmap.c | 5 | ||||
-rw-r--r-- | frontends/amiga/clipboard.c | 2 | ||||
-rw-r--r-- | frontends/amiga/ctxmenu.c | 4 | ||||
-rw-r--r-- | frontends/amiga/download.c | 4 | ||||
-rw-r--r-- | frontends/amiga/drag.c | 4 | ||||
-rw-r--r-- | frontends/amiga/dt_anim.c | 4 | ||||
-rw-r--r-- | frontends/amiga/dt_picture.c | 3 | ||||
-rw-r--r-- | frontends/amiga/dt_sound.c | 20 | ||||
-rw-r--r-- | frontends/amiga/file.c | 6 | ||||
-rw-r--r-- | frontends/amiga/filetype.c | 15 | ||||
-rw-r--r-- | frontends/amiga/filetype.h | 6 | ||||
-rw-r--r-- | frontends/amiga/gui.c | 29 | ||||
-rwxr-xr-x | frontends/amiga/gui_options.c | 1 | ||||
-rw-r--r-- | frontends/amiga/icon.c | 5 | ||||
-rw-r--r-- | frontends/amiga/iff_dr2d.c | 3 | ||||
-rw-r--r-- | frontends/amiga/menu.c | 6 | ||||
-rw-r--r-- | frontends/amiga/plugin_hack.c | 17 | ||||
-rw-r--r-- | frontends/amiga/print.c | 7 | ||||
-rw-r--r-- | frontends/amiga/tree.c | 4 |
20 files changed, 82 insertions, 67 deletions
diff --git a/frontends/amiga/arexx.c b/frontends/amiga/arexx.c index 6f2ca0c1b..14c0ad770 100644 --- a/frontends/amiga/arexx.c +++ b/frontends/amiga/arexx.c @@ -32,7 +32,7 @@ #include "utils/log.h" #include "utils/nsoption.h" #include "utils/nsurl.h" -#include "content/hlcache.h" +#include "netsurf/content.h" #include "netsurf/browser_window.h" #include "desktop/version.h" @@ -331,7 +331,7 @@ STATIC VOID rx_save(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu if((fh = FOpen((char *)cmd->ac_ArgList[0], MODE_NEWFILE, 0))) { - hlcache_handle *h = browser_window_get_content(gw->bw); + struct hlcache_handle *h = browser_window_get_content(gw->bw); if((source_data = content_get_source_data(h, &source_size))) FWrite(fh, source_data, 1, source_size); diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 8d1815298..badd37438 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -19,6 +19,7 @@ #include "amiga/os3support.h" #include <stdlib.h> +#include <string.h> #include <proto/exec.h> #ifdef __amigaos4__ #include <graphics/blitattr.h> @@ -46,8 +47,8 @@ #include "utils/nsoption.h" #include "utils/nsurl.h" #include "utils/messages.h" -#include "content/hlcache.h" #include "netsurf/bitmap.h" +#include "netsurf/content.h" #include "amiga/gui.h" #include "amiga/bitmap.h" @@ -596,7 +597,7 @@ void ami_bitmap_fini(void) pool_bitmap = NULL; } -static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content) +static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *content) { #ifdef __amigaos4__ struct redraw_context ctx = { diff --git a/frontends/amiga/clipboard.c b/frontends/amiga/clipboard.c index 3a96456c6..1b87f5b57 100644 --- a/frontends/amiga/clipboard.c +++ b/frontends/amiga/clipboard.c @@ -30,7 +30,7 @@ #include "utils/nsoption.h" #include "utils/utf8.h" #include "utils/nsurl.h" -#include "content/hlcache.h" +#include "netsurf/content.h" #include "netsurf/browser_window.h" #include "netsurf/plotters.h" #include "desktop/textinput.h" diff --git a/frontends/amiga/ctxmenu.c b/frontends/amiga/ctxmenu.c index f9c873cff..a68819298 100644 --- a/frontends/amiga/ctxmenu.c +++ b/frontends/amiga/ctxmenu.c @@ -40,10 +40,10 @@ #include "utils/messages.h" #include "utils/nsoption.h" #include "utils/nsurl.h" -#include "content/hlcache.h" +#include "netsurf/content.h" #include "netsurf/browser_window.h" -#include "desktop/browser_history.h" #include "netsurf/mouse.h" +#include "desktop/browser_history.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" diff --git a/frontends/amiga/download.c b/frontends/amiga/download.c index b9fecf362..93536f494 100644 --- a/frontends/amiga/download.c +++ b/frontends/amiga/download.c @@ -48,13 +48,13 @@ #include "utils/utils.h" #include "utils/nsoption.h" #include "utils/string.h" -#include "desktop/download.h" -#include "desktop/save_complete.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "netsurf/window.h" #include "netsurf/download.h" #include "content/handlers/image/ico.h" +#include "desktop/download.h" +#include "desktop/save_complete.h" #include "amiga/gui.h" #include "amiga/download.h" diff --git a/frontends/amiga/drag.c b/frontends/amiga/drag.c index b653be815..92617dd13 100644 --- a/frontends/amiga/drag.c +++ b/frontends/amiga/drag.c @@ -34,8 +34,8 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" -#include "content/hlcache.h" #include "netsurf/mouse.h" +#include "netsurf/content.h" #include "amiga/bitmap.h" #include "amiga/clipboard.h" @@ -178,7 +178,7 @@ void ami_drag_save(struct Window *win) case GUI_SAVE_OBJECT_NATIVE: { - hlcache_handle *c = drag_save_data; + struct hlcache_handle *c = drag_save_data; AddPart(path, content_get_title(c), 1024); ami_file_save(AMINS_SAVE_IFF, path, win, c, NULL, NULL); diff --git a/frontends/amiga/dt_anim.c b/frontends/amiga/dt_anim.c index 04f1ce27d..19467882a 100644 --- a/frontends/amiga/dt_anim.c +++ b/frontends/amiga/dt_anim.c @@ -37,9 +37,11 @@ #include "utils/log.h" #include "utils/messages.h" -#include "content/content_protected.h" #include "netsurf/plotters.h" #include "netsurf/bitmap.h" +#include "netsurf/content.h" +#include "content/content_protected.h" +#include "content/llcache.h" #include "amiga/bitmap.h" #include "amiga/filetype.h" diff --git a/frontends/amiga/dt_picture.c b/frontends/amiga/dt_picture.c index 49dde5e67..e7f1c9724 100644 --- a/frontends/amiga/dt_picture.c +++ b/frontends/amiga/dt_picture.c @@ -33,9 +33,10 @@ #include "utils/log.h" #include "utils/messages.h" -#include "content/content_protected.h" #include "netsurf/plotters.h" #include "netsurf/bitmap.h" +#include "content/llcache.h" +#include "content/content_protected.h" #include "content/handlers/image/image_cache.h" #include "amiga/bitmap.h" diff --git a/frontends/amiga/dt_sound.c b/frontends/amiga/dt_sound.c index 04486c1fb..55fc60d61 100644 --- a/frontends/amiga/dt_sound.c +++ b/frontends/amiga/dt_sound.c @@ -23,20 +23,24 @@ #ifdef WITH_AMIGA_DATATYPES #include "amiga/os3support.h" -#include "amiga/filetype.h" -#include "amiga/datatypes.h" -#include "content/content_protected.h" -#include "netsurf/plotters.h" -#include "render/box.h" -#include "utils/log.h" -#include "utils/messages.h" - #include <proto/datatypes.h> #include <proto/dos.h> #include <proto/intuition.h> #include <datatypes/soundclass.h> #include <intuition/classusr.h> +#include "utils/log.h" +#include "utils/messages.h" +#include "netsurf/plotters.h" +#include "netsurf/content.h" +#include "render/box.h" +#include "content/llcache.h" +#include "content/content_protected.h" + +#include "amiga/filetype.h" +#include "amiga/datatypes.h" + + typedef struct amiga_dt_sound_content { struct content base; diff --git a/frontends/amiga/file.c b/frontends/amiga/file.c index 595a981f9..1bba30eb3 100644 --- a/frontends/amiga/file.c +++ b/frontends/amiga/file.c @@ -26,14 +26,12 @@ #include "utils/nsoption.h" #include "utils/file.h" #include "utils/messages.h" -#include "content/hlcache.h" -#include "content/content.h" -#include "content/fetch.h" +#include "utils/nsurl.h" #include "netsurf/browser_window.h" +#include "netsurf/content.h" #include "desktop/save_complete.h" #include "desktop/save_pdf.h" #include "desktop/save_text.h" -#include "netsurf/window.h" #include "amiga/gui.h" #include "amiga/bitmap.h" diff --git a/frontends/amiga/filetype.c b/frontends/amiga/filetype.c index d598f530c..05f130e66 100644 --- a/frontends/amiga/filetype.c +++ b/frontends/amiga/filetype.c @@ -20,19 +20,20 @@ #include <stdlib.h> #include <string.h> -#include "amiga/filetype.h" -#include "amiga/misc.h" -#include "amiga/object.h" -#include "content/fetch.h" -#include "content/content.h" -#include "utils/log.h" -#include "utils/utils.h" #include <proto/icon.h> #include <proto/dos.h> #include <proto/datatypes.h> #include <proto/exec.h> #include <workbench/icon.h> +#include "netsurf/content.h" +#include "utils/log.h" +#include "utils/utils.h" + +#include "amiga/filetype.h" +#include "amiga/misc.h" +#include "amiga/object.h" + /** * filetype -- determine the MIME type of a local file */ diff --git a/frontends/amiga/filetype.h b/frontends/amiga/filetype.h index fc27b1df2..52fdf9cb5 100644 --- a/frontends/amiga/filetype.h +++ b/frontends/amiga/filetype.h @@ -18,12 +18,14 @@ #ifndef AMIGA_FILETYPE_H #define AMIGA_FILETYPE_H + #include <stdbool.h> #include <libwapcaplet/libwapcaplet.h> -#include "content/content_type.h" -#include "utils/errors.h" #include <datatypes/datatypes.h> +#include "netsurf/content_type.h" +#include "utils/errors.h" + struct hlcache_handle; struct ami_mime_entry; diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index f285d9669..9bd1cd4d0 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -86,6 +86,7 @@ /* newlib includes */ #include <math.h> #include <string.h> +#include <stdlib.h> /* NetSurf core includes */ #include "utils/log.h" @@ -95,26 +96,24 @@ #include "utils/utils.h" #include "utils/nsurl.h" #include "utils/file.h" -#include "content/hlcache.h" +#include "netsurf/window.h" +#include "netsurf/fetch.h" +#include "netsurf/misc.h" +#include "netsurf/mouse.h" +#include "netsurf/netsurf.h" +#include "netsurf/content.h" +#include "netsurf/browser_window.h" #include "content/backing_store.h" #include "content/fetchers.h" -#include "content/fetchers/resource.h" #include "content/urldb.h" -#include "content/handlers/image/ico.h" #include "desktop/browser_history.h" -#include "netsurf/browser_window.h" #include "desktop/hotlist.h" -#include "netsurf/mouse.h" -#include "netsurf/netsurf.h" #include "desktop/version.h" #include "desktop/save_complete.h" #include "desktop/scrollbar.h" #include "desktop/searchweb.h" #include "desktop/textinput.h" #include "desktop/tree.h" -#include "netsurf/window.h" -#include "netsurf/fetch.h" -#include "netsurf/misc.h" /* NetSurf Amiga platform includes */ #include "amiga/gui.h" @@ -848,12 +847,14 @@ static struct RDArgs *ami_gui_commandline(int *argc, char **argv, int *nargc, ch if((args = ReadArgs(template, rarray, NULL))) { if(rarray[A_URL]) { - LOG("URL %s specified on command line", rarray[A_URL]); + LOG("URL %s specified on command line", + (char *)rarray[A_URL]); temp_homepage_url = ami_to_utf8_easy((char *)rarray[A_URL]); } if(rarray[A_USERSDIR]) { - LOG("USERSDIR %s specified on command line", rarray[A_USERSDIR]); + LOG("USERSDIR %s specified on command line", + (char *)rarray[A_USERSDIR]); users_dir = ASPrintf("%s", rarray[A_USERSDIR]); } @@ -1751,7 +1752,7 @@ static void ami_gui_scroller_update(struct gui_window_2 *gwin) /** * function to add retrieved favicon to gui */ -static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) +static void gui_window_set_icon(struct gui_window *g, struct hlcache_handle *icon) { struct BitMap *bm = NULL; struct IBox *bbox; @@ -5216,7 +5217,7 @@ static void gui_window_remove_caret(struct gui_window *g) static void gui_window_new_content(struct gui_window *g) { - hlcache_handle *c; + struct hlcache_handle *c; if(g && g->shared && g->bw && browser_window_has_content(g->bw)) c = browser_window_get_content(g->bw); @@ -5399,7 +5400,7 @@ void ami_gui_splash_close(Object *win_obj) DisposeObject(win_obj); } -static void gui_file_gadget_open(struct gui_window *g, hlcache_handle *hl, +static void gui_file_gadget_open(struct gui_window *g, struct hlcache_handle *hl, struct form_control *gadget) { LOG("File open dialog request for %p/%p", g, gadget); diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c index 340af4b27..4e6914c6a 100755 --- a/frontends/amiga/gui_options.c +++ b/frontends/amiga/gui_options.c @@ -78,6 +78,7 @@ #include "amiga/selectmenu.h" #include "amiga/theme.h" #include "amiga/utf8.h" +#include "amiga/plotters.h" enum { diff --git a/frontends/amiga/icon.c b/frontends/amiga/icon.c index f19797676..9e441d8d7 100644 --- a/frontends/amiga/icon.c +++ b/frontends/amiga/icon.c @@ -43,6 +43,7 @@ #include "utils/file.h" #include "netsurf/plotters.h" #include "netsurf/bitmap.h" +#include "netsurf/content.h" #include "content/content_protected.h" #include "amiga/os3support.h" @@ -66,7 +67,7 @@ typedef struct amiga_icon_content { static nserror amiga_icon_create(const content_handler *handler, lwc_string *imime_type, const struct http_parameter *params, - llcache_handle *llcache, const char *fallback_charset, + struct llcache_handle *llcache, const char *fallback_charset, bool quirks, struct content **c); static bool amiga_icon_convert(struct content *c); static void amiga_icon_destroy(struct content *c); @@ -104,7 +105,7 @@ CONTENT_FACTORY_REGISTER_TYPES(amiga_icon, amiga_icon_types, nserror amiga_icon_create(const content_handler *handler, lwc_string *imime_type, const struct http_parameter *params, - llcache_handle *llcache, const char *fallback_charset, + struct llcache_handle *llcache, const char *fallback_charset, bool quirks, struct content **c) { amiga_icon_content *ai_content; diff --git a/frontends/amiga/iff_dr2d.c b/frontends/amiga/iff_dr2d.c index d4e3b220c..966d2a6e3 100644 --- a/frontends/amiga/iff_dr2d.c +++ b/frontends/amiga/iff_dr2d.c @@ -26,10 +26,11 @@ #include <proto/dos.h> #ifndef AMIGA_DR2D_STANDALONE +#include "utils/nsurl.h" +#include "netsurf/content.h" #include "amiga/os3support.h" #include "amiga/iff_dr2d.h" #include "amiga/misc.h" -#include "content/hlcache.h" #else #include "os3support.h" #include "iff_dr2d.h" diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c index e1017cd1f..636951ea3 100644 --- a/frontends/amiga/menu.c +++ b/frontends/amiga/menu.c @@ -47,11 +47,11 @@ #include "utils/log.h" #include "utils/utils.h" #include "utils/nsurl.h" -#include "content/hlcache.h" -#include "desktop/hotlist.h" #include "netsurf/browser_window.h" #include "netsurf/mouse.h" #include "netsurf/window.h" +#include "netsurf/content.h" +#include "desktop/hotlist.h" #include "desktop/textinput.h" #include "desktop/version.h" @@ -1076,7 +1076,7 @@ void ami_menu_update_checked(struct gui_window_2 *gwin) ResetMenuStrip(gwin->win, menustrip); } -void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c) +void ami_menu_update_disabled(struct gui_window *g, struct hlcache_handle *c) { struct Window *win = g->shared->win; diff --git a/frontends/amiga/plugin_hack.c b/frontends/amiga/plugin_hack.c index 19fa66cd5..7fe78b9b0 100644 --- a/frontends/amiga/plugin_hack.c +++ b/frontends/amiga/plugin_hack.c @@ -23,19 +23,20 @@ #include "amiga/os3support.h" #include <stdlib.h> +#include <proto/dos.h> +#include <proto/exec.h> +#include <proto/intuition.h> +#include <proto/utility.h> +#include "utils/log.h" +#include "utils/messages.h" +#include "netsurf/plotters.h" +#include "netsurf/content.h" #include "amiga/filetype.h" #include "amiga/plugin_hack.h" #include "content/content_protected.h" -#include "content/hlcache.h" -#include "netsurf/plotters.h" -#include "utils/log.h" -#include "utils/messages.h" +#include "content/llcache.h" -#include <proto/dos.h> -#include <proto/exec.h> -#include <proto/intuition.h> -#include <proto/utility.h> typedef struct amiga_plugin_hack_content { struct content base; diff --git a/frontends/amiga/print.c b/frontends/amiga/print.c index 007245c73..56d25703e 100644 --- a/frontends/amiga/print.c +++ b/frontends/amiga/print.c @@ -49,13 +49,14 @@ #include "utils/nsoption.h" #include "utils/messages.h" #include "utils/utils.h" +#include "utils/nsurl.h" #include "netsurf/plotters.h" -#include "desktop/printer.h" -#include "desktop/print.h" #include "netsurf/layout.h" #include "netsurf/mouse.h" #include "netsurf/window.h" -#include "content/hlcache.h" +#include "netsurf/content.h" +#include "desktop/printer.h" +#include "desktop/print.h" #include "amiga/plotters.h" #include "amiga/font.h" diff --git a/frontends/amiga/tree.c b/frontends/amiga/tree.c index 7f7140c3a..7a6f8b3b5 100644 --- a/frontends/amiga/tree.c +++ b/frontends/amiga/tree.c @@ -53,13 +53,13 @@ #include "utils/nsoption.h" #include "utils/utils.h" #include "utils/messages.h" +#include "netsurf/browser_window.h" +#include "netsurf/window.h" #include "content/urldb.h" #include "content/llcache.h" -#include "netsurf/browser_window.h" #include "desktop/cookie_manager.h" #include "desktop/global_history.h" #include "desktop/hotlist.h" -#include "netsurf/window.h" #include "desktop/sslcert_viewer.h" #include "amiga/gui.h" |