Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2bd8eb8c0b468799109191e63e939ea7bd69f8a1
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2bd8eb8c0b468799109191e63e939ea7bd69f8a1
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2bd8eb8c0b468799109191e63e939ea7bd69f8a1
The branch, chris/amiga-corewindow has been updated
via 2bd8eb8c0b468799109191e63e939ea7bd69f8a1 (commit)
from 64bb74bdafa216d4163d6b717271a9f45ac0d287 (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=2bd8eb8c0b468799109191e63e939ea7bd69f8a1
commit 2bd8eb8c0b468799109191e63e939ea7bd69f8a1
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix sslcert redraw
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index 052ddd6..38b980a 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -223,12 +223,12 @@ ami_cw_redraw_rect(struct ami_corewindow *ami_cw, struct
rect *r)
if(((x + width) - tile_x) < tile_size_x)
tile_w = (x + width) - tile_x;
- draw_rect.x0 = - tile_x;
- draw_rect.y0 = - tile_y;
+ draw_rect.x0 = tile_x; // was -
+ draw_rect.y0 = tile_y; // was -
draw_rect.x1 = tile_x + tile_w;
draw_rect.y1 = tile_y + tile_h;
- ami_cw->draw(ami_cw, &draw_rect, &ctx);
+ ami_cw->draw(ami_cw, -tile_x, -tile_y, &draw_rect,
&ctx);
#ifdef __amigaos4__
BltBitMapTags(BLITA_SrcType, BLITT_BITMAP,
diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h
index ba754d6..8d93882 100644
--- a/frontends/amiga/corewindow.h
+++ b/frontends/amiga/corewindow.h
@@ -81,10 +81,14 @@ struct ami_corewindow {
* callback to draw on drawable area of Amiga core window
*
* \param ami_cw The Amiga core window structure.
+ * \param x Plot origin (X)
+ * \param r Plot origin (Y)
* \param r The rectangle of the window that needs updating.
+ * \param ctx Redraw context
* \return NSERROR_OK on success otherwise apropriate error code
*/
- nserror (*draw)(struct ami_corewindow *ami_cw, struct rect *r,
struct redraw_context *ctx);
+ nserror (*draw)(struct ami_corewindow *ami_cw, int x, int y,
struct rect *r,
+ struct redraw_context *ctx);
/**
* callback for keypress on Amiga core window
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 4685cae..d56a1fe 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -197,14 +197,14 @@ ami_crtvrfy_key(struct ami_corewindow *ami_cw, uint32_t
nskey)
* \return NSERROR_OK on success otherwise apropriate error code
*/
static nserror
-ami_crtvrfy_draw(struct ami_corewindow *ami_cw, struct rect *r, struct
redraw_context *ctx)
+ami_crtvrfy_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r,
struct redraw_context *ctx)
{
struct ami_crtvrfy_window *crtvrfy_win;
/* technically degenerate container of */
crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw;
- sslcert_viewer_redraw(crtvrfy_win->ssl_data, 0, 0, r, ctx);
+ sslcert_viewer_redraw(crtvrfy_win->ssl_data, x, y, r, ctx);
return NSERROR_OK;
}
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/corewindow.c | 6 +++---
frontends/amiga/corewindow.h | 6 +++++-
frontends/amiga/sslcert.c | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c
index 052ddd6..38b980a 100644
--- a/frontends/amiga/corewindow.c
+++ b/frontends/amiga/corewindow.c
@@ -223,12 +223,12 @@ ami_cw_redraw_rect(struct ami_corewindow *ami_cw, struct
rect *r)
if(((x + width) - tile_x) < tile_size_x)
tile_w = (x + width) - tile_x;
- draw_rect.x0 = - tile_x;
- draw_rect.y0 = - tile_y;
+ draw_rect.x0 = tile_x; // was -
+ draw_rect.y0 = tile_y; // was -
draw_rect.x1 = tile_x + tile_w;
draw_rect.y1 = tile_y + tile_h;
- ami_cw->draw(ami_cw, &draw_rect, &ctx);
+ ami_cw->draw(ami_cw, -tile_x, -tile_y, &draw_rect,
&ctx);
#ifdef __amigaos4__
BltBitMapTags(BLITA_SrcType, BLITT_BITMAP,
diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h
index ba754d6..8d93882 100644
--- a/frontends/amiga/corewindow.h
+++ b/frontends/amiga/corewindow.h
@@ -81,10 +81,14 @@ struct ami_corewindow {
* callback to draw on drawable area of Amiga core window
*
* \param ami_cw The Amiga core window structure.
+ * \param x Plot origin (X)
+ * \param r Plot origin (Y)
* \param r The rectangle of the window that needs updating.
+ * \param ctx Redraw context
* \return NSERROR_OK on success otherwise apropriate error code
*/
- nserror (*draw)(struct ami_corewindow *ami_cw, struct rect *r,
struct redraw_context *ctx);
+ nserror (*draw)(struct ami_corewindow *ami_cw, int x, int y,
struct rect *r,
+ struct redraw_context *ctx);
/**
* callback for keypress on Amiga core window
diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c
index 4685cae..d56a1fe 100644
--- a/frontends/amiga/sslcert.c
+++ b/frontends/amiga/sslcert.c
@@ -197,14 +197,14 @@ ami_crtvrfy_key(struct ami_corewindow *ami_cw, uint32_t
nskey)
* \return NSERROR_OK on success otherwise apropriate error code
*/
static nserror
-ami_crtvrfy_draw(struct ami_corewindow *ami_cw, struct rect *r, struct
redraw_context *ctx)
+ami_crtvrfy_draw(struct ami_corewindow *ami_cw, int x, int y, struct rect *r,
struct redraw_context *ctx)
{
struct ami_crtvrfy_window *crtvrfy_win;
/* technically degenerate container of */
crtvrfy_win = (struct ami_crtvrfy_window *)ami_cw;
- sslcert_viewer_redraw(crtvrfy_win->ssl_data, 0, 0, r, ctx);
+ sslcert_viewer_redraw(crtvrfy_win->ssl_data, x, y, r, ctx);
return NSERROR_OK;
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
