Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/cc0abb66b092f2198e193... ...commit http://git.netsurf-browser.org/netsurf.git/commit/cc0abb66b092f2198e1931e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/cc0abb66b092f2198e1931ee6... The branch, master has been updated via cc0abb66b092f2198e1931ee6921fe79da4ed94d (commit) via e98c220813cb12a413711990d9b25aa8a9cb847a (commit) via 1acc32b3a952c5d5526193ac546389c0a42420e3 (commit) via 7729d9369696e5983ac7959f21171ffdf684d2a1 (commit) from bf4382e3ec9af8e65e0903af7b1f492454877558 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=cc0abb66b092f2198e1... commit cc0abb66b092f2198e1931ee6921fe79da4ed94d Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Implement warn_multi for OS3 (needed for the multiple tab close warning) diff --git a/amiga/misc.c b/amiga/misc.c index 407aec1..aa9d119 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -137,7 +137,7 @@ void warn_user(const char *warning, const char *detail) int32 ami_warn_user_multi(const char *body, const char *opt1, const char *opt2, struct Window *win) { int res = 0; -#ifdef __amigaos4__ + char *utf8text = ami_utf8_easy(body); char *utf8gadget1 = ami_utf8_easy(messages_get(opt1)); char *utf8gadget2 = ami_utf8_easy(messages_get(opt2)); @@ -145,18 +145,28 @@ int32 ami_warn_user_multi(const char *body, const char *opt1, const char *opt2, free(utf8gadget1); free(utf8gadget2); +#ifdef __amigaos4__ res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_WARNING, TDR_TitleString, messages_get("NetSurf"), TDR_FormatString, utf8text, TDR_GadgetString, utf8gadgets, TDR_Window, win, TAG_DONE); +#else + struct EasyStruct easyreq = { + sizeof(struct EasyStruct), + 0, + messages_get("NetSurf"), + utf8text, + utf8gadgets, + }; + + res = EasyRequest(win, &easyreq, NULL); +#endif if(utf8text) free(utf8text); if(utf8gadgets) FreeVec(utf8gadgets); -#else -#warning write this for os3 -#endif + return res; } commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e98c220813cb12a4137... commit e98c220813cb12a413711990d9b25aa8a9cb847a Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix some enable/disable gadget logic diff --git a/amiga/gui.c b/amiga/gui.c index 2eb4984..e4cdd18 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1163,8 +1163,8 @@ static void ami_update_buttons(struct gui_window_2 *gwin) SetGadgetAttrs((struct Gadget *)gwin->objects[GID_STOP], gwin->win, NULL, GA_Disabled, stop, TAG_DONE); - if((gwin->tabs) && (ClickTabBase->lib_Version < 53)) - { + if(ClickTabBase->lib_Version < 53) { + if(gwin->tabs <= 1) tabclose = TRUE; GetAttr(GA_Disabled, gwin->objects[GID_CLOSETAB], (uint32 *)&storage); if(storage != tabclose) SetGadgetAttrs((struct Gadget *)gwin->objects[GID_CLOSETAB], commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1acc32b3a952c5d5526... commit 1acc32b3a952c5d5526193ac546389c0a42420e3 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Force always show tabs when clicktab.gadget is older than v53 diff --git a/amiga/gui.c b/amiga/gui.c index 41a0a45..2eb4984 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -556,6 +556,10 @@ static nserror ami_set_options(struct nsoption_s *defaults) */ nsoption_set_bool(core_select_menu, true); + /* ClickTab < 53 doesn't work with the auto show/hide tab-bar (for reasons forgotten) */ + if(ClickTabBase->lib_Version < 53) + nsoption_set_bool(tab_always_show, true); + /* Some AmigaOS3 overrides */ #ifndef __amigaos4__ nsoption_set_bool(download_notify, false); @@ -3985,7 +3989,6 @@ gui_window_create(struct browser_window *bw, if(ClickTabBase->lib_Version < 53) { -//#ifdef __amigaos4__ addtabclosegadget = LAYOUT_AddChild; g->shared->objects[GID_CLOSETAB] = ButtonObj, GA_ID, GID_CLOSETAB, @@ -4007,9 +4010,6 @@ gui_window_create(struct browser_window *bw, GA_Text, "+", BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM], ButtonEnd; -//#else -//#warning OS3 tab bar permanently disabled! -//#endif } else { diff --git a/amiga/gui_options.c b/amiga/gui_options.c index cd23880..3be0cd5 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -504,7 +504,7 @@ void ami_gui_opts_open(void) BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE; BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE; BOOL ditherdisable = TRUE, nativebm_disable = FALSE; - BOOL download_notify_disabled = FALSE; + BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE; BOOL ptr_disable = FALSE; char animspeed[10]; char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url)); @@ -602,6 +602,10 @@ void ami_gui_opts_open(void) nsoption_set_bool(download_notify, FALSE); } + if(ClickTabBase->lib_Version < 53) { + tab_always_show_disabled = TRUE; + } + fontsans.ta_Name = ASPrintf("%s.font", nsoption_charp(font_sans)); fontserif.ta_Name = ASPrintf("%s.font", nsoption_charp(font_serif)); fontmono.ta_Name = ASPrintf("%s.font", nsoption_charp(font_mono)); @@ -1344,6 +1348,7 @@ void ami_gui_opts_open(void) GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ALWAYS], GA_Selected, nsoption_bool(tab_always_show), + GA_Disabled, tab_always_show_disabled, CheckBoxEnd, LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj, GA_ID, GID_OPTS_TAB_CLOSE, commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=7729d9369696e5983ac... commit 7729d9369696e5983ac7959f21171ffdf684d2a1 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Enable tabbed browsing on OS3 diff --git a/amiga/gui.c b/amiga/gui.c index c7f920f..41a0a45 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2162,8 +2162,13 @@ static void ami_handle_msg(void) { case GID_TABS: if(gwin->objects[GID_TABS] == NULL) break; - GetAttrs(gwin->objects[GID_TABS], - CLICKTAB_NodeClosed, &tabnode, TAG_DONE); + if(ClickTabBase->lib_Version >= 53) { + GetAttrs(gwin->objects[GID_TABS], + CLICKTAB_NodeClosed, &tabnode, TAG_DONE); + } else { + tabnode = NULL; + } + if(tabnode) { struct gui_window *closedgw; @@ -3980,7 +3985,7 @@ gui_window_create(struct browser_window *bw, if(ClickTabBase->lib_Version < 53) { -#ifdef __amigaos4__ +//#ifdef __amigaos4__ addtabclosegadget = LAYOUT_AddChild; g->shared->objects[GID_CLOSETAB] = ButtonObj, GA_ID, GID_CLOSETAB, @@ -4002,9 +4007,9 @@ gui_window_create(struct browser_window *bw, GA_Text, "+", BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM], ButtonEnd; -#else -#warning OS3 tab bar permanently disabled! -#endif +//#else +//#warning OS3 tab bar permanently disabled! +//#endif } else { ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 21 +++++++++++++-------- amiga/gui_options.c | 7 ++++++- amiga/misc.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index c7f920f..e4cdd18 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -556,6 +556,10 @@ static nserror ami_set_options(struct nsoption_s *defaults) */ nsoption_set_bool(core_select_menu, true); + /* ClickTab < 53 doesn't work with the auto show/hide tab-bar (for reasons forgotten) */ + if(ClickTabBase->lib_Version < 53) + nsoption_set_bool(tab_always_show, true); + /* Some AmigaOS3 overrides */ #ifndef __amigaos4__ nsoption_set_bool(download_notify, false); @@ -1159,8 +1163,8 @@ static void ami_update_buttons(struct gui_window_2 *gwin) SetGadgetAttrs((struct Gadget *)gwin->objects[GID_STOP], gwin->win, NULL, GA_Disabled, stop, TAG_DONE); - if((gwin->tabs) && (ClickTabBase->lib_Version < 53)) - { + if(ClickTabBase->lib_Version < 53) { + if(gwin->tabs <= 1) tabclose = TRUE; GetAttr(GA_Disabled, gwin->objects[GID_CLOSETAB], (uint32 *)&storage); if(storage != tabclose) SetGadgetAttrs((struct Gadget *)gwin->objects[GID_CLOSETAB], @@ -2162,8 +2166,13 @@ static void ami_handle_msg(void) { case GID_TABS: if(gwin->objects[GID_TABS] == NULL) break; - GetAttrs(gwin->objects[GID_TABS], - CLICKTAB_NodeClosed, &tabnode, TAG_DONE); + if(ClickTabBase->lib_Version >= 53) { + GetAttrs(gwin->objects[GID_TABS], + CLICKTAB_NodeClosed, &tabnode, TAG_DONE); + } else { + tabnode = NULL; + } + if(tabnode) { struct gui_window *closedgw; @@ -3980,7 +3989,6 @@ gui_window_create(struct browser_window *bw, if(ClickTabBase->lib_Version < 53) { -#ifdef __amigaos4__ addtabclosegadget = LAYOUT_AddChild; g->shared->objects[GID_CLOSETAB] = ButtonObj, GA_ID, GID_CLOSETAB, @@ -4002,9 +4010,6 @@ gui_window_create(struct browser_window *bw, GA_Text, "+", BUTTON_RenderImage, g->shared->objects[GID_ADDTAB_BM], ButtonEnd; -#else -#warning OS3 tab bar permanently disabled! -#endif } else { diff --git a/amiga/gui_options.c b/amiga/gui_options.c index cd23880..3be0cd5 100755 --- a/amiga/gui_options.c +++ b/amiga/gui_options.c @@ -504,7 +504,7 @@ void ami_gui_opts_open(void) BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE; BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE; BOOL ditherdisable = TRUE, nativebm_disable = FALSE; - BOOL download_notify_disabled = FALSE; + BOOL download_notify_disabled = FALSE, tab_always_show_disabled = FALSE; BOOL ptr_disable = FALSE; char animspeed[10]; char *homepage_url_lc = ami_utf8_easy(nsoption_charp(homepage_url)); @@ -602,6 +602,10 @@ void ami_gui_opts_open(void) nsoption_set_bool(download_notify, FALSE); } + if(ClickTabBase->lib_Version < 53) { + tab_always_show_disabled = TRUE; + } + fontsans.ta_Name = ASPrintf("%s.font", nsoption_charp(font_sans)); fontserif.ta_Name = ASPrintf("%s.font", nsoption_charp(font_serif)); fontmono.ta_Name = ASPrintf("%s.font", nsoption_charp(font_mono)); @@ -1344,6 +1348,7 @@ void ami_gui_opts_open(void) GA_RelVerify, TRUE, GA_Text, gadlab[GID_OPTS_TAB_ALWAYS], GA_Selected, nsoption_bool(tab_always_show), + GA_Disabled, tab_always_show_disabled, CheckBoxEnd, LAYOUT_AddChild, gow->objects[GID_OPTS_TAB_CLOSE] = CheckBoxObj, GA_ID, GID_OPTS_TAB_CLOSE, diff --git a/amiga/misc.c b/amiga/misc.c index 407aec1..aa9d119 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -137,7 +137,7 @@ void warn_user(const char *warning, const char *detail) int32 ami_warn_user_multi(const char *body, const char *opt1, const char *opt2, struct Window *win) { int res = 0; -#ifdef __amigaos4__ + char *utf8text = ami_utf8_easy(body); char *utf8gadget1 = ami_utf8_easy(messages_get(opt1)); char *utf8gadget2 = ami_utf8_easy(messages_get(opt2)); @@ -145,18 +145,28 @@ int32 ami_warn_user_multi(const char *body, const char *opt1, const char *opt2, free(utf8gadget1); free(utf8gadget2); +#ifdef __amigaos4__ res = TimedDosRequesterTags(TDR_ImageType, TDRIMAGE_WARNING, TDR_TitleString, messages_get("NetSurf"), TDR_FormatString, utf8text, TDR_GadgetString, utf8gadgets, TDR_Window, win, TAG_DONE); +#else + struct EasyStruct easyreq = { + sizeof(struct EasyStruct), + 0, + messages_get("NetSurf"), + utf8text, + utf8gadgets, + }; + + res = EasyRequest(win, &easyreq, NULL); +#endif if(utf8text) free(utf8text); if(utf8gadgets) FreeVec(utf8gadgets); -#else -#warning write this for os3 -#endif + return res; } -- NetSurf Browser