r10551 chris_y - in /trunk/netsurf: !NetSurf/Resources/de/Messages !NetSurf/Resources/en/Messages !NetSurf/Resources/fr/Messages !NetSurf/Resources/it/Messages !NetSurf/Resources/nl/Messages amiga/font.c amiga/gui.c amiga/gui_options.c amiga/options.h

Author: chris_y Date: Thu May 6 05:02:58 2010 New Revision: 10551 URL: http://source.netsurf-browser.org?rev=10551&view=rev Log: Amiga font code revamped and fixed. Will now fall back to a different font if the character isn't present in the current one, this needs a complete or near-complete Unicode font in order to be useful - Code2000 and Bitstream Cyberbit are auto-detected by NetSurf on startup if none is configured. Japanese websites now display correctly, along with Japanese characters within Google UK search results etc. Modified: trunk/netsurf/!NetSurf/Resources/de/Messages trunk/netsurf/!NetSurf/Resources/en/Messages trunk/netsurf/!NetSurf/Resources/fr/Messages trunk/netsurf/!NetSurf/Resources/it/Messages trunk/netsurf/!NetSurf/Resources/nl/Messages trunk/netsurf/amiga/font.c trunk/netsurf/amiga/gui.c trunk/netsurf/amiga/gui_options.c trunk/netsurf/amiga/options.h Modified: trunk/netsurf/!NetSurf/Resources/de/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/de/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/de/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/de/Messages Thu May 6 05:02:58 2010 @@ -1352,6 +1352,7 @@ FontMono:Monospace FontCursive:Kursiv FontFantasy:Fantasy +FontFallback:Fallback (Unicode) Default:Standard FontSize:Schriftgröße Minimum:Minimum Modified: trunk/netsurf/!NetSurf/Resources/en/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/en/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/en/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/en/Messages Thu May 6 05:02:58 2010 @@ -1357,6 +1357,7 @@ FontMono:Monospaced FontCursive:Cursive FontFantasy:Fantasy +FontFallback:Fallback (Unicode) Default:Default FontSize:Font size Minimum:Minimum Modified: trunk/netsurf/!NetSurf/Resources/fr/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/fr/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/fr/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/fr/Messages Thu May 6 05:02:58 2010 @@ -1358,6 +1358,7 @@ FontMono:Monospaced FontCursive:Cursive FontFantasy:Fantasy +FontFallback:Fallback (Unicode) Default:Default FontSize:Font size Minimum:Minimum Modified: trunk/netsurf/!NetSurf/Resources/it/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/it/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/it/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/it/Messages Thu May 6 05:02:58 2010 @@ -1358,6 +1358,7 @@ FontMono:Monospaziato FontCursive:Corsivo FontFantasy:Fantasia +FontFallback:Fallback (Unicode) Default:Predefinito FontSize:Dimensione Font Minimum:Minimo Modified: trunk/netsurf/!NetSurf/Resources/nl/Messages URL: http://source.netsurf-browser.org/trunk/netsurf/%21NetSurf/Resources/nl/M... ============================================================================== --- trunk/netsurf/!NetSurf/Resources/nl/Messages (original) +++ trunk/netsurf/!NetSurf/Resources/nl/Messages Thu May 6 05:02:58 2010 @@ -1353,6 +1353,7 @@ FontMono:Monospaced FontCursive:Cursive FontFantasy:Fantasy +FontFallback:Fallback (Unicode) Default:Default FontSize:Font size Minimum:Minimum Modified: trunk/netsurf/amiga/font.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/font.c?rev=10551&am... ============================================================================== --- trunk/netsurf/amiga/font.c (original) +++ trunk/netsurf/amiga/font.c Thu May 6 05:02:58 2010 @@ -36,12 +36,16 @@ #include <proto/utility.h> #include "utils/utils.h" -static struct OutlineFont *of[PLOT_FONT_FAMILY_COUNT]; -static struct OutlineFont *ofb[PLOT_FONT_FAMILY_COUNT]; -static struct OutlineFont *ofi[PLOT_FONT_FAMILY_COUNT]; -static struct OutlineFont *ofbi[PLOT_FONT_FAMILY_COUNT]; - -struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle); +#define NSA_UNICODE_FONT PLOT_FONT_FAMILY_COUNT + +static struct OutlineFont *of[PLOT_FONT_FAMILY_COUNT+1]; +static struct OutlineFont *ofb[PLOT_FONT_FAMILY_COUNT+1]; +static struct OutlineFont *ofi[PLOT_FONT_FAMILY_COUNT+1]; +static struct OutlineFont *ofbi[PLOT_FONT_FAMILY_COUNT+1]; + +int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, + uint16 char1, uint16 char2, uint32 x, uint32 y, uint32 emwidth); +struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, BOOL fallback); static bool nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, @@ -65,9 +69,9 @@ const char *string, size_t length, int *width) { - struct TextFont *tfont; - *width = ami_unicode_text(NULL,string,length,fstyle,0,0); + + if(*width <= 0) *width == length; // fudge return true; } @@ -93,7 +97,7 @@ uint16 *utf16 = NULL, *outf16 = NULL; uint16 utf16next = NULL; FIXED kern = 0; - struct OutlineFont *ofont; + struct OutlineFont *ofont, *ufont = NULL; struct GlyphMap *glyph; uint32 tx=0,i=0; size_t len, utf8len = 0; @@ -101,13 +105,13 @@ uint32 co = 0; int utf16charlen; ULONG emwidth = (ULONG)((fstyle->size / FONT_SIZE_SCALE) * glob->scale); - ULONG charwidth; + int32 tempx; len = utf8_bounded_length(string, length); if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return false; outf16 = utf16; - if(!(ofont = ami_open_outline_font(fstyle))) return false; + if(!(ofont = ami_open_outline_font(fstyle, FALSE))) return false; *char_offset = length; @@ -122,41 +126,41 @@ utf16next = utf16[utf16charlen]; - if(ESetInfo(&ofont->olf_EEngine, - OT_GlyphCode, *utf16, - OT_GlyphCode2, utf16next, - TAG_END) == OTERR_Success) - { - if(EObtainInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,&glyph, - TAG_END) == 0) - { - kern = 0; - - if(utf16next) EObtainInfo(&ofont->olf_EEngine, - OT_TextKernPair, &kern, - TAG_END); - - charwidth = (ULONG)(((glyph->glm_Width - kern) * emwidth) / 65536); - - if(x < (tx + charwidth)) - { - *actual_x = tx; - i = len+1; - } - else - { - co += utf8len; - } - - tx += charwidth; - - EReleaseInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,glyph, - TAG_END); - } - } - + tempx = ami_font_plot_glyph(ofont, NULL, *utf16, utf16next, + 0, 0, emwidth); + + if(tempx == 0) + { + if(ufont == NULL) + { + ufont = ami_open_outline_font(fstyle, TRUE); + } + + if(ufont) + { + tempx = ami_font_plot_glyph(ufont, NULL, *utf16, utf16next, + 0, 0, emwidth); + } +/* + if(tempx == 0) + { + tempx = ami_font_plot_glyph(ofont, NULL, 0xfffd, utf16next, + 0, 0, emwidth); + } +*/ + } + + if(x < (tx + tempx)) + { + *actual_x = tx; + i = len+1; + } + else + { + co += utf8len; + } + + tx += tempx; string += utf8len; utf16 += utf16charlen; } @@ -203,17 +207,18 @@ uint16 utf16next = 0; FIXED kern = 0; int utf16charlen = 0; - struct OutlineFont *ofont; + struct OutlineFont *ofont, *ufont = NULL; struct GlyphMap *glyph; uint32 tx=0,i=0; size_t len; int utf8len, utf8clen = 0; + int32 tempx = 0; ULONG emwidth = (ULONG)((fstyle->size / FONT_SIZE_SCALE) * glob->scale); len = utf8_bounded_length(string, length); if(utf8_to_enc((char *)string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return false; outf16 = utf16; - if(!(ofont = ami_open_outline_font(fstyle))) return false; + if(!(ofont = ami_open_outline_font(fstyle, FALSE))) return false; *char_offset = 0; *actual_x = 0; @@ -229,36 +234,43 @@ utf16next = utf16[utf16charlen]; - if(ESetInfo(&ofont->olf_EEngine, - OT_GlyphCode, *utf16, - OT_GlyphCode2, utf16next, - TAG_END) == OTERR_Success) - { - if(EObtainInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,&glyph, - TAG_END) == 0) - { - if(x < tx) - { - i = length+1; - } - else - { - if(string[utf8clen] == ' ') //*utf16 == 0x0020) - { - *actual_x = tx; - *char_offset = utf8clen; - } - } - - tx += (ULONG)(((glyph->glm_Width - kern) * emwidth) / 65536); - - EReleaseInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,glyph, - TAG_END); - } - } - + if(x < tx) + { + i = length+1; + } + else + { + if(string[utf8clen] == ' ') //*utf16 == 0x0020) + { + *actual_x = tx; + *char_offset = utf8clen; + } + } + + tempx = ami_font_plot_glyph(ofont, NULL, *utf16, utf16next, 0, 0, emwidth); + + if(tempx == 0) + { + if(ufont == NULL) + { + ufont = ami_open_outline_font(fstyle, TRUE); + } + + if(ufont) + { + tempx = ami_font_plot_glyph(ufont, NULL, *utf16, utf16next, + 0, 0, emwidth); + } +/* + if(tempx == 0) + { + tempx = ami_font_plot_glyph(ofont, NULL, 0xfffd, utf16next, + 0, 0, emwidth); + } +*/ + } + + tx += tempx; utf16 += utf16charlen; utf8clen += utf8len; } @@ -268,12 +280,23 @@ return true; } -struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle) +/** + * Open an outline font in the specified size and style + * + * \param fstyle font style structure + * \param default open a default font instead of the one specified by fstyle + * \return outline font or NULL on error + */ +struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, BOOL fallback) { struct OutlineFont *ofont; char *fontname; ULONG ysize; int tstyle = 0; + plot_font_generic_family_t fontfamily; + + if(fallback) fontfamily = NSA_UNICODE_FONT; + else fontfamily = fstyle->family; if ((fstyle->flags & FONTF_ITALIC) || (fstyle->flags & FONTF_OBLIQUE)) tstyle += NSA_ITALIC; @@ -284,22 +307,22 @@ switch(tstyle) { case NSA_ITALIC: - if(ofi[fstyle->family]) ofont = ofi[fstyle->family]; - else ofont = of[fstyle->family]; + if(ofi[fontfamily]) ofont = ofi[fontfamily]; + else ofont = of[fontfamily]; break; case NSA_BOLD: - if(ofb[fstyle->family]) ofont = ofb[fstyle->family]; - else ofont = of[fstyle->family]; + if(ofb[fontfamily]) ofont = ofb[fontfamily]; + else ofont = of[fontfamily]; break; case NSA_BOLDITALIC: - if(ofbi[fstyle->family]) ofont = ofbi[fstyle->family]; - else ofont = of[fstyle->family]; + if(ofbi[fontfamily]) ofont = ofbi[fontfamily]; + else ofont = of[fontfamily]; break; default: - ofont = of[fstyle->family]; + ofont = of[fontfamily]; break; } @@ -317,38 +340,82 @@ return NULL; } +int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, + uint16 char1, uint16 char2, uint32 x, uint32 y, uint32 emwidth) +{ + struct GlyphMap *glyph; + UBYTE *glyphbm; + int32 char_advance = 0; + FIXED kern = 0; + + if(ESetInfo(&ofont->olf_EEngine, + OT_GlyphCode, char1, + OT_GlyphCode2, char2, + TAG_END) == OTERR_Success) + { + if(EObtainInfo(&ofont->olf_EEngine, + OT_GlyphMap8Bit,&glyph, + TAG_END) == 0) + { + glyphbm = glyph->glm_BitMap; + if(!glyphbm) return 0; + + if(rp) + { + BltBitMapTags(BLITA_SrcX, glyph->glm_BlackLeft, + BLITA_SrcY, glyph->glm_BlackTop, + BLITA_DestX, x - glyph->glm_X0 + glyph->glm_BlackLeft, + BLITA_DestY, y - glyph->glm_Y0 + glyph->glm_BlackTop, + BLITA_Width, glyph->glm_BlackWidth, + BLITA_Height, glyph->glm_BlackHeight, + BLITA_Source, glyphbm, + BLITA_SrcType, BLITT_ALPHATEMPLATE, + BLITA_Dest, rp, + BLITA_DestType, BLITT_RASTPORT, + BLITA_SrcBytesPerRow, glyph->glm_BMModulo, + TAG_DONE); + } + + kern = 0; + + if(char2) EObtainInfo(&ofont->olf_EEngine, + OT_TextKernPair, &kern, + TAG_END); + + char_advance = (ULONG)(((glyph->glm_Width - kern) * emwidth) / 65536); + + EReleaseInfo(&ofont->olf_EEngine, + OT_GlyphMap8Bit,glyph, + TAG_END); + } + } + + return char_advance; +} + ULONG ami_unicode_text(struct RastPort *rp,const char *string,ULONG length,const plot_font_style_t *fstyle,ULONG dx, ULONG dy) { uint16 *utf16 = NULL, *outf16 = NULL; uint16 utf16next = 0; int utf16charlen; - FIXED kern = 0; - struct OutlineFont *ofont; - struct GlyphMap *glyph; + struct OutlineFont *ofont, *ufont = NULL; ULONG i,gx,gy; - UBYTE *glyphbm; UWORD posn; - struct BitMap *tbm; - struct RastPort trp; - uint32 width,height; - uint32 x=0,y=0; - size_t len; + uint32 x=0; uint8 co = 0; + int32 tempx = 0; ULONG emwidth = (ULONG)((fstyle->size / FONT_SIZE_SCALE) * glob->scale); if(!string || string[0]=='\0') return 0; if(!length) return 0; - len = utf8_bounded_length(string, length); if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != UTF8_CONVERT_OK) return 0; outf16 = utf16; - if(!(ofont = ami_open_outline_font(fstyle))) return 0; + if(!(ofont = ami_open_outline_font(fstyle, FALSE))) return 0; if(rp) SetRPAttrs(rp,RPTAG_APenColor,p96EncodeColor(RGBFB_A8B8G8R8,fstyle->foreground),TAG_DONE); - dy++; - - for(i=0;i<=len;i++) + while(*utf16 != 0) { if (*utf16 < 0xD800 || 0xDFFF < *utf16) utf16charlen = 1; @@ -357,47 +424,31 @@ utf16next = utf16[utf16charlen]; - if(ESetInfo(&ofont->olf_EEngine, - OT_GlyphCode, *utf16, - OT_GlyphCode2, utf16next, - TAG_END) == OTERR_Success) - { - if(EObtainInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,&glyph, - TAG_END) == 0) - { - glyphbm = glyph->glm_BitMap; - if(!glyphbm) continue; - - if(rp) - { - BltBitMapTags(BLITA_SrcX,glyph->glm_BlackLeft, - BLITA_SrcY,glyph->glm_BlackTop, - BLITA_DestX,dx + x - glyph->glm_X0 + glyph->glm_BlackLeft, - BLITA_DestY,dy - glyph->glm_Y0 + glyph->glm_BlackTop, - BLITA_Width,glyph->glm_BlackWidth, - BLITA_Height,glyph->glm_BlackHeight, - BLITA_Source,glyphbm, - BLITA_SrcType,BLITT_ALPHATEMPLATE, - BLITA_Dest,rp, - BLITA_DestType,BLITT_RASTPORT, - BLITA_SrcBytesPerRow,glyph->glm_BMModulo, - TAG_DONE); - } - - kern = 0; - - if(utf16next) EObtainInfo(&ofont->olf_EEngine, - OT_TextKernPair, &kern, - TAG_END); - - x += (ULONG)(((glyph->glm_Width - kern) * emwidth) / 65536); - - EReleaseInfo(&ofont->olf_EEngine, - OT_GlyphMap8Bit,glyph, - TAG_END); - } - } + tempx = ami_font_plot_glyph(ofont, rp, *utf16, utf16next, dx + x, dy, emwidth); + + if(tempx == 0) + { + if(ufont == NULL) + { + ufont = ami_open_outline_font(fstyle, TRUE); + } + + if(ufont) + { + tempx = ami_font_plot_glyph(ufont, rp, *utf16, utf16next, + dx + x, dy, emwidth); + } +/* + if(tempx == 0) + { + tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next, + dx + x, dy, emwidth); + } +*/ + } + + x += tempx; + utf16 += utf16charlen; } @@ -438,8 +489,9 @@ of[PLOT_FONT_FAMILY_MONOSPACE] = OpenOutlineFont(option_font_mono,NULL,OFF_OPEN); of[PLOT_FONT_FAMILY_CURSIVE] = OpenOutlineFont(option_font_cursive,NULL,OFF_OPEN); of[PLOT_FONT_FAMILY_FANTASY] = OpenOutlineFont(option_font_fantasy,NULL,OFF_OPEN); - - for(i=PLOT_FONT_FAMILY_SANS_SERIF;i<=PLOT_FONT_FAMILY_FANTASY;i++) + of[NSA_UNICODE_FONT] = OpenOutlineFont(option_font_unicode,NULL,OFF_OPEN); + + for(i=PLOT_FONT_FAMILY_SANS_SERIF;i<=NSA_UNICODE_FONT;i++) { if(!of[i]) { @@ -460,6 +512,9 @@ break; case PLOT_FONT_FAMILY_FANTASY: tmpfontname = option_font_fantasy; + break; + case NSA_UNICODE_FONT: + tmpfontname = option_font_unicode; break; default: /* should never get here, but just in case */ @@ -503,7 +558,7 @@ { int i=0; - for(i=PLOT_FONT_FAMILY_SANS_SERIF;i<=PLOT_FONT_FAMILY_FANTASY;i++) + for(i=PLOT_FONT_FAMILY_SANS_SERIF;i<=NSA_UNICODE_FONT;i++) { if(of[i]) CloseOutlineFont(of[i],NULL); if(ofb[i]) CloseOutlineFont(ofb[i],NULL); Modified: trunk/netsurf/amiga/gui.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10551&... ============================================================================== --- trunk/netsurf/amiga/gui.c (original) +++ trunk/netsurf/amiga/gui.c Thu May 6 05:02:58 2010 @@ -299,6 +299,7 @@ void ami_set_options(void) { STRPTR tempacceptlangs; + BPTR lock = 0; /* The following line disables the popupmenu.class select menu ** This will become a user option when/if popupmenu.class is @@ -363,6 +364,23 @@ if((!option_font_fantasy) || (option_font_fantasy[0] == '\0')) option_font_fantasy = (char *)strdup("DejaVu Serif"); + + if((!option_font_unicode) || (option_font_unicode[0] == '\0')) + { + /* Search for some likely candidates */ + + if(lock=Lock("FONTS:Code2000.font",ACCESS_READ)) + { + UnLock(lock); + option_font_unicode = (char *)strdup("Code2000"); + } + else if(lock=Lock("FONTS:Bitstream Cyberbit.font",ACCESS_READ)) + { + UnLock(lock); + option_font_unicode = (char *)strdup("Bitstream Cyberbit"); + } + else option_font_unicode = (char *)strdup("Deja Vu Sans"); + } if((!option_theme) || (option_theme[0] == '\0')) option_theme = (char *)strdup("PROGDIR:Resources/Themes/Default"); Modified: trunk/netsurf/amiga/gui_options.c URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui_options.c?rev=1... ============================================================================== --- trunk/netsurf/amiga/gui_options.c (original) +++ trunk/netsurf/amiga/gui_options.c Thu May 6 05:02:58 2010 @@ -97,6 +97,7 @@ GID_OPTS_FONT_MONO, GID_OPTS_FONT_CURSIVE, GID_OPTS_FONT_FANTASY, + GID_OPTS_FONT_UNICODE, GID_OPTS_FONT_DEFAULT, GID_OPTS_FONT_SIZE, GID_OPTS_FONT_MINSIZE, @@ -259,6 +260,7 @@ gadlab[GID_OPTS_FONT_MONO] = (char *)ami_utf8_easy((char *)messages_get("FontMono")); gadlab[GID_OPTS_FONT_CURSIVE] = (char *)ami_utf8_easy((char *)messages_get("FontCursive")); gadlab[GID_OPTS_FONT_FANTASY] = (char *)ami_utf8_easy((char *)messages_get("FontFantasy")); + gadlab[GID_OPTS_FONT_UNICODE] = (char *)ami_utf8_easy((char *)messages_get("FontFallback")); gadlab[GID_OPTS_FONT_DEFAULT] = (char *)ami_utf8_easy((char *)messages_get("Default")); gadlab[GID_OPTS_FONT_SIZE] = (char *)ami_utf8_easy((char *)messages_get("Default")); gadlab[GID_OPTS_FONT_MINSIZE] = (char *)ami_utf8_easy((char *)messages_get("Minimum")); @@ -367,7 +369,7 @@ BOOL scaleselected = option_scale_quality, scaledisabled = FALSE; BOOL download_notify_disabled = FALSE; char animspeed[10]; - struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy; + struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy, fontunicode; if(option_use_pubscreen && option_use_pubscreen[0] != '\0') { @@ -438,24 +440,28 @@ fontmono.ta_Name = ASPrintf("%s.font",option_font_mono); fontcursive.ta_Name = ASPrintf("%s.font",option_font_cursive); fontfantasy.ta_Name = ASPrintf("%s.font",option_font_fantasy); + fontunicode.ta_Name = ASPrintf("%s.font",option_font_unicode); fontsans.ta_Style = 0; fontserif.ta_Style = 0; fontmono.ta_Style = 0; fontcursive.ta_Style = 0; fontfantasy.ta_Style = 0; + fontunicode.ta_Style = 0; fontsans.ta_YSize = 0; fontserif.ta_YSize = 0; fontmono.ta_YSize = 0; fontcursive.ta_YSize = 0; fontfantasy.ta_YSize = 0; + fontunicode.ta_YSize = 0; fontsans.ta_Flags = 0; fontserif.ta_Flags = 0; fontmono.ta_Flags = 0; fontcursive.ta_Flags = 0; fontfantasy.ta_Flags = 0; + fontunicode.ta_Flags = 0; if(!gow) { @@ -893,6 +899,15 @@ GetFontEnd, CHILD_Label, LabelObject, LABEL_Text, gadlab[GID_OPTS_FONT_FANTASY], + LabelEnd, + LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_UNICODE] = GetFontObject, + GA_ID, GID_OPTS_FONT_UNICODE, + GA_RelVerify, TRUE, + GETFONT_TextAttr, &fontunicode, + GETFONT_OTagOnly, TRUE, + GetFontEnd, + CHILD_Label, LabelObject, + LABEL_Text, gadlab[GID_OPTS_FONT_UNICODE], LabelEnd, LAYOUT_AddChild, gow->objects[GID_OPTS_FONT_DEFAULT] = ChooserObject, GA_ID, GID_OPTS_FONT_DEFAULT, @@ -1473,6 +1488,12 @@ if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; option_font_fantasy = (char *)strdup((char *)tattr->ta_Name); + GetAttr(GETFONT_TextAttr,gow->objects[GID_OPTS_FONT_UNICODE],(ULONG *)&data); + tattr = (struct TextAttr *)data; + if(option_font_unicode) free(option_font_unicode); + if(dot = strrchr(tattr->ta_Name,'.')) *dot = '\0'; + option_font_unicode = (char *)strdup((char *)tattr->ta_Name); + GetAttr(CHOOSER_Selected,gow->objects[GID_OPTS_FONT_DEFAULT],(ULONG *)&option_font_default); option_font_default += PLOT_FONT_FAMILY_SANS_SERIF; @@ -1741,6 +1762,11 @@ GFONT_REQUEST,gow->win); break; + case GID_OPTS_FONT_UNICODE: + IDoMethod(gow->objects[GID_OPTS_FONT_UNICODE], + GFONT_REQUEST,gow->win); + break; + case GID_OPTS_DLDIR: IDoMethod(gow->objects[GID_OPTS_DLDIR], GFILE_REQUEST,gow->win); Modified: trunk/netsurf/amiga/options.h URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=10551... ============================================================================== --- trunk/netsurf/amiga/options.h (original) +++ trunk/netsurf/amiga/options.h Thu May 6 05:02:58 2010 @@ -48,6 +48,7 @@ extern bool option_startup_no_window; extern bool option_close_no_quit; extern bool option_hide_docky_icon; +extern char *option_font_unicode; #define EXTRA_OPTION_DEFINE \ char *option_url_file = 0; \ @@ -78,6 +79,7 @@ bool option_startup_no_window = false; \ bool option_close_no_quit = false; \ bool option_hide_docky_icon = false; \ +char *option_font_unicode = 0; \ #define EXTRA_OPTION_TABLE \ { "url_file", OPTION_STRING, &option_url_file }, \ @@ -107,5 +109,6 @@ { "print_scale", OPTION_INTEGER, &option_print_scale}, \ { "startup_no_window", OPTION_BOOL, &option_startup_no_window}, \ { "close_no_quit", OPTION_BOOL, &option_close_no_quit}, \ -{ "hide_docky_icon", OPTION_BOOL, &option_hide_docky_icon}, +{ "hide_docky_icon", OPTION_BOOL, &option_hide_docky_icon}, \ +{ "font_unicode", OPTION_STRING, &option_font_unicode }, #endif