Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0fafa9576e8963928c13c... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0fafa9576e8963928c13c81... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0fafa9576e8963928c13c8152... The branch, chris/amiga-corewindow has been updated via 0fafa9576e8963928c13c81524e64b624b794c98 (commit) via 4892497a19083cf328711f28376d16133a684353 (commit) via 4b7abde7b0449a3a3fe03b43533b8d0697f55e0d (commit) from 98f94c4bf39db60b0b686bccc84175e15214b348 (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=0fafa9576e8963928c1... commit 0fafa9576e8963928c13c81524e64b624b794c98 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; make the window title text common diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c index db42775..024e768 100644 --- a/frontends/amiga/corewindow.c +++ b/frontends/amiga/corewindow.c @@ -60,6 +60,7 @@ #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/schedule.h" +#include "amiga/utf8.h" /** * Convert co-ordinates relative to space.gadget @@ -665,6 +666,9 @@ nserror ami_corewindow_fini(struct ami_corewindow *ami_cw) ami_plot_release_pens(ami_cw->gg.shared_pens); ami_free_layers(&ami_cw->gg); + /* free the window title */ + ami_utf8_free(ami_cw->wintitle); + /* remove the core window from our window list */ ami_gui_win_list_remove(ami_cw); diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h index 2c5dbb5..42c0f03 100644 --- a/frontends/amiga/corewindow.h +++ b/frontends/amiga/corewindow.h @@ -57,6 +57,9 @@ struct ami_corewindow { APTR deferred_rects_pool; struct MinList *deferred_rects; + /** window title, must be allocated wth ami_utf8 function */ + char *wintitle; + /** stuff for our off-screen render bitmap */ struct gui_globals gg; struct MinList *shared_pens; diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index c1b9ae2..b3d57ef 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -64,7 +64,6 @@ struct ami_crtvrfy_window { /** Amiga GUI stuff */ Object *sslcert_objects[GID_SSLCERT_LAST]; // technically wasting a few bytes here - char *wintitle; char *sslerr; char *sslaccept; char *sslreject; @@ -83,7 +82,6 @@ ami_crtvrfy_destroy(struct ami_crtvrfy_window *crtvrfy_win) res = sslcert_viewer_fini(crtvrfy_win->ssl_data); if (res == NSERROR_OK) { - ami_utf8_free(crtvrfy_win->wintitle); ami_utf8_free(crtvrfy_win->sslerr); ami_utf8_free(crtvrfy_win->sslaccept); ami_utf8_free(crtvrfy_win->sslreject); @@ -217,7 +215,7 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win) ami_cw->objects[GID_CW_WIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), - WA_Title, crtvrfy_win->wintitle, + WA_Title, ami_cw->wintitle, WA_Activate, TRUE, WA_DepthGadget, TRUE, WA_DragBar, TRUE, @@ -287,7 +285,7 @@ nserror ami_cert_verify(struct nsurl *url, return NSERROR_NOMEM; } - ncwin->wintitle = ami_utf8_easy((char *)messages_get("SSLCerts")); + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("SSLCerts")); ncwin->sslerr = ami_utf8_easy((char *)messages_get("SSLError")); ncwin->sslaccept = ami_utf8_easy((char *)messages_get("SSL_Certificate_Accept")); ncwin->sslreject = ami_utf8_easy((char *)messages_get("SSL_Certificate_Reject")); @@ -295,7 +293,7 @@ nserror ami_cert_verify(struct nsurl *url, res = ami_crtvrfy_create_window(ncwin); if (res != NSERROR_OK) { LOG("SSL UI builder init failed"); - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -312,7 +310,7 @@ nserror ami_cert_verify(struct nsurl *url, res = ami_corewindow_init(&ncwin->core); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -325,7 +323,7 @@ nserror ami_cert_verify(struct nsurl *url, res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs, &ncwin->ssl_data); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -338,7 +336,7 @@ nserror ami_cert_verify(struct nsurl *url, (struct core_window *)ncwin, ncwin->ssl_data); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4892497a19083cf3287... commit 4892497a19083cf328711f28376d16133a684353 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; correct full-window redraw co-ords diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c index 509499f..db42775 100644 --- a/frontends/amiga/corewindow.c +++ b/frontends/amiga/corewindow.c @@ -295,8 +295,8 @@ ami_cw_redraw(struct ami_corewindow *ami_cw, const struct rect *restrict r) return; } - new_rect.x0 = bbox->Left; - new_rect.y0 = bbox->Top; + new_rect.x0 = 0; + new_rect.y0 = 0; ami_cw_coord_amiga_to_ns(ami_cw, &new_rect.x0, &new_rect.y0); new_rect.x1 = new_rect.x0 + bbox->Width; new_rect.y1 = new_rect.y0 + bbox->Height; commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=4b7abde7b0449a3a3fe... commit 4b7abde7b0449a3a3fe03b43533b8d0697f55e0d Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; ssl cert window should not have a close gadget diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index 5d74464..c1b9ae2 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -221,7 +221,7 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win) WA_Activate, TRUE, WA_DepthGadget, TRUE, WA_DragBar, TRUE, - WA_CloseGadget, TRUE, + WA_CloseGadget, FALSE, WA_SizeGadget, TRUE, WA_SizeBRight, TRUE, WA_Height, scrn->Height / 2, ----------------------------------------------------------------------- Summary of changes: frontends/amiga/corewindow.c | 8 ++++++-- frontends/amiga/corewindow.h | 3 +++ frontends/amiga/sslcert.c | 16 +++++++--------- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/frontends/amiga/corewindow.c b/frontends/amiga/corewindow.c index 509499f..024e768 100644 --- a/frontends/amiga/corewindow.c +++ b/frontends/amiga/corewindow.c @@ -60,6 +60,7 @@ #include "amiga/misc.h" #include "amiga/object.h" #include "amiga/schedule.h" +#include "amiga/utf8.h" /** * Convert co-ordinates relative to space.gadget @@ -295,8 +296,8 @@ ami_cw_redraw(struct ami_corewindow *ami_cw, const struct rect *restrict r) return; } - new_rect.x0 = bbox->Left; - new_rect.y0 = bbox->Top; + new_rect.x0 = 0; + new_rect.y0 = 0; ami_cw_coord_amiga_to_ns(ami_cw, &new_rect.x0, &new_rect.y0); new_rect.x1 = new_rect.x0 + bbox->Width; new_rect.y1 = new_rect.y0 + bbox->Height; @@ -665,6 +666,9 @@ nserror ami_corewindow_fini(struct ami_corewindow *ami_cw) ami_plot_release_pens(ami_cw->gg.shared_pens); ami_free_layers(&ami_cw->gg); + /* free the window title */ + ami_utf8_free(ami_cw->wintitle); + /* remove the core window from our window list */ ami_gui_win_list_remove(ami_cw); diff --git a/frontends/amiga/corewindow.h b/frontends/amiga/corewindow.h index 2c5dbb5..42c0f03 100644 --- a/frontends/amiga/corewindow.h +++ b/frontends/amiga/corewindow.h @@ -57,6 +57,9 @@ struct ami_corewindow { APTR deferred_rects_pool; struct MinList *deferred_rects; + /** window title, must be allocated wth ami_utf8 function */ + char *wintitle; + /** stuff for our off-screen render bitmap */ struct gui_globals gg; struct MinList *shared_pens; diff --git a/frontends/amiga/sslcert.c b/frontends/amiga/sslcert.c index 5d74464..b3d57ef 100644 --- a/frontends/amiga/sslcert.c +++ b/frontends/amiga/sslcert.c @@ -64,7 +64,6 @@ struct ami_crtvrfy_window { /** Amiga GUI stuff */ Object *sslcert_objects[GID_SSLCERT_LAST]; // technically wasting a few bytes here - char *wintitle; char *sslerr; char *sslaccept; char *sslreject; @@ -83,7 +82,6 @@ ami_crtvrfy_destroy(struct ami_crtvrfy_window *crtvrfy_win) res = sslcert_viewer_fini(crtvrfy_win->ssl_data); if (res == NSERROR_OK) { - ami_utf8_free(crtvrfy_win->wintitle); ami_utf8_free(crtvrfy_win->sslerr); ami_utf8_free(crtvrfy_win->sslaccept); ami_utf8_free(crtvrfy_win->sslreject); @@ -217,11 +215,11 @@ ami_crtvrfy_create_window(struct ami_crtvrfy_window *crtvrfy_win) ami_cw->objects[GID_CW_WIN] = WindowObj, WA_ScreenTitle, ami_gui_get_screen_title(), - WA_Title, crtvrfy_win->wintitle, + WA_Title, ami_cw->wintitle, WA_Activate, TRUE, WA_DepthGadget, TRUE, WA_DragBar, TRUE, - WA_CloseGadget, TRUE, + WA_CloseGadget, FALSE, WA_SizeGadget, TRUE, WA_SizeBRight, TRUE, WA_Height, scrn->Height / 2, @@ -287,7 +285,7 @@ nserror ami_cert_verify(struct nsurl *url, return NSERROR_NOMEM; } - ncwin->wintitle = ami_utf8_easy((char *)messages_get("SSLCerts")); + ncwin->core.wintitle = ami_utf8_easy((char *)messages_get("SSLCerts")); ncwin->sslerr = ami_utf8_easy((char *)messages_get("SSLError")); ncwin->sslaccept = ami_utf8_easy((char *)messages_get("SSL_Certificate_Accept")); ncwin->sslreject = ami_utf8_easy((char *)messages_get("SSL_Certificate_Reject")); @@ -295,7 +293,7 @@ nserror ami_cert_verify(struct nsurl *url, res = ami_crtvrfy_create_window(ncwin); if (res != NSERROR_OK) { LOG("SSL UI builder init failed"); - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -312,7 +310,7 @@ nserror ami_cert_verify(struct nsurl *url, res = ami_corewindow_init(&ncwin->core); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -325,7 +323,7 @@ nserror ami_cert_verify(struct nsurl *url, res = sslcert_viewer_create_session_data(num, url, cb, cbpw, certs, &ncwin->ssl_data); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); @@ -338,7 +336,7 @@ nserror ami_cert_verify(struct nsurl *url, (struct core_window *)ncwin, ncwin->ssl_data); if (res != NSERROR_OK) { - ami_utf8_free(ncwin->wintitle); + ami_utf8_free(ncwin->core.wintitle); ami_utf8_free(ncwin->sslerr); ami_utf8_free(ncwin->sslaccept); ami_utf8_free(ncwin->sslreject); -- NetSurf Browser