From 835d033e7b0c37883c05ab0c66086d089ababd26 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 30 Oct 2010 14:23:38 +0000 Subject: Amiga icon loader. Treeviews will now use the user's icons for content types. svn path=/trunk/netsurf/; revision=10925 --- Makefile.defaults | 4 + amiga/Makefile.target | 3 +- amiga/filetype.c | 38 +++++++--- amiga/gui.c | 6 +- amiga/icon.c | 177 ++++++++++++++++++++++++++++++++++++++++++++ amiga/icon.h | 47 ++++++++++++ amiga/tree.c | 38 +--------- content/content.c | 14 ++++ content/content_protected.h | 6 ++ content/content_type.h | 3 + desktop/tree_url_node.c | 3 + render/box.c | 3 + render/box_construct.c | 3 + 13 files changed, 295 insertions(+), 50 deletions(-) create mode 100644 amiga/icon.c create mode 100644 amiga/icon.h diff --git a/Makefile.defaults b/Makefile.defaults index 29e5c22a0..188f4f10f 100644 --- a/Makefile.defaults +++ b/Makefile.defaults @@ -209,6 +209,10 @@ ifeq ($(TARGET),amiga) # Valid options: YES, NO NETSURF_USE_WEBP := YES + # Enable NetSurf to display Amiga icons + # Valid options: YES, NO (recommended) + NETSURF_USE_AMIGA_ICON := YES + # Enable NetSurf's use of libsvgtiny for displaying SVGs # (NB: Requires NETSURF_AMIGA_USE_CAIRO) # Valid options: YES, NO diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 76477a475..45908725e 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -17,6 +17,7 @@ $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) )) $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) $(eval $(call feature_enabled,MNG,,-llcms -ljpeg,PNG/JNG/MNG (libmng))) $(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp -lvpx,WebP (libwebp))) +$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon )) CFLAGS += -D__USE_INLINE__ -std=c99 -I . -I /SDK/local/common/include/libpng12 -Dnsamiga LDFLAGS += -lxml2 -lcurl -lpthread -lregex -lauto @@ -38,7 +39,7 @@ S_AMIGA := compat.c gui.c tree.c history.c hotlist.c schedule.c \ plotters.c object.c menu.c save_pdf.c arexx.c version.c \ cookies.c context_menu.c clipboard.c save_complete.c \ fetch_mailto.c search.c history_local.c download.c iff_dr2d.c \ - sslcert.c gui_options.c print.c theme.c drag.c \ + sslcert.c gui_options.c print.c theme.c drag.c icon.c \ stringview/stringview.c stringview/urlhistory.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) diff --git a/amiga/filetype.c b/amiga/filetype.c index 790a2404a..68ccca0bc 100644 --- a/amiga/filetype.c +++ b/amiga/filetype.c @@ -41,20 +41,33 @@ const char *fetch_filetype(const char *unix_path) struct DataType *dtn; BOOL found = FALSE; - /* First try getting a tooltype "MIMETYPE" and use that as the MIME type. Will fail over - to default icons if the file doesn't have a real icon. */ + /* First, check if we appear to have an icon. + We'll just do a filename check here for quickness, although the + first word ought to be checked against WB_DISKMAGIC really. */ - if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE, - TAG_DONE)) + if(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) { - ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE"); - if(ttype) + strcpy(mimetype,"image/x-amiga-icon"); + found = TRUE; + } + + /* Secondly try getting a tooltype "MIMETYPE" and use that as the MIME type. + Will fail over to default icons if the file doesn't have a real icon. */ + + if(!found) + { + if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE, + TAG_DONE)) { - strcpy(mimetype,ttype); - found = TRUE; - } + ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE"); + if(ttype) + { + strcpy(mimetype,ttype); + found = TRUE; + } - FreeDiskObject(dobj); + FreeDiskObject(dobj); + } } /* If that didn't work, have a go at guessing it using datatypes.library. This isn't @@ -190,6 +203,11 @@ const char *ami_content_type_to_file_type(content_type type) case CONTENT_SVG: return "svg"; break; +#endif +#ifdef WITH_WEBP + case CONTENT_WEBP: + return "webp"; + break; #endif default: return "project"; diff --git a/amiga/gui.c b/amiga/gui.c index d0e88e905..0d13a2145 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -144,8 +144,8 @@ BOOL screen_closed = FALSE; struct MsgPort *applibport = NULL; ULONG applibsig = 0; -const char tree_directory_icon_name[100]; -const char tree_content_icon_name[100]; +const char tree_directory_icon_name[] = "def_drawer.info"; +const char tree_content_icon_name[] = "def_project.info"; extern colour scroll_widget_fg_colour; extern colour scroll_widget_bg_colour; extern colour scroll_widget_arrow_colour; @@ -565,8 +565,6 @@ static void gui_init2(int argc, char** argv) glob = &browserglob; /**/ - ami_get_theme_filename(&tree_directory_icon_name,"theme_list_folder",true); - ami_get_theme_filename(&tree_content_icon_name,"theme_list_content",true); ami_hotlist_initialise(option_hotlist_file); ami_cookies_initialise(); ami_global_history_initialise(); diff --git a/amiga/icon.c b/amiga/icon.c new file mode 100644 index 000000000..5c0395f4b --- /dev/null +++ b/amiga/icon.c @@ -0,0 +1,177 @@ + /* + * Copyright 2010 Chris Young + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Content for image/x-amiga-icon (icon.library implementation). + * + */ + +#include "utils/config.h" +#ifdef WITH_AMIGA_ICON + +#include +#include +#include + +#include + +#include + +#include "desktop/plotters.h" +#include "image/bitmap.h" +#include "content/content_protected.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/utils.h" +#include "utils/url.h" + +/** + * Convert a CONTENT_AMIGA_ICON for display. + * + * No conversion is necessary. We merely read the icon dimensions. + */ + +bool amiga_icon_convert(struct content *c) +{ + union content_msg_data msg_data; + struct DiskObject *dobj; + ULONG *imagebuf; + unsigned char *imagebufptr = NULL; + ULONG size; + int width = 0, height = 0; + long format = 0; + int err = 0; + uint8 r, g, b, a; + ULONG offset; + char *url; + char *filename; + char *p; + + url = content__get_url(c); + filename = url_to_path(url); + + /* This loader will only work on local files, so fail if not a local path */ + if(filename == NULL) + { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + return false; + } + + p = strstr(filename, ".info"); + *p = '\0'; + + dobj = GetIconTagList(filename, NULL); + + if(dobj == NULL) + { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + return false; + } + + err = IconControl(dobj, + ICONCTRLA_GetImageDataFormat,&format, + ICONCTRLA_GetWidth,&width, + ICONCTRLA_GetHeight,&height, + TAG_DONE); + + /* Check icon is direct mapped (truecolour). + We need additional code to handle ColourIcons and planar icons */ + if(format != IDFMT_DIRECTMAPPED) return false; + + c->bitmap = bitmap_create(width, height, BITMAP_NEW); + if (!c->bitmap) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + return false; + } + imagebuf = bitmap_get_buffer(c->bitmap); + if (!imagebuf) { + msg_data.error = messages_get("NoMemory"); + content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + return false; + } + + err = IconControl(dobj, + ICONCTRLA_GetImageData1, &imagebufptr, + TAG_DONE); + + /* Decoded data is ARGB, so ensure correct byte order */ + + size = width * height * 4; + + for (offset = 0; offset < size; offset += 4) { + b = imagebufptr[offset+3]; + g = imagebufptr[offset+2]; + r = imagebufptr[offset+1]; + a = imagebufptr[offset]; + + *imagebuf = r << 24 | g << 16 | b << 8 | a; + imagebuf++; + } + + c->width = width; + c->height = height; + + bitmap_modified(c->bitmap); + c->status = CONTENT_STATUS_DONE; + + content_set_status(c, ""); + return true; +} + + +/** + * Destroy a CONTENT_AMIGA_ICON and free all resources it owns. + */ + +void amiga_icon_destroy(struct content *c) +{ + if (c->bitmap != NULL) + bitmap_destroy(c->bitmap); +} + + +/** + * Redraw a CONTENT_AMIGA_ICON. + */ + +bool amiga_icon_redraw(struct content *c, int x, int y, + int width, int height, + int clip_x0, int clip_y0, int clip_x1, int clip_y1, + float scale, colour background_colour) +{ + return plot.bitmap(x, y, width, height, + c->bitmap, background_colour, BITMAPF_NONE); +} + + +bool amiga_icon_clone(const struct content *old, struct content *new_content) +{ + /* Simply replay convert */ + if (old->status == CONTENT_STATUS_READY || + old->status == CONTENT_STATUS_DONE) { + if (webp_convert(new_content) == false) + return false; + } + + return true; +} + +#endif diff --git a/amiga/icon.h b/amiga/icon.h new file mode 100644 index 000000000..73fb9776e --- /dev/null +++ b/amiga/icon.h @@ -0,0 +1,47 @@ +/* + * Copyright 2010 Chris Young + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** \file + * Content for image/x-amiga-icon (icon.library interface). + */ + +#ifndef AMIGA_ICON_H +#define AMIGA_ICON_H + +#include "utils/config.h" +#ifdef WITH_AMIGA_ICON + +#include + +struct content; + +struct content_amiga_icon_data { +/* empty */ +}; + +bool amiga_icon_convert(struct content *c); +void amiga_icon_destroy(struct content *c); +bool amiga_icon_redraw(struct content *c, int x, int y, + int width, int height, + int clip_x0, int clip_y0, int clip_x1, int clip_y1, + float scale, colour background_colour); +bool amiga_icon_clone(const struct content *old, struct content *new_content); + +#endif /* WITH_AMIGA_ICON */ + +#endif diff --git a/amiga/tree.c b/amiga/tree.c index a72de8d1f..a7f86035a 100755 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -52,6 +52,7 @@ #include "amiga/sslcert.h" #include "amiga/drag.h" /* drag icon stuff */ #include "amiga/theme.h" /* pointers */ +#include "amiga/filetype.h" #include "utils/utils.h" #define AMI_TREE_MENU_ITEMS 19 @@ -174,41 +175,8 @@ void ami_tree_get_window_dimensions(int *width, int *height, void *data) */ void tree_icon_name_from_content_type(char *buffer, content_type type) { - // TODO: design/acquire icons - switch (type) { - case CONTENT_HTML: - case CONTENT_TEXTPLAIN: - case CONTENT_CSS: -#if defined(WITH_MNG) || defined(WITH_PNG) - case CONTENT_PNG: -#endif -#ifdef WITH_MNG - case CONTENT_JNG: - case CONTENT_MNG: -#endif -#ifdef WITH_JPEG - case CONTENT_JPEG: -#endif -#ifdef WITH_GIF - case CONTENT_GIF: -#endif -#ifdef WITH_BMP - case CONTENT_BMP: - case CONTENT_ICO: -#endif -#ifdef WITH_NSSPRITE - case CONTENT_SPRITE: -#endif -#ifdef WITH_NS_SVG - case CONTENT_SVG: -#endif -#ifdef WITH_WEBP - case CONTENT_WEBP: -#endif - default: - ami_get_theme_filename(buffer,"theme_list_content",true); - break; - } + const char *ftype = ami_content_type_to_file_type(type); + sprintf(buffer, "def_%s.info", ftype); } /** 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 @@ -239,6 +245,9 @@ const char * const content_type_name[] = { #endif #ifdef WITH_WEBP "WEBP", +#endif +#ifdef WITH_AMIGA_ICON + "AMIGA_ICON", #endif "OTHER", "UNKNOWN" @@ -373,6 +382,11 @@ static const struct handler_entry handler_map[] = { {0, 0, webp_convert, 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} }; 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; @@ -152,6 +155,9 @@ struct content { #endif #ifdef WITH_WEBP struct content_webp_data webp; +#endif +#ifdef WITH_AMIGA_ICON + struct content_amiga_icon_data amiga_icon; #endif } data; 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 @@ -70,6 +70,9 @@ typedef enum { #endif #ifdef WITH_WEBP CONTENT_WEBP, +#endif +#ifdef WITH_AMIGA_ICON + CONTENT_AMIGA_ICON, #endif /* these must be the last two */ CONTENT_OTHER, diff --git a/desktop/tree_url_node.c b/desktop/tree_url_node.c index f70d6ed05..f89d5c045 100644 --- a/desktop/tree_url_node.c +++ b/desktop/tree_url_node.c @@ -92,6 +92,9 @@ struct icon_entry icon_table[] = { #endif #ifdef WITH_WEBP {CONTENT_WEBP, NULL}, +#endif +#ifdef WITH_AMIGA_ICON + {CONTENT_AMIGA_ICON, NULL}, #endif {CONTENT_UNKNOWN, NULL}, diff --git a/render/box.c b/render/box.c index 635bcbb3b..e4292d20b 100644 --- a/render/box.c +++ b/render/box.c @@ -1163,6 +1163,9 @@ bool box_duplicate_main_tree(struct box *box, struct content *c, int *count) #ifdef WITH_WEBP content_get_type(box->object) == CONTENT_WEBP || #endif +#ifdef WITH_AMIGA_ICON + content_get_type(box->object) == CONTENT_AMIGA_ICON || +#endif #if defined(WITH_SPRITE) || defined(WITH_NSSPRITE) content_get_type(box->object) == CONTENT_SPRITE || #endif diff --git a/render/box_construct.c b/render/box_construct.c index a241dde43..b115dc026 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -83,6 +83,9 @@ static const content_type image_types[] = { #endif #ifdef WITH_WEBP CONTENT_WEBP, +#endif +#ifdef WITH_AMIGA_ICON + CONTENT_AMIGA_ICON, #endif CONTENT_UNKNOWN }; -- cgit v1.2.3