diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-10-30 14:23:38 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-10-30 14:23:38 +0000 |
commit | 835d033e7b0c37883c05ab0c66086d089ababd26 (patch) | |
tree | 8a305d608aec7b06768ef46b9116c111ae38ae1d /content | |
parent | 22c31c63492ed051faf7b313158b8466d4812ce1 (diff) | |
download | netsurf-835d033e7b0c37883c05ab0c66086d089ababd26.tar.gz netsurf-835d033e7b0c37883c05ab0c66086d089ababd26.tar.bz2 |
Amiga icon loader. Treeviews will now use the user's icons for content types.
svn path=/trunk/netsurf/; revision=10925
Diffstat (limited to 'content')
-rw-r--r-- | content/content.c | 14 | ||||
-rw-r--r-- | content/content_protected.h | 6 | ||||
-rw-r--r-- | content/content_type.h | 3 |
3 files changed, 23 insertions, 0 deletions
diff --git a/content/content.c b/content/content.c index 9a8336287..36b39b3ca 100644 --- a/content/content.c +++ b/content/content.c @@ -80,6 +80,9 @@ #ifdef WITH_WEBP #include "image/webp.h" #endif +#ifdef WITH_AMIGA_ICON +#include "amiga/icon.h" +#endif #include "utils/http.h" #include "utils/log.h" #include "utils/messages.h" @@ -159,6 +162,9 @@ static const struct mime_entry mime_map[] = { #ifdef WITH_WEBP {"image/webp", CONTENT_WEBP}, #endif +#ifdef WITH_AMIGA_ICON + {"image/x-amiga-icon", CONTENT_AMIGA_ICON}, +#endif #ifdef WITH_ARTWORKS {"image/x-artworks", CONTENT_ARTWORKS}, #endif @@ -240,6 +246,9 @@ const char * const content_type_name[] = { #ifdef WITH_WEBP "WEBP", #endif +#ifdef WITH_AMIGA_ICON + "AMIGA_ICON", +#endif "OTHER", "UNKNOWN" }; @@ -374,6 +383,11 @@ static const struct handler_entry handler_map[] = { 0, webp_destroy, 0, 0, 0, webp_redraw, 0, 0, 0, webp_clone, false}, #endif +#ifdef WITH_WEBP + {0, 0, amiga_icon_convert, + 0, amiga_icon_destroy, 0, 0, 0, amiga_icon_redraw, 0, + 0, 0, amiga_icon_clone, false}, +#endif {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false} }; #define HANDLER_MAP_COUNT (sizeof(handler_map) / sizeof(handler_map[0])) diff --git a/content/content_protected.h b/content/content_protected.h index 6d8d50dc7..9541eb428 100644 --- a/content/content_protected.h +++ b/content/content_protected.h @@ -78,6 +78,9 @@ #ifdef WITH_WEBP #include "image/webp.h" #endif +#ifdef WITH_AMIGA_ICON +#include "amiga/icon.h" +#endif struct bitmap; @@ -153,6 +156,9 @@ struct content { #ifdef WITH_WEBP struct content_webp_data webp; #endif +#ifdef WITH_AMIGA_ICON + struct content_amiga_icon_data amiga_icon; +#endif } data; /**< URL for refresh request, in standard form as from url_join. */ diff --git a/content/content_type.h b/content/content_type.h index bcb2cc170..9703c5616 100644 --- a/content/content_type.h +++ b/content/content_type.h @@ -71,6 +71,9 @@ typedef enum { #ifdef WITH_WEBP CONTENT_WEBP, #endif +#ifdef WITH_AMIGA_ICON + CONTENT_AMIGA_ICON, +#endif /* these must be the last two */ CONTENT_OTHER, CONTENT_UNKNOWN /**< content-type not received yet */ |