netsurf: branch master updated. release/3.0-691-gd3aac06

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/d3aac06e3f7a1fb687090... ...commit http://git.netsurf-browser.org/netsurf.git/commit/d3aac06e3f7a1fb68709013... ...tree http://git.netsurf-browser.org/netsurf.git/tree/d3aac06e3f7a1fb68709013a9... The branch, master has been updated via d3aac06e3f7a1fb68709013a987d696935d96d23 (commit) via ef24e5ce9ef10d121c6ab95c2a124a71f5943998 (commit) from f6b1227c8dff395fc30271b71a150ae3501ba68a (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=d3aac06e3f7a1fb6870... commit d3aac06e3f7a1fb68709013a987d696935d96d23 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Correct some more offsets diff --git a/amiga/tree.c b/amiga/tree.c index 8cd155b..f2acc2d 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1272,7 +1272,7 @@ static void ami_tree_redraw_req_dr(void *p) y = pos_y; } - tree_draw(twin->tree, 0 - pos_x, 0 - pos_y, + tree_draw(twin->tree, bbox->Left - pos_x, bbox->Top - pos_y, atrr_data->x, atrr_data->y, atrr_data->width, atrr_data->height, &ctx); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ef24e5ce9ef10d121c6... commit ef24e5ce9ef10d121c6ab95c2a124a71f5943998 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix bitmap offsets in direct render mode by forcing use of BltBitMap diff --git a/amiga/plotters.c b/amiga/plotters.c index 42b5239..6683fc5 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -690,7 +690,8 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma LOG(("[ami_plotter] ami_bitmap() got native bitmap")); #endif - if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false)) + if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false) && + (nsoption_bool(direct_render) == false)) { #ifdef __amigaos4__ uint32 comptype = COMPOSITE_Src_Over_Dest; diff --git a/amiga/tree.c b/amiga/tree.c index 28eebcb..8cd155b 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1272,8 +1272,9 @@ static void ami_tree_redraw_req_dr(void *p) y = pos_y; } - tree_draw(twin->tree, - x, - y, - bbox->Left, bbox->Top, width, height, &ctx); + tree_draw(twin->tree, 0 - pos_x, 0 - pos_y, + atrr_data->x, atrr_data->y, + atrr_data->width, atrr_data->height, &ctx); FreeVec(atrr_data); ami_update_pointer(twin->win, GUI_POINTER_DEFAULT); ----------------------------------------------------------------------- Summary of changes: amiga/plotters.c | 3 ++- amiga/tree.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/amiga/plotters.c b/amiga/plotters.c index 42b5239..6683fc5 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -690,7 +690,8 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma LOG(("[ami_plotter] ami_bitmap() got native bitmap")); #endif - if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false)) + if((GfxBase->LibNode.lib_Version >= 53) && (palette_mapped == false) && + (nsoption_bool(direct_render) == false)) { #ifdef __amigaos4__ uint32 comptype = COMPOSITE_Src_Over_Dest; diff --git a/amiga/tree.c b/amiga/tree.c index 28eebcb..f2acc2d 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1272,8 +1272,9 @@ static void ami_tree_redraw_req_dr(void *p) y = pos_y; } - tree_draw(twin->tree, - x, - y, - bbox->Left, bbox->Top, width, height, &ctx); + tree_draw(twin->tree, bbox->Left - pos_x, bbox->Top - pos_y, + atrr_data->x, atrr_data->y, + atrr_data->width, atrr_data->height, &ctx); FreeVec(atrr_data); ami_update_pointer(twin->win, GUI_POINTER_DEFAULT); -- NetSurf Browser