Author: chris_y Date: Sun Oct 31 06:14:26 2010 New Revision: 10928 URL: http://source.netsurf-browser.org?rev=10928&view=rev Log: Support ColourIcons Modified: trunk/netsurf/amiga/Makefile.target trunk/netsurf/amiga/download.c trunk/netsurf/amiga/download.h trunk/netsurf/amiga/icon.c trunk/netsurf/amiga/icon.h trunk/netsurf/amiga/misc.c 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 Sun Oct 31 06:14:26 2010 @@ -26,7 +26,9 @@ ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES) CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat - SUBTARGET := -cairo + EXETARGET := NetSurf-Cairo +else + EXETARGET := NetSurf endif # ---------------------------------------------------------------------------- @@ -45,4 +47,3 @@ # complete source file list SOURCES := $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_AMIGA) $(S_PDF) -EXETARGET := NetSurf$(SUBTARGET) Modified: trunk/netsurf/amiga/download.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.c?rev=1092... ============================================================================== --- trunk/netsurf/amiga/download.c (original) +++ trunk/netsurf/amiga/download.c Sun Oct 31 06:14:26 2010 @@ -27,10 +27,10 @@ #include <proto/icon.h> #include <proto/application.h> -#include <graphics/blitattr.h> #include <workbench/icon.h> #include "amiga/download.h" +#include "amiga/icon.h" #include "amiga/object.h" #include "amiga/options.h" #include "amiga/bitmap.h" @@ -325,84 +325,3 @@ ami_update_pointer(g->shared->win,GUI_POINTER_DEFAULT); } } - -void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type) -{ - struct DiskObject *dobj = NULL; - struct BitMap *bm = NULL; - ULONG *icondata1, *icondata2; - ULONG width, height; - long format = 0; - int err = 0; - - if(!type) - { - dobj = GetIconTags(NULL, - ICONGETA_GetDefaultType, WBDRAWER, - TAG_DONE); - } - else - { - dobj = GetIconTags(NULL, ICONGETA_GetDefaultName, type, - ICONGETA_GetDefaultType, WBPROJECT, - TAG_DONE); - } - - err = IconControl(dobj, - ICONCTRLA_GetImageDataFormat,&format, - ICONCTRLA_GetImageData1,&icondata1, - ICONCTRLA_GetImageData2,&icondata2, - ICONCTRLA_GetWidth,&width, - ICONCTRLA_GetHeight,&height, - TAG_DONE); - - /* Check icon is direct mapped (truecolour). - * Quite a bit more code is needed for palette mapped and planar icons, - * and OS4 default icons should all be truecolour anyway. */ - if(format == IDFMT_DIRECTMAPPED) - { - if ((icon != NULL) && (content_get_type(icon) == CONTENT_ICO)) - { - nsico_set_bitmap_from_size(icon, 16, 16); - } - - if ((icon != NULL) && (content_get_bitmap(icon) != NULL)) - { - bm = ami_getcachenativebm(content_get_bitmap(icon), 16, 16, NULL); - } - - if(bm) - { - BltBitMapTags(BLITA_SrcX, 0, - BLITA_SrcY, 0, - BLITA_DestX, width - 16, - BLITA_DestY, height - 16, - BLITA_Width, 16, - BLITA_Height, 16, - BLITA_Source, bm, - BLITA_Dest, icondata1, - BLITA_SrcType, BLITT_BITMAP, - BLITA_DestType, BLITT_ARGB32, - BLITA_DestBytesPerRow, width * 4, - BLITA_UseSrcAlpha, TRUE, - TAG_DONE); - - BltBitMapTags(BLITA_SrcX, 0, - BLITA_SrcY, 0, - BLITA_DestX, width - 16, - BLITA_DestY, height - 16, - BLITA_Width, 16, - BLITA_Height, 16, - BLITA_Source, bm, - BLITA_Dest, icondata2, - BLITA_SrcType, BLITT_BITMAP, - BLITA_DestType, BLITT_ARGB32, - BLITA_DestBytesPerRow, width * 4, - BLITA_UseSrcAlpha, TRUE, - TAG_DONE); - } - } - - PutIconTags(path, dobj, - ICONPUTA_NotifyWorkbench, TRUE, TAG_DONE); -} Modified: trunk/netsurf/amiga/download.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/download.h?rev=1092... ============================================================================== --- trunk/netsurf/amiga/download.h (original) +++ trunk/netsurf/amiga/download.h Sun Oct 31 06:14:26 2010 @@ -45,5 +45,4 @@ void ami_download_window_abort(struct gui_download_window *dw); BOOL ami_download_window_event(struct gui_download_window *dw); void ami_free_download_list(struct List *dllist); -void ami_superimpose_favicon(STRPTR path, struct hlcache_handle *icon, STRPTR type); #endif Modified: trunk/netsurf/amiga/icon.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/icon.c?rev=10928&am... ============================================================================== --- trunk/netsurf/amiga/icon.c (original) +++ trunk/netsurf/amiga/icon.c Sun Oct 31 06:14:26 2010 @@ -1,4 +1,4 @@ - /* +/* * Copyright 2010 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ @@ -22,16 +22,20 @@ */ #include "utils/config.h" -#ifdef WITH_AMIGA_ICON #include <assert.h> #include <string.h> #include <stdlib.h> +#include <proto/exec.h> #include <proto/icon.h> +#include <datatypes/pictureclass.h> +#include <graphics/blitattr.h> #include <workbench/icon.h> +#include "amiga/bitmap.h" +#include "amiga/icon.h" #include "desktop/plotters.h" #include "image/bitmap.h" #include "content/content_protected.h" @@ -39,6 +43,11 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/url.h" + +ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG height, + ULONG trans, ULONG pals1, struct ColorRegister *pal1, int alpha); + +#ifdef WITH_AMIGA_ICON /** * Convert a CONTENT_AMIGA_ICON for display. @@ -61,6 +70,8 @@ char *url; char *filename; char *p; + ULONG trans, pals1; + struct ColorRegister *pal1; url = content__get_url(c); filename = url_to_path(url); @@ -91,26 +102,40 @@ 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; + /* Check icon is direct mapped (truecolour) or palette-mapped colour. + We need additional code to handle planar icons */ + if((format != IDFMT_DIRECTMAPPED) && (format==IDFMT_PALETTEMAPPED)) + 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); + if(dobj) FreeDiskObject(dobj); return false; } imagebuf = bitmap_get_buffer(c->bitmap); if (!imagebuf) { msg_data.error = messages_get("NoMemory"); content_broadcast(c, CONTENT_MSG_ERROR, msg_data); + if(dobj) FreeDiskObject(dobj); return false; } err = IconControl(dobj, ICONCTRLA_GetImageData1, &imagebufptr, TAG_DONE); + + if(format==IDFMT_PALETTEMAPPED) + { + IconControl(dobj, ICONCTRLA_GetTransparentColor1, &trans, + ICONCTRLA_GetPalette1, &pal1, + ICONCTRLA_GetPaletteSize1, &pals1, + TAG_DONE); + + imagebufptr = amiga_icon_convertcolouricon32((UBYTE *)imagebufptr, + width, height, trans, pals1, pal1, 0xff); + } /* Decoded data is ARGB, so ensure correct byte order */ @@ -131,8 +156,10 @@ bitmap_modified(c->bitmap); c->status = CONTENT_STATUS_DONE; - content_set_status(c, ""); + + if(dobj) FreeDiskObject(dobj); + return true; } @@ -167,11 +194,136 @@ /* Simply replay convert */ if (old->status == CONTENT_STATUS_READY || old->status == CONTENT_STATUS_DONE) { - if (webp_convert(new_content) == false) + if (amiga_icon_convert(new_content) == false) return false; } return true; } - -#endif +#endif /* WITH_AMIGA_ICON */ + +ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG height, + ULONG trans, ULONG pals1, struct ColorRegister *pal1, int alpha) +{ + ULONG *argbicon; + struct ColorRegister *colour; + struct ColorMap *cmap; + int i; + ULONG a,r,g,b; + + if (alpha==0) alpha=0xff; + + argbicon = (ULONG *)AllocVec(width*height*4,MEMF_CLEAR); + if (!argbicon) return(NULL); + + cmap=GetColorMap(pals1); + if(!cmap) return(NULL); + + for(i=0;i<(width*height);i++) + { + colour = &pal1[icondata[i]]; + + if(icondata[i] == trans) + { + a=0x00; + } + else + { + a=alpha; + } + + r = colour->red; + g = colour->green; + b = colour->blue; + + argbicon[i] = (a << 24) + + (r << 16) + + (g << 8) + + (b); + } + + return(argbicon); + +} + +void ami_superimpose_favicon(char *path, struct hlcache_handle *icon, char *type) +{ + struct DiskObject *dobj = NULL; + struct BitMap *bm = NULL; + ULONG *icondata1, *icondata2; + ULONG width, height; + long format = 0; + int err = 0; + + if(!type) + { + dobj = GetIconTags(NULL, + ICONGETA_GetDefaultType, WBDRAWER, + TAG_DONE); + } + else + { + dobj = GetIconTags(NULL, ICONGETA_GetDefaultName, type, + ICONGETA_GetDefaultType, WBPROJECT, + TAG_DONE); + } + + err = IconControl(dobj, + ICONCTRLA_GetImageDataFormat,&format, + ICONCTRLA_GetImageData1,&icondata1, + ICONCTRLA_GetImageData2,&icondata2, + ICONCTRLA_GetWidth,&width, + ICONCTRLA_GetHeight,&height, + TAG_DONE); + + /* Check icon is direct mapped (truecolour). + * Quite a bit more code is needed for palette mapped and planar icons, + * and OS4 default icons should all be truecolour anyway. */ + if(format == IDFMT_DIRECTMAPPED) + { + if ((icon != NULL) && (content_get_type(icon) == CONTENT_ICO)) + { + nsico_set_bitmap_from_size(icon, 16, 16); + } + + if ((icon != NULL) && (content_get_bitmap(icon) != NULL)) + { + bm = ami_getcachenativebm(content_get_bitmap(icon), 16, 16, NULL); + } + + if(bm) + { + BltBitMapTags(BLITA_SrcX, 0, + BLITA_SrcY, 0, + BLITA_DestX, width - 16, + BLITA_DestY, height - 16, + BLITA_Width, 16, + BLITA_Height, 16, + BLITA_Source, bm, + BLITA_Dest, icondata1, + BLITA_SrcType, BLITT_BITMAP, + BLITA_DestType, BLITT_ARGB32, + BLITA_DestBytesPerRow, width * 4, + BLITA_UseSrcAlpha, TRUE, + TAG_DONE); + + BltBitMapTags(BLITA_SrcX, 0, + BLITA_SrcY, 0, + BLITA_DestX, width - 16, + BLITA_DestY, height - 16, + BLITA_Width, 16, + BLITA_Height, 16, + BLITA_Source, bm, + BLITA_Dest, icondata2, + BLITA_SrcType, BLITT_BITMAP, + BLITA_DestType, BLITT_ARGB32, + BLITA_DestBytesPerRow, width * 4, + BLITA_UseSrcAlpha, TRUE, + TAG_DONE); + } + } + + PutIconTags(path, dobj, + ICONPUTA_NotifyWorkbench, TRUE, TAG_DONE); +} + Modified: trunk/netsurf/amiga/icon.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/icon.h?rev=10928&am... ============================================================================== --- trunk/netsurf/amiga/icon.h (original) +++ trunk/netsurf/amiga/icon.h Sun Oct 31 06:14:26 2010 @@ -27,8 +27,7 @@ #ifdef WITH_AMIGA_ICON #include <stdbool.h> - -struct content; +#include "content/hlcache.h" struct content_amiga_icon_data { /* empty */ @@ -44,4 +43,5 @@ #endif /* WITH_AMIGA_ICON */ +void ami_superimpose_favicon(char *path, struct hlcache_handle *icon, char *type); #endif Modified: trunk/netsurf/amiga/misc.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/misc.c?rev=10928&am... ============================================================================== --- trunk/netsurf/amiga/misc.c (original) +++ trunk/netsurf/amiga/misc.c Sun Oct 31 06:14:26 2010 @@ -110,6 +110,7 @@ DevNameFromLock(lock, newpath, sizeof newpath, DN_FULLPATH); UnLock(lock); } + else strncpy(newpath, path, sizeof newpath); r = malloc(strlen(newpath) + SLEN("file:///") + 1);