Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40
...commit
http://git.netsurf-browser.org/netsurf.git/commit/6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40
...tree
http://git.netsurf-browser.org/netsurf.git/tree/6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40
The branch, master has been updated
via 6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40 (commit)
via df8aeb4a88210b5ce0738b08d96f619f6ce6bfea (commit)
via c9daec556780610d5d4a25f35d06a288294da744 (commit)
from 39dcd22b05342e639c587de8e1af382e7dee2454 (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=6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40
commit 6a9a8d6127e3fd677dc8ad28d14b4d84b3dfdc40
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Move current user options path to an abstracted nsoptions_read/write
function
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 22bf85b..eb3c70b 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -45,7 +45,7 @@ S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c
file.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 os3support.c font_diskfont.c \
- selectmenu.c hash/xxhash.c font_cache.c font_bullet.c
+ selectmenu.c hash/xxhash.c font_cache.c font_bullet.c nsoption.c
# This is the final source build list
# Note this is deliberately *not* expanded here as common and image
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 9e57bc7..815ffb7 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -776,7 +776,7 @@ static void ami_openscreen(void)
id = screenmodereq->sm_DisplayID;
sprintf(modeid, "0x%lx", id);
nsoption_set_charp(screen_modeid,
modeid);
- nsoption_write(current_user_options,
NULL, NULL);
+ ami_nsoption_write();
}
FreeAslRequest(screenmodereq);
}
@@ -5643,7 +5643,7 @@ int main(int argc, char** argv)
if((lock = CreateDirTree(current_user_dir)))
UnLock(lock);
- current_user_options = ASPrintf("%s/Choices", current_user_dir);
+ ami_nsoption_set_location(current_user_dir);
current_user_cache = ASPrintf("%s/Cache", current_user_dir);
current_user_faviconcache = ASPrintf("%s/IconCache", current_user_dir);
@@ -5672,7 +5672,7 @@ int main(int argc, char** argv)
ami_libs_close();
return RETURN_FAIL;
}
- nsoption_read(current_user_options, NULL);
+ ami_nsoption_read();
if(args != NULL) {
nsoption_commandline(&nargc, &nargv, NULL);
FreeArgs(args);
@@ -5742,7 +5742,7 @@ int main(int argc, char** argv)
netsurf_exit();
- FreeVec(current_user_options);
+ ami_nsoption_free();
FreeVec(current_user_dir);
FreeVec(current_user_faviconcache);
FreeVec(current_user);
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 21067fb..2b1b7c9 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -74,6 +74,7 @@
#include "amiga/help.h"
#include "amiga/libs.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/object.h"
#include "amiga/selectmenu.h"
#include "amiga/theme.h"
@@ -233,8 +234,6 @@ struct ami_gui_opts_window {
#endif
};
-char *current_user_options = NULL;
-
static struct ami_gui_opts_window *gow = NULL;
static CONST_STRPTR tabs[OPTS_MAX_TABS];
@@ -2057,7 +2056,7 @@ static void ami_gui_opts_use(bool save)
}
if(save == true) {
- nsoption_write(current_user_options, NULL, NULL);
+ ami_nsoption_write();
ami_font_savescanner(); /* just in case it has changed and been
used only */
}
diff --git a/frontends/amiga/gui_options.h b/frontends/amiga/gui_options.h
index 3d68084..abb0b11 100755
--- a/frontends/amiga/gui_options.h
+++ b/frontends/amiga/gui_options.h
@@ -26,7 +26,5 @@ void ami_gui_opts_close(void);
/* Web search list */
struct List *ami_gui_opts_websearch(void);
void ami_gui_opts_websearch_free(struct List *websearchlist);
-
-extern char *current_user_options;
#endif
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 479bf81..0fd730e 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -69,6 +69,7 @@
#include "amiga/libs.h"
#include "amiga/menu.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/print.h"
#include "amiga/search.h"
#include "amiga/theme.h"
@@ -484,7 +485,7 @@ HOOKF(void, ami_menu_item_settings_snapshot, APTR, window,
struct IntuiMessage *
HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *)
{
- nsoption_write(current_user_options, NULL, NULL);
+ ami_nsoption_write();
}
HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *)
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=df8aeb4a88210b5ce0738b08d96f619f6ce6bfea
commit df8aeb4a88210b5ce0738b08d96f619f6ce6bfea
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Remove unused variable; help gcc
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 69a103a..3addea5 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -94,7 +94,7 @@ struct history_window;
struct gui_window_2 {
struct nsObject *node;
struct Window *win;
- Object *objects[GID_LAST];
+ Object *restrict objects[GID_LAST];
struct gui_window *gw; /* currently-displayed gui_window */
bool redraw_required;
int throbber_frame;
@@ -112,22 +112,22 @@ struct gui_window_2 {
int temp;
bool redraw_scroll;
bool new_content;
- char *menulab[AMI_MENU_AREXX_MAX + 1];
- Object *menuobj[AMI_MENU_AREXX_MAX + 1];
+ char *restrict menulab[AMI_MENU_AREXX_MAX + 1];
+ Object *restrict menuobj[AMI_MENU_AREXX_MAX + 1];
char menukey[AMI_MENU_AREXX_MAX + 1];
- char *menuicon[AMI_MENU_AREXX_MAX + 1];
+ char *restrict menuicon[AMI_MENU_AREXX_MAX + 1];
struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1];
UBYTE *menutype;
struct NewMenu *menu;
ULONG hotlist_items;
- Object *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
+ Object *restrict hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
struct List hotlist_toolbar_list;
struct List *web_search_list;
Object *search_bm;
- char *svbuffer;
- char *status;
- char *wintitle;
- char *helphints[GID_LAST];
+ char *restrict svbuffer;
+ char *restrict status;
+ char *restrict wintitle;
+ char *restrict helphints[GID_LAST];
browser_mouse_state prev_mouse_state;
struct timeval lastclick;
struct AppIcon *appicon; /* iconify appicon */
@@ -135,8 +135,8 @@ struct gui_window_2 {
struct Hook favicon_hook;
struct Hook throbber_hook;
struct Hook *ctxmenu_hook;
- Object *history_ctxmenu[2];
- Object *clicktab_ctxmenu;
+ Object *restrict history_ctxmenu[2];
+ Object *restrict clicktab_ctxmenu;
gui_drag_type drag_op;
struct IBox *ptr_lock;
struct AppWindow *appwin;
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index c735141..479bf81 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -89,8 +89,7 @@ enum {
static bool menu_quit = false;
static bool ami_menu_check_toggled = false;
-static BOOL menualreadyinit;
-static Object *menu_glyph[NSA_GLYPH_MAX];
+static Object *restrict menu_glyph[NSA_GLYPH_MAX];
static int menu_glyph_width[NSA_GLYPH_MAX];
static bool menu_glyphs_loaded = false;
@@ -577,7 +576,7 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin,
int num, UBYTE type,
if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) {
utf8_from_local_encoding(label,
(strlen(label) < NSA_MAX_HOTLIST_MENU_LEN) ?
strlen(label) : NSA_MAX_HOTLIST_MENU_LEN,
- &gwin->menulab[num]);
+ (char **)&gwin->menulab[num]);
} else if((num >= AMI_MENU_AREXX) && (num <
AMI_MENU_AREXX_MAX)) {
gwin->menulab[num] = strdup(label);
} else {
@@ -856,8 +855,8 @@ static struct gui_window_2 *ami_menu_layout(struct
gui_window_2 *gwin)
using label.image if there's a bitmap
associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] !=
NM_BARLABEL)) {
int icon_width = 0;
- Object *submenuarrow = NULL;
- Object *icon = BitMapObj,
+ Object *restrict submenuarrow = NULL;
+ Object *restrict icon = BitMapObj,
IA_Scalable, TRUE,
BITMAP_Screen, scrn,
BITMAP_SourceFile,
gwin->menuicon[i],
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c9daec556780610d5d4a25f35d06a288294da744
commit c9daec556780610d5d4a25f35d06a288294da744
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Set an env-var if we don't have AltiVec
This, in theory, allows us to use libjpeg-turbo 1.5+ on both AltiVec and
non-AltiVec systems.
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index a05761a..9e57bc7 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -5544,6 +5544,19 @@ int main(int argc, char** argv)
/* Open splash window */
Object *splash_window = ami_gui_splash_open();
+#ifdef __amigaos4__
+ /* Check for AltiVec */
+ uint32 altivec = 0;
+ GetCPUInfoTags(GCIT_VectorUnit, &altivec);
+
+ if(altivec == VECTORTYPE_ALTIVEC) {
+ LOG("AltiVec detected");
+ } else {
+ LOG("AltiVec NOT detected");
+ SetVar("JSIMD_FORCENONE", "0", 1, GVF_LOCAL_ONLY);
+ }
+#endif
+
ami_object_init();
if (ami_open_resources() == false) { /* alloc message ports */
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 2 +-
frontends/amiga/gui.c | 21 +++++++++++++++++----
frontends/amiga/gui.h | 22 +++++++++++-----------
frontends/amiga/gui_options.c | 5 ++---
frontends/amiga/gui_options.h | 2 --
frontends/amiga/menu.c | 12 ++++++------
6 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 22bf85b..eb3c70b 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -45,7 +45,7 @@ S_FRONTEND := gui.c tree.c history.c hotlist.c schedule.c
file.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 os3support.c font_diskfont.c \
- selectmenu.c hash/xxhash.c font_cache.c font_bullet.c
+ selectmenu.c hash/xxhash.c font_cache.c font_bullet.c nsoption.c
# This is the final source build list
# Note this is deliberately *not* expanded here as common and image
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index a05761a..815ffb7 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -776,7 +776,7 @@ static void ami_openscreen(void)
id = screenmodereq->sm_DisplayID;
sprintf(modeid, "0x%lx", id);
nsoption_set_charp(screen_modeid,
modeid);
- nsoption_write(current_user_options,
NULL, NULL);
+ ami_nsoption_write();
}
FreeAslRequest(screenmodereq);
}
@@ -5544,6 +5544,19 @@ int main(int argc, char** argv)
/* Open splash window */
Object *splash_window = ami_gui_splash_open();
+#ifdef __amigaos4__
+ /* Check for AltiVec */
+ uint32 altivec = 0;
+ GetCPUInfoTags(GCIT_VectorUnit, &altivec);
+
+ if(altivec == VECTORTYPE_ALTIVEC) {
+ LOG("AltiVec detected");
+ } else {
+ LOG("AltiVec NOT detected");
+ SetVar("JSIMD_FORCENONE", "0", 1, GVF_LOCAL_ONLY);
+ }
+#endif
+
ami_object_init();
if (ami_open_resources() == false) { /* alloc message ports */
@@ -5630,7 +5643,7 @@ int main(int argc, char** argv)
if((lock = CreateDirTree(current_user_dir)))
UnLock(lock);
- current_user_options = ASPrintf("%s/Choices", current_user_dir);
+ ami_nsoption_set_location(current_user_dir);
current_user_cache = ASPrintf("%s/Cache", current_user_dir);
current_user_faviconcache = ASPrintf("%s/IconCache", current_user_dir);
@@ -5659,7 +5672,7 @@ int main(int argc, char** argv)
ami_libs_close();
return RETURN_FAIL;
}
- nsoption_read(current_user_options, NULL);
+ ami_nsoption_read();
if(args != NULL) {
nsoption_commandline(&nargc, &nargv, NULL);
FreeArgs(args);
@@ -5729,7 +5742,7 @@ int main(int argc, char** argv)
netsurf_exit();
- FreeVec(current_user_options);
+ ami_nsoption_free();
FreeVec(current_user_dir);
FreeVec(current_user_faviconcache);
FreeVec(current_user);
diff --git a/frontends/amiga/gui.h b/frontends/amiga/gui.h
index 69a103a..3addea5 100644
--- a/frontends/amiga/gui.h
+++ b/frontends/amiga/gui.h
@@ -94,7 +94,7 @@ struct history_window;
struct gui_window_2 {
struct nsObject *node;
struct Window *win;
- Object *objects[GID_LAST];
+ Object *restrict objects[GID_LAST];
struct gui_window *gw; /* currently-displayed gui_window */
bool redraw_required;
int throbber_frame;
@@ -112,22 +112,22 @@ struct gui_window_2 {
int temp;
bool redraw_scroll;
bool new_content;
- char *menulab[AMI_MENU_AREXX_MAX + 1];
- Object *menuobj[AMI_MENU_AREXX_MAX + 1];
+ char *restrict menulab[AMI_MENU_AREXX_MAX + 1];
+ Object *restrict menuobj[AMI_MENU_AREXX_MAX + 1];
char menukey[AMI_MENU_AREXX_MAX + 1];
- char *menuicon[AMI_MENU_AREXX_MAX + 1];
+ char *restrict menuicon[AMI_MENU_AREXX_MAX + 1];
struct Hook menu_hook[AMI_MENU_AREXX_MAX + 1];
UBYTE *menutype;
struct NewMenu *menu;
ULONG hotlist_items;
- Object *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
+ Object *restrict hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
struct List hotlist_toolbar_list;
struct List *web_search_list;
Object *search_bm;
- char *svbuffer;
- char *status;
- char *wintitle;
- char *helphints[GID_LAST];
+ char *restrict svbuffer;
+ char *restrict status;
+ char *restrict wintitle;
+ char *restrict helphints[GID_LAST];
browser_mouse_state prev_mouse_state;
struct timeval lastclick;
struct AppIcon *appicon; /* iconify appicon */
@@ -135,8 +135,8 @@ struct gui_window_2 {
struct Hook favicon_hook;
struct Hook throbber_hook;
struct Hook *ctxmenu_hook;
- Object *history_ctxmenu[2];
- Object *clicktab_ctxmenu;
+ Object *restrict history_ctxmenu[2];
+ Object *restrict clicktab_ctxmenu;
gui_drag_type drag_op;
struct IBox *ptr_lock;
struct AppWindow *appwin;
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index 21067fb..2b1b7c9 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -74,6 +74,7 @@
#include "amiga/help.h"
#include "amiga/libs.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/object.h"
#include "amiga/selectmenu.h"
#include "amiga/theme.h"
@@ -233,8 +234,6 @@ struct ami_gui_opts_window {
#endif
};
-char *current_user_options = NULL;
-
static struct ami_gui_opts_window *gow = NULL;
static CONST_STRPTR tabs[OPTS_MAX_TABS];
@@ -2057,7 +2056,7 @@ static void ami_gui_opts_use(bool save)
}
if(save == true) {
- nsoption_write(current_user_options, NULL, NULL);
+ ami_nsoption_write();
ami_font_savescanner(); /* just in case it has changed and been
used only */
}
diff --git a/frontends/amiga/gui_options.h b/frontends/amiga/gui_options.h
index 3d68084..abb0b11 100755
--- a/frontends/amiga/gui_options.h
+++ b/frontends/amiga/gui_options.h
@@ -26,7 +26,5 @@ void ami_gui_opts_close(void);
/* Web search list */
struct List *ami_gui_opts_websearch(void);
void ami_gui_opts_websearch_free(struct List *websearchlist);
-
-extern char *current_user_options;
#endif
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index c735141..0fd730e 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -69,6 +69,7 @@
#include "amiga/libs.h"
#include "amiga/menu.h"
#include "amiga/misc.h"
+#include "amiga/nsoption.h"
#include "amiga/print.h"
#include "amiga/search.h"
#include "amiga/theme.h"
@@ -89,8 +90,7 @@ enum {
static bool menu_quit = false;
static bool ami_menu_check_toggled = false;
-static BOOL menualreadyinit;
-static Object *menu_glyph[NSA_GLYPH_MAX];
+static Object *restrict menu_glyph[NSA_GLYPH_MAX];
static int menu_glyph_width[NSA_GLYPH_MAX];
static bool menu_glyphs_loaded = false;
@@ -485,7 +485,7 @@ HOOKF(void, ami_menu_item_settings_snapshot, APTR, window,
struct IntuiMessage *
HOOKF(void, ami_menu_item_settings_save, APTR, window, struct IntuiMessage *)
{
- nsoption_write(current_user_options, NULL, NULL);
+ ami_nsoption_write();
}
HOOKF(void, ami_menu_item_arexx_execute, APTR, window, struct IntuiMessage *)
@@ -577,7 +577,7 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin,
int num, UBYTE type,
if((num >= AMI_MENU_HOTLIST) && (num <= AMI_MENU_HOTLIST_MAX)) {
utf8_from_local_encoding(label,
(strlen(label) < NSA_MAX_HOTLIST_MENU_LEN) ?
strlen(label) : NSA_MAX_HOTLIST_MENU_LEN,
- &gwin->menulab[num]);
+ (char **)&gwin->menulab[num]);
} else if((num >= AMI_MENU_AREXX) && (num <
AMI_MENU_AREXX_MAX)) {
gwin->menulab[num] = strdup(label);
} else {
@@ -856,8 +856,8 @@ static struct gui_window_2 *ami_menu_layout(struct
gui_window_2 *gwin)
using label.image if there's a bitmap
associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] !=
NM_BARLABEL)) {
int icon_width = 0;
- Object *submenuarrow = NULL;
- Object *icon = BitMapObj,
+ Object *restrict submenuarrow = NULL;
+ Object *restrict icon = BitMapObj,
IA_Scalable, TRUE,
BITMAP_Screen, scrn,
BITMAP_SourceFile,
gwin->menuicon[i],
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
