netsurf: branch master updated. release/3.0-637-g56723e5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/56723e5898217cc10f808...
...commit http://git.netsurf-browser.org/netsurf.git/commit/56723e5898217cc10f808ba...
...tree http://git.netsurf-browser.org/netsurf.git/tree/56723e5898217cc10f808bad1...
The branch, master has been updated
via 56723e5898217cc10f808bad18bc39a4e5bcae79 (commit)
from 8b9963e7efdad6ca35cdede07a6ad1fd25c19e74 (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=56723e5898217cc10f8...
commit 56723e5898217cc10f808bad18bc39a4e5bcae79
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use LIB_IS_AT_LEAST macro
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 2a7b9f5..1bf20ad 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -418,7 +418,7 @@ void ami_gui_opts_open(void)
return;
}
- if(IntuitionBase->LibNode.lib_Version >= 53) ptr_disable = TRUE;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) ptr_disable = TRUE;
if(nsoption_charp(pubscreen_name))
{
diff --git a/amiga/menu.c b/amiga/menu.c
index 3e9cae5..0b93ade 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -393,8 +393,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
} while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0));
}
- if((GadToolsBase->lib_Version > 53) ||
- ((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 6))) {
+ if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 6)) {
/* GadTools 53.6+ only. For now we will only create the menu
using label.image if there's a bitmap associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) {
diff --git a/amiga/theme.c b/amiga/theme.c
index 0778e29..03ce01a 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -218,7 +218,7 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
- if(IntuitionBase->LibNode.lib_Version >= 53) {
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) {
BOOL ptr_delay = FALSE;
if(shape == GUI_POINTER_WAIT) ptr_delay = TRUE;
@@ -282,7 +282,7 @@ void gui_window_hide_pointer(struct gui_window *g)
void ami_init_mouse_pointers(void)
{
- if(IntuitionBase->LibNode.lib_Version >= 53) return;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return;
int i;
struct RastPort mouseptr;
@@ -400,7 +400,7 @@ void ami_init_mouse_pointers(void)
void ami_mouse_pointers_free(void)
{
- if(IntuitionBase->LibNode.lib_Version >= 53) return;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return;
int i;
-----------------------------------------------------------------------
Summary of changes:
amiga/gui_options.c | 2 +-
amiga/menu.c | 3 +--
amiga/theme.c | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 2a7b9f5..1bf20ad 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -418,7 +418,7 @@ void ami_gui_opts_open(void)
return;
}
- if(IntuitionBase->LibNode.lib_Version >= 53) ptr_disable = TRUE;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) ptr_disable = TRUE;
if(nsoption_charp(pubscreen_name))
{
diff --git a/amiga/menu.c b/amiga/menu.c
index 3e9cae5..0b93ade 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -393,8 +393,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
} while((gwin->menutype[j] != NM_TITLE) && (gwin->menutype[j] != 0));
}
- if((GadToolsBase->lib_Version > 53) ||
- ((GadToolsBase->lib_Version == 53) && (GadToolsBase->lib_Revision >= 6))) {
+ if(LIB_IS_AT_LEAST((struct Library *)GadToolsBase, 53, 6)) {
/* GadTools 53.6+ only. For now we will only create the menu
using label.image if there's a bitmap associated with the item. */
if((gwin->menuicon[i] != NULL) && (gwin->menulab[i] != NM_BARLABEL)) {
diff --git a/amiga/theme.c b/amiga/theme.c
index 0778e29..03ce01a 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -218,7 +218,7 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
- if(IntuitionBase->LibNode.lib_Version >= 53) {
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) {
BOOL ptr_delay = FALSE;
if(shape == GUI_POINTER_WAIT) ptr_delay = TRUE;
@@ -282,7 +282,7 @@ void gui_window_hide_pointer(struct gui_window *g)
void ami_init_mouse_pointers(void)
{
- if(IntuitionBase->LibNode.lib_Version >= 53) return;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return;
int i;
struct RastPort mouseptr;
@@ -400,7 +400,7 @@ void ami_init_mouse_pointers(void)
void ami_mouse_pointers_free(void)
{
- if(IntuitionBase->LibNode.lib_Version >= 53) return;
+ if(LIB_IS_AT_LEAST((struct Library *)IntuitionBase, 53, 42)) return;
int i;
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-636-g8b9963e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/8b9963e7efdad6ca35cde...
...commit http://git.netsurf-browser.org/netsurf.git/commit/8b9963e7efdad6ca35cdede...
...tree http://git.netsurf-browser.org/netsurf.git/tree/8b9963e7efdad6ca35cdede07...
The branch, master has been updated
via 8b9963e7efdad6ca35cdede07a6ad1fd25c19e74 (commit)
from efc2d5e03b87d38ed71e6443f9afbc88f4b66f19 (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=8b9963e7efdad6ca35c...
commit 8b9963e7efdad6ca35cdede07a6ad1fd25c19e74
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use picture.datatype's PromoteMask function so we get an alpha channel for non-alpha bitmaps loaded through datatypes.library
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 05f5a8b..c07f45c 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -356,6 +356,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
if(dto = NewDTObject(filename,
DTA_GroupID, GID_PICTURE,
PDTA_DestMode, PMODE_V43,
+ PDTA_PromoteMask, TRUE,
TAG_DONE))
{
struct BitMapHeader *bmh;
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index 2b612bf..211d221 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -138,6 +138,7 @@ Object *amiga_dt_picture_newdtobject(struct amiga_dt_picture_content *adt)
DTA_SourceSize, size,
DTA_GroupID, GID_PICTURE,
PDTA_DestMode, PMODE_V43,
+ PDTA_PromoteMask, TRUE,
TAG_DONE);
}
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 1 +
amiga/dt_picture.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 05f5a8b..c07f45c 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -356,6 +356,7 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
if(dto = NewDTObject(filename,
DTA_GroupID, GID_PICTURE,
PDTA_DestMode, PMODE_V43,
+ PDTA_PromoteMask, TRUE,
TAG_DONE))
{
struct BitMapHeader *bmh;
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index 2b612bf..211d221 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -138,6 +138,7 @@ Object *amiga_dt_picture_newdtobject(struct amiga_dt_picture_content *adt)
DTA_SourceSize, size,
DTA_GroupID, GID_PICTURE,
PDTA_DestMode, PMODE_V43,
+ PDTA_PromoteMask, TRUE,
TAG_DONE);
}
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-635-gefc2d5e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/efc2d5e03b87d38ed71e6...
...commit http://git.netsurf-browser.org/netsurf.git/commit/efc2d5e03b87d38ed71e644...
...tree http://git.netsurf-browser.org/netsurf.git/tree/efc2d5e03b87d38ed71e6443f...
The branch, master has been updated
via efc2d5e03b87d38ed71e6443f9afbc88f4b66f19 (commit)
from 9786cc241716b42891463ec6a47a10a5032bff7d (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=efc2d5e03b87d38ed71...
commit efc2d5e03b87d38ed71e6443f9afbc88f4b66f19
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Delay the busy pointer again on intuition v53+
diff --git a/amiga/theme.c b/amiga/theme.c
index bb793a3..0778e29 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -217,53 +217,59 @@ void ami_reset_pointer(struct gui_window_2 *gwin)
void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
- if(IntuitionBase->LibNode.lib_Version >= 53) {
- SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
- return;
- }
- if(nsoption_bool(os_mouse_pointers))
- {
- switch(shape)
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ BOOL ptr_delay = FALSE;
+ if(shape == GUI_POINTER_WAIT) ptr_delay = TRUE;
+
+ SetWindowPointer(win,
+ WA_PointerType, osmouseptr[shape],
+ WA_PointerDelay, ptr_delay,
+ TAG_DONE);
+ } else {
+ if(nsoption_bool(os_mouse_pointers))
{
- case GUI_POINTER_DEFAULT:
- SetWindowPointer(win, TAG_DONE);
- break;
-
- case GUI_POINTER_WAIT:
- SetWindowPointer(win,
- WA_BusyPointer, TRUE,
- WA_PointerDelay, TRUE,
- TAG_DONE);
- break;
-
- default:
- if(mouseptrobj[shape]) {
- SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
- } else {
+ switch(shape)
+ {
+ case GUI_POINTER_DEFAULT:
SetWindowPointer(win, TAG_DONE);
- }
- break;
- }
- }
- else
- {
- if(mouseptrobj[shape])
- {
- SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
+ break;
+
+ case GUI_POINTER_WAIT:
+ SetWindowPointer(win,
+ WA_BusyPointer, TRUE,
+ WA_PointerDelay, TRUE,
+ TAG_DONE);
+ break;
+
+ default:
+ if(mouseptrobj[shape]) {
+ SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
+ } else {
+ SetWindowPointer(win, TAG_DONE);
+ }
+ break;
+ }
}
else
{
- if(shape == GUI_POINTER_WAIT)
+ if(mouseptrobj[shape])
{
- SetWindowPointer(win,
- WA_BusyPointer, TRUE,
- WA_PointerDelay, TRUE,
- TAG_DONE);
+ SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
}
else
{
- SetWindowPointer(win, TAG_DONE);
+ if(shape == GUI_POINTER_WAIT)
+ {
+ SetWindowPointer(win,
+ WA_BusyPointer, TRUE,
+ WA_PointerDelay, TRUE,
+ TAG_DONE);
+ }
+ else
+ {
+ SetWindowPointer(win, TAG_DONE);
+ }
}
}
}
-----------------------------------------------------------------------
Summary of changes:
amiga/theme.c | 80 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 37 deletions(-)
diff --git a/amiga/theme.c b/amiga/theme.c
index bb793a3..0778e29 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -217,53 +217,59 @@ void ami_reset_pointer(struct gui_window_2 *gwin)
void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
- if(IntuitionBase->LibNode.lib_Version >= 53) {
- SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
- return;
- }
- if(nsoption_bool(os_mouse_pointers))
- {
- switch(shape)
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ BOOL ptr_delay = FALSE;
+ if(shape == GUI_POINTER_WAIT) ptr_delay = TRUE;
+
+ SetWindowPointer(win,
+ WA_PointerType, osmouseptr[shape],
+ WA_PointerDelay, ptr_delay,
+ TAG_DONE);
+ } else {
+ if(nsoption_bool(os_mouse_pointers))
{
- case GUI_POINTER_DEFAULT:
- SetWindowPointer(win, TAG_DONE);
- break;
-
- case GUI_POINTER_WAIT:
- SetWindowPointer(win,
- WA_BusyPointer, TRUE,
- WA_PointerDelay, TRUE,
- TAG_DONE);
- break;
-
- default:
- if(mouseptrobj[shape]) {
- SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
- } else {
+ switch(shape)
+ {
+ case GUI_POINTER_DEFAULT:
SetWindowPointer(win, TAG_DONE);
- }
- break;
- }
- }
- else
- {
- if(mouseptrobj[shape])
- {
- SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
+ break;
+
+ case GUI_POINTER_WAIT:
+ SetWindowPointer(win,
+ WA_BusyPointer, TRUE,
+ WA_PointerDelay, TRUE,
+ TAG_DONE);
+ break;
+
+ default:
+ if(mouseptrobj[shape]) {
+ SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
+ } else {
+ SetWindowPointer(win, TAG_DONE);
+ }
+ break;
+ }
}
else
{
- if(shape == GUI_POINTER_WAIT)
+ if(mouseptrobj[shape])
{
- SetWindowPointer(win,
- WA_BusyPointer, TRUE,
- WA_PointerDelay, TRUE,
- TAG_DONE);
+ SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
}
else
{
- SetWindowPointer(win, TAG_DONE);
+ if(shape == GUI_POINTER_WAIT)
+ {
+ SetWindowPointer(win,
+ WA_BusyPointer, TRUE,
+ WA_PointerDelay, TRUE,
+ TAG_DONE);
+ }
+ else
+ {
+ SetWindowPointer(win, TAG_DONE);
+ }
}
}
}
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-634-g9786cc2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9786cc241716b42891463...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9786cc241716b42891463ec...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9786cc241716b42891463ec6a...
The branch, master has been updated
via 9786cc241716b42891463ec6a47a10a5032bff7d (commit)
from 20dabacb25c879474feccd91e8204b4377b3c8f2 (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=9786cc241716b428914...
commit 9786cc241716b42891463ec6a47a10a5032bff7d
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix scaled bitmaps
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index dfa2ba5..05f5a8b 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -443,8 +443,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
if(nsoption_bool(scale_quality)) flags |= COMPFLAG_SrcFilter;
CompositeTags(COMPOSITE_Src, tbm, scaledbm,
- COMPTAG_ScaleX,COMP_FLOAT_TO_FIX(width/bitmap->width),
- COMPTAG_ScaleY,COMP_FLOAT_TO_FIX(height/bitmap->height),
+ COMPTAG_ScaleX,COMP_FLOAT_TO_FIX((float)width/bitmap->width),
+ COMPTAG_ScaleY,COMP_FLOAT_TO_FIX((float)height/bitmap->height),
COMPTAG_Flags, flags,
COMPTAG_DestX,0,
COMPTAG_DestY,0,
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index dfa2ba5..05f5a8b 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -443,8 +443,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
if(nsoption_bool(scale_quality)) flags |= COMPFLAG_SrcFilter;
CompositeTags(COMPOSITE_Src, tbm, scaledbm,
- COMPTAG_ScaleX,COMP_FLOAT_TO_FIX(width/bitmap->width),
- COMPTAG_ScaleY,COMP_FLOAT_TO_FIX(height/bitmap->height),
+ COMPTAG_ScaleX,COMP_FLOAT_TO_FIX((float)width/bitmap->width),
+ COMPTAG_ScaleY,COMP_FLOAT_TO_FIX((float)height/bitmap->height),
COMPTAG_Flags, flags,
COMPTAG_DestX,0,
COMPTAG_DestY,0,
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-633-g20dabac
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/20dabacb25c879474fecc...
...commit http://git.netsurf-browser.org/netsurf.git/commit/20dabacb25c879474feccd9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/20dabacb25c879474feccd91e...
The branch, master has been updated
via 20dabacb25c879474feccd91e8204b4377b3c8f2 (commit)
via ade86e496ea4bc27b6edab125bad9f5dc4bb3852 (commit)
from 6ea52d0d9f423a13acc7c7fe015038a15a9636ff (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=20dabacb25c879474fe...
commit 20dabacb25c879474feccd91e8204b4377b3c8f2
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Correct some memory allocation parameters
diff --git a/amiga/gui.c b/amiga/gui.c
index cbd7134..e82c134 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3268,7 +3268,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
g->shared->tabs=1;
g->shared->next_tab=1;
- g->shared->svbuffer = AllocVecTagList(2000, NULL);
+ g->shared->svbuffer = AllocVecTags(2000, AVT_ClearWithValue, 0, TAG_DONE);
g->shared->helphints[GID_BACK] =
translate_escape_chars(messages_get("HelpToolbarBack"));
diff --git a/amiga/menu.c b/amiga/menu.c
index c8c085a..3e9cae5 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -188,7 +188,7 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
- gwin->menutype = AllocVecTagList(AMI_MENU_AREXX_MAX + 1, NULL);
+ gwin->menutype = AllocVecTags(AMI_MENU_AREXX_MAX + 1, AVT_ClearWithValue, 0, TAG_DONE);
for(i=0;i <= AMI_MENU_AREXX_MAX;i++)
{
@@ -458,7 +458,8 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
{
int i;
- gwin->menu = AllocVecTagList(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), NULL); /* NB: Was not MEMF_PRIVATE */
+ gwin->menu = AllocVecTags(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1),
+ AVT_ClearWithValue, 0, TAG_DONE);
ami_init_menulabs(gwin);
ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin);
ami_menu_arexx_scan(gwin);
diff --git a/amiga/object.c b/amiga/object.c
index a70efdd..735ea30 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -41,7 +41,7 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype)
{
struct nsObject *dtzo;
- dtzo = (struct nsObject *)AllocVecTagList(sizeof(struct nsObject), NULL);
+ dtzo = (struct nsObject *)AllocVecTags(sizeof(struct nsObject), AVT_ClearWithValue, 0, TAG_DONE);
AddTail((struct List *)objlist,(struct Node *)dtzo);
diff --git a/amiga/tree.c b/amiga/tree.c
index 78777da..69fe3e8 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -377,7 +377,8 @@ void ami_tree_menu(struct treeview_window *twin)
{
if(twin->menu) return;
- if(twin->menu = AllocVecTagList(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS, NULL)) /* NB: Was not MEMF_PRIVATE */
+ if(twin->menu = AllocVecTags(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS,
+ AVT_ClearWithValue, 0, TAG_DONE))
{
twin->menu[0].nm_Type = NM_TITLE;
twin->menu_name[0] = ami_utf8_easy((char *)messages_get("Tree"));
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ade86e496ea4bc27b6e...
commit ade86e496ea4bc27b6edab125bad9f5dc4bb3852
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Replace AllocVec with AllocVecTags. Remove some instances of MEMF_CLEAR where it is not necessary.
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 436aa8f..472aea1 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -239,7 +239,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
{
if(!bw) return;
- dln = AllocVec(sizeof(struct dlnode),MEMF_PRIVATE | MEMF_CLEAR);
+ dln = AllocVecTags(sizeof(struct dlnode), AVT_ClearWithValue, 0, TAG_DONE);
dln->filename = strdup((char *)cmd->ac_ArgList[3]);
dln->node.ln_Name = strdup((char *)cmd->ac_ArgList[0]);
dln->node.ln_Type = NT_USER;
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 0704129..dfa2ba5 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -49,7 +49,7 @@ void *bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
- bitmap = AllocVec(sizeof(struct bitmap),MEMF_PRIVATE | MEMF_CLEAR);
+ bitmap = AllocVecTags(sizeof(struct bitmap), AVT_ClearWithValue, 0, TAG_DONE);
if(bitmap)
{
bitmap->pixdata = AllocVecTags(width*height*4,
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index fd42f4d..e02344c 100644
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -135,10 +135,10 @@ char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size
case 0:
if(ci_new) {
- ci_next->ci_Next = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_next->ci_Next = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_next->ci_Next;
} else {
- ci_new = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_new = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_new;
}
@@ -149,10 +149,10 @@ char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size
default:
if(ci_new) {
- ci_next->ci_Next = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_next->ci_Next = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_next->ci_Next;
} else {
- ci_new = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_new = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_new;
}
diff --git a/amiga/download.c b/amiga/download.c
index fc68e2a..52baedb 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -94,7 +94,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx,
struct gui_download_window *dw;
APTR va[3];
- dw = AllocVec(sizeof(struct gui_download_window),MEMF_PRIVATE | MEMF_CLEAR);
+ dw = AllocVecTags(sizeof(struct gui_download_window), AVT_ClearWithValue, 0, TAG_DONE);
if(gui && (!IsListEmpty(&gui->dllist)) && (dw->dln = (struct dlnode *)FindName(&gui->dllist,url)))
{
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index 221f331..c844700 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -340,7 +340,7 @@ content_type amiga_dt_anim_content_type(void)
APTR ami_colormap_to_clut(struct ColorMap *cmap)
{
int i;
- UBYTE *clut = AllocVec(256 * 4, MEMF_CLEAR);
+ UBYTE *clut = AllocVecTags(256 * 4, AVT_ClearWithValue, 0, TAG_DONE); /* NB: Was not MEMF_PRIVATE */
ULONG colour[3 * 256];
if(!clut) return NULL;
diff --git a/amiga/file.c b/amiga/file.c
index 6942857..937fb90 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -91,7 +91,7 @@ void ami_file_open(struct gui_window_2 *gwin)
ASLFR_FilterFunc, &aslhookfunc,
TAG_DONE))
{
- if(temp = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strlcpy(temp, filereq->fr_Drawer, 1024);
AddPart(temp, filereq->fr_File, 1024);
@@ -228,7 +228,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
void ami_file_save_req(int type, struct gui_window_2 *gwin,
struct hlcache_handle *object)
{
- char *fname = AllocVec(1024, MEMF_CLEAR | MEMF_PRIVATE);
+ char *fname = AllocVecTags(1024, NULL);
if(AslRequestTags(savereq,
ASLFR_Window, gwin->win,
diff --git a/amiga/filetype.c b/amiga/filetype.c
index 7808ff7..39e874a 100644
--- a/amiga/filetype.c
+++ b/amiga/filetype.c
@@ -218,7 +218,7 @@ nserror ami_mime_init(const char *mimefile)
if(ReadArgs(template, rarray, rargs))
{
node = AddObject(ami_mime_list, AMINS_MIME);
- mimeentry = AllocVec(sizeof(struct ami_mime_entry), MEMF_PRIVATE | MEMF_CLEAR);
+ mimeentry = AllocVecTags(sizeof(struct ami_mime_entry), AVT_ClearWithValue, 0, TAG_DONE);
node->objstruct = mimeentry;
if(rarray[AMI_MIME_MIMETYPE])
@@ -366,7 +366,7 @@ APTR ami_mime_guess_add_datatype(struct DataType *dt, lwc_string **lwc_mimetype)
char *p;
node = AddObject(ami_mime_list, AMINS_MIME);
- mimeentry = AllocVec(sizeof(struct ami_mime_entry), MEMF_PRIVATE | MEMF_CLEAR);
+ mimeentry = AllocVecTags(sizeof(struct ami_mime_entry), AVT_ClearWithValue, 0, TAG_DONE);
node->objstruct = mimeentry;
lerror = lwc_intern_string(dth->dth_Name, strlen(dth->dth_Name), &mimeentry->datatype);
diff --git a/amiga/font.c b/amiga/font.c
index 310d8be..36c8104 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -383,7 +383,7 @@ struct ami_font_node *ami_font_open(const char *font)
LOG(("Font cache miss: %s", font));
- nodedata = AllocVec(sizeof(struct ami_font_node), MEMF_PRIVATE | MEMF_CLEAR);
+ nodedata = AllocVecTagList(sizeof(struct ami_font_node), NULL);
nodedata->font = OpenOutlineFont(font, &ami_diskfontlib_list, OFF_OPEN);
if(!nodedata->font)
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index b1732da..f3ad36e 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -91,7 +91,7 @@ const char *ami_font_scan_lookup(uint16 *code, lwc_string **glypharray)
struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts)
{
struct ami_font_scan_window *fsw =
- AllocVec(sizeof(struct ami_font_scan_window), MEMF_PRIVATE);
+ AllocVecTagList(sizeof(struct ami_font_scan_window), NULL);
if(fsw == NULL) return NULL;
@@ -301,7 +301,7 @@ ULONG ami_font_scan_list(struct MinList *list)
struct nsObject *node;
do {
- if(afh = (struct AvailFontsHeader *)AllocVec(afSize, MEMF_PRIVATE)) {
+ if(afh = (struct AvailFontsHeader *)AllocVecTagList(afSize, NULL)) {
if(afShortage = AvailFonts(afh, afSize, AFF_DISK | AFF_OTAG | AFF_SCALED)) {
FreeVec(afh);
afSize += afShortage;
diff --git a/amiga/gui.c b/amiga/gui.c
index 962c3a1..cbd7134 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1323,7 +1323,7 @@ struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct rect *r
{
struct IBox *bbox, *ibox;
- ibox = AllocVec(sizeof(struct IBox), MEMF_CLEAR | MEMF_PRIVATE);
+ ibox = AllocVecTagList(sizeof(struct IBox), NULL);
if(ibox == NULL) return NULL;
GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox);
@@ -2312,7 +2312,7 @@ void ami_handle_appmsg(void)
{
if(appwinargs = &appmsg->am_ArgList[i])
{
- if(filename = AllocVec(1024, MEMF_PRIVATE | MEMF_CLEAR))
+ if(filename = AllocVecTagList(1024, NULL))
{
if(appwinargs->wa_Lock)
{
@@ -3146,7 +3146,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
}
}
- g = AllocVec(sizeof(struct gui_window),MEMF_PRIVATE | MEMF_CLEAR);
+ g = AllocVecTags(sizeof(struct gui_window), AVT_ClearWithValue, 0, TAG_DONE);
if(!g)
{
@@ -3215,7 +3215,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
return g;
}
- g->shared = AllocVec(sizeof(struct gui_window_2),MEMF_PRIVATE | MEMF_CLEAR);
+ g->shared = AllocVecTags(sizeof(struct gui_window_2), AVT_ClearWithValue, 0, TAG_DONE);
if(!g->shared)
{
@@ -3268,7 +3268,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
g->shared->tabs=1;
g->shared->next_tab=1;
- g->shared->svbuffer = AllocVec(2000, MEMF_CLEAR);
+ g->shared->svbuffer = AllocVecTagList(2000, NULL);
g->shared->helphints[GID_BACK] =
translate_escape_chars(messages_get("HelpToolbarBack"));
@@ -4204,7 +4204,7 @@ void gui_window_update_box(struct gui_window *g, const struct rect *rect)
if(!g) return;
if(ami_gui_window_update_box_deferred_check(g->deferred_rects, rect)) {
- deferred_rect = AllocVec(sizeof(struct rect), MEMF_PRIVATE);
+ deferred_rect = AllocVecTagList(sizeof(struct rect), NULL);
CopyMem(rect, deferred_rect, sizeof(struct rect));
nsobj = AddObject(g->deferred_rects, AMINS_RECT);
nsobj->objstruct = deferred_rect;
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 4da3d35..2a7b9f5 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -520,7 +520,7 @@ void ami_gui_opts_open(void)
{
ami_gui_opts_setup();
- gow = AllocVec(sizeof(struct ami_gui_opts_window),MEMF_CLEAR | MEMF_PRIVATE);
+ gow = AllocVecTags(sizeof(struct ami_gui_opts_window), AVT_ClearWithValue, 0, TAG_DONE);
gow->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle,nsscreentitle,
@@ -2116,7 +2116,7 @@ STRPTR *ami_gui_opts_websearch(void)
ULONG ref = 0;
STRPTR *websearchlist;
- websearchlist = AllocVec(200, MEMF_CLEAR);
+ websearchlist = AllocVecTagList(200, NULL); /* NB: Was not MEMF_PRIVATE */
if (nsoption_charp(search_engines_file) == NULL) return websearchlist;
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 5203276..b5aba38 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -82,7 +82,7 @@ void ami_history_open(struct browser_window *bw, struct history *history)
if(!hwindow)
{
- hwindow = AllocVec(sizeof(struct history_window),MEMF_CLEAR | MEMF_PRIVATE);
+ hwindow = AllocVecTags(sizeof(struct history_window), AVT_ClearWithValue, 0, TAG_DONE);
ami_init_layers(&hwindow->gg, scrn->Width, scrn->Height);
diff --git a/amiga/icon.c b/amiga/icon.c
index 641095b..c5bc6ae 100644
--- a/amiga/icon.c
+++ b/amiga/icon.c
@@ -326,7 +326,7 @@ ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG height
if (alpha==0) alpha=0xff;
- argbicon = (ULONG *)AllocVec(width*height*4,MEMF_CLEAR);
+ argbicon = (ULONG *)AllocVecTagList(width*height*4, NULL);
if (!argbicon) return(NULL);
cmap=GetColorMap(pals1);
@@ -504,8 +504,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm)
{
bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH,
THUMBNAIL_HEIGHT, NULL);
- bm->icondata = AllocVec(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT,
- MEMF_CLEAR);
+ bm->icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL);
BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
BLITA_Height, THUMBNAIL_HEIGHT,
diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c
index b428ed2..0638b94 100644
--- a/amiga/iff_dr2d.c
+++ b/amiga/iff_dr2d.c
@@ -165,7 +165,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer,
}
for (i = 0; i != diagram->shape_count; i++) {
- attr = AllocVec(sizeof(struct attr_struct),MEMF_CLEAR | MEMF_PRIVATE);
+ attr = AllocVecTagList(sizeof(struct attr_struct), NULL);
if (diagram->shape[i].fill == svgtiny_TRANSPARENT)
attr->FillType = FT_NONE;
else
@@ -266,13 +266,13 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer,
PopChunk(iffh);
}
} else if (diagram->shape[i].text) {
- stxt = AllocVec(sizeof(struct stxt_struct),MEMF_CLEAR);
+ stxt = AllocVecTagList(sizeof(struct stxt_struct), NULL);
stxt->BaseX = diagram->shape[i].text_x;
stxt->BaseY = diagram->shape[i].text_y;
stxt->NumChars = strlen(diagram->shape[i].text);
if(!fons_written)
{
- fons = AllocVec(sizeof(struct fons_struct),MEMF_CLEAR);
+ fons = AllocVecTagList(sizeof(struct fons_struct), NULL);
if(!(PushChunk(iffh,0,ID_FONS,IFFSIZE_UNKNOWN)))
{
WriteChunkBytes(iffh,fons,sizeof(struct fons_struct));
@@ -366,7 +366,7 @@ int main(int argc, char **argv)
{
size = GetFileSize(fh);
- buffer = AllocVec((uint32)size,MEMF_PRIVATE);
+ buffer = AllocVecTagList((uint32)size, NULL);
Read(fh,buffer,(uint32)size);
Close(fh);
diff --git a/amiga/launch.c b/amiga/launch.c
index 3236e79..ebd8229 100755
--- a/amiga/launch.c
+++ b/amiga/launch.c
@@ -47,8 +47,7 @@ struct ami_protocol
struct ami_protocol *ami_openurl_add_protocol(const char *url)
{
struct ami_protocol *ami_p =
- (struct ami_protocol *)AllocVec(sizeof(struct ami_protocol),
- MEMF_PRIVATE | MEMF_CLEAR);
+ (struct ami_protocol *)AllocVecTagList(sizeof(struct ami_protocol), NULL);
if(url_scheme(url, &ami_p->protocol) != URL_FUNC_OK)
{
diff --git a/amiga/login.c b/amiga/login.c
index e70002c..816ece6 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -59,7 +59,8 @@ void gui_401login_open(nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw)
{
const char *auth;
- struct gui_login_window *lw = AllocVec(sizeof(struct gui_login_window),MEMF_PRIVATE | MEMF_CLEAR);
+ struct gui_login_window *lw = AllocVecTags(sizeof(struct gui_login_window),
+ AVT_ClearWithValue, 0, TAG_DONE);
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
diff --git a/amiga/menu.c b/amiga/menu.c
index 3280bde..c8c085a 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -188,7 +188,7 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
- gwin->menutype = AllocVec(AMI_MENU_AREXX_MAX + 1, MEMF_PRIVATE | MEMF_CLEAR);
+ gwin->menutype = AllocVecTagList(AMI_MENU_AREXX_MAX + 1, NULL);
for(i=0;i <= AMI_MENU_AREXX_MAX;i++)
{
@@ -458,7 +458,7 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
{
int i;
- gwin->menu = AllocVec(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), MEMF_CLEAR);
+ gwin->menu = AllocVecTagList(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), NULL); /* NB: Was not MEMF_PRIVATE */
ami_init_menulabs(gwin);
ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin);
ami_menu_arexx_scan(gwin);
@@ -499,7 +499,7 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
if(lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))
{
- if(buffer = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(buffer = AllocVecTagList(1024, NULL))
{
if(ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))
{
@@ -1093,7 +1093,7 @@ static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct I
ASLFR_InitialPattern, "#?.nsrx",
TAG_DONE))
{
- if(temp = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strlcpy(temp, filereq->fr_Drawer, 1024);
AddPart(temp, filereq->fr_File, 1024);
@@ -1112,7 +1112,7 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I
if(script)
{
- if(temp = AllocVec(1024, MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strcpy(temp, nsoption_charp(arexx_dir));
AddPart(temp, script, 1024);
diff --git a/amiga/object.c b/amiga/object.c
index c028ea3..a70efdd 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -29,7 +29,7 @@ struct MinList *NewObjList(void)
struct MinList *objlist;
- objlist = (struct MinList *)AllocVec(sizeof(struct MinList),MEMF_PRIVATE | MEMF_CLEAR);
+ objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
NewMinList(objlist);
@@ -41,7 +41,7 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype)
{
struct nsObject *dtzo;
- dtzo = (struct nsObject *)AllocVec(sizeof(struct nsObject),MEMF_PRIVATE | MEMF_CLEAR);
+ dtzo = (struct nsObject *)AllocVecTagList(sizeof(struct nsObject), NULL);
AddTail((struct List *)objlist,(struct Node *)dtzo);
diff --git a/amiga/plotters.c b/amiga/plotters.c
index b2544da..42b5239 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -158,8 +158,8 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
if(!height) height = nsoption_int(redraw_tile_size_y);
gg->layerinfo = NewLayerInfo();
- gg->areabuf = AllocVec(AREA_SIZE, MEMF_PRIVATE | MEMF_CLEAR);
- gg->tmprasbuf = AllocVec(width * height, MEMF_PRIVATE | MEMF_CLEAR);
+ gg->areabuf = AllocVecTagList(AREA_SIZE, NULL);
+ gg->tmprasbuf = AllocVecTagList(width * height, NULL);
if(palette_mapped == true) {
gg->bm = AllocBitMap(width, height, depth,
@@ -171,7 +171,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
if(!gg->bm) warn_user("NoMemory","");
- gg->rp = AllocVec(sizeof(struct RastPort), MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp = AllocVecTagList(sizeof(struct RastPort), NULL);
if(!gg->rp) warn_user("NoMemory","");
InitRastPort(gg->rp);
@@ -185,12 +185,12 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
InstallLayerHook(gg->rp->Layer,LAYERS_NOBACKFILL);
- gg->rp->AreaInfo = AllocVec(sizeof(struct AreaInfo),MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp->AreaInfo = AllocVecTagList(sizeof(struct AreaInfo), NULL);
if((!gg->areabuf) || (!gg->rp->AreaInfo)) warn_user("NoMemory","");
InitArea(gg->rp->AreaInfo,gg->areabuf, AREA_SIZE/5);
- gg->rp->TmpRas = AllocVec(sizeof(struct TmpRas),MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp->TmpRas = AllocVecTagList(sizeof(struct TmpRas), NULL);
if((!gg->tmprasbuf) || (!gg->rp->TmpRas)) warn_user("NoMemory","");
@@ -251,8 +251,7 @@ static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colour)
if(pen == -1) LOG(("WARNING: Cannot allocate pen for ABGR:%lx", colour));
if(shared_pens != NULL) {
- if(node = (struct ami_plot_pen *)AllocVec(sizeof(struct ami_plot_pen),
- MEMF_PRIVATE | MEMF_CLEAR)) {
+ if(node = (struct ami_plot_pen *)AllocVecTagList(sizeof(struct ami_plot_pen), NULL)) {
AddTail((struct List *)shared_pens, (struct Node *)node);
}
} else {
@@ -829,7 +828,7 @@ bool ami_bitmap_tile(int x, int y, int width, int height,
bfbm.offsetx = ox;
bfbm.offsety = oy;
bfbm.mask = ami_bitmap_get_mask(bitmap, width, height, tbm);
- bfh = AllocVec(sizeof(struct Hook),MEMF_CLEAR);
+ bfh = AllocVecTags(sizeof(struct Hook), AVT_ClearWithValue, 0, TAG_DONE); /* NB: Was not MEMF_PRIVATE */
bfh->h_Entry = (HOOKFUNC)ami_bitmap_tile_hook;
bfh->h_SubEntry = 0;
bfh->h_Data = &bfbm;
diff --git a/amiga/print.c b/amiga/print.c
index f0689f7..4bfce13 100644
--- a/amiga/print.c
+++ b/amiga/print.c
@@ -212,19 +212,18 @@ void ami_print_ui(struct hlcache_handle *c)
char filename[30];
int i;
- struct ami_print_window *pw = AllocVec(sizeof(struct ami_print_window),
- MEMF_PRIVATE | MEMF_CLEAR);
+ struct ami_print_window *pw = AllocVecTags(sizeof(struct ami_print_window), AVT_ClearWithValue, 0, TAG_DONE);
pw->c = c;
- printers[0] = AllocVec(50, MEMF_PRIVATE | MEMF_CLEAR);
+ printers[0] = AllocVecTags(50, AVT_ClearWithValue, 0, TAG_DONE);
ami_print_readunit("ENV:Sys/printer.prefs", printers[0], 50, 0);
strcpy(filename,"ENV:Sys/printerN.prefs");
for (i = 1; i < 10; i++)
{
filename[15] = '0' + i;
- printers[i] = AllocVec(50, MEMF_PRIVATE | MEMF_CLEAR);
+ printers[i] = AllocVecTagList(50, NULL);
if(!ami_print_readunit(filename, printers[i], 50, i))
{
FreeVec(printers[i]);
@@ -461,8 +460,7 @@ struct MsgPort *ami_print_get_msgport(void)
bool ami_print_begin(struct print_settings *ps)
{
- ami_print_info.gg = AllocVec(sizeof(struct gui_globals),
- MEMF_PRIVATE | MEMF_CLEAR);
+ ami_print_info.gg = AllocVecTags(sizeof(struct gui_globals), AVT_ClearWithValue, 0, TAG_DONE);
if(!ami_print_info.gg) return false;
ami_init_layers(ami_print_info.gg,
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 260225b..d4b35a5 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -58,7 +58,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
if(schedule_list == NULL) return;
- nscb = AllocVec(sizeof(struct nscallback), MEMF_PRIVATE | MEMF_CLEAR);
+ nscb = AllocVecTagList(sizeof(struct nscallback), NULL);
if(!nscb) return;
time_us = t*10000; /* t converted to �s */
@@ -69,7 +69,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
GetSysTime(&tv);
AddTime(&nscb->tv,&tv); // now contains time when event occurs
- if(nscb->treq = AllocVec(sizeof(struct TimeRequest),MEMF_PRIVATE | MEMF_CLEAR))
+ if(nscb->treq = AllocVecTagList(sizeof(struct TimeRequest), NULL))
{
*nscb->treq = *tioreq;
nscb->treq->Request.io_Command=TR_ADDREQUEST;
diff --git a/amiga/search.c b/amiga/search.c
index 18ea27f..17a2d45 100755
--- a/amiga/search.c
+++ b/amiga/search.c
@@ -100,7 +100,7 @@ void ami_search_open(struct gui_window *gwin)
return;
}
- fwin = AllocVec(sizeof(struct find_window),MEMF_PRIVATE | MEMF_CLEAR);
+ fwin = AllocVecTags(sizeof(struct find_window), AVT_ClearWithValue, 0, TAG_DONE);
fwin->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle,nsscreentitle,
diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c
index fa5aec4..6d134a4 100644
--- a/amiga/stringview/urlhistory.c
+++ b/amiga/stringview/urlhistory.c
@@ -73,17 +73,24 @@ static bool URLHistoryFound(nsurl *url, const struct url_data *data)
{
struct Node *node;
- /* skip non-visted pages */
+ /* skip non-visited pages */
if(data->visits <= 0) return true;
/* skip this URL if it is already in the list */
if(URLHistory_FindPage(nsurl_access(url))) return true;
- node = AllocVec( sizeof( struct Node ), MEMF_SHARED|MEMF_CLEAR );
+ node = AllocVecTags(sizeof(struct Node),
+ AVT_Type, MEMF_SHARED,
+ //AVT_ClearWithValue, 0,
+ TAG_DONE);
if ( node )
{
- STRPTR urladd = (STRPTR) AllocVec( strlen ( nsurl_access(url) ) + 1, MEMF_SHARED|MEMF_CLEAR );
+ STRPTR urladd = (STRPTR) AllocVecTags( strlen ( nsurl_access(url) ) + 1,
+ AVT_Type, MEMF_SHARED,
+ //AVT_ClearWithValue, 0,
+ TAG_DONE);
+
if ( urladd )
{
strcpy(urladd, nsurl_access(url));
diff --git a/amiga/theme.c b/amiga/theme.c
index 512173d..bb793a3 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -353,10 +353,10 @@ void ami_init_mouse_pointers(void)
if(ptrfile = Open(ptrfname,MODE_OLDFILE))
{
int mx,my;
- UBYTE *pprefsbuf = AllocVec(1061,MEMF_PRIVATE | MEMF_CLEAR);
+ UBYTE *pprefsbuf = AllocVecTagList(1061, NULL);
Read(ptrfile,pprefsbuf,1061);
- mouseptrbm[i]=AllocVec(sizeof(struct BitMap),MEMF_PRIVATE | MEMF_CLEAR);
+ mouseptrbm[i]=AllocVecTagList(sizeof(struct BitMap), NULL);
InitBitMap(mouseptrbm[i],2,32,32);
mouseptrbm[i]->Planes[0] = AllocRaster(32,32);
mouseptrbm[i]->Planes[1] = AllocRaster(32,32);
diff --git a/amiga/tree.c b/amiga/tree.c
index 5ef3a20..78777da 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -130,8 +130,7 @@ struct treeview_window *ami_tree_create(int flags,
{
struct treeview_window *twin;
- twin = AllocVec(sizeof(struct treeview_window),
- MEMF_PRIVATE | MEMF_CLEAR);
+ twin = AllocVecTags(sizeof(struct treeview_window), AVT_ClearWithValue, 0, TAG_DONE);
if(!twin)
{
@@ -378,7 +377,7 @@ void ami_tree_menu(struct treeview_window *twin)
{
if(twin->menu) return;
- if(twin->menu = AllocVec(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS, MEMF_CLEAR))
+ if(twin->menu = AllocVecTagList(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS, NULL)) /* NB: Was not MEMF_PRIVATE */
{
twin->menu[0].nm_Type = NM_TITLE;
twin->menu_name[0] = ami_utf8_easy((char *)messages_get("Tree"));
@@ -1301,7 +1300,7 @@ static void ami_tree_redraw_req(void *p)
void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
{
- struct ami_tree_redraw_req *atrr_data = AllocVec(sizeof(struct ami_tree_redraw_req), MEMF_CLEAR | MEMF_PRIVATE);
+ struct ami_tree_redraw_req *atrr_data = AllocVecTagList(sizeof(struct ami_tree_redraw_req), NULL);
atrr_data->x = x;
atrr_data->y = y;
-----------------------------------------------------------------------
Summary of changes:
amiga/arexx.c | 2 +-
amiga/bitmap.c | 2 +-
amiga/clipboard.c | 8 ++++----
amiga/download.c | 2 +-
amiga/dt_anim.c | 2 +-
amiga/file.c | 4 ++--
amiga/filetype.c | 4 ++--
amiga/font.c | 2 +-
amiga/font_scan.c | 4 ++--
amiga/gui.c | 12 ++++++------
amiga/gui_options.c | 4 ++--
amiga/history_local.c | 2 +-
amiga/icon.c | 5 ++---
amiga/iff_dr2d.c | 8 ++++----
amiga/launch.c | 3 +--
amiga/login.c | 3 ++-
amiga/menu.c | 11 ++++++-----
amiga/object.c | 4 ++--
amiga/plotters.c | 15 +++++++--------
amiga/print.c | 10 ++++------
amiga/schedule.c | 4 ++--
amiga/search.c | 2 +-
amiga/stringview/urlhistory.c | 13 ++++++++++---
amiga/theme.c | 4 ++--
amiga/tree.c | 8 ++++----
25 files changed, 71 insertions(+), 67 deletions(-)
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 436aa8f..472aea1 100644
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -239,7 +239,7 @@ STATIC VOID rx_open(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unu
{
if(!bw) return;
- dln = AllocVec(sizeof(struct dlnode),MEMF_PRIVATE | MEMF_CLEAR);
+ dln = AllocVecTags(sizeof(struct dlnode), AVT_ClearWithValue, 0, TAG_DONE);
dln->filename = strdup((char *)cmd->ac_ArgList[3]);
dln->node.ln_Name = strdup((char *)cmd->ac_ArgList[0]);
dln->node.ln_Type = NT_USER;
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 0704129..dfa2ba5 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -49,7 +49,7 @@ void *bitmap_create(int width, int height, unsigned int state)
{
struct bitmap *bitmap;
- bitmap = AllocVec(sizeof(struct bitmap),MEMF_PRIVATE | MEMF_CLEAR);
+ bitmap = AllocVecTags(sizeof(struct bitmap), AVT_ClearWithValue, 0, TAG_DONE);
if(bitmap)
{
bitmap->pixdata = AllocVecTags(width*height*4,
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index fd42f4d..e02344c 100644
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -135,10 +135,10 @@ char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size
case 0:
if(ci_new) {
- ci_next->ci_Next = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_next->ci_Next = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_next->ci_Next;
} else {
- ci_new = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_new = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_new;
}
@@ -149,10 +149,10 @@ char *ami_clipboard_cat_collection(struct CollectionItem *ci, LONG codeset, size
default:
if(ci_new) {
- ci_next->ci_Next = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_next->ci_Next = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_next->ci_Next;
} else {
- ci_new = AllocVec(sizeof(struct CollectionItem), MEMF_PRIVATE | MEMF_CLEAR);
+ ci_new = AllocVecTags(sizeof(struct CollectionItem), AVT_ClearWithValue, 0, TAG_DONE);
ci_next = ci_new;
}
diff --git a/amiga/download.c b/amiga/download.c
index fc68e2a..52baedb 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -94,7 +94,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx,
struct gui_download_window *dw;
APTR va[3];
- dw = AllocVec(sizeof(struct gui_download_window),MEMF_PRIVATE | MEMF_CLEAR);
+ dw = AllocVecTags(sizeof(struct gui_download_window), AVT_ClearWithValue, 0, TAG_DONE);
if(gui && (!IsListEmpty(&gui->dllist)) && (dw->dln = (struct dlnode *)FindName(&gui->dllist,url)))
{
diff --git a/amiga/dt_anim.c b/amiga/dt_anim.c
index 221f331..c844700 100644
--- a/amiga/dt_anim.c
+++ b/amiga/dt_anim.c
@@ -340,7 +340,7 @@ content_type amiga_dt_anim_content_type(void)
APTR ami_colormap_to_clut(struct ColorMap *cmap)
{
int i;
- UBYTE *clut = AllocVec(256 * 4, MEMF_CLEAR);
+ UBYTE *clut = AllocVecTags(256 * 4, AVT_ClearWithValue, 0, TAG_DONE); /* NB: Was not MEMF_PRIVATE */
ULONG colour[3 * 256];
if(!clut) return NULL;
diff --git a/amiga/file.c b/amiga/file.c
index 6942857..937fb90 100644
--- a/amiga/file.c
+++ b/amiga/file.c
@@ -91,7 +91,7 @@ void ami_file_open(struct gui_window_2 *gwin)
ASLFR_FilterFunc, &aslhookfunc,
TAG_DONE))
{
- if(temp = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strlcpy(temp, filereq->fr_Drawer, 1024);
AddPart(temp, filereq->fr_File, 1024);
@@ -228,7 +228,7 @@ void ami_file_save(int type, char *fname, struct Window *win,
void ami_file_save_req(int type, struct gui_window_2 *gwin,
struct hlcache_handle *object)
{
- char *fname = AllocVec(1024, MEMF_CLEAR | MEMF_PRIVATE);
+ char *fname = AllocVecTags(1024, NULL);
if(AslRequestTags(savereq,
ASLFR_Window, gwin->win,
diff --git a/amiga/filetype.c b/amiga/filetype.c
index 7808ff7..39e874a 100644
--- a/amiga/filetype.c
+++ b/amiga/filetype.c
@@ -218,7 +218,7 @@ nserror ami_mime_init(const char *mimefile)
if(ReadArgs(template, rarray, rargs))
{
node = AddObject(ami_mime_list, AMINS_MIME);
- mimeentry = AllocVec(sizeof(struct ami_mime_entry), MEMF_PRIVATE | MEMF_CLEAR);
+ mimeentry = AllocVecTags(sizeof(struct ami_mime_entry), AVT_ClearWithValue, 0, TAG_DONE);
node->objstruct = mimeentry;
if(rarray[AMI_MIME_MIMETYPE])
@@ -366,7 +366,7 @@ APTR ami_mime_guess_add_datatype(struct DataType *dt, lwc_string **lwc_mimetype)
char *p;
node = AddObject(ami_mime_list, AMINS_MIME);
- mimeentry = AllocVec(sizeof(struct ami_mime_entry), MEMF_PRIVATE | MEMF_CLEAR);
+ mimeentry = AllocVecTags(sizeof(struct ami_mime_entry), AVT_ClearWithValue, 0, TAG_DONE);
node->objstruct = mimeentry;
lerror = lwc_intern_string(dth->dth_Name, strlen(dth->dth_Name), &mimeentry->datatype);
diff --git a/amiga/font.c b/amiga/font.c
index 310d8be..36c8104 100755
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -383,7 +383,7 @@ struct ami_font_node *ami_font_open(const char *font)
LOG(("Font cache miss: %s", font));
- nodedata = AllocVec(sizeof(struct ami_font_node), MEMF_PRIVATE | MEMF_CLEAR);
+ nodedata = AllocVecTagList(sizeof(struct ami_font_node), NULL);
nodedata->font = OpenOutlineFont(font, &ami_diskfontlib_list, OFF_OPEN);
if(!nodedata->font)
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index b1732da..f3ad36e 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -91,7 +91,7 @@ const char *ami_font_scan_lookup(uint16 *code, lwc_string **glypharray)
struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts)
{
struct ami_font_scan_window *fsw =
- AllocVec(sizeof(struct ami_font_scan_window), MEMF_PRIVATE);
+ AllocVecTagList(sizeof(struct ami_font_scan_window), NULL);
if(fsw == NULL) return NULL;
@@ -301,7 +301,7 @@ ULONG ami_font_scan_list(struct MinList *list)
struct nsObject *node;
do {
- if(afh = (struct AvailFontsHeader *)AllocVec(afSize, MEMF_PRIVATE)) {
+ if(afh = (struct AvailFontsHeader *)AllocVecTagList(afSize, NULL)) {
if(afShortage = AvailFonts(afh, afSize, AFF_DISK | AFF_OTAG | AFF_SCALED)) {
FreeVec(afh);
afSize += afShortage;
diff --git a/amiga/gui.c b/amiga/gui.c
index 962c3a1..e82c134 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1323,7 +1323,7 @@ struct IBox *ami_ns_rect_to_ibox(struct gui_window_2 *gwin, const struct rect *r
{
struct IBox *bbox, *ibox;
- ibox = AllocVec(sizeof(struct IBox), MEMF_CLEAR | MEMF_PRIVATE);
+ ibox = AllocVecTagList(sizeof(struct IBox), NULL);
if(ibox == NULL) return NULL;
GetAttr(SPACE_AreaBox, (Object *)gwin->objects[GID_BROWSER], (ULONG *)&bbox);
@@ -2312,7 +2312,7 @@ void ami_handle_appmsg(void)
{
if(appwinargs = &appmsg->am_ArgList[i])
{
- if(filename = AllocVec(1024, MEMF_PRIVATE | MEMF_CLEAR))
+ if(filename = AllocVecTagList(1024, NULL))
{
if(appwinargs->wa_Lock)
{
@@ -3146,7 +3146,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
}
}
- g = AllocVec(sizeof(struct gui_window),MEMF_PRIVATE | MEMF_CLEAR);
+ g = AllocVecTags(sizeof(struct gui_window), AVT_ClearWithValue, 0, TAG_DONE);
if(!g)
{
@@ -3215,7 +3215,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
return g;
}
- g->shared = AllocVec(sizeof(struct gui_window_2),MEMF_PRIVATE | MEMF_CLEAR);
+ g->shared = AllocVecTags(sizeof(struct gui_window_2), AVT_ClearWithValue, 0, TAG_DONE);
if(!g->shared)
{
@@ -3268,7 +3268,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
g->shared->tabs=1;
g->shared->next_tab=1;
- g->shared->svbuffer = AllocVec(2000, MEMF_CLEAR);
+ g->shared->svbuffer = AllocVecTags(2000, AVT_ClearWithValue, 0, TAG_DONE);
g->shared->helphints[GID_BACK] =
translate_escape_chars(messages_get("HelpToolbarBack"));
@@ -4204,7 +4204,7 @@ void gui_window_update_box(struct gui_window *g, const struct rect *rect)
if(!g) return;
if(ami_gui_window_update_box_deferred_check(g->deferred_rects, rect)) {
- deferred_rect = AllocVec(sizeof(struct rect), MEMF_PRIVATE);
+ deferred_rect = AllocVecTagList(sizeof(struct rect), NULL);
CopyMem(rect, deferred_rect, sizeof(struct rect));
nsobj = AddObject(g->deferred_rects, AMINS_RECT);
nsobj->objstruct = deferred_rect;
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index 4da3d35..2a7b9f5 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -520,7 +520,7 @@ void ami_gui_opts_open(void)
{
ami_gui_opts_setup();
- gow = AllocVec(sizeof(struct ami_gui_opts_window),MEMF_CLEAR | MEMF_PRIVATE);
+ gow = AllocVecTags(sizeof(struct ami_gui_opts_window), AVT_ClearWithValue, 0, TAG_DONE);
gow->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle,nsscreentitle,
@@ -2116,7 +2116,7 @@ STRPTR *ami_gui_opts_websearch(void)
ULONG ref = 0;
STRPTR *websearchlist;
- websearchlist = AllocVec(200, MEMF_CLEAR);
+ websearchlist = AllocVecTagList(200, NULL); /* NB: Was not MEMF_PRIVATE */
if (nsoption_charp(search_engines_file) == NULL) return websearchlist;
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 5203276..b5aba38 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -82,7 +82,7 @@ void ami_history_open(struct browser_window *bw, struct history *history)
if(!hwindow)
{
- hwindow = AllocVec(sizeof(struct history_window),MEMF_CLEAR | MEMF_PRIVATE);
+ hwindow = AllocVecTags(sizeof(struct history_window), AVT_ClearWithValue, 0, TAG_DONE);
ami_init_layers(&hwindow->gg, scrn->Width, scrn->Height);
diff --git a/amiga/icon.c b/amiga/icon.c
index 641095b..c5bc6ae 100644
--- a/amiga/icon.c
+++ b/amiga/icon.c
@@ -326,7 +326,7 @@ ULONG *amiga_icon_convertcolouricon32(UBYTE *icondata, ULONG width, ULONG height
if (alpha==0) alpha=0xff;
- argbicon = (ULONG *)AllocVec(width*height*4,MEMF_CLEAR);
+ argbicon = (ULONG *)AllocVecTagList(width*height*4, NULL);
if (!argbicon) return(NULL);
cmap=GetColorMap(pals1);
@@ -504,8 +504,7 @@ struct DiskObject *amiga_icon_from_bitmap(struct bitmap *bm)
{
bitmap = ami_bitmap_get_native(bm, THUMBNAIL_WIDTH,
THUMBNAIL_HEIGHT, NULL);
- bm->icondata = AllocVec(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT,
- MEMF_CLEAR);
+ bm->icondata = AllocVecTagList(THUMBNAIL_WIDTH * 4 * THUMBNAIL_HEIGHT, NULL);
BltBitMapTags(BLITA_Width, THUMBNAIL_WIDTH,
BLITA_Height, THUMBNAIL_HEIGHT,
diff --git a/amiga/iff_dr2d.c b/amiga/iff_dr2d.c
index b428ed2..0638b94 100644
--- a/amiga/iff_dr2d.c
+++ b/amiga/iff_dr2d.c
@@ -165,7 +165,7 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer,
}
for (i = 0; i != diagram->shape_count; i++) {
- attr = AllocVec(sizeof(struct attr_struct),MEMF_CLEAR | MEMF_PRIVATE);
+ attr = AllocVecTagList(sizeof(struct attr_struct), NULL);
if (diagram->shape[i].fill == svgtiny_TRANSPARENT)
attr->FillType = FT_NONE;
else
@@ -266,13 +266,13 @@ bool ami_svg_to_dr2d(struct IFFHandle *iffh, const char *buffer,
PopChunk(iffh);
}
} else if (diagram->shape[i].text) {
- stxt = AllocVec(sizeof(struct stxt_struct),MEMF_CLEAR);
+ stxt = AllocVecTagList(sizeof(struct stxt_struct), NULL);
stxt->BaseX = diagram->shape[i].text_x;
stxt->BaseY = diagram->shape[i].text_y;
stxt->NumChars = strlen(diagram->shape[i].text);
if(!fons_written)
{
- fons = AllocVec(sizeof(struct fons_struct),MEMF_CLEAR);
+ fons = AllocVecTagList(sizeof(struct fons_struct), NULL);
if(!(PushChunk(iffh,0,ID_FONS,IFFSIZE_UNKNOWN)))
{
WriteChunkBytes(iffh,fons,sizeof(struct fons_struct));
@@ -366,7 +366,7 @@ int main(int argc, char **argv)
{
size = GetFileSize(fh);
- buffer = AllocVec((uint32)size,MEMF_PRIVATE);
+ buffer = AllocVecTagList((uint32)size, NULL);
Read(fh,buffer,(uint32)size);
Close(fh);
diff --git a/amiga/launch.c b/amiga/launch.c
index 3236e79..ebd8229 100755
--- a/amiga/launch.c
+++ b/amiga/launch.c
@@ -47,8 +47,7 @@ struct ami_protocol
struct ami_protocol *ami_openurl_add_protocol(const char *url)
{
struct ami_protocol *ami_p =
- (struct ami_protocol *)AllocVec(sizeof(struct ami_protocol),
- MEMF_PRIVATE | MEMF_CLEAR);
+ (struct ami_protocol *)AllocVecTagList(sizeof(struct ami_protocol), NULL);
if(url_scheme(url, &ami_p->protocol) != URL_FUNC_OK)
{
diff --git a/amiga/login.c b/amiga/login.c
index e70002c..816ece6 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -59,7 +59,8 @@ void gui_401login_open(nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw)
{
const char *auth;
- struct gui_login_window *lw = AllocVec(sizeof(struct gui_login_window),MEMF_PRIVATE | MEMF_CLEAR);
+ struct gui_login_window *lw = AllocVecTags(sizeof(struct gui_login_window),
+ AVT_ClearWithValue, 0, TAG_DONE);
lwc_string *host = nsurl_get_component(url, NSURL_HOST);
assert(host != NULL);
diff --git a/amiga/menu.c b/amiga/menu.c
index 3280bde..3e9cae5 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -188,7 +188,7 @@ void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
- gwin->menutype = AllocVec(AMI_MENU_AREXX_MAX + 1, MEMF_PRIVATE | MEMF_CLEAR);
+ gwin->menutype = AllocVecTags(AMI_MENU_AREXX_MAX + 1, AVT_ClearWithValue, 0, TAG_DONE);
for(i=0;i <= AMI_MENU_AREXX_MAX;i++)
{
@@ -458,7 +458,8 @@ struct NewMenu *ami_create_menu(struct gui_window_2 *gwin)
{
int i;
- gwin->menu = AllocVec(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1), MEMF_CLEAR);
+ gwin->menu = AllocVecTags(sizeof(struct NewMenu) * (AMI_MENU_AREXX_MAX + 1),
+ AVT_ClearWithValue, 0, TAG_DONE);
ami_init_menulabs(gwin);
ami_menu_scan(ami_tree_get_tree(hotlist_window), gwin);
ami_menu_arexx_scan(gwin);
@@ -499,7 +500,7 @@ void ami_menu_arexx_scan(struct gui_window_2 *gwin)
if(lock = Lock(nsoption_charp(arexx_dir), SHARED_LOCK))
{
- if(buffer = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(buffer = AllocVecTagList(1024, NULL))
{
if(ctrl = AllocDosObject(DOS_EXALLCONTROL,NULL))
{
@@ -1093,7 +1094,7 @@ static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct I
ASLFR_InitialPattern, "#?.nsrx",
TAG_DONE))
{
- if(temp = AllocVec(1024,MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strlcpy(temp, filereq->fr_Drawer, 1024);
AddPart(temp, filereq->fr_File, 1024);
@@ -1112,7 +1113,7 @@ static void ami_menu_item_arexx_entries(struct Hook *hook, APTR window, struct I
if(script)
{
- if(temp = AllocVec(1024, MEMF_PRIVATE | MEMF_CLEAR))
+ if(temp = AllocVecTagList(1024, NULL))
{
strcpy(temp, nsoption_charp(arexx_dir));
AddPart(temp, script, 1024);
diff --git a/amiga/object.c b/amiga/object.c
index c028ea3..735ea30 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -29,7 +29,7 @@ struct MinList *NewObjList(void)
struct MinList *objlist;
- objlist = (struct MinList *)AllocVec(sizeof(struct MinList),MEMF_PRIVATE | MEMF_CLEAR);
+ objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
NewMinList(objlist);
@@ -41,7 +41,7 @@ struct nsObject *AddObject(struct MinList *objlist, ULONG otype)
{
struct nsObject *dtzo;
- dtzo = (struct nsObject *)AllocVec(sizeof(struct nsObject),MEMF_PRIVATE | MEMF_CLEAR);
+ dtzo = (struct nsObject *)AllocVecTags(sizeof(struct nsObject), AVT_ClearWithValue, 0, TAG_DONE);
AddTail((struct List *)objlist,(struct Node *)dtzo);
diff --git a/amiga/plotters.c b/amiga/plotters.c
index b2544da..42b5239 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -158,8 +158,8 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
if(!height) height = nsoption_int(redraw_tile_size_y);
gg->layerinfo = NewLayerInfo();
- gg->areabuf = AllocVec(AREA_SIZE, MEMF_PRIVATE | MEMF_CLEAR);
- gg->tmprasbuf = AllocVec(width * height, MEMF_PRIVATE | MEMF_CLEAR);
+ gg->areabuf = AllocVecTagList(AREA_SIZE, NULL);
+ gg->tmprasbuf = AllocVecTagList(width * height, NULL);
if(palette_mapped == true) {
gg->bm = AllocBitMap(width, height, depth,
@@ -171,7 +171,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
if(!gg->bm) warn_user("NoMemory","");
- gg->rp = AllocVec(sizeof(struct RastPort), MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp = AllocVecTagList(sizeof(struct RastPort), NULL);
if(!gg->rp) warn_user("NoMemory","");
InitRastPort(gg->rp);
@@ -185,12 +185,12 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
InstallLayerHook(gg->rp->Layer,LAYERS_NOBACKFILL);
- gg->rp->AreaInfo = AllocVec(sizeof(struct AreaInfo),MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp->AreaInfo = AllocVecTagList(sizeof(struct AreaInfo), NULL);
if((!gg->areabuf) || (!gg->rp->AreaInfo)) warn_user("NoMemory","");
InitArea(gg->rp->AreaInfo,gg->areabuf, AREA_SIZE/5);
- gg->rp->TmpRas = AllocVec(sizeof(struct TmpRas),MEMF_PRIVATE | MEMF_CLEAR);
+ gg->rp->TmpRas = AllocVecTagList(sizeof(struct TmpRas), NULL);
if((!gg->tmprasbuf) || (!gg->rp->TmpRas)) warn_user("NoMemory","");
@@ -251,8 +251,7 @@ static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colour)
if(pen == -1) LOG(("WARNING: Cannot allocate pen for ABGR:%lx", colour));
if(shared_pens != NULL) {
- if(node = (struct ami_plot_pen *)AllocVec(sizeof(struct ami_plot_pen),
- MEMF_PRIVATE | MEMF_CLEAR)) {
+ if(node = (struct ami_plot_pen *)AllocVecTagList(sizeof(struct ami_plot_pen), NULL)) {
AddTail((struct List *)shared_pens, (struct Node *)node);
}
} else {
@@ -829,7 +828,7 @@ bool ami_bitmap_tile(int x, int y, int width, int height,
bfbm.offsetx = ox;
bfbm.offsety = oy;
bfbm.mask = ami_bitmap_get_mask(bitmap, width, height, tbm);
- bfh = AllocVec(sizeof(struct Hook),MEMF_CLEAR);
+ bfh = AllocVecTags(sizeof(struct Hook), AVT_ClearWithValue, 0, TAG_DONE); /* NB: Was not MEMF_PRIVATE */
bfh->h_Entry = (HOOKFUNC)ami_bitmap_tile_hook;
bfh->h_SubEntry = 0;
bfh->h_Data = &bfbm;
diff --git a/amiga/print.c b/amiga/print.c
index f0689f7..4bfce13 100644
--- a/amiga/print.c
+++ b/amiga/print.c
@@ -212,19 +212,18 @@ void ami_print_ui(struct hlcache_handle *c)
char filename[30];
int i;
- struct ami_print_window *pw = AllocVec(sizeof(struct ami_print_window),
- MEMF_PRIVATE | MEMF_CLEAR);
+ struct ami_print_window *pw = AllocVecTags(sizeof(struct ami_print_window), AVT_ClearWithValue, 0, TAG_DONE);
pw->c = c;
- printers[0] = AllocVec(50, MEMF_PRIVATE | MEMF_CLEAR);
+ printers[0] = AllocVecTags(50, AVT_ClearWithValue, 0, TAG_DONE);
ami_print_readunit("ENV:Sys/printer.prefs", printers[0], 50, 0);
strcpy(filename,"ENV:Sys/printerN.prefs");
for (i = 1; i < 10; i++)
{
filename[15] = '0' + i;
- printers[i] = AllocVec(50, MEMF_PRIVATE | MEMF_CLEAR);
+ printers[i] = AllocVecTagList(50, NULL);
if(!ami_print_readunit(filename, printers[i], 50, i))
{
FreeVec(printers[i]);
@@ -461,8 +460,7 @@ struct MsgPort *ami_print_get_msgport(void)
bool ami_print_begin(struct print_settings *ps)
{
- ami_print_info.gg = AllocVec(sizeof(struct gui_globals),
- MEMF_PRIVATE | MEMF_CLEAR);
+ ami_print_info.gg = AllocVecTags(sizeof(struct gui_globals), AVT_ClearWithValue, 0, TAG_DONE);
if(!ami_print_info.gg) return false;
ami_init_layers(ami_print_info.gg,
diff --git a/amiga/schedule.c b/amiga/schedule.c
index 260225b..d4b35a5 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -58,7 +58,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
if(schedule_list == NULL) return;
- nscb = AllocVec(sizeof(struct nscallback), MEMF_PRIVATE | MEMF_CLEAR);
+ nscb = AllocVecTagList(sizeof(struct nscallback), NULL);
if(!nscb) return;
time_us = t*10000; /* t converted to �s */
@@ -69,7 +69,7 @@ void schedule(int t, void (*callback)(void *p), void *p)
GetSysTime(&tv);
AddTime(&nscb->tv,&tv); // now contains time when event occurs
- if(nscb->treq = AllocVec(sizeof(struct TimeRequest),MEMF_PRIVATE | MEMF_CLEAR))
+ if(nscb->treq = AllocVecTagList(sizeof(struct TimeRequest), NULL))
{
*nscb->treq = *tioreq;
nscb->treq->Request.io_Command=TR_ADDREQUEST;
diff --git a/amiga/search.c b/amiga/search.c
index 18ea27f..17a2d45 100755
--- a/amiga/search.c
+++ b/amiga/search.c
@@ -100,7 +100,7 @@ void ami_search_open(struct gui_window *gwin)
return;
}
- fwin = AllocVec(sizeof(struct find_window),MEMF_PRIVATE | MEMF_CLEAR);
+ fwin = AllocVecTags(sizeof(struct find_window), AVT_ClearWithValue, 0, TAG_DONE);
fwin->objects[OID_MAIN] = WindowObject,
WA_ScreenTitle,nsscreentitle,
diff --git a/amiga/stringview/urlhistory.c b/amiga/stringview/urlhistory.c
index fa5aec4..6d134a4 100644
--- a/amiga/stringview/urlhistory.c
+++ b/amiga/stringview/urlhistory.c
@@ -73,17 +73,24 @@ static bool URLHistoryFound(nsurl *url, const struct url_data *data)
{
struct Node *node;
- /* skip non-visted pages */
+ /* skip non-visited pages */
if(data->visits <= 0) return true;
/* skip this URL if it is already in the list */
if(URLHistory_FindPage(nsurl_access(url))) return true;
- node = AllocVec( sizeof( struct Node ), MEMF_SHARED|MEMF_CLEAR );
+ node = AllocVecTags(sizeof(struct Node),
+ AVT_Type, MEMF_SHARED,
+ //AVT_ClearWithValue, 0,
+ TAG_DONE);
if ( node )
{
- STRPTR urladd = (STRPTR) AllocVec( strlen ( nsurl_access(url) ) + 1, MEMF_SHARED|MEMF_CLEAR );
+ STRPTR urladd = (STRPTR) AllocVecTags( strlen ( nsurl_access(url) ) + 1,
+ AVT_Type, MEMF_SHARED,
+ //AVT_ClearWithValue, 0,
+ TAG_DONE);
+
if ( urladd )
{
strcpy(urladd, nsurl_access(url));
diff --git a/amiga/theme.c b/amiga/theme.c
index 512173d..bb793a3 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -353,10 +353,10 @@ void ami_init_mouse_pointers(void)
if(ptrfile = Open(ptrfname,MODE_OLDFILE))
{
int mx,my;
- UBYTE *pprefsbuf = AllocVec(1061,MEMF_PRIVATE | MEMF_CLEAR);
+ UBYTE *pprefsbuf = AllocVecTagList(1061, NULL);
Read(ptrfile,pprefsbuf,1061);
- mouseptrbm[i]=AllocVec(sizeof(struct BitMap),MEMF_PRIVATE | MEMF_CLEAR);
+ mouseptrbm[i]=AllocVecTagList(sizeof(struct BitMap), NULL);
InitBitMap(mouseptrbm[i],2,32,32);
mouseptrbm[i]->Planes[0] = AllocRaster(32,32);
mouseptrbm[i]->Planes[1] = AllocRaster(32,32);
diff --git a/amiga/tree.c b/amiga/tree.c
index 5ef3a20..69fe3e8 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -130,8 +130,7 @@ struct treeview_window *ami_tree_create(int flags,
{
struct treeview_window *twin;
- twin = AllocVec(sizeof(struct treeview_window),
- MEMF_PRIVATE | MEMF_CLEAR);
+ twin = AllocVecTags(sizeof(struct treeview_window), AVT_ClearWithValue, 0, TAG_DONE);
if(!twin)
{
@@ -378,7 +377,8 @@ void ami_tree_menu(struct treeview_window *twin)
{
if(twin->menu) return;
- if(twin->menu = AllocVec(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS, MEMF_CLEAR))
+ if(twin->menu = AllocVecTags(sizeof(struct NewMenu) * AMI_TREE_MENU_ITEMS,
+ AVT_ClearWithValue, 0, TAG_DONE))
{
twin->menu[0].nm_Type = NM_TITLE;
twin->menu_name[0] = ami_utf8_easy((char *)messages_get("Tree"));
@@ -1301,7 +1301,7 @@ static void ami_tree_redraw_req(void *p)
void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
{
- struct ami_tree_redraw_req *atrr_data = AllocVec(sizeof(struct ami_tree_redraw_req), MEMF_CLEAR | MEMF_PRIVATE);
+ struct ami_tree_redraw_req *atrr_data = AllocVecTagList(sizeof(struct ami_tree_redraw_req), NULL);
atrr_data->x = x;
atrr_data->y = y;
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-631-g6ea52d0
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/6ea52d0d9f423a13acc7c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/6ea52d0d9f423a13acc7c7f...
...tree http://git.netsurf-browser.org/netsurf.git/tree/6ea52d0d9f423a13acc7c7fe0...
The branch, master has been updated
via 6ea52d0d9f423a13acc7c7fe015038a15a9636ff (commit)
from 67f957df39114368262c70e763d38dfd33801a10 (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=6ea52d0d9f423a13acc...
commit 6ea52d0d9f423a13acc7c7fe015038a15a9636ff
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't change the setting, just in case NetSurf is being used from two different OS installs on the same computer.
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index c98511d..4da3d35 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -418,11 +418,7 @@ void ami_gui_opts_open(void)
return;
}
- if(IntuitionBase->LibNode.lib_Version >= 53) {
- nsoption_set_bool(os_mouse_pointers, true);
- nsoption_set_bool(truecolour_mouse_pointers, true);
- ptr_disable = TRUE;
- }
+ if(IntuitionBase->LibNode.lib_Version >= 53) ptr_disable = TRUE;
if(nsoption_charp(pubscreen_name))
{
-----------------------------------------------------------------------
Summary of changes:
amiga/gui_options.c | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index c98511d..4da3d35 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -418,11 +418,7 @@ void ami_gui_opts_open(void)
return;
}
- if(IntuitionBase->LibNode.lib_Version >= 53) {
- nsoption_set_bool(os_mouse_pointers, true);
- nsoption_set_bool(truecolour_mouse_pointers, true);
- ptr_disable = TRUE;
- }
+ if(IntuitionBase->LibNode.lib_Version >= 53) ptr_disable = TRUE;
if(nsoption_charp(pubscreen_name))
{
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-630-g67f957d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/67f957df39114368262c7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/67f957df39114368262c70e...
...tree http://git.netsurf-browser.org/netsurf.git/tree/67f957df39114368262c70e76...
The branch, master has been updated
via 67f957df39114368262c70e763d38dfd33801a10 (commit)
via 5d2f4b0b98317eae6362bd444a3ca333c1b98f9e (commit)
from af2c37167b1caa30f1771a64302767ec54d00f42 (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=67f957df39114368262...
commit 67f957df39114368262c70e763d38dfd33801a10
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Force usage of OS pointers for OS4.1, there's no reason to use custom ones now.
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index a1bd291..c98511d 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -407,6 +407,7 @@ void ami_gui_opts_open(void)
BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE;
BOOL download_notify_disabled = FALSE;
+ BOOL ptr_disable = FALSE;
char animspeed[10];
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -417,6 +418,12 @@ void ami_gui_opts_open(void)
return;
}
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ nsoption_set_bool(os_mouse_pointers, true);
+ nsoption_set_bool(truecolour_mouse_pointers, true);
+ ptr_disable = TRUE;
+ }
+
if(nsoption_charp(pubscreen_name))
{
if(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0)
@@ -742,6 +749,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTRTRUE],
GA_Selected, nsoption_bool(truecolour_mouse_pointers),
+ GA_Disabled, ptr_disable,
CheckBoxEnd,
#endif
LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObject,
@@ -749,6 +757,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTROS],
GA_Selected, nsoption_bool(os_mouse_pointers),
+ GA_Disabled, ptr_disable,
CheckBoxEnd,
LayoutEnd, // mouse
CHILD_WeightedHeight,0,
diff --git a/amiga/theme.c b/amiga/theme.c
index 5874ba6..512173d 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -217,6 +217,10 @@ void ami_reset_pointer(struct gui_window_2 *gwin)
void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
+ return;
+ }
if(nsoption_bool(os_mouse_pointers))
{
@@ -234,9 +238,7 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
break;
default:
- if((IntuitionBase->LibNode.lib_Version >= 53) && (osmouseptr[shape] != -1)) {
- SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
- } else if(mouseptrobj[shape]) {
+ if(mouseptrobj[shape]) {
SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
} else {
SetWindowPointer(win, TAG_DONE);
@@ -274,6 +276,8 @@ void gui_window_hide_pointer(struct gui_window *g)
void ami_init_mouse_pointers(void)
{
+ if(IntuitionBase->LibNode.lib_Version >= 53) return;
+
int i;
struct RastPort mouseptr;
struct DiskObject *dobj;
@@ -390,6 +394,8 @@ void ami_init_mouse_pointers(void)
void ami_mouse_pointers_free(void)
{
+ if(IntuitionBase->LibNode.lib_Version >= 53) return;
+
int i;
for(i=0;i<=AMI_LASTPOINTER;i++)
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5d2f4b0b98317eae636...
commit 5d2f4b0b98317eae6362bd444a3ca333c1b98f9e
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use all the built-in mouse pointers on OS4.1
diff --git a/amiga/theme.c b/amiga/theme.c
index a0755b2..5874ba6 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -95,6 +95,31 @@ char *ptrs32[AMI_LASTPOINTER+1] = {
"ptr32_blank",
"ptr32_drag"};
+/* Mapping from NetSurf to AmigaOS mouse pointers */
+int osmouseptr[AMI_LASTPOINTER+1] = {
+ POINTERTYPE_NORMAL,
+ POINTERTYPE_LINK,
+ POINTERTYPE_TEXT,
+ POINTERTYPE_CONTEXTMENU,
+ POINTERTYPE_NORTHRESIZE,
+ POINTERTYPE_SOUTHRESIZE,
+ POINTERTYPE_WESTRESIZE,
+ POINTERTYPE_EASTRESIZE,
+ POINTERTYPE_NORTHEASTRESIZE,
+ POINTERTYPE_SOUTHWESTRESIZE,
+ POINTERTYPE_NORTHWESTRESIZE,
+ POINTERTYPE_SOUTHEASTRESIZE,
+ POINTERTYPE_CROSS,
+ POINTERTYPE_HAND,
+ POINTERTYPE_BUSY,
+ POINTERTYPE_HELP,
+ POINTERTYPE_NODROP,
+ POINTERTYPE_NOTALLOWED,
+ POINTERTYPE_PROGRESS,
+ POINTERTYPE_NONE,
+ POINTERTYPE_DRAGANDDROP};
+
+
void ami_theme_init(void)
{
char themefile[1024];
@@ -209,12 +234,11 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
break;
default:
- if(mouseptrobj[shape])
- {
+ if((IntuitionBase->LibNode.lib_Version >= 53) && (osmouseptr[shape] != -1)) {
+ SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
+ } else if(mouseptrobj[shape]) {
SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
- }
- else
- {
+ } else {
SetWindowPointer(win, TAG_DONE);
}
break;
-----------------------------------------------------------------------
Summary of changes:
amiga/gui_options.c | 9 +++++++++
amiga/theme.c | 40 +++++++++++++++++++++++++++++++++++-----
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index a1bd291..c98511d 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -407,6 +407,7 @@ void ami_gui_opts_open(void)
BOOL disableanims, animspeeddisabled = FALSE, acceptlangdisabled = FALSE;
BOOL scaleselected = nsoption_bool(scale_quality), scaledisabled = FALSE;
BOOL download_notify_disabled = FALSE;
+ BOOL ptr_disable = FALSE;
char animspeed[10];
struct TextAttr fontsans, fontserif, fontmono, fontcursive, fontfantasy;
@@ -417,6 +418,12 @@ void ami_gui_opts_open(void)
return;
}
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ nsoption_set_bool(os_mouse_pointers, true);
+ nsoption_set_bool(truecolour_mouse_pointers, true);
+ ptr_disable = TRUE;
+ }
+
if(nsoption_charp(pubscreen_name))
{
if(strcmp(nsoption_charp(pubscreen_name),"Workbench") == 0)
@@ -742,6 +749,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTRTRUE],
GA_Selected, nsoption_bool(truecolour_mouse_pointers),
+ GA_Disabled, ptr_disable,
CheckBoxEnd,
#endif
LAYOUT_AddChild, gow->objects[GID_OPTS_PTROS] = CheckBoxObject,
@@ -749,6 +757,7 @@ void ami_gui_opts_open(void)
GA_RelVerify, TRUE,
GA_Text, gadlab[GID_OPTS_PTROS],
GA_Selected, nsoption_bool(os_mouse_pointers),
+ GA_Disabled, ptr_disable,
CheckBoxEnd,
LayoutEnd, // mouse
CHILD_WeightedHeight,0,
diff --git a/amiga/theme.c b/amiga/theme.c
index a0755b2..512173d 100644
--- a/amiga/theme.c
+++ b/amiga/theme.c
@@ -95,6 +95,31 @@ char *ptrs32[AMI_LASTPOINTER+1] = {
"ptr32_blank",
"ptr32_drag"};
+/* Mapping from NetSurf to AmigaOS mouse pointers */
+int osmouseptr[AMI_LASTPOINTER+1] = {
+ POINTERTYPE_NORMAL,
+ POINTERTYPE_LINK,
+ POINTERTYPE_TEXT,
+ POINTERTYPE_CONTEXTMENU,
+ POINTERTYPE_NORTHRESIZE,
+ POINTERTYPE_SOUTHRESIZE,
+ POINTERTYPE_WESTRESIZE,
+ POINTERTYPE_EASTRESIZE,
+ POINTERTYPE_NORTHEASTRESIZE,
+ POINTERTYPE_SOUTHWESTRESIZE,
+ POINTERTYPE_NORTHWESTRESIZE,
+ POINTERTYPE_SOUTHEASTRESIZE,
+ POINTERTYPE_CROSS,
+ POINTERTYPE_HAND,
+ POINTERTYPE_BUSY,
+ POINTERTYPE_HELP,
+ POINTERTYPE_NODROP,
+ POINTERTYPE_NOTALLOWED,
+ POINTERTYPE_PROGRESS,
+ POINTERTYPE_NONE,
+ POINTERTYPE_DRAGANDDROP};
+
+
void ami_theme_init(void)
{
char themefile[1024];
@@ -192,6 +217,10 @@ void ami_reset_pointer(struct gui_window_2 *gwin)
void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
{
if(drag_save_data) return;
+ if(IntuitionBase->LibNode.lib_Version >= 53) {
+ SetWindowPointer(win, WA_PointerType, osmouseptr[shape], TAG_DONE);
+ return;
+ }
if(nsoption_bool(os_mouse_pointers))
{
@@ -209,12 +238,9 @@ void ami_update_pointer(struct Window *win, gui_pointer_shape shape)
break;
default:
- if(mouseptrobj[shape])
- {
+ if(mouseptrobj[shape]) {
SetWindowPointer(win, WA_Pointer, mouseptrobj[shape], TAG_DONE);
- }
- else
- {
+ } else {
SetWindowPointer(win, TAG_DONE);
}
break;
@@ -250,6 +276,8 @@ void gui_window_hide_pointer(struct gui_window *g)
void ami_init_mouse_pointers(void)
{
+ if(IntuitionBase->LibNode.lib_Version >= 53) return;
+
int i;
struct RastPort mouseptr;
struct DiskObject *dobj;
@@ -366,6 +394,8 @@ void ami_init_mouse_pointers(void)
void ami_mouse_pointers_free(void)
{
+ if(IntuitionBase->LibNode.lib_Version >= 53) return;
+
int i;
for(i=0;i<=AMI_LASTPOINTER;i++)
--
NetSurf Browser
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-628-gaf2c371
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/af2c37167b1caa30f1771...
...commit http://git.netsurf-browser.org/netsurf.git/commit/af2c37167b1caa30f1771a6...
...tree http://git.netsurf-browser.org/netsurf.git/tree/af2c37167b1caa30f1771a643...
The branch, master has been updated
via af2c37167b1caa30f1771a64302767ec54d00f42 (commit)
from 4cc0d9c233886a419ede7c9791b9ce7252e2dcdb (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=af2c37167b1caa30f17...
commit af2c37167b1caa30f1771a64302767ec54d00f42
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
application.library fix for new SDK. Note that:
* application.library functionality will no longer be available on OS4.0, however that only extends to the Docky icon as notifications weren't supported anyway.
* CI builds may crash until the toolchain is updated.
diff --git a/amiga/gui.c b/amiga/gui.c
index acbf841..962c3a1 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -383,9 +383,8 @@ void ami_open_resources(void)
IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL);
}
- if(ApplicationBase = OpenLibrary("application.library",50))
- {
- IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase,"application",1,NULL);
+ if(ApplicationBase = OpenLibrary("application.library", 53)) {
+ IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase, "application", 2, NULL);
}
urlStringClass = MakeStringClass();
@@ -938,9 +937,6 @@ static void gui_init2(int argc, char** argv)
if(IApplication)
{
- ULONG desc = REGAPP_Description;
- if(ApplicationBase->lib_Version < 53) desc = TAG_IGNORE;
-
if(argc == 0)
{
ULONG noicon = TAG_IGNORE;
@@ -955,7 +951,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE,
- desc, messages_get("NetSurfDesc"),
+ REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE);
}
else
@@ -968,7 +964,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE,
- desc, messages_get("NetSurfDesc"),
+ REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE);
}
diff --git a/amiga/tree.c b/amiga/tree.c
index 80d05a6..5ef3a20 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -1309,6 +1309,9 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
atrr_data->height = height;
atrr_data->twin = (struct treeview_window *)data;
+ /**TODO: Queue these requests properly like the main browser code does
+ **/
+
schedule(0, ami_tree_redraw_req, atrr_data);
}
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 12 ++++--------
amiga/tree.c | 3 +++
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index acbf841..962c3a1 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -383,9 +383,8 @@ void ami_open_resources(void)
IKeymap = (struct KeymapIFace *)GetInterface(KeymapBase,"main",1,NULL);
}
- if(ApplicationBase = OpenLibrary("application.library",50))
- {
- IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase,"application",1,NULL);
+ if(ApplicationBase = OpenLibrary("application.library", 53)) {
+ IApplication = (struct ApplicationIFace *)GetInterface(ApplicationBase, "application", 2, NULL);
}
urlStringClass = MakeStringClass();
@@ -938,9 +937,6 @@ static void gui_init2(int argc, char** argv)
if(IApplication)
{
- ULONG desc = REGAPP_Description;
- if(ApplicationBase->lib_Version < 53) desc = TAG_IGNORE;
-
if(argc == 0)
{
ULONG noicon = TAG_IGNORE;
@@ -955,7 +951,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE,
- desc, messages_get("NetSurfDesc"),
+ REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE);
}
else
@@ -968,7 +964,7 @@ static void gui_init2(int argc, char** argv)
REGAPP_HasPrefsWindow, TRUE,
REGAPP_CanCreateNewDocs, TRUE,
REGAPP_UniqueApplication, TRUE,
- desc, messages_get("NetSurfDesc"),
+ REGAPP_Description, messages_get("NetSurfDesc"),
TAG_DONE);
}
diff --git a/amiga/tree.c b/amiga/tree.c
index 80d05a6..5ef3a20 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -1309,6 +1309,9 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
atrr_data->height = height;
atrr_data->twin = (struct treeview_window *)data;
+ /**TODO: Queue these requests properly like the main browser code does
+ **/
+
schedule(0, ami_tree_redraw_req, atrr_data);
}
--
NetSurf Browser
9 years, 5 months
- 1
- 0
toolchains: branch chris/sdk-53-24 created. 39f4157a9c7dcb9ab514f70d45cee7e40d8745bc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/39f4157a9c7dcb9ab5...
...commit http://git.netsurf-browser.org/toolchains.git/commit/39f4157a9c7dcb9ab514...
...tree http://git.netsurf-browser.org/toolchains.git/tree/39f4157a9c7dcb9ab514f7...
The branch, chris/sdk-53-24 has been created
at 39f4157a9c7dcb9ab514f70d45cee7e40d8745bc (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=39f4157a9c7dcb9a...
commit 39f4157a9c7dcb9ab514f70d45cee7e40d8745bc
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Update to SDK 53.24
diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index 04ccbbd..47d9514 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -20,7 +20,7 @@ UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_NDK_TARBALL := SDK_53.20.lha
-UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..."
+UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php?option=com_registration&view=..."
UPSTREAM_OPENURL_VERSION := 7.8
UPSTREAM_OPENURL_TARBALL := openurl
@@ -80,8 +80,8 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
mkdir -p $(BUILDDIR)/ndk/tmp/
lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.9.lha
- lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.204.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.28.lha
+ lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.205.lha
mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK
cp -r $(BUILDDIR)/ndk/tmp/Include $(PREFIX)/$(TARGET_NAME)/SDK/include
cp -r $(BUILDDIR)/ndk/tmp/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
9 years, 5 months
- 1
- 0
netsurf: branch master updated. release/3.0-627-g4cc0d9c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/4cc0d9c233886a419ede7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/4cc0d9c233886a419ede7c9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/4cc0d9c233886a419ede7c979...
The branch, master has been updated
via 4cc0d9c233886a419ede7c9791b9ce7252e2dcdb (commit)
from 06f852151eb33bcbf5e51c918f6f48f6b9772221 (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=4cc0d9c233886a419ed...
commit 4cc0d9c233886a419ede7c9791b9ce7252e2dcdb
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
LOG init/fini messages.
diff --git a/desktop/treeview.c b/desktop/treeview.c
index e426838..d9e1f9e 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -3828,6 +3828,8 @@ nserror treeview_init(int font_pt_size)
if (tree_g.initialised == true)
return NSERROR_OK;
+ LOG(("Initialising treeview module"));
+
if (font_pt_size <= 0)
font_pt_size = 11;
@@ -3846,9 +3848,10 @@ nserror treeview_init(int font_pt_size)
tree_g.icon_step = 23;
tree_g.move_offset = 18;
-
tree_g.initialised = true;
+ LOG(("Initialised treeview module"));
+
return NSERROR_OK;
}
@@ -3858,6 +3861,8 @@ nserror treeview_fini(void)
{
int i;
+ LOG(("Finalising treeview module"));
+
for (i = 0; i < TREE_RES_LAST; i++) {
hlcache_handle_release(treeview_res[i].c);
}
@@ -3873,5 +3878,7 @@ nserror treeview_fini(void)
tree_g.initialised = false;
+ LOG(("Finalised treeview module"));
+
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
desktop/treeview.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/desktop/treeview.c b/desktop/treeview.c
index e426838..d9e1f9e 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -3828,6 +3828,8 @@ nserror treeview_init(int font_pt_size)
if (tree_g.initialised == true)
return NSERROR_OK;
+ LOG(("Initialising treeview module"));
+
if (font_pt_size <= 0)
font_pt_size = 11;
@@ -3846,9 +3848,10 @@ nserror treeview_init(int font_pt_size)
tree_g.icon_step = 23;
tree_g.move_offset = 18;
-
tree_g.initialised = true;
+ LOG(("Initialised treeview module"));
+
return NSERROR_OK;
}
@@ -3858,6 +3861,8 @@ nserror treeview_fini(void)
{
int i;
+ LOG(("Finalising treeview module"));
+
for (i = 0; i < TREE_RES_LAST; i++) {
hlcache_handle_release(treeview_res[i].c);
}
@@ -3873,5 +3878,7 @@ nserror treeview_fini(void)
tree_g.initialised = false;
+ LOG(("Finalised treeview module"));
+
return NSERROR_OK;
}
--
NetSurf Browser
9 years, 5 months
- 1
- 0