Author: chris_y Date: Sat Oct 30 09:23:38 2010 New Revision: 10925 URL: http://source.netsurf-browser.org?rev=10925&view=rev Log: Amiga icon loader. Treeviews will now use the user's icons for content types. Added: trunk/netsurf/amiga/icon.c (with props) trunk/netsurf/amiga/icon.h (with props) Removed: branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png Modified: branches/jmb/treeview-redux/amiga/resources/Themes/AISS/Theme branches/jmb/treeview-redux/amiga/resources/Themes/Default/Theme trunk/netsurf/Makefile.defaults trunk/netsurf/amiga/Makefile.target trunk/netsurf/amiga/filetype.c trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/tree.c trunk/netsurf/content/content.c trunk/netsurf/content/content_protected.h trunk/netsurf/content/content_type.h trunk/netsurf/desktop/tree_url_node.c trunk/netsurf/render/box.c trunk/netsurf/render/box_construct.c Modified: branches/jmb/treeview-redux/amiga/resources/Themes/AISS/Theme URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/resou... ============================================================================== --- branches/jmb/treeview-redux/amiga/resources/Themes/AISS/Theme (original) +++ branches/jmb/treeview-redux/amiga/resources/Themes/AISS/Theme Sat Oct 30 09:23:38 2010 @@ -24,8 +24,6 @@ theme_addtab:*TBImages:list_add theme_addtab_s:*TBImages:list_add theme_addtab_g:*TBImages:list_add -theme_list_folder:*TBImages:list_drawer -theme_list_content:*TBImages:list_abstract theme_throbber:Throbber theme_throbber_frames:13 theme_throbber_delay:100 Modified: branches/jmb/treeview-redux/amiga/resources/Themes/Default/Theme URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/resou... ============================================================================== --- branches/jmb/treeview-redux/amiga/resources/Themes/Default/Theme (original) +++ branches/jmb/treeview-redux/amiga/resources/Themes/Default/Theme Sat Oct 30 09:23:38 2010 @@ -37,8 +37,6 @@ theme_addtab: theme_addtab_s: theme_addtab_g: -theme_list_folder:directory.png -theme_list_content:content.png theme_throbber:Throbber theme_throbber_frames:9 theme_throbber_delay:100 Removed: branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/resou... ============================================================================== --- branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png (original) +++ branches/jmb/treeview-redux/amiga/resources/Themes/Default/content.png (removed) @@ -1,1 +1,0 @@ -link ../../../../!NetSurf/Resources/Icons/content.png Removed: branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png URL: http://source.netsurf-browser.org/branches/jmb/treeview-redux/amiga/resou... ============================================================================== --- branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png (original) +++ branches/jmb/treeview-redux/amiga/resources/Themes/Default/directory.png (removed) @@ -1,1 +1,0 @@ -link ../../../../!NetSurf/Resources/Icons/directory.png Modified: trunk/netsurf/Makefile.defaults URL: http://source.netsurf-browser.org/trunk/netsurf/Makefile.defaults?rev=109... ============================================================================== --- trunk/netsurf/Makefile.defaults (original) +++ trunk/netsurf/Makefile.defaults Sat Oct 30 09:23:38 2010 @@ -208,6 +208,10 @@ # Enable NetSurf's use of libwebp/libvpx for displaying WebPs # 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) Modified: trunk/netsurf/amiga/Makefile.target URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/Makefile.target?rev... ============================================================================== --- trunk/netsurf/amiga/Makefile.target (original) +++ trunk/netsurf/amiga/Makefile.target Sat Oct 30 09:23:38 2010 @@ -17,6 +17,7 @@ $(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 @@ 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)) Modified: trunk/netsurf/amiga/filetype.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/filetype.c?rev=1092... ============================================================================== --- trunk/netsurf/amiga/filetype.c (original) +++ trunk/netsurf/amiga/filetype.c Sat Oct 30 09:23:38 2010 @@ -41,20 +41,33 @@ 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. */ - - if(dobj = GetIconTags(unix_path,ICONGETA_FailIfUnavailable,FALSE, + /* 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(strncmp(unix_path + strlen(unix_path) - 5, ".info", 5) == 0) + { + 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)) - { - ttype = FindToolType(dobj->do_ToolTypes, "MIMETYPE"); - if(ttype) { - 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 @@ -191,6 +204,11 @@ return "svg"; break; #endif +#ifdef WITH_WEBP + case CONTENT_WEBP: + return "webp"; + break; +#endif default: return "project"; break; Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10925&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Sat Oct 30 09:23:38 2010 @@ -144,8 +144,8 @@ 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 @@ 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(); Added: trunk/netsurf/amiga/icon.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/icon.c?rev=10925&am... ============================================================================== --- trunk/netsurf/amiga/icon.c (added) +++ trunk/netsurf/amiga/icon.c Sat Oct 30 09:23:38 2010 @@ -1,0 +1,177 @@ + /* + * Copyright 2010 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * + * 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 <http://www.gnu.org/licenses/>;. + */ + +/** \file + * Content for image/x-amiga-icon (icon.library implementation). + * + */ + +#include "utils/config.h" +#ifdef WITH_AMIGA_ICON + +#include <assert.h> +#include <string.h> +#include <stdlib.h> + +#include <proto/icon.h> + +#include <workbench/icon.h> + +#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 Propchange: trunk/netsurf/amiga/icon.c ------------------------------------------------------------------------------ amiga:protection = ----rw-d ---- ---- Added: trunk/netsurf/amiga/icon.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/icon.h?rev=10925&am... ============================================================================== --- trunk/netsurf/amiga/icon.h (added) +++ trunk/netsurf/amiga/icon.h Sat Oct 30 09:23:38 2010 @@ -1,0 +1,47 @@ +/* + * Copyright 2010 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * + * 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 <http://www.gnu.org/licenses/>;. + */ + +/** \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 <stdbool.h> + +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 Propchange: trunk/netsurf/amiga/icon.h ------------------------------------------------------------------------------ amiga:protection = ----rw-d ---- ---- Modified: trunk/netsurf/amiga/tree.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/tree.c?rev=10925&am... ============================================================================== --- trunk/netsurf/amiga/tree.c (original) +++ trunk/netsurf/amiga/tree.c Sat Oct 30 09:23:38 2010 @@ -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 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); } /** Modified: trunk/netsurf/content/content.c URL: http://source.netsurf-browser.org/trunk/netsurf/content/content.c?rev=109... ============================================================================== --- trunk/netsurf/content/content.c (original) +++ trunk/netsurf/content/content.c Sat Oct 30 09:23:38 2010 @@ -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 @@ #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 @@ #endif #ifdef WITH_WEBP "WEBP", +#endif +#ifdef WITH_AMIGA_ICON + "AMIGA_ICON", #endif "OTHER", "UNKNOWN" @@ -374,6 +383,11 @@ 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])) Modified: trunk/netsurf/content/content_protected.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/content_protected... ============================================================================== --- trunk/netsurf/content/content_protected.h (original) +++ trunk/netsurf/content/content_protected.h Sat Oct 30 09:23:38 2010 @@ -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 @@ #endif #ifdef WITH_WEBP struct content_webp_data webp; +#endif +#ifdef WITH_AMIGA_ICON + struct content_amiga_icon_data amiga_icon; #endif } data; Modified: trunk/netsurf/content/content_type.h URL: http://source.netsurf-browser.org/trunk/netsurf/content/content_type.h?re... ============================================================================== --- trunk/netsurf/content/content_type.h (original) +++ trunk/netsurf/content/content_type.h Sat Oct 30 09:23:38 2010 @@ -71,6 +71,9 @@ #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 */ Modified: trunk/netsurf/desktop/tree_url_node.c URL: http://source.netsurf-browser.org/trunk/netsurf/desktop/tree_url_node.c?r... ============================================================================== --- trunk/netsurf/desktop/tree_url_node.c (original) +++ trunk/netsurf/desktop/tree_url_node.c Sat Oct 30 09:23:38 2010 @@ -92,6 +92,9 @@ #endif #ifdef WITH_WEBP {CONTENT_WEBP, NULL}, +#endif +#ifdef WITH_AMIGA_ICON + {CONTENT_AMIGA_ICON, NULL}, #endif {CONTENT_UNKNOWN, NULL}, Modified: trunk/netsurf/render/box.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/box.c?rev=10925&am... ============================================================================== --- trunk/netsurf/render/box.c (original) +++ trunk/netsurf/render/box.c Sat Oct 30 09:23:38 2010 @@ -1163,6 +1163,9 @@ #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 Modified: trunk/netsurf/render/box_construct.c URL: http://source.netsurf-browser.org/trunk/netsurf/render/box_construct.c?re... ============================================================================== --- trunk/netsurf/render/box_construct.c (original) +++ trunk/netsurf/render/box_construct.c Sat Oct 30 09:23:38 2010 @@ -83,6 +83,9 @@ #endif #ifdef WITH_WEBP CONTENT_WEBP, +#endif +#ifdef WITH_AMIGA_ICON + CONTENT_AMIGA_ICON, #endif CONTENT_UNKNOWN };