netsurf: branch master updated. release/3.2-673-g73b7498
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/73b74988dc8fa9ba5df9c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/73b74988dc8fa9ba5df9cc4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/73b74988dc8fa9ba5df9cc46a...
The branch, master has been updated
via 73b74988dc8fa9ba5df9cc46a4dec9b49dd0c057 (commit)
via f514595ccffde956e976b726c556aee215e23a73 (commit)
from 7370e83d605814c0d79482427dd17a2621a86c7e (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=73b74988dc8fa9ba5df...
commit 73b74988dc8fa9ba5df9cc46a4dec9b49dd0c057
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Remove BMF_DISPLAYABLE from other non-displayed BitMaps
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 54ac1ea..95b5f71 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -425,7 +425,7 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
struct BitMap *scaledbm;
struct BitScaleArgs bsa;
- scaledbm = ami_rtg_allocbitmap(width, height, 32, BMF_DISPLAYABLE,
+ scaledbm = ami_rtg_allocbitmap(width, height, 32, 0,
friendbm, AMI_BITMAP_FORMAT);
if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index 310630f..538f22b 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -62,8 +62,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
bitmap->width;
bitmap->nativebm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32,
- BMF_CLEAR | BMF_DISPLAYABLE | BMF_INTERLEAVED,
- browserglob.bm, RGBFB_A8R8G8B8);
+ BMF_CLEAR, browserglob.bm, RGBFB_A8R8G8B8);
bitmap->nativebmwidth = bitmap->width;
bitmap->nativebmheight = bitmap->height;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f514595ccffde956e97...
commit f514595ccffde956e976b726c556aee215e23a73
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't allocate our off-screen render area as BMF_DISPLAYABLE, as it is never displayed.
Befriend the screen BitMap but only if we're 32-bit on both.
diff --git a/amiga/plotters.c b/amiga/plotters.c
index acdf50e..1d074e8 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -132,11 +132,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
gg->tmprasbuf = AllocVecTagList(width * height, NULL);
if(palette_mapped == true) {
- gg->bm = AllocBitMap(width, height, depth,
- BMF_INTERLEAVED | BMF_DISPLAYABLE, friend);
+ gg->bm = AllocBitMap(width, height, depth, 0, friend);
} else {
- gg->bm = ami_rtg_allocbitmap(width, height, 32,
- BMF_INTERLEAVED | BMF_DISPLAYABLE, friend, RGBFB_A8R8G8B8);
+ if(depth == 32) friend = scrn->RastPort.BitMap;
+ gg->bm = ami_rtg_allocbitmap(width, height, 32, 0, friend, RGBFB_A8R8G8B8);
}
if(!gg->bm) warn_user("NoMemory","");
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 2 +-
amiga/plotters.c | 7 +++----
amiga/thumbnail.c | 3 +--
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 54ac1ea..95b5f71 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -425,7 +425,7 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
struct BitMap *scaledbm;
struct BitScaleArgs bsa;
- scaledbm = ami_rtg_allocbitmap(width, height, 32, BMF_DISPLAYABLE,
+ scaledbm = ami_rtg_allocbitmap(width, height, 32, 0,
friendbm, AMI_BITMAP_FORMAT);
if(GfxBase->LibNode.lib_Version >= 53) // AutoDoc says v52, but this function isn't in OS4.0, so checking for v53 (OS4.1)
diff --git a/amiga/plotters.c b/amiga/plotters.c
index acdf50e..1d074e8 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -132,11 +132,10 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
gg->tmprasbuf = AllocVecTagList(width * height, NULL);
if(palette_mapped == true) {
- gg->bm = AllocBitMap(width, height, depth,
- BMF_INTERLEAVED | BMF_DISPLAYABLE, friend);
+ gg->bm = AllocBitMap(width, height, depth, 0, friend);
} else {
- gg->bm = ami_rtg_allocbitmap(width, height, 32,
- BMF_INTERLEAVED | BMF_DISPLAYABLE, friend, RGBFB_A8R8G8B8);
+ if(depth == 32) friend = scrn->RastPort.BitMap;
+ gg->bm = ami_rtg_allocbitmap(width, height, 32, 0, friend, RGBFB_A8R8G8B8);
}
if(!gg->bm) warn_user("NoMemory","");
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index 310630f..538f22b 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -62,8 +62,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
bitmap->width;
bitmap->nativebm = ami_rtg_allocbitmap(bitmap->width, bitmap->height, 32,
- BMF_CLEAR | BMF_DISPLAYABLE | BMF_INTERLEAVED,
- browserglob.bm, RGBFB_A8R8G8B8);
+ BMF_CLEAR, browserglob.bm, RGBFB_A8R8G8B8);
bitmap->nativebmwidth = bitmap->width;
bitmap->nativebmheight = bitmap->height;
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-671-g7370e83
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/7370e83d605814c0d7948...
...commit http://git.netsurf-browser.org/netsurf.git/commit/7370e83d605814c0d794824...
...tree http://git.netsurf-browser.org/netsurf.git/tree/7370e83d605814c0d79482427...
The branch, master has been updated
via 7370e83d605814c0d79482427dd17a2621a86c7e (commit)
from 2544f60ae09869567f91d29ead78e33daee62806 (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=7370e83d605814c0d79...
commit 7370e83d605814c0d79482427dd17a2621a86c7e
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Squash a minor warning from GCC
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 02797bc..54ac1ea 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -381,8 +381,8 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm)
{
-#ifdef __amigaos4__
struct BitMap *tbm = NULL;
+#ifdef __amigaos4__
if(!bitmap) return NULL;
@@ -479,9 +479,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
bitmap->nativebmheight = height;
}
}
-
- return tbm;
#endif
+ return tbm;
}
PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
diff --git a/amiga/rtg.c b/amiga/rtg.c
index 33d0242..e156284 100644
--- a/amiga/rtg.c
+++ b/amiga/rtg.c
@@ -28,6 +28,9 @@ struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth,
ULONG flags, struct BitMap *friend, RGBFTYPE format)
{
if(P96Base == NULL) {
+#ifndef __amigaos4__
+ if(depth > 8) depth = 8;
+#endif
return AllocBitMap(width, height, depth, flags, friend);
} else {
return p96AllocBitMap(width, height, depth, flags, friend, format);
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index 09d8afe..310630f 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -117,3 +117,4 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
return true;
}
+
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 5 ++---
amiga/rtg.c | 3 +++
amiga/thumbnail.c | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 02797bc..54ac1ea 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -381,8 +381,8 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,int height,struct BitMap *friendbm)
{
-#ifdef __amigaos4__
struct BitMap *tbm = NULL;
+#ifdef __amigaos4__
if(!bitmap) return NULL;
@@ -479,9 +479,8 @@ static struct BitMap *ami_bitmap_get_truecolour(struct bitmap *bitmap,int width,
bitmap->nativebmheight = height;
}
}
-
- return tbm;
#endif
+ return tbm;
}
PLANEPTR ami_bitmap_get_mask(struct bitmap *bitmap, int width,
diff --git a/amiga/rtg.c b/amiga/rtg.c
index 33d0242..e156284 100644
--- a/amiga/rtg.c
+++ b/amiga/rtg.c
@@ -28,6 +28,9 @@ struct BitMap *ami_rtg_allocbitmap(ULONG width, ULONG height, ULONG depth,
ULONG flags, struct BitMap *friend, RGBFTYPE format)
{
if(P96Base == NULL) {
+#ifndef __amigaos4__
+ if(depth > 8) depth = 8;
+#endif
return AllocBitMap(width, height, depth, flags, friend);
} else {
return p96AllocBitMap(width, height, depth, flags, friend, format);
diff --git a/amiga/thumbnail.c b/amiga/thumbnail.c
index 09d8afe..310630f 100755
--- a/amiga/thumbnail.c
+++ b/amiga/thumbnail.c
@@ -117,3 +117,4 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
return true;
}
+
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-670-g2544f60
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/2544f60ae09869567f91d...
...commit http://git.netsurf-browser.org/netsurf.git/commit/2544f60ae09869567f91d29...
...tree http://git.netsurf-browser.org/netsurf.git/tree/2544f60ae09869567f91d29ea...
The branch, master has been updated
via 2544f60ae09869567f91d29ead78e33daee62806 (commit)
via e68171a17c9f90f5b67b04bb4218f50bfe3b2843 (commit)
via 6389b0f7d64cfb787b9c631ac231fe57e993666b (commit)
via 9ac9866521e48933389dcf05f1ec5523f36b3435 (commit)
from f7c2971be3a4e9b4b9eabae6386de07a5172be13 (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=2544f60ae09869567f9...
commit 2544f60ae09869567f91d29ead78e33daee62806
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Set the obtained pen in our node so we can release it later.
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 1da380b..acdf50e 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -211,6 +211,7 @@ static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colr)
if(shared_pens != NULL) {
if((node = (struct ami_plot_pen *)AllocVecTagList(sizeof(struct ami_plot_pen), NULL))) {
+ node->pen = pen;
AddTail((struct List *)shared_pens, (struct Node *)node);
}
} else {
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=e68171a17c9f90f5b67...
commit e68171a17c9f90f5b67b04bb4218f50bfe3b2843
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
picture.datatype v45 does apparently support RGBA, so avoid extra conversion
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 7c676df..02797bc 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -342,9 +342,9 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap)
PDTA_SourceMode,PMODE_V43,
TAG_DONE);
- IDoMethod(dto,PDTM_WRITEPIXELARRAY,bitmap_get_buffer(bitmap),
- PBPAFMT_RGBA,bitmap_get_rowstride(bitmap),0,0,
- bitmap_get_width(bitmap),bitmap_get_height(bitmap));
+ IDoMethod(dto, PDTM_WRITEPIXELARRAY, bitmap_get_buffer(bitmap),
+ PBPAFMT_RGBA, bitmap_get_rowstride(bitmap), 0, 0,
+ bitmap_get_width(bitmap), bitmap_get_height(bitmap));
}
return dto;
@@ -355,11 +355,6 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
{
Object *dto;
struct bitmap *bm = NULL;
-#ifdef __amigaos4__
- int bm_format = PBPAFMT_RGBA;
-#else
- int bm_format = PBPAFMT_ARGB;
-#endif
if((dto = NewDTObject(filename,
DTA_GroupID, GID_PICTURE,
@@ -373,11 +368,9 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
bm = bitmap_create(bmh->bmh_Width, bmh->bmh_Height, 0);
IDoMethod(dto, PDTM_READPIXELARRAY, bitmap_get_buffer(bm),
- bm_format, bitmap_get_rowstride(bm), 0, 0,
+ PBPAFMT_RGBA, bitmap_get_rowstride(bm), 0, 0,
bmh->bmh_Width, bmh->bmh_Height);
-#ifndef __amigaos4__
- ami_bitmap_argb_to_rgba(bm);
-#endif
+
bitmap_set_opaque(bm, bitmap_test_opaque(bm));
}
DisposeDTObject(dto);
@@ -562,7 +555,6 @@ static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap,
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
- ami_bitmap_get_mask(bitmap, width, height, dtbm);
return dtbm;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6389b0f7d64cfb787b9...
commit 6389b0f7d64cfb787b9c631ac231fe57e993666b
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Ensure on OS3 we don't try to create a BitMap with a depth of more than 8
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 6bb4243..1da380b 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -113,14 +113,17 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
struct BitMap *friend = NULL;
depth = GetBitMapAttr(scrn->RastPort.BitMap, BMA_DEPTH);
+#ifdef __amigaos4__
if(depth < 16) {
palette_mapped = true;
} else {
palette_mapped = false;
}
-#ifndef __amigaos4__
+#else
palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */
+ if(depth > 8) depth = 8;
#endif
+
if(!width) width = nsoption_int(redraw_tile_size_x);
if(!height) height = nsoption_int(redraw_tile_size_y);
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9ac9866521e48933389...
commit 9ac9866521e48933389dcf05f1ec5523f36b3435
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Correct calling usage of BltMaskBitMapRastPort
Thanks to Matthey for the debugging
diff --git a/amiga/gui.c b/amiga/gui.c
index fddf4ab..884f263 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1713,7 +1713,7 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
#else
/*\todo we are assuming we are always masking here, which might not be true */
BltMaskBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
- bbox->Left, bbox->Top, 16, 16, tag_data, minterm);
+ bbox->Left, bbox->Top, 16, 16, minterm, tag_data);
#endif
ami_gui_free_space_box(bbox);
}
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 2952f10..6bb4243 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -543,7 +543,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma
TAG_DONE);
#else
/* Assume mask is always required */
- BltMaskBitMapRastPort(tbm, 0, 0, glob->rp, x, y, width, height, tag_data, minterm);
+ BltMaskBitMapRastPort(tbm, 0, 0, glob->rp, x, y, width, height, minterm, tag_data);
#endif
}
-----------------------------------------------------------------------
Summary of changes:
amiga/bitmap.c | 18 +++++-------------
amiga/gui.c | 2 +-
amiga/plotters.c | 8 ++++++--
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/amiga/bitmap.c b/amiga/bitmap.c
index 7c676df..02797bc 100644
--- a/amiga/bitmap.c
+++ b/amiga/bitmap.c
@@ -342,9 +342,9 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap)
PDTA_SourceMode,PMODE_V43,
TAG_DONE);
- IDoMethod(dto,PDTM_WRITEPIXELARRAY,bitmap_get_buffer(bitmap),
- PBPAFMT_RGBA,bitmap_get_rowstride(bitmap),0,0,
- bitmap_get_width(bitmap),bitmap_get_height(bitmap));
+ IDoMethod(dto, PDTM_WRITEPIXELARRAY, bitmap_get_buffer(bitmap),
+ PBPAFMT_RGBA, bitmap_get_rowstride(bitmap), 0, 0,
+ bitmap_get_width(bitmap), bitmap_get_height(bitmap));
}
return dto;
@@ -355,11 +355,6 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
{
Object *dto;
struct bitmap *bm = NULL;
-#ifdef __amigaos4__
- int bm_format = PBPAFMT_RGBA;
-#else
- int bm_format = PBPAFMT_ARGB;
-#endif
if((dto = NewDTObject(filename,
DTA_GroupID, GID_PICTURE,
@@ -373,11 +368,9 @@ struct bitmap *ami_bitmap_from_datatype(char *filename)
bm = bitmap_create(bmh->bmh_Width, bmh->bmh_Height, 0);
IDoMethod(dto, PDTM_READPIXELARRAY, bitmap_get_buffer(bm),
- bm_format, bitmap_get_rowstride(bm), 0, 0,
+ PBPAFMT_RGBA, bitmap_get_rowstride(bm), 0, 0,
bmh->bmh_Width, bmh->bmh_Height);
-#ifndef __amigaos4__
- ami_bitmap_argb_to_rgba(bm);
-#endif
+
bitmap_set_opaque(bm, bitmap_test_opaque(bm));
}
DisposeDTObject(dto);
@@ -562,7 +555,6 @@ static struct BitMap *ami_bitmap_get_palettemapped(struct bitmap *bitmap,
bitmap->nativebmwidth = width;
bitmap->nativebmheight = height;
- ami_bitmap_get_mask(bitmap, width, height, dtbm);
return dtbm;
}
diff --git a/amiga/gui.c b/amiga/gui.c
index fddf4ab..884f263 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1713,7 +1713,7 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
#else
/*\todo we are assuming we are always masking here, which might not be true */
BltMaskBitMapRastPort(bm, 0, 0, g->shared->win->RPort,
- bbox->Left, bbox->Top, 16, 16, tag_data, minterm);
+ bbox->Left, bbox->Top, 16, 16, minterm, tag_data);
#endif
ami_gui_free_space_box(bbox);
}
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 2952f10..acdf50e 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -113,14 +113,17 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
struct BitMap *friend = NULL;
depth = GetBitMapAttr(scrn->RastPort.BitMap, BMA_DEPTH);
+#ifdef __amigaos4__
if(depth < 16) {
palette_mapped = true;
} else {
palette_mapped = false;
}
-#ifndef __amigaos4__
+#else
palette_mapped = true; /* only supporting palette mapped screens on OS3 for now */
+ if(depth > 8) depth = 8;
#endif
+
if(!width) width = nsoption_int(redraw_tile_size_x);
if(!height) height = nsoption_int(redraw_tile_size_y);
@@ -208,6 +211,7 @@ static ULONG ami_plot_obtain_pen(struct MinList *shared_pens, ULONG colr)
if(shared_pens != NULL) {
if((node = (struct ami_plot_pen *)AllocVecTagList(sizeof(struct ami_plot_pen), NULL))) {
+ node->pen = pen;
AddTail((struct List *)shared_pens, (struct Node *)node);
}
} else {
@@ -543,7 +547,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma
TAG_DONE);
#else
/* Assume mask is always required */
- BltMaskBitMapRastPort(tbm, 0, 0, glob->rp, x, y, width, height, tag_data, minterm);
+ BltMaskBitMapRastPort(tbm, 0, 0, glob->rp, x, y, width, height, minterm, tag_data);
#endif
}
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-666-gf7c2971
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/f7c2971be3a4e9b4b9eab...
...commit http://git.netsurf-browser.org/netsurf.git/commit/f7c2971be3a4e9b4b9eabae...
...tree http://git.netsurf-browser.org/netsurf.git/tree/f7c2971be3a4e9b4b9eabae63...
The branch, master has been updated
via f7c2971be3a4e9b4b9eabae6386de07a5172be13 (commit)
via 70dd445d5b5ec0ac8f5f708b4938f8d2c1b5ce07 (commit)
via ca6ac7c37e2ffeadbabbc03daa7eb80187c7f028 (commit)
via 305f1acc79c0d04172a872e60797baa6397d2a79 (commit)
via 37db0f6f8520aeb9d5bfafa6b94e8c976ff85111 (commit)
from 1200fedb1c42839da1791c5c46d881a02a47b9c0 (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=f7c2971be3a4e9b4b9e...
commit f7c2971be3a4e9b4b9eabae6386de07a5172be13
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Replace some over-zealous deletion
diff --git a/amiga/gui.c b/amiga/gui.c
index 837e018..fddf4ab 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3134,6 +3134,8 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
+ tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+
speed_button_node = AllocSpeedButtonNode(item,
SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
SBNA_UserData, (void *)url,
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=70dd445d5b5ec0ac8f5...
commit 70dd445d5b5ec0ac8f5f708b4938f8d2c1b5ce07
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Remove dead code
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index fa2799a..95eacaa 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -513,24 +513,4 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save,
LOG(("Initialised with %ld glyphs", found));
}
-#if 0
-#warning FIXME: font_scan.c needs fixing for OS3
-void ami_font_scan_init(const char *filename, bool force_scan, bool save,
- lwc_string **glypharray)
-{
-}
-
-void ami_font_scan_fini(lwc_string **glypharray)
-{
-}
-
-void ami_font_scan_save(const char *filename, lwc_string **glypharray)
-{
-}
-
-const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray)
-{
-}
-#endif
-
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ca6ac7c37e2ffeadbab...
commit ca6ac7c37e2ffeadbabbc03daa7eb80187c7f028
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix creation of SpeedBar objects
diff --git a/amiga/libs.h b/amiga/libs.h
index e539876..57a430f 100644
--- a/amiga/libs.h
+++ b/amiga/libs.h
@@ -63,7 +63,7 @@ extern Class *WindowClass;
#define RadioButtonObj NewObject(RadioButtonClass, NULL
#define ScrollerObj NewObject(ScrollerClass, NULL
#define SpaceObj NewObject(SpaceClass, NULL
-#define SpeedBarObj NewObject(ScrollerClass, NULL
+#define SpeedBarObj NewObject(SpeedBarClass, NULL
#define StringObj NewObject(StringClass, NULL
#define WindowObj NewObject(WindowClass, NULL
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=305f1acc79c0d04172a...
commit 305f1acc79c0d04172a872e60797baa6397d2a79
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Remove unneeded #ifdefs
diff --git a/amiga/gui.c b/amiga/gui.c
index efa9fdd..837e018 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3158,7 +3158,6 @@ static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_lis
static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
{
-#ifdef __amigaos4__
struct TagItem attrs[2];
attrs[0].ti_Tag = CHILD_MinWidth;
@@ -3203,9 +3202,6 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
ami_schedule_redraw(gwin, true);
}
-#else
-#warning FIXME for OS3
-#endif
}
static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list)
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=37db0f6f8520aeb9d5b...
commit 37db0f6f8520aeb9d5bfafa6b94e8c976ff85111
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Open the interface for speedbar.gadget
diff --git a/amiga/gui.c b/amiga/gui.c
index e6487ea..efa9fdd 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3134,12 +3134,6 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
- if(title) {
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
- } else {
- tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)");
- }
-
speed_button_node = AllocSpeedButtonNode(item,
SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
SBNA_UserData, (void *)url,
diff --git a/amiga/libs.c b/amiga/libs.c
index c37774a..903c0f7 100644
--- a/amiga/libs.c
+++ b/amiga/libs.c
@@ -254,7 +254,7 @@ bool ami_libs_open(void)
AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, false)
AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, false)
AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, false)
- AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, false)
+ AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, true)
AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, false)
AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, false)
-----------------------------------------------------------------------
Summary of changes:
amiga/font_scan.c | 20 --------------------
amiga/gui.c | 10 +---------
amiga/libs.c | 2 +-
amiga/libs.h | 2 +-
4 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index fa2799a..95eacaa 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -513,24 +513,4 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save,
LOG(("Initialised with %ld glyphs", found));
}
-#if 0
-#warning FIXME: font_scan.c needs fixing for OS3
-void ami_font_scan_init(const char *filename, bool force_scan, bool save,
- lwc_string **glypharray)
-{
-}
-
-void ami_font_scan_fini(lwc_string **glypharray)
-{
-}
-
-void ami_font_scan_save(const char *filename, lwc_string **glypharray)
-{
-}
-
-const char *ami_font_scan_lookup(const uint16 *code, lwc_string **glypharray)
-{
-}
-#endif
-
diff --git a/amiga/gui.c b/amiga/gui.c
index e6487ea..fddf4ab 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3134,11 +3134,7 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
- if(title) {
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
- } else {
- tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)");
- }
+ tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
speed_button_node = AllocSpeedButtonNode(item,
SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
@@ -3164,7 +3160,6 @@ static int ami_gui_hotlist_scan(struct tree *tree, struct List *speed_button_lis
static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
{
-#ifdef __amigaos4__
struct TagItem attrs[2];
attrs[0].ti_Tag = CHILD_MinWidth;
@@ -3209,9 +3204,6 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
ami_schedule_redraw(gwin, true);
}
-#else
-#warning FIXME for OS3
-#endif
}
static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List *speed_button_list)
diff --git a/amiga/libs.c b/amiga/libs.c
index c37774a..903c0f7 100644
--- a/amiga/libs.c
+++ b/amiga/libs.c
@@ -254,7 +254,7 @@ bool ami_libs_open(void)
AMINS_CLASS_OPEN("gadgets/radiobutton.gadget", 44, RadioButton, RADIOBUTTON, false)
AMINS_CLASS_OPEN("gadgets/scroller.gadget", 44, Scroller, SCROLLER, false)
AMINS_CLASS_OPEN("gadgets/space.gadget", 44, Space, SPACE, false)
- AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, false)
+ AMINS_CLASS_OPEN("gadgets/speedbar.gadget", 44, SpeedBar, SPEEDBAR, true)
AMINS_CLASS_OPEN("gadgets/string.gadget", 44, String, STRING, false)
AMINS_CLASS_OPEN("window.class", 44, Window, WINDOW, false)
diff --git a/amiga/libs.h b/amiga/libs.h
index e539876..57a430f 100644
--- a/amiga/libs.h
+++ b/amiga/libs.h
@@ -63,7 +63,7 @@ extern Class *WindowClass;
#define RadioButtonObj NewObject(RadioButtonClass, NULL
#define ScrollerObj NewObject(ScrollerClass, NULL
#define SpaceObj NewObject(SpaceClass, NULL
-#define SpeedBarObj NewObject(ScrollerClass, NULL
+#define SpeedBarObj NewObject(SpeedBarClass, NULL
#define StringObj NewObject(StringClass, NULL
#define WindowObj NewObject(WindowClass, NULL
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-661-g1200fed
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/1200fedb1c42839da1791...
...commit http://git.netsurf-browser.org/netsurf.git/commit/1200fedb1c42839da1791c5...
...tree http://git.netsurf-browser.org/netsurf.git/tree/1200fedb1c42839da1791c5c4...
The branch, master has been updated
via 1200fedb1c42839da1791c5c46d881a02a47b9c0 (commit)
via 0dea8112d444a711e6d1e3914d6956e752ac1089 (commit)
from 889ee3108c8c2b1c6f6bf06bb50d47cb177ad14a (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=1200fedb1c42839da17...
commit 1200fedb1c42839da1791c5c46d881a02a47b9c0
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Enable alpha bitmaps in chooser.gadget on OS4.1FE
diff --git a/amiga/gui.c b/amiga/gui.c
index 1fdb6e7..e6487ea 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -43,6 +43,7 @@
/* Other OS includes */
#include <datatypes/textclass.h>
#include <devices/inputevent.h>
+#include <graphics/gfxbase.h>
#include <graphics/rpattr.h>
#ifdef __amigaos4__
#include <graphics/blitattr.h>
@@ -4965,11 +4966,20 @@ static nserror gui_search_web_provider_update(const char *provider_name,
if(gwin->search_bm != NULL)
DisposeObject(gwin->search_bm);
+ ULONG bm_masking_tag = TAG_IGNORE;
+
+ if(GfxBase->LibNode.lib_Version >= 54) { /* chooser 53.21, but check gfx.lib
+ * is FE as it's easier */
+ bm_masking_tag = BITMAP_Masking;
+ }
+
gwin->search_bm = BitMapObj,
BITMAP_Screen, scrn,
BITMAP_Width, 16,
BITMAP_Height, 16,
BITMAP_BitMap, bm,
+ BITMAP_HasAlpha, TRUE,
+ bm_masking_tag, TRUE,
BitMapEnd;
RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON],
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 4752e91..f0667b5 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -62,6 +62,7 @@
/* Ignore unsupported tags */
#define ASO_NoTrack TAG_IGNORE
#define BITMAP_DisabledSourceFile TAG_IGNORE
+#define BITMAP_HasAlpha TAG_IGNORE
#define BLITA_UseSrcAlpha TAG_IGNORE
#define BLITA_MaskPlane TAG_IGNORE
#define CLICKTAB_CloseImage TAG_IGNORE
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0dea8112d444a711e6d...
commit 0dea8112d444a711e6d1e3914d6956e752ac1089
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Erase favicon area before redrawing
diff --git a/amiga/gui.c b/amiga/gui.c
index 608d6bf..1fdb6e7 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1691,6 +1691,10 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
warn_user("NoMemory", "");
return;
}
+
+ EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top,
+ bbox->Left + 16, bbox->Top + 16);
+
#ifdef __amigaos4__
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 14 ++++++++++++++
amiga/os3support.h | 1 +
2 files changed, 15 insertions(+)
diff --git a/amiga/gui.c b/amiga/gui.c
index 608d6bf..e6487ea 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -43,6 +43,7 @@
/* Other OS includes */
#include <datatypes/textclass.h>
#include <devices/inputevent.h>
+#include <graphics/gfxbase.h>
#include <graphics/rpattr.h>
#ifdef __amigaos4__
#include <graphics/blitattr.h>
@@ -1691,6 +1692,10 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon)
warn_user("NoMemory", "");
return;
}
+
+ EraseRect(g->shared->win->RPort, bbox->Left, bbox->Top,
+ bbox->Left + 16, bbox->Top + 16);
+
#ifdef __amigaos4__
BltBitMapTags(BLITA_SrcX, 0,
BLITA_SrcY, 0,
@@ -4961,11 +4966,20 @@ static nserror gui_search_web_provider_update(const char *provider_name,
if(gwin->search_bm != NULL)
DisposeObject(gwin->search_bm);
+ ULONG bm_masking_tag = TAG_IGNORE;
+
+ if(GfxBase->LibNode.lib_Version >= 54) { /* chooser 53.21, but check gfx.lib
+ * is FE as it's easier */
+ bm_masking_tag = BITMAP_Masking;
+ }
+
gwin->search_bm = BitMapObj,
BITMAP_Screen, scrn,
BITMAP_Width, 16,
BITMAP_Height, 16,
BITMAP_BitMap, bm,
+ BITMAP_HasAlpha, TRUE,
+ bm_masking_tag, TRUE,
BitMapEnd;
RefreshSetGadgetAttrs((struct Gadget *)gwin->objects[GID_SEARCH_ICON],
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 4752e91..f0667b5 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -62,6 +62,7 @@
/* Ignore unsupported tags */
#define ASO_NoTrack TAG_IGNORE
#define BITMAP_DisabledSourceFile TAG_IGNORE
+#define BITMAP_HasAlpha TAG_IGNORE
#define BLITA_UseSrcAlpha TAG_IGNORE
#define BLITA_MaskPlane TAG_IGNORE
#define CLICKTAB_CloseImage TAG_IGNORE
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-659-g889ee31
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/889ee3108c8c2b1c6f6bf...
...commit http://git.netsurf-browser.org/netsurf.git/commit/889ee3108c8c2b1c6f6bf06...
...tree http://git.netsurf-browser.org/netsurf.git/tree/889ee3108c8c2b1c6f6bf06bb...
The branch, master has been updated
via 889ee3108c8c2b1c6f6bf06bb50d47cb177ad14a (commit)
from 9de4889a4f539e8bb9824bb5cbb2f7966461a4bf (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=889ee3108c8c2b1c6f6...
commit 889ee3108c8c2b1c6f6bf06bb50d47cb177ad14a
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Stop the favicon getting obliterated when switching tabs
diff --git a/amiga/gui.c b/amiga/gui.c
index 1457c6d..608d6bf 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2877,8 +2877,6 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
if(redraw)
{
- gui_window_set_icon(gwin->gw, gwin->gw->favicon);
-
ami_rtg_rectfill(gwin->win->RPort, bbox->Left, bbox->Top,
bbox->Width+bbox->Left, bbox->Height+bbox->Top, 0xffffffff);
browser_window_update(gwin->gw->bw, false);
@@ -2891,6 +2889,8 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
ami_gui_update_hotlist_button(gwin);
ami_gui_scroller_update(gwin);
ami_throbber_redraw_schedule(0, gwin->gw);
+
+ gui_window_set_icon(gwin->gw, gwin->gw->favicon);
}
ami_gui_free_space_box(bbox);
@@ -3866,7 +3866,7 @@ gui_window_create(struct browser_window *bw,
GA_ID, GID_ICON,
SPACE_MinWidth, 16,
SPACE_MinHeight, 16,
- SPACE_Transparent, FALSE,
+ SPACE_Transparent, TRUE,
// SPACE_RenderHook, &g->shared->favicon_hook,
SpaceEnd,
CHILD_WeightedWidth, 0,
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index 1457c6d..608d6bf 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2877,8 +2877,6 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
if(redraw)
{
- gui_window_set_icon(gwin->gw, gwin->gw->favicon);
-
ami_rtg_rectfill(gwin->win->RPort, bbox->Left, bbox->Top,
bbox->Width+bbox->Left, bbox->Height+bbox->Top, 0xffffffff);
browser_window_update(gwin->gw->bw, false);
@@ -2891,6 +2889,8 @@ void ami_switch_tab(struct gui_window_2 *gwin, bool redraw)
ami_gui_update_hotlist_button(gwin);
ami_gui_scroller_update(gwin);
ami_throbber_redraw_schedule(0, gwin->gw);
+
+ gui_window_set_icon(gwin->gw, gwin->gw->favicon);
}
ami_gui_free_space_box(bbox);
@@ -3866,7 +3866,7 @@ gui_window_create(struct browser_window *bw,
GA_ID, GID_ICON,
SPACE_MinWidth, 16,
SPACE_MinHeight, 16,
- SPACE_Transparent, FALSE,
+ SPACE_Transparent, TRUE,
// SPACE_RenderHook, &g->shared->favicon_hook,
SpaceEnd,
CHILD_WeightedWidth, 0,
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-658-g9de4889
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/9de4889a4f539e8bb9824...
...commit http://git.netsurf-browser.org/netsurf.git/commit/9de4889a4f539e8bb9824bb...
...tree http://git.netsurf-browser.org/netsurf.git/tree/9de4889a4f539e8bb9824bb5c...
The branch, master has been updated
via 9de4889a4f539e8bb9824bb5cbb2f7966461a4bf (commit)
from a54170eeeacd7f5b78c79dd81785e725c983ca98 (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=9de4889a4f539e8bb98...
commit 9de4889a4f539e8bb9824bb5cbb2f7966461a4bf
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Revert "Attempt to fix a couple of Enforcer hits"
This reverts commit 2893e30c4e1eebecf84636c35fd1bbc54698b1ed.
This commit somehow was reverting some things which shouldn't have been reverted.
Conflicts:
amiga/gui.c
diff --git a/amiga/filetype.c b/amiga/filetype.c
index a3823db..b37ebe5 100644
--- a/amiga/filetype.c
+++ b/amiga/filetype.c
@@ -297,7 +297,6 @@ static struct ami_mime_entry *ami_mime_entry_locate(lwc_string *search,
{
nnode=(struct nsObject *)GetSucc((struct Node *)node);
mimeentry = node->objstruct;
- if(mimeentry == NULL) continue;
lerror = lwc_error_ok;
diff --git a/amiga/gui.c b/amiga/gui.c
index 667a00e..1457c6d 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1535,7 +1535,8 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HSCROLL], attrs);
#else
- SetAttrs(gwin->objects[GID_HSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_HSCROLL]);
+ SetAttrs(gwin->objects[GID_HSCROLLLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@@ -1579,7 +1580,8 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_VSCROLL], attrs);
#else
- SetAttrs(gwin->objects[GID_VSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_VSCROLL]);
+ SetAttrs(gwin->objects[GID_VSCROLLLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_VSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@@ -1857,6 +1859,7 @@ static void ami_handle_msg(void)
while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
+
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@@ -3180,13 +3183,20 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
BevelObj,
BEVEL_Style, BVS_SBAR_VERT,
BevelEnd;
-
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HOTLIST], attrs);
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDIMAGE,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR], NULL);
+#else
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HOTLIST], TAG_MORE, &attrs);
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HOTLISTSEPBAR], TAG_DONE);
+#endif
+
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
@@ -3232,14 +3242,16 @@ static void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR]);
-
+#else
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLIST]);
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLISTSEPBAR]);
+#endif
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
gwin->win, NULL, TRUE);
ami_schedule_redraw(gwin, true);
-#endif
}
static void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin)
@@ -3296,9 +3308,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
{
if(ClickTabBase->lib_Version < 53) return;
-#ifdef __amigaos4__
- if(show)
- {
+ if(show) {
struct TagItem attrs[3];
attrs[0].ti_Tag = CHILD_WeightedWidth;
@@ -3325,20 +3335,31 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
GA_Text, "+",
BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
ButtonEnd;
-
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_TABS], NULL);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_ADDTAB], attrs);
- }
- else
- {
+#else
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_TABS], TAG_DONE);
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_ADDTAB], TAG_MORE, &attrs);
+#endif
+ } else {
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_TABS]);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_ADDTAB]);
+#else
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_RemoveChild, gwin->objects[GID_TABS], TAG_DONE);
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_RemoveChild, gwin->objects[GID_ADDTAB], TAG_DONE);
+#endif
gwin->objects[GID_TABS] = NULL;
gwin->objects[GID_ADDTAB] = NULL;
@@ -3350,7 +3371,6 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
gwin->win, NULL, TRUE);
if(gwin->gw && gwin->gw->bw) browser_window_update(gwin->gw->bw, false);
-#endif
}
void ami_gui_tabs_toggle_all(void)
@@ -4928,6 +4948,8 @@ static nserror gui_search_web_provider_update(const char *provider_name,
bm = ami_bitmap_get_native(ico_bitmap, 16, 16, NULL);
}
+ if(bm == NULL) return NSERROR_BAD_PARAMETER;
+
node = (struct nsObject *)GetHead((struct List *)window_list);
do {
@@ -5223,7 +5245,7 @@ Object *ami_gui_splash_open(void)
SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
tattr.ta_Name = "DejaVu Serif Italic.font";
#else
- SetAPen(win->RPort, 3);
+ SetAPen(win->RPort, 3); /* Pen 3 is usually blue */
tattr.ta_Name = "CGTriumvirate.font";
#endif
tattr.ta_YSize = 24;
-----------------------------------------------------------------------
Summary of changes:
amiga/filetype.c | 1 -
amiga/gui.c | 50 ++++++++++++++++++++++++++++++++++++--------------
2 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/amiga/filetype.c b/amiga/filetype.c
index a3823db..b37ebe5 100644
--- a/amiga/filetype.c
+++ b/amiga/filetype.c
@@ -297,7 +297,6 @@ static struct ami_mime_entry *ami_mime_entry_locate(lwc_string *search,
{
nnode=(struct nsObject *)GetSucc((struct Node *)node);
mimeentry = node->objstruct;
- if(mimeentry == NULL) continue;
lerror = lwc_error_ok;
diff --git a/amiga/gui.c b/amiga/gui.c
index 667a00e..1457c6d 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1535,7 +1535,8 @@ static bool ami_gui_hscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HSCROLL], attrs);
#else
- SetAttrs(gwin->objects[GID_HSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_HSCROLL]);
+ SetAttrs(gwin->objects[GID_HSCROLLLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@@ -1579,7 +1580,8 @@ static bool ami_gui_vscroll_add(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_VSCROLLLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_VSCROLL], attrs);
#else
- SetAttrs(gwin->objects[GID_VSCROLLLAYOUT], LAYOUT_AddChild, gwin->objects[GID_VSCROLL]);
+ SetAttrs(gwin->objects[GID_VSCROLLLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_VSCROLL], TAG_MORE, &attrs);
#endif
return true;
}
@@ -1857,6 +1859,7 @@ static void ami_handle_msg(void)
while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
+
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@@ -3180,13 +3183,20 @@ static void ami_gui_hotlist_toolbar_add(struct gui_window_2 *gwin)
BevelObj,
BEVEL_Style, BVS_SBAR_VERT,
BevelEnd;
-
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_HOTLIST], attrs);
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_ADDIMAGE,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR], NULL);
+#else
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HOTLIST], TAG_MORE, &attrs);
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_HOTLISTSEPBAR], TAG_DONE);
+#endif
+
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
@@ -3232,14 +3242,16 @@ static void ami_gui_hotlist_toolbar_remove(struct gui_window_2 *gwin)
IDoMethod(gwin->objects[GID_HOTLISTLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_HOTLISTSEPBAR]);
-
+#else
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLIST]);
+ SetAttrs(gwin->objects[GID_HOTLISTLAYOUT], LAYOUT_RemoveChild, gwin->objects[GID_HOTLISTSEPBAR]);
+#endif
FlushLayoutDomainCache((struct Gadget *)gwin->objects[GID_MAIN]);
RethinkLayout((struct Gadget *)gwin->objects[GID_MAIN],
gwin->win, NULL, TRUE);
ami_schedule_redraw(gwin, true);
-#endif
}
static void ami_gui_hotlist_toolbar_update(struct gui_window_2 *gwin)
@@ -3296,9 +3308,7 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
{
if(ClickTabBase->lib_Version < 53) return;
-#ifdef __amigaos4__
- if(show)
- {
+ if(show) {
struct TagItem attrs[3];
attrs[0].ti_Tag = CHILD_WeightedWidth;
@@ -3325,20 +3335,31 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
GA_Text, "+",
BUTTON_RenderImage, gwin->objects[GID_ADDTAB_BM],
ButtonEnd;
-
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_TABS], NULL);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_ADDCHILD,
gwin->win, gwin->objects[GID_ADDTAB], attrs);
- }
- else
- {
+#else
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_TABS], TAG_DONE);
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_AddChild, gwin->objects[GID_ADDTAB], TAG_MORE, &attrs);
+#endif
+ } else {
+#ifdef __amigaos4__
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_TABS]);
IDoMethod(gwin->objects[GID_TABLAYOUT], LM_REMOVECHILD,
gwin->win, gwin->objects[GID_ADDTAB]);
+#else
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_RemoveChild, gwin->objects[GID_TABS], TAG_DONE);
+ SetAttrs(gwin->objects[GID_TABLAYOUT],
+ LAYOUT_RemoveChild, gwin->objects[GID_ADDTAB], TAG_DONE);
+#endif
gwin->objects[GID_TABS] = NULL;
gwin->objects[GID_ADDTAB] = NULL;
@@ -3350,7 +3371,6 @@ static void ami_toggletabbar(struct gui_window_2 *gwin, bool show)
gwin->win, NULL, TRUE);
if(gwin->gw && gwin->gw->bw) browser_window_update(gwin->gw->bw, false);
-#endif
}
void ami_gui_tabs_toggle_all(void)
@@ -4928,6 +4948,8 @@ static nserror gui_search_web_provider_update(const char *provider_name,
bm = ami_bitmap_get_native(ico_bitmap, 16, 16, NULL);
}
+ if(bm == NULL) return NSERROR_BAD_PARAMETER;
+
node = (struct nsObject *)GetHead((struct List *)window_list);
do {
@@ -5223,7 +5245,7 @@ Object *ami_gui_splash_open(void)
SetRPAttrs(win->RPort, RPTAG_APenColor, 0xFF3F6DFE, TAG_DONE);
tattr.ta_Name = "DejaVu Serif Italic.font";
#else
- SetAPen(win->RPort, 3);
+ SetAPen(win->RPort, 3); /* Pen 3 is usually blue */
tattr.ta_Name = "CGTriumvirate.font";
#endif
tattr.ta_YSize = 24;
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-657-ga54170e
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/a54170eeeacd7f5b78c79...
...commit http://git.netsurf-browser.org/netsurf.git/commit/a54170eeeacd7f5b78c79dd...
...tree http://git.netsurf-browser.org/netsurf.git/tree/a54170eeeacd7f5b78c79dd81...
The branch, master has been updated
via a54170eeeacd7f5b78c79dd81785e725c983ca98 (commit)
via 8dc707d554b069d14c33882ed8f156f73ebc7be4 (commit)
from 8fb6f4d148fce8c41c5417d1ede8fc38d99a7396 (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=a54170eeeacd7f5b78c...
commit a54170eeeacd7f5b78c79dd81785e725c983ca98
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Tidy up debug and increase list allocation to aid debugging
diff --git a/amiga/gui.c b/amiga/gui.c
index b61dba5..667a00e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1852,9 +1852,11 @@ static void ami_handle_msg(void)
}
if((gwin == NULL) || (gwin->objects[OID_MAIN] == NULL)) continue;
-LOG(("while..."));
+
+ LOG(("RA_HandleInput(%p,%p) (gwin=%p)", gwin->objects[OID_MAIN], &code, gwin));
+
while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
-LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
+ LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@@ -5129,7 +5131,7 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
break;
default:
- printf("UNHANDLED EVENT %ld\n",msg->Class);
+ LOG(("IDCMP hook unhandled event: %d\n", msg->Class));
break;
}
// ReplyMsg((struct Message *)msg);
diff --git a/amiga/object.c b/amiga/object.c
index 99f359a..f071cce 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -34,7 +34,8 @@ struct MinList *NewObjList(void)
struct MinList *objlist;
- objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
+ objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList) + 10, NULL);
+#warning List structure allocation is larger than necessary for debugging ^^^^
NewMinList(objlist);
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8dc707d554b069d14c3...
commit 8dc707d554b069d14c33882ed8f156f73ebc7be4
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Attempt to fix a crash adding hotlist entries to the toolbar
diff --git a/amiga/gui.c b/amiga/gui.c
index 41beaba..b61dba5 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1790,6 +1790,7 @@ static void ami_handle_msg(void)
nnode=(struct nsObject *)GetSucc((struct Node *)node);
gwin = node->objstruct;
+ LOG(("Type %d", node->Type));
if(node->Type == AMINS_TVWINDOW) {
if(ami_tree_event((struct treeview_window *)gwin)) {
@@ -1850,11 +1851,10 @@ static void ami_handle_msg(void)
}
}
- if(gwin->objects[OID_MAIN] == NULL) continue;
-
- while((result = RA_HandleInput(gwin->objects[OID_MAIN],&code)) != WMHI_LASTMSG)
- {
-//printf("%ld: %ld (switch)\n",code, result & WMHI_CLASSMASK);
+ if((gwin == NULL) || (gwin->objects[OID_MAIN] == NULL)) continue;
+LOG(("while..."));
+ while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
+LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@@ -3123,8 +3123,12 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
if(level != 1) return false;
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
-
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+
+ if(title) {
+ tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+ } else {
+ tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)");
+ }
speed_button_node = AllocSpeedButtonNode(item,
SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 22 ++++++++++++++--------
amiga/object.c | 3 ++-
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index 41beaba..667a00e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1790,6 +1790,7 @@ static void ami_handle_msg(void)
nnode=(struct nsObject *)GetSucc((struct Node *)node);
gwin = node->objstruct;
+ LOG(("Type %d", node->Type));
if(node->Type == AMINS_TVWINDOW) {
if(ami_tree_event((struct treeview_window *)gwin)) {
@@ -1850,11 +1851,12 @@ static void ami_handle_msg(void)
}
}
- if(gwin->objects[OID_MAIN] == NULL) continue;
-
- while((result = RA_HandleInput(gwin->objects[OID_MAIN],&code)) != WMHI_LASTMSG)
- {
-//printf("%ld: %ld (switch)\n",code, result & WMHI_CLASSMASK);
+ if((gwin == NULL) || (gwin->objects[OID_MAIN] == NULL)) continue;
+
+ LOG(("RA_HandleInput(%p,%p) (gwin=%p)", gwin->objects[OID_MAIN], &code, gwin));
+
+ while((result = RA_HandleInput(gwin->objects[OID_MAIN], &code)) != WMHI_LASTMSG) {
+ LOG(("%d: %d (switch)",code, result & WMHI_CLASSMASK));
switch(result & WMHI_CLASSMASK) // class
{
case WMHI_MOUSEMOVE:
@@ -3123,8 +3125,12 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
if(level != 1) return false;
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
-
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+
+ if(title) {
+ tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+ } else {
+ tb_userdata->gw->hotlist_toolbar_lab[item] = strdup("(untitled)");
+ }
speed_button_node = AllocSpeedButtonNode(item,
SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
@@ -5125,7 +5131,7 @@ void ami_scroller_hook(struct Hook *hook,Object *object,struct IntuiMessage *msg
break;
default:
- printf("UNHANDLED EVENT %ld\n",msg->Class);
+ LOG(("IDCMP hook unhandled event: %d\n", msg->Class));
break;
}
// ReplyMsg((struct Message *)msg);
diff --git a/amiga/object.c b/amiga/object.c
index 99f359a..f071cce 100755
--- a/amiga/object.c
+++ b/amiga/object.c
@@ -34,7 +34,8 @@ struct MinList *NewObjList(void)
struct MinList *objlist;
- objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList), NULL);
+ objlist = (struct MinList *)AllocVecTagList(sizeof(struct MinList) + 10, NULL);
+#warning List structure allocation is larger than necessary for debugging ^^^^
NewMinList(objlist);
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-655-g8fb6f4d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/8fb6f4d148fce8c41c541...
...commit http://git.netsurf-browser.org/netsurf.git/commit/8fb6f4d148fce8c41c5417d...
...tree http://git.netsurf-browser.org/netsurf.git/tree/8fb6f4d148fce8c41c5417d1e...
The branch, master has been updated
via 8fb6f4d148fce8c41c5417d1ede8fc38d99a7396 (commit)
from b36c1401a09b0e7c489558bfc95c6223dea56291 (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=8fb6f4d148fce8c41c5...
commit 8fb6f4d148fce8c41c5417d1ede8fc38d99a7396
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix GetSucc (credit: Buzz)
diff --git a/amiga/os3support.c b/amiga/os3support.c
index 3411793..f297636 100644
--- a/amiga/os3support.c
+++ b/amiga/os3support.c
@@ -192,6 +192,13 @@ struct Node *GetHead(struct List *list)
return res;
}
+struct Node *GetSucc(struct Node *node)
+{
+ if (node->ln_Succ->ln_Succ == NULL) return NULL;
+ return node->ln_Succ;
+}
+
+
/* Intuition */
uint32 GetAttrs(Object *obj, Tag tag1, ...)
{
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 319d3b3..4752e91 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -144,7 +144,6 @@
#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */
#define FindIName FindName
#define GetPred(N) N ? (N)->ln_Pred : NULL
-#define GetSucc(N) N ? (N)->ln_Succ : NULL
/* Gfx */
#define SetRPAttrs(...) (void)0 /*\todo Probably need to emulate this */
@@ -240,6 +239,7 @@ void FreeSysObject(ULONG type, APTR obj);
/* Exec */
struct Node *GetHead(struct List *list);
+struct Node *GetSucc(struct Node *node);
/* Intuition */
uint32 GetAttrs(Object *obj, Tag tag1, ...);
-----------------------------------------------------------------------
Summary of changes:
amiga/os3support.c | 7 +++++++
amiga/os3support.h | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/amiga/os3support.c b/amiga/os3support.c
index 3411793..f297636 100644
--- a/amiga/os3support.c
+++ b/amiga/os3support.c
@@ -192,6 +192,13 @@ struct Node *GetHead(struct List *list)
return res;
}
+struct Node *GetSucc(struct Node *node)
+{
+ if (node->ln_Succ->ln_Succ == NULL) return NULL;
+ return node->ln_Succ;
+}
+
+
/* Intuition */
uint32 GetAttrs(Object *obj, Tag tag1, ...)
{
diff --git a/amiga/os3support.h b/amiga/os3support.h
index 319d3b3..4752e91 100644
--- a/amiga/os3support.h
+++ b/amiga/os3support.h
@@ -144,7 +144,6 @@
#define AllocVecTagList(SZ,TAG) AllocVec(SZ,MEMF_ANY) /* AllocVecTagList with no tags */
#define FindIName FindName
#define GetPred(N) N ? (N)->ln_Pred : NULL
-#define GetSucc(N) N ? (N)->ln_Succ : NULL
/* Gfx */
#define SetRPAttrs(...) (void)0 /*\todo Probably need to emulate this */
@@ -240,6 +239,7 @@ void FreeSysObject(ULONG type, APTR obj);
/* Exec */
struct Node *GetHead(struct List *list);
+struct Node *GetSucc(struct Node *node);
/* Intuition */
uint32 GetAttrs(Object *obj, Tag tag1, ...);
--
NetSurf Browser
8 years, 1 month
netsurf: branch master updated. release/3.2-654-gb36c140
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b36c1401a09b0e7c48955...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b36c1401a09b0e7c489558b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b36c1401a09b0e7c489558bfc...
The branch, master has been updated
via b36c1401a09b0e7c489558bfc95c6223dea56291 (commit)
from 2377e93898d784803421ae0f2fbf2b5dcf469b2a (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=b36c1401a09b0e7c489...
commit b36c1401a09b0e7c489558bfc95c6223dea56291
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add the Dutch files to the Amiga archive
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index a9178e6..86cfb1c 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -94,7 +94,7 @@ install-amiga:
package-amiga: netsurf.lha
-AMIGA_LANGUAGES := de en it ja
+AMIGA_LANGUAGES := de en it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
-----------------------------------------------------------------------
Summary of changes:
amiga/Makefile.target | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index a9178e6..86cfb1c 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -94,7 +94,7 @@ install-amiga:
package-amiga: netsurf.lha
-AMIGA_LANGUAGES := de en it ja
+AMIGA_LANGUAGES := de en it ja nl
AMIGA_PLATFORM_RESOURCES := Pointers Themes default.css default.css.info favicon.png LangNames mimetypes Resource.map SearchEngines splash.png
AMIGA_GENERIC_RESOURCES := $(AMIGA_LANGUAGES) ca-bundle Icons
AMIGA_RESOURCES := $(addprefix amiga/resources/,$(AMIGA_PLATFORM_RESOURCES)) $(addprefix \!NetSurf/Resources/,$(AMIGA_GENERIC_RESOURCES))
--
NetSurf Browser
8 years, 1 month