diff options
-rw-r--r-- | amiga/Makefile.target | 3 | ||||
-rw-r--r-- | amiga/agclass/amigaguide_class.c | 11 | ||||
-rw-r--r-- | amiga/context_menu.c | 10 | ||||
-rw-r--r-- | amiga/file.c | 7 | ||||
-rw-r--r-- | amiga/font.c | 198 | ||||
-rwxr-xr-x | amiga/font.h | 16 | ||||
-rw-r--r-- | amiga/font_bitmap.c | 232 | ||||
-rw-r--r-- | amiga/gui.c | 21 | ||||
-rwxr-xr-x | amiga/gui.h | 6 | ||||
-rwxr-xr-x | amiga/history_local.c | 4 | ||||
-rw-r--r-- | amiga/menu.c | 863 | ||||
-rw-r--r-- | amiga/options.h | 1 | ||||
-rw-r--r-- | amiga/plotters.c | 2 | ||||
-rw-r--r-- | amiga/tree.c | 2 |
14 files changed, 833 insertions, 543 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index 32e076ca6..215ee097a 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -74,7 +74,8 @@ S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c file.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c libs.c \ datatypes.c dt_picture.c dt_anim.c dt_sound.c plugin_hack.c \ stringview/stringview.c stringview/urlhistory.c rtg.c \ - agclass/amigaguide_class.c fs_backing_store.c os3support.c + agclass/amigaguide_class.c fs_backing_store.c os3support.c \ + font_bitmap.c S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) # This is the final source build list diff --git a/amiga/agclass/amigaguide_class.c b/amiga/agclass/amigaguide_class.c index 556445e1b..2b80223ca 100644 --- a/amiga/agclass/amigaguide_class.c +++ b/amiga/agclass/amigaguide_class.c @@ -7,7 +7,11 @@ #include "amiga/os3support.h" #include "amigaguide_class.h" - +#ifdef __amigaos4__ +#define DISPATCHHOOK(func) static uint32 func(Class *cl, Object *o, Msg msg) +#else +#define DISPATCHHOOK(func) static ASM uint32 func(REG(a0, Class *cl),REG(a2, Object *o), REG(a1, Msg msg)) +#endif struct localObjectData { @@ -24,7 +28,8 @@ struct AmigaGuideIFace *IAmigaGuide = NULL; /* ********************************** function prototypes ************************************ */ -static uint32 dispatchAGClass(Class *, Object *, Msg); +DISPATCHHOOK(dispatchAGClass); + // class methods uint32 om_new(Class *, Object *, struct opSet *); @@ -89,7 +94,7 @@ BOOL freeAGClass(Class *cl) /* ************************************** class dispatcher ************************************ */ -static uint32 dispatchAGClass(Class *cl, Object *o, Msg msg) +DISPATCHHOOK(dispatchAGClass) { switch (msg->MethodID) diff --git a/amiga/context_menu.c b/amiga/context_menu.c index b74affb11..970490e16 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -52,12 +52,12 @@ #include "amiga/context_menu.h" -static uint32 ami_context_menu_hook(struct Hook *hook, Object *item, APTR reserved); +HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR); +HOOKF(uint32, ami_popup_hook, Object *, item, APTR); + static bool ami_context_menu_history(const struct browser_window *bw, int x0, int y0, int x1, int y1, const struct history_entry *entry, void *user_data); -static uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved); - enum { CMID_SELECTFILE, CMID_COPYURL, @@ -695,7 +695,7 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) IDoMethod(ctxmenuobj, PM_OPEN, gwin->win); } -static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved) +HOOKF(uint32, ami_context_menu_hook, Object *, item, APTR) { int32 itemid = 0; struct gui_window_2 *gwin = hook->h_Data; @@ -1255,7 +1255,7 @@ static bool ami_context_menu_history(const struct browser_window *bw, return true; } -static uint32 ami_popup_hook(struct Hook *hook,Object *item,APTR reserved) +HOOKF(uint32, ami_popup_hook, Object *, item, APTR) { uint32 itemid = 0; struct gui_window *gwin = hook->h_Data; diff --git a/amiga/file.c b/amiga/file.c index 733c9c780..e7f1fd356 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -46,8 +46,7 @@ static struct Hook aslhookfunc; -static ULONG ami_file_asl_mime_hook(struct Hook *mh, - struct FileRequester *fr, struct AnchorPathOld *ap) +HOOKF(ULONG, ami_file_asl_mime_hook, struct FileRequester *, fr, struct AnchorPathOld *) { char fname[1024]; BOOL ret = FALSE; @@ -56,10 +55,10 @@ static ULONG ami_file_asl_mime_hook(struct Hook *mh, lwc_error lerror; content_type ct; - if(ap->ap_Info.fib_DirEntryType > 0) return(TRUE); + if(msg->ap_Info.fib_DirEntryType > 0) return(TRUE); strcpy(fname,fr->fr_Drawer); - AddPart(fname,ap->ap_Info.fib_FileName,1024); + AddPart(fname, msg->ap_Info.fib_FileName,1024); mt = strdup(fetch_filetype(fname)); lerror = lwc_intern_string(mt, strlen(mt), &lwc_mt); diff --git a/amiga/font.c b/amiga/font.c index 435e75992..32f12f272 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -152,38 +152,21 @@ lwc_string *glypharray[0xffff + 1]; ULONG ami_devicedpi; ULONG ami_xdpi; -int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa); -int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth); -struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, +static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint); static void ami_font_cleanup(struct MinList *ami_font_list); +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); -static bool nsfont_width(const plot_font_style_t *fstyle, - const char *string, size_t length, - int *width); - -static bool nsfont_position_in_string(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - -static bool nsfont_split(const plot_font_style_t *fstyle, - const char *string, size_t length, - int x, size_t *char_offset, int *actual_x); - -const struct font_functions nsfont = { - nsfont_width, - nsfont_position_in_string, - nsfont_split -}; - - -bool nsfont_width(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_width(const plot_font_style_t *fstyle, const char *string, size_t length, int *width) { - *width = ami_unicode_text(NULL, string, length, fstyle, 0, 0, false); + *width = ami_font_unicode_width(string, length, fstyle, 0, 0, false); if(*width <= 0) *width == length; // fudge @@ -202,7 +185,7 @@ bool nsfont_width(const plot_font_style_t *fstyle, * \return true on success, false on error and error reported */ -bool nsfont_position_in_string(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_position_in_string(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -289,7 +272,7 @@ bool nsfont_position_in_string(const plot_font_style_t *fstyle, * Returning char_offset == length means no split possible */ -bool nsfont_split(const plot_font_style_t *fstyle, +static inline bool amiga_nsfont_split(const plot_font_style_t *fstyle, const char *string, size_t length, int x, size_t *char_offset, int *actual_x) { @@ -428,7 +411,7 @@ static struct ami_font_node *ami_font_open(const char *font) * \param codepoint 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, +static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, const uint16 *codepoint) { struct ami_font_node *node; @@ -567,7 +550,7 @@ struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle, return NULL; } -int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, +static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, uint16 *char1, uint16 *char2, uint32 x, uint32 y, uint32 emwidth, bool aa) { struct GlyphMap *glyph; @@ -580,12 +563,12 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ *char2 = 0; } @@ -658,7 +641,7 @@ int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPort *rp, return char_advance; } -int32 ami_font_width_glyph(struct OutlineFont *ofont, +static inline int32 ami_font_width_glyph(struct OutlineFont *ofont, const uint16 *char1, const uint16 *char2, uint32 emwidth) { int32 char_advance = 0; @@ -671,12 +654,12 @@ int32 ami_font_width_glyph(struct OutlineFont *ofont, struct BulletBase *BulletBase = ofont->BulletBase; #endif - if ((*char1 >= 0xD800) && (*char1 <= 0xDBFF)) { + if (__builtin_expect(((*char1 >= 0xD800) && (*char1 <= 0xDBFF)), 0)) { /* We don't support UTF-16 surrogates yet, so just return. */ return 0; } - - if ((*char2 >= 0xD800) && (*char2 <= 0xDBFF)) { + + if (__builtin_expect(((*char2 >= 0xD800) && (*char2 <= 0xDBFF)), 0)) { /* Don't attempt to kern a UTF-16 surrogate */ skip_c2 = true; } @@ -737,7 +720,7 @@ static const uint16 *ami_font_translate_smallcaps(uint16 *utf16char) return utf16char; } -ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) { uint16 *utf16 = NULL, *outf16 = NULL; @@ -751,6 +734,11 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, if(!string || string[0]=='\0') return 0; if(!length) return 0; + if(rp == NULL) return 0; + + if(__builtin_expect(nsoption_bool(use_diskfont) == true, 0)) { + return ami_font_bm_text(rp, string, length, fstyle, dx, dy); + } if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; outf16 = utf16; @@ -770,22 +758,14 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, + tempx = ami_font_plot_glyph(ofont, rp, utf16charsc, utf16nextsc, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); - } } else tempx = 0; if(tempx == 0) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, + tempx = ami_font_plot_glyph(ofont, rp, utf16, utf16next, dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); - } } if(tempx == 0) @@ -795,26 +775,73 @@ ULONG ami_unicode_text(struct RastPort *rp, const char *string, ULONG length, ufont = ami_open_outline_font(fstyle, utf16); } - if(ufont) + if(ufont) { + tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, + dx + x, dy, emwidth, aa); + } + } + + x += tempx; + + utf16 += utf16charlen; + } + + free(outf16); + return x; +} + +static inline ULONG ami_font_unicode_width(const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy, bool aa) +{ + uint16 *utf16 = NULL, *outf16 = NULL; + uint16 *utf16charsc = 0, *utf16nextsc = 0; + uint16 *utf16next = 0; + int utf16charlen; + struct OutlineFont *ofont, *ufont = NULL; + uint32 x=0; + int32 tempx = 0; + ULONG emwidth = (ULONG)NSA_FONT_EMWIDTH(fstyle->size); + + if(!string || string[0]=='\0') return 0; + if(!length) return 0; + + if(utf8_to_enc(string,"UTF-16",length,(char **)&utf16) != NSERROR_OK) return 0; + outf16 = utf16; + if(!(ofont = ami_open_outline_font(fstyle, 0))) return 0; + + while(*utf16 != 0) + { + if ((*utf16 < 0xD800) || (0xDBFF < *utf16)) + utf16charlen = 1; + else + utf16charlen = 2; + + utf16next = &utf16[utf16charlen]; + + if(fstyle->flags & FONTF_SMALLCAPS) + { + utf16charsc = (uint16 *)ami_font_translate_smallcaps(utf16); + utf16nextsc = (uint16 *)ami_font_translate_smallcaps(utf16next); + + tempx = ami_font_width_glyph(ofont, utf16charsc, utf16nextsc, emwidth); + } + else tempx = 0; + + if(tempx == 0) { + tempx = ami_font_width_glyph(ofont, utf16, utf16next, emwidth); + } + + if(tempx == 0) + { + if(ufont == NULL) { - if(rp) { - tempx = ami_font_plot_glyph(ufont, rp, utf16, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); - } + ufont = ami_open_outline_font(fstyle, utf16); } -/* - if(tempx == 0) + + if(ufont) { - if(rp) { - tempx = ami_font_plot_glyph(ofont, rp, 0xfffd, utf16next, - dx + x, dy, emwidth, aa); - } else { - tempx = ami_font_width_glyph(ofont, 0xfffd, utf16next, emwidth); - } + tempx = ami_font_width_glyph(ufont, utf16, utf16next, emwidth); } -*/ } x += tempx; @@ -905,6 +932,11 @@ void ami_font_setdevicedpi(int id) ULONG ydpi = nsoption_int(screen_ydpi); ULONG xdpi = nsoption_int(screen_ydpi); + if(nsoption_bool(use_diskfont) == true) { + LOG(("WARNING: Using diskfont.library for text. Forcing DPI to 72.")); + nsoption_int(screen_ydpi) = 72; + } + browser_set_dpi(nsoption_int(screen_ydpi)); if(id && (nsoption_int(monitor_aspect_x) != 0) && (nsoption_int(monitor_aspect_y) != 0)) @@ -949,3 +981,47 @@ void ami_font_close_disk_font(struct TextFont *tfont) { CloseFont(tfont); } + + +/* Stub entry points */ +static bool nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, + int *width) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_width(fstyle, string, length, width); + } else { + return amiga_bm_nsfont_width(fstyle, string, length, width); + } +} + +static bool nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_position_in_string(fstyle, string, length, x, + char_offset, actual_x); + } else { + return amiga_bm_nsfont_position_in_string(fstyle, string, length, x, + char_offset, actual_x); + } +} + +static bool nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + if(__builtin_expect(nsoption_bool(use_diskfont) == false, 1)) { + return amiga_nsfont_split(fstyle, string, length, x, char_offset, actual_x); + } else { + return amiga_bm_nsfont_split(fstyle, string, length, x, char_offset, actual_x); + } +} + +const struct font_functions nsfont = { + nsfont_width, + nsfont_position_in_string, + nsfont_split +}; + diff --git a/amiga/font.h b/amiga/font.h index 10137f777..375e15032 100755 --- a/amiga/font.h +++ b/amiga/font.h @@ -25,7 +25,7 @@ struct ami_font_node; -ULONG ami_unicode_text(struct RastPort *rp, const char *string, +ULONG ami_font_unicode_text(struct RastPort *rp, const char *string, ULONG length, const plot_font_style_t *fstyle, ULONG x, ULONG y, bool aa); void ami_font_setdevicedpi(int id); void ami_init_fonts(void); @@ -40,4 +40,18 @@ void ami_font_savescanner(void); /* Simple diskfont functions for graphics.library use (not page rendering) */ struct TextFont *ami_font_open_disk_font(struct TextAttr *tattr); void ami_font_close_disk_font(struct TextFont *tfont); + +/* In font_bitmap.c */ +bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, int *width); +bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x); +ULONG ami_font_bm_text(struct RastPort *rp, const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy); + #endif + diff --git a/amiga/font_bitmap.c b/amiga/font_bitmap.c new file mode 100644 index 000000000..8f142ae6b --- /dev/null +++ b/amiga/font_bitmap.c @@ -0,0 +1,232 @@ +/* + * Copyright 2008 - 2015 Chris Young <chris@unsatisfactorysoftware.co.uk> + * + * 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/>. + */ + +#include "amiga/os3support.h" + +#include <assert.h> + +#include <proto/diskfont.h> +#include <proto/exec.h> +#include <proto/graphics.h> +#include <proto/timer.h> +#include <proto/utility.h> + +#include <graphics/rpattr.h> + +#include "utils/log.h" +#include "utils/utf8.h" +#include "utils/utils.h" +#include "utils/nsoption.h" +#include "desktop/browser.h" +#include "desktop/font.h" +#include "desktop/gui_window.h" + +#include "amiga/font.h" +#include "amiga/gui.h" +#include "amiga/utf8.h" + +static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_style_t *fstyle) +{ + struct TextFont *bmfont = NULL; + struct TextAttr tattr; + char *fontname, *font; + + if(rp == NULL) return NULL; + + switch(fstyle->family) + { + case PLOT_FONT_FAMILY_SANS_SERIF: + fontname = nsoption_charp(font_sans); + break; + case PLOT_FONT_FAMILY_SERIF: + fontname = nsoption_charp(font_serif); + break; + case PLOT_FONT_FAMILY_MONOSPACE: + fontname = nsoption_charp(font_mono); + break; + case PLOT_FONT_FAMILY_CURSIVE: + fontname = nsoption_charp(font_cursive); + break; + case PLOT_FONT_FAMILY_FANTASY: + fontname = nsoption_charp(font_fantasy); + break; + default: + return NULL; + break; + } + + tattr.ta_Style = FS_NORMAL; + + if (fstyle->flags & FONTF_OBLIQUE) + tattr.ta_Style = FSF_ITALIC; + + if (fstyle->flags & FONTF_ITALIC) + tattr.ta_Style = FSF_ITALIC; + + if (fstyle->weight >= 700) + tattr.ta_Style |= FSF_BOLD; + + if((font = ASPrintf("%s.font", fontname))) { + tattr.ta_Name = font; + tattr.ta_YSize = fstyle->size / FONT_SIZE_SCALE; + LOG(("font: %s/%d", tattr.ta_Name, tattr.ta_YSize)); + if((bmfont = OpenDiskFont(&tattr))) { + SetRPAttrs(rp, RPTAG_Font, bmfont, TAG_DONE); + } + FreeVec(font); + } + + return bmfont; +} + +static void ami_font_bm_close(struct TextFont *bmfont) +{ + CloseFont(bmfont); +} + +bool amiga_bm_nsfont_width(const plot_font_style_t *fstyle, + const char *string, size_t length, + int *width) +{ + *width = length; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + struct TextFont *bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + +// convert to local charset + *width = TextLength(glob->rp, string, length); + ami_font_bm_close(bmfont); + + return true; +} + +/** + * Find the position in a string where an x coordinate falls. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string + * \param x x coordinate to search for + * \param char_offset updated to offset in string of actual_x, [0..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + */ + +bool amiga_bm_nsfont_position_in_string(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + struct TextExtent extent; + struct TextFont *bmfont; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + + // convert to local charset + *char_offset = TextFit(glob->rp, string, length, + &extent, NULL, 1, x, 32767); + + *actual_x = extent.te_Extent.MaxX; + + ami_font_bm_close(bmfont); + + return true; +} + + +/** + * Find where to split a string to make it fit a width. + * + * \param fstyle style for this text + * \param string UTF-8 string to measure + * \param length length of string + * \param x width available + * \param char_offset updated to offset in string of actual_x, [1..length] + * \param actual_x updated to x coordinate of character closest to x + * \return true on success, false on error and error reported + * + * On exit, char_offset indicates first character after split point. + * + * Note: char_offset of 0 should never be returned. + * + * Returns: + * char_offset giving split point closest to x, where actual_x <= x + * else + * char_offset giving split point closest to x, where actual_x > x + * + * Returning char_offset == length means no split possible + */ + +bool amiga_bm_nsfont_split(const plot_font_style_t *fstyle, + const char *string, size_t length, + int x, size_t *char_offset, int *actual_x) +{ + struct TextExtent extent; + ULONG co; + char *charp; + + if((glob == NULL) || (glob->rp == NULL)) return false; + + struct TextFont *bmfont = ami_font_bm_open(glob->rp, fstyle); + + if(bmfont == NULL) return false; + + co = TextFit(glob->rp, string, length, + &extent, NULL, 1, x, 32767); + + charp = string + co; + + while(((*charp != ' ')) && (charp > string)) { + charp--; + co--; + } + + if(co > 0) { + *actual_x = TextLength(glob->rp, string, co); + *char_offset = co; + } else { + *actual_x = x; + *char_offset = length; + } + + ami_font_bm_close(bmfont); + + return true; +} + +ULONG ami_font_bm_text(struct RastPort *rp, const char *string, ULONG length, + const plot_font_style_t *fstyle, ULONG dx, ULONG dy) +{ + struct TextFont *bmfont = ami_font_bm_open(rp, fstyle); + char *localtext = NULL; + if(bmfont == NULL) return 0; + if(utf8_to_local_encoding(string, length, &localtext) == NSERROR_OK) { + Move(rp, dx, dy); + Text(rp, localtext, length); + free(localtext); + } + + return 0; +} + diff --git a/amiga/gui.c b/amiga/gui.c index 753f6901f..184c5b01a 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -204,10 +204,8 @@ void ami_get_vscroll_pos(struct gui_window_2 *gwin, ULONG *ys); void ami_quit_netsurf_delayed(void); Object *ami_gui_splash_open(void); void ami_gui_splash_close(Object *win_obj); -static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); -static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg); +HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *); +HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *); bool ami_gui_map_filename(char **remapped, const char *path, const char *file, const char *map); static void ami_gui_window_update_box_deferred(struct gui_window *g, bool draw); @@ -687,7 +685,7 @@ static nsurl *gui_get_resource_url(const char *path) return url; } -static void ami_gui_newprefs_hook(struct Hook *hook, APTR window, APTR reserved) +HOOKF(void, ami_gui_newprefs_hook, APTR, window, APTR) { ami_set_screen_defaults(scrn); } @@ -3644,11 +3642,7 @@ static void ami_refresh_window(struct gui_window_2 *gwin) ami_reset_pointer(gwin); } -#ifdef __amigaos4__ -static void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) -#else -static ASM void ami_scroller_hook(REG(a0, struct Hook *hook),REG(a2, Object *object), REG(a1, struct IntuiMessage *msg)) -#endif +HOOKF(void, ami_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct gui_window_2 *gwin = hook->h_Data; @@ -4996,9 +4990,7 @@ static nserror gui_window_set_url(struct gui_window *g, nsurl *url) return NSERROR_OK; } - -static uint32 ami_set_favicon_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) +HOOKF(uint32, ami_set_favicon_render_hook, APTR, space, struct gpRender *) { ami_schedule(0, ami_gui_refresh_favicon, hook->h_Data); return 0; @@ -5066,8 +5058,7 @@ static nserror gui_search_web_provider_update(const char *provider_name, return NSERROR_OK; } -static uint32 ami_set_throbber_render_hook(struct Hook *hook, APTR space, - struct gpRender *msg) +HOOKF(uint32, ami_set_throbber_render_hook, APTR, space, struct gpRender *) { struct gui_window_2 *gwin = hook->h_Data; ami_throbber_redraw_schedule(0, gwin->gw); diff --git a/amiga/gui.h b/amiga/gui.h index 246d75124..adad63d4f 100755 --- a/amiga/gui.h +++ b/amiga/gui.h @@ -28,6 +28,12 @@ #include "amiga/plotters.h" #include "amiga/menu.h" +#ifdef __amigaos4__ +#define HOOKF(ret,func,type,ptr,msgtype) static ret func(struct Hook *hook, type ptr, msgtype msg) +#else +#define HOOKF(ret,func,type,ptr,msgtype) static ASM ret func(REG(a0, struct Hook *hook),REG(a2, type ptr), REG(a1, msgtype msg)) +#endif + enum { OID_MAIN = 0, diff --git a/amiga/history_local.c b/amiga/history_local.c index b56293d48..39456496c 100755 --- a/amiga/history_local.c +++ b/amiga/history_local.c @@ -57,7 +57,7 @@ #include "amiga/history_local.h" void ami_history_update_extent(struct history_window *hw); -static void ami_history_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg); +HOOKF(void, ami_history_scroller_hook, Object *, object, struct IntuiMessage *); /** * Redraw history window. @@ -323,7 +323,7 @@ void ami_history_update_extent(struct history_window *hw) ami_gui_free_space_box(bbox); } -void ami_history_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) +HOOKF(void, ami_history_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct history_window *hw = hook->h_Data; diff --git a/amiga/menu.c b/amiga/menu.c index aa8203740..fbb6af336 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -96,43 +96,421 @@ bool menu_glyphs_loaded = false; static nserror ami_menu_scan(struct tree *tree, struct gui_window_2 *gwin); void ami_menu_arexx_scan(struct gui_window_2 *gwin); -/* Functions for menu selections */ -static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_open(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_save(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_closetab(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_closewin(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_print(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_project_quit(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_cut(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_copy(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_paste(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_selectall(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_clearsel(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_undo(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_edit_redo(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_find(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_localhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_globalhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_cookies(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_foreimg(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_backimg(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_enablejs(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_decrease(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_normal(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_scale_increase(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_browser_redraw(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_add(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_show(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_edit(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_snapshot(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_settings_save(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct IntuiMessage *msg); -static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg); +/* + * The below functions are called automatically by window.class when menu items are selected. + */ + +HOOKF(void, ami_menu_item_project_newwin, APTR, window, struct IntuiMessage *) +{ + nsurl *url; + nserror error; + + error = nsurl_create(nsoption_charp(homepage_url), &url); + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } +} + +HOOKF(void, ami_menu_item_project_newtab, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + nserror error; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + error = ami_gui_new_blank_tab(gwin); +} + +HOOKF(void, ami_menu_item_project_open, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_file_open(gwin); +} + +HOOKF(void, ami_menu_item_project_save, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + ULONG type = (ULONG)hook->h_Data; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); +} + +HOOKF(void, ami_menu_item_project_closetab, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_destroy(gwin->gw->bw); +} + +HOOKF(void, ami_menu_item_project_closewin, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_menu_window_close = gwin; +} + +HOOKF(void, ami_menu_item_project_print, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + ami_print_ui(browser_window_get_content(gwin->gw->bw)); + ami_reset_pointer(gwin); +} + +HOOKF(void, ami_menu_item_project_about, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + char *temp, *temp2; + int sel; + nsurl *url = NULL; + nserror error = NSERROR_OK; + + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_set_pointer(gwin, GUI_POINTER_WAIT, false); + + temp = ASPrintf("%s|%s|%s", messages_get("OK"), + messages_get("HelpCredits"), + messages_get("HelpLicence")); + + temp2 = ami_utf8_easy(temp); + FreeVec(temp); +#ifdef __amigaos4__ + sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, + TDR_TitleString, messages_get("NetSurf"), + TDR_Window, gwin->win, + TDR_GadgetString, temp2, + TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", + TDR_Arg1,netsurf_version, + TDR_Arg2,verdate, + TAG_DONE); +#else + /*\todo proper requester for OS3 + * at the moment menus are disabled so won't get here anyway */ + printf("NetSurf %s\nBuild date %s\n", netsurf_version, verdate); + sel = 0; +#endif + free(temp2); + + if(sel == 2) { + error = nsurl_create("about:credits", &url); + } else if(sel == 0) { + error = nsurl_create("about:licence", &url); + } + + if(url) { + if (error == NSERROR_OK) { + error = browser_window_create(BW_CREATE_HISTORY, + url, + NULL, + NULL, + NULL); + nsurl_unref(url); + } + if (error != NSERROR_OK) { + warn_user(messages_get_errorcode(error), 0); + } + } + + ami_reset_pointer(gwin); +} + +HOOKF(void, ami_menu_item_project_quit, APTR, window, struct IntuiMessage *) +{ + ami_menu_window_close = AMI_MENU_WINDOW_CLOSE_ALL; +} + +HOOKF(void, ami_menu_item_edit_cut, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); +} + +HOOKF(void, ami_menu_item_edit_copy, APTR, window, struct IntuiMessage *) +{ + struct bitmap *bm; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(browser_window_can_select(gwin->gw->bw)) { + browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); + browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); + } + else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { + /** @todo It should be checked that the lifetime of + * the objects containing the values returned (and the + * constness cast away) is safe. + */ + bm->url = (char *)nsurl_access(browser_window_get_url(gwin->gw->bw)); + bm->title = (char *)browser_window_get_title(gwin->gw->bw); + ami_easy_clipboard_bitmap(bm); + } +#ifdef WITH_NS_SVG + else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { + ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); + } +#endif +} + +HOOKF(void, ami_menu_item_edit_paste, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_PASTE); +} + +HOOKF(void, ami_menu_item_edit_selectall, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); + gui_start_selection(gwin->gw); +} + +HOOKF(void, ami_menu_item_edit_clearsel, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); +} + +HOOKF(void, ami_menu_item_edit_undo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_UNDO); +} + +HOOKF(void, ami_menu_item_edit_redo, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + browser_window_key_press(gwin->gw->bw, KEY_REDO); +} + +HOOKF(void, ami_menu_item_browser_find, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_search_open(gwin->gw); +} + +HOOKF(void, ami_menu_item_browser_localhistory, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_history_open(gwin->gw); +} + +HOOKF(void, ami_menu_item_browser_globalhistory, APTR, window, struct IntuiMessage *) +{ + ami_tree_open(global_history_window,AMI_TREE_HISTORY); +} + +HOOKF(void, ami_menu_item_browser_cookies, APTR, window, struct IntuiMessage *) +{ + ami_tree_open(cookies_window,AMI_TREE_COOKIES); +} + +HOOKF(void, ami_menu_item_browser_foreimg, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(foreground_images, checked); + ami_menu_check_toggled = true; +} + +HOOKF(void, ami_menu_item_browser_backimg, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(background_images, checked); + ami_menu_check_toggled = true; +} + +HOOKF(void, ami_menu_item_browser_enablejs, APTR, window, struct IntuiMessage *) +{ + struct Menu *menustrip; + bool checked = false; + + GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); + if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; + + nsoption_set_bool(enable_javascript, checked); + ami_menu_check_toggled = true; +} + +HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(gwin->gw->scale > 0.1) + ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); +} + +HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_gui_set_scale(gwin->gw, 1.0); +} + +HOOKF(void, ami_menu_item_browser_scale_increase, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); +} + +HOOKF(void, ami_menu_item_browser_redraw, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + ami_schedule_redraw(gwin, true); + gwin->new_content = true; +} + +HOOKF(void, ami_menu_item_hotlist_add, APTR, window, struct IntuiMessage *) +{ + struct browser_window *bw; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + bw = gwin->gw->bw; + + if (bw == NULL || browser_window_has_content(bw) == false) + return; + + hotlist_add_url(browser_window_get_url(bw)); + ami_gui_update_hotlist_button(gwin); +} + +HOOKF(void, ami_menu_item_hotlist_show, APTR, window, struct IntuiMessage *) +{ + ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); +} + +HOOKF(void, ami_menu_item_hotlist_entries, APTR, window, struct IntuiMessage *) +{ + nsurl *url = hook->h_Data; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(url == NULL) return; + + browser_window_navigate(gwin->gw->bw, + url, + NULL, + BW_NAVIGATE_HISTORY, + NULL, + NULL, + NULL); +} + +HOOKF(void, ami_menu_item_settings_edit, APTR, window, struct IntuiMessage *) +{ + ami_gui_opts_open(); +} + +HOOKF(void, ami_menu_item_settings_snapshot, APTR, window, struct IntuiMessage *) +{ + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + nsoption_set_int(window_x, gwin->win->LeftEdge); + nsoption_set_int(window_y, gwin->win->TopEdge); + nsoption_set_int(window_width, gwin->win->Width); + nsoption_set_int(window_height, gwin->win->Height); +} + +HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *) +{ + nsoption_write(current_user_options, NULL, NULL); +} + +HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *) +{ + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(AslRequestTags(filereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, + ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Screen, scrn, + ASLFR_DoSaveMode, FALSE, + ASLFR_InitialDrawer, nsoption_charp(arexx_dir), + ASLFR_InitialPattern, "#?.nsrx", + TAG_DONE)) { + if((temp = AllocVecTagList(1024, NULL))) { + strlcpy(temp, filereq->fr_Drawer, 1024); + AddPart(temp, filereq->fr_File, 1024); + ami_arexx_execute(temp); + FreeVec(temp); + } + } +} + +HOOKF(void, ami_menu_item_arexx_entries, APTR, window, struct IntuiMessage *) +{ + char *script = hook->h_Data; + char *temp; + struct gui_window_2 *gwin; + GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); + + if(script) { + if((temp = AllocVecTagList(1024, NULL))) { + BPTR lock; + if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { + DevNameFromLock(lock, temp, 1024, DN_FULLPATH); + AddPart(temp, script, 1024); + ami_arexx_execute(temp); + FreeVec(temp); + UnLock(lock); + } + } + } +} + +/* menu creation code */ void ami_free_menulabs(struct gui_window_2 *gwin) { @@ -782,416 +1160,3 @@ void ami_menu_update_disabled(struct gui_window *g, hlcache_handle *c) } } -/* - * The below functions are called automatically by window.class when menu items are selected. - */ - -static void ami_menu_item_project_newwin(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - nsurl *url; - nserror error; - - error = nsurl_create(nsoption_charp(homepage_url), &url); - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } -} - -static void ami_menu_item_project_newtab(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - nserror error; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - error = ami_gui_new_blank_tab(gwin); -} - -static void ami_menu_item_project_open(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_file_open(gwin); -} - -static void ami_menu_item_project_save(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - ULONG type = (ULONG)hook->h_Data; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_file_save_req(type, gwin, browser_window_get_content(gwin->gw->bw)); -} - -static void ami_menu_item_project_closetab(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_destroy(gwin->gw->bw); -} - -static void ami_menu_item_project_closewin(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_menu_window_close = gwin; -} - -static void ami_menu_item_project_print(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - ami_print_ui(browser_window_get_content(gwin->gw->bw)); - ami_reset_pointer(gwin); -} - -static void ami_menu_item_project_about(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - char *temp, *temp2; - int sel; - nsurl *url = NULL; - nserror error = NSERROR_OK; - - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_set_pointer(gwin, GUI_POINTER_WAIT, false); - - temp = ASPrintf("%s|%s|%s", messages_get("OK"), - messages_get("HelpCredits"), - messages_get("HelpLicence")); - - temp2 = ami_utf8_easy(temp); - FreeVec(temp); -#ifdef __amigaos4__ - sel = TimedDosRequesterTags(TDR_ImageType,TDRIMAGE_INFO, - TDR_TitleString, messages_get("NetSurf"), - TDR_Window, gwin->win, - TDR_GadgetString, temp2, - TDR_FormatString,"NetSurf %s\nBuild date %s\n\nhttp://www.netsurf-browser.org", - TDR_Arg1,netsurf_version, - TDR_Arg2,verdate, - TAG_DONE); -#else - /*\todo proper requester for OS3 - * at the moment menus are disabled so won't get here anyway */ - printf("NetSurf %s\nBuild date %s\n", netsurf_version, verdate); - sel = 0; -#endif - free(temp2); - - if(sel == 2) { - error = nsurl_create("about:credits", &url); - } else if(sel == 0) { - error = nsurl_create("about:licence", &url); - } - - if(url) { - if (error == NSERROR_OK) { - error = browser_window_create(BW_CREATE_HISTORY, - url, - NULL, - NULL, - NULL); - nsurl_unref(url); - } - if (error != NSERROR_OK) { - warn_user(messages_get_errorcode(error), 0); - } - } - - ami_reset_pointer(gwin); -} - -static void ami_menu_item_project_quit(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_menu_window_close = AMI_MENU_WINDOW_CLOSE_ALL; -} - -static void ami_menu_item_edit_cut(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_CUT_SELECTION); -} - -static void ami_menu_item_edit_copy(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct bitmap *bm; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(browser_window_can_select(gwin->gw->bw)) { - browser_window_key_press(gwin->gw->bw, KEY_COPY_SELECTION); - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); - } - else if((bm = content_get_bitmap(browser_window_get_content(gwin->gw->bw)))) { - /** @todo It should be checked that the lifetime of - * the objects containing the values returned (and the - * constness cast away) is safe. - */ - bm->url = (char *)nsurl_access(browser_window_get_url(gwin->gw->bw)); - bm->title = (char *)browser_window_get_title(gwin->gw->bw); - ami_easy_clipboard_bitmap(bm); - } -#ifdef WITH_NS_SVG - else if(ami_mime_compare(browser_window_get_content(gwin->gw->bw), "svg") == true) { - ami_easy_clipboard_svg(browser_window_get_content(gwin->gw->bw)); - } -#endif -} - -static void ami_menu_item_edit_paste(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_PASTE); -} - -static void ami_menu_item_edit_selectall(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_SELECT_ALL); - gui_start_selection(gwin->gw); -} - -static void ami_menu_item_edit_clearsel(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_CLEAR_SELECTION); -} - -static void ami_menu_item_edit_undo(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_UNDO); -} - -static void ami_menu_item_edit_redo(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - browser_window_key_press(gwin->gw->bw, KEY_REDO); -} - -static void ami_menu_item_browser_find(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_search_open(gwin->gw); -} - -static void ami_menu_item_browser_localhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_history_open(gwin->gw); -} - -static void ami_menu_item_browser_globalhistory(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_tree_open(global_history_window,AMI_TREE_HISTORY); -} - -static void ami_menu_item_browser_cookies(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_tree_open(cookies_window,AMI_TREE_COOKIES); -} - -static void ami_menu_item_browser_foreimg(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(foreground_images, checked); - ami_menu_check_toggled = true; -} - -static void ami_menu_item_browser_backimg(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(background_images, checked); - ami_menu_check_toggled = true; -} - -static void ami_menu_item_browser_enablejs(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct Menu *menustrip; - bool checked = false; - - GetAttr(WINDOW_MenuStrip, (Object *)window, (ULONG *)&menustrip); - if(ItemAddress(menustrip, msg->Code)->Flags & CHECKED) checked = true; - - nsoption_set_bool(enable_javascript, checked); - ami_menu_check_toggled = true; -} - -static void ami_menu_item_browser_scale_decrease(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(gwin->gw->scale > 0.1) - ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1); -} - -static void ami_menu_item_browser_scale_normal(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_gui_set_scale(gwin->gw, 1.0); -} - -static void ami_menu_item_browser_scale_increase(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1); -} - -static void ami_menu_item_browser_redraw(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - ami_schedule_redraw(gwin, true); - gwin->new_content = true; -} - -static void ami_menu_item_hotlist_add(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct browser_window *bw; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - bw = gwin->gw->bw; - - if (bw == NULL || browser_window_has_content(bw) == false) - return; - - hotlist_add_url(browser_window_get_url(bw)); - ami_gui_update_hotlist_button(gwin); -} - -static void ami_menu_item_hotlist_show(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_tree_open(hotlist_window, AMI_TREE_HOTLIST); -} - -static void ami_menu_item_hotlist_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - nsurl *url = hook->h_Data; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(url == NULL) return; - - browser_window_navigate(gwin->gw->bw, - url, - NULL, - BW_NAVIGATE_HISTORY, - NULL, - NULL, - NULL); -} - -static void ami_menu_item_settings_edit(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - ami_gui_opts_open(); -} - -static void ami_menu_item_settings_snapshot(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - nsoption_set_int(window_x, gwin->win->LeftEdge); - nsoption_set_int(window_y, gwin->win->TopEdge); - nsoption_set_int(window_width, gwin->win->Width); - nsoption_set_int(window_height, gwin->win->Height); -} - -static void ami_menu_item_settings_save(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - nsoption_write(current_user_options, NULL, NULL); -} - -static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(AslRequestTags(filereq, - ASLFR_Window, gwin->win, - ASLFR_SleepWindow, TRUE, - ASLFR_TitleText, messages_get("NetSurf"), - ASLFR_Screen, scrn, - ASLFR_DoSaveMode, FALSE, - ASLFR_InitialDrawer, nsoption_charp(arexx_dir), - ASLFR_InitialPattern, "#?.nsrx", - TAG_DONE)) { - if((temp = AllocVecTagList(1024, NULL))) { - strlcpy(temp, filereq->fr_Drawer, 1024); - AddPart(temp, filereq->fr_File, 1024); - ami_arexx_execute(temp); - FreeVec(temp); - } - } -} - -static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct IntuiMessage *msg) -{ - char *script = hook->h_Data; - char *temp; - struct gui_window_2 *gwin; - GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); - - if(script) { - if((temp = AllocVecTagList(1024, NULL))) { - BPTR lock; - if((lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))) { - DevNameFromLock(lock, temp, 1024, DN_FULLPATH); - AddPart(temp, script, 1024); - ami_arexx_execute(temp); - FreeVec(temp); - UnLock(lock); - } - } - } -} - diff --git a/amiga/options.h b/amiga/options.h index 868e28fdb..b94242085 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -63,6 +63,7 @@ NSOPTION_STRING(font_unicode, NULL) NSOPTION_STRING(font_unicode_file, NULL) NSOPTION_BOOL(font_unicode_only, false) NSOPTION_BOOL(font_antialiasing, true) +NSOPTION_BOOL(use_diskfont, false) NSOPTION_BOOL(drag_save_icons, true) NSOPTION_INTEGER(hotlist_window_xpos, 0) NSOPTION_INTEGER(hotlist_window_ypos, 0) diff --git a/amiga/plotters.c b/amiga/plotters.c index 443077b58..660dea74d 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -414,7 +414,7 @@ static bool ami_text(int x, int y, const char *text, size_t length, aa = false; ami_plot_setapen(glob->rp, fstyle->foreground); - ami_unicode_text(glob->rp, text, length, fstyle, x, y, aa); + ami_font_unicode_text(glob->rp, text, length, fstyle, x, y, aa); return true; } diff --git a/amiga/tree.c b/amiga/tree.c index 4f2c28630..cba5375b6 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -524,7 +524,7 @@ static void ami_tree_drag_end(struct treeview_window *twin, int x, int y) } } -static void ami_tree_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg) +HOOKF(void, ami_tree_scroller_hook, Object *, object, struct IntuiMessage *) { ULONG gid; struct treeview_window *twin = hook->h_Data; |