netsurf: branch master updated. release/3.0-161-g9b39408

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/9b39408dffe09940589c2... ...commit http://git.netsurf-browser.org/netsurf.git/commit/9b39408dffe09940589c2f0... ...tree http://git.netsurf-browser.org/netsurf.git/tree/9b39408dffe09940589c2f000... The branch, master has been updated via 9b39408dffe09940589c2f00026c0e605d836b78 (commit) via ac1865f36181d3b25045d0ab284b70b697b6a2ed (commit) from b2aa0c129c73201b7e1e466d9996e5e491464592 (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=9b39408dffe09940589... commit 9b39408dffe09940589c2f00026c0e605d836b78 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Use macro directly diff --git a/amiga/plotters.c b/amiga/plotters.c index a4ddb61..d95915c 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -102,9 +102,6 @@ const struct plotter_table amiplot = { .option_knockout = true, }; -colour ami_abgr_to_argb(colour c) { - return ns_color_to_nscss(c); -} #ifdef NS_AMIGA_CAIRO void ami_cairo_set_colour(cairo_t *cr,colour c) @@ -288,7 +285,7 @@ static void ami_plot_setapen(ULONG colour) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_APenColor, - ami_abgr_to_argb(colour), + ns_color_to_nscss(colour), TAG_DONE); } else { ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); @@ -300,7 +297,7 @@ static void ami_plot_setopen(ULONG colour) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_OPenColor, - ami_abgr_to_argb(colour), + ns_color_to_nscss(colour), TAG_DONE); } else { ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ac1865f36181d3b2504... commit ac1865f36181d3b25045d0ab284b70b697b6a2ed Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Set more sensible default window size diff --git a/amiga/gui.c b/amiga/gui.c index af6a6d8..b1786ce 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -443,6 +443,22 @@ colour_option_from_pen(struct nsoption_s *opts, return NSERROR_OK; } +static void ami_set_screen_defaults(struct Screen *scrn) +{ + if((nsoption_int(window_x) == 0) && + (nsoption_int(window_y) == 0) && + (nsoption_int(window_width) == 0) && + (nsoption_int(window_height) == 0)) { + nsoption_set_int(window_x, 0); + nsoption_set_int(window_y, scrn->BarHeight + 1); + nsoption_set_int(window_width, scrn->Width); + nsoption_set_int(window_height, scrn->Height - scrn->BarHeight - 1); + } + + /* TODO: Update screen colour defaults here */ +} + + /** * Set option defaults for amiga frontend * @@ -531,9 +547,6 @@ static nserror ami_set_options(struct nsoption_s *defaults) tree_set_icon_dir(strdup("ENV:Sys")); - if(!nsoption_int(window_width)) nsoption_set_int(window_width, 800); - if(!nsoption_int(window_height)) nsoption_set_int(window_height, 600); - #ifndef __amigaos4__ nsoption_set_bool(download_notify, false); nsoption_set_bool(context_menu, false); @@ -745,10 +758,7 @@ void ami_openscreen(void) dri = GetScreenDrawInfo(scrn); ami_font_setdevicedpi(id); -/* TODO: Reset system colours so they are correct for the new screen - gui_system_colour_finalize(); - gui_system_colour_init(); -*/ + ami_set_screen_defaults(scrn); //ami_help_new_screen(scrn); } ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 24 +++++++++++++++++------- amiga/plotters.c | 7 ++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index af6a6d8..b1786ce 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -443,6 +443,22 @@ colour_option_from_pen(struct nsoption_s *opts, return NSERROR_OK; } +static void ami_set_screen_defaults(struct Screen *scrn) +{ + if((nsoption_int(window_x) == 0) && + (nsoption_int(window_y) == 0) && + (nsoption_int(window_width) == 0) && + (nsoption_int(window_height) == 0)) { + nsoption_set_int(window_x, 0); + nsoption_set_int(window_y, scrn->BarHeight + 1); + nsoption_set_int(window_width, scrn->Width); + nsoption_set_int(window_height, scrn->Height - scrn->BarHeight - 1); + } + + /* TODO: Update screen colour defaults here */ +} + + /** * Set option defaults for amiga frontend * @@ -531,9 +547,6 @@ static nserror ami_set_options(struct nsoption_s *defaults) tree_set_icon_dir(strdup("ENV:Sys")); - if(!nsoption_int(window_width)) nsoption_set_int(window_width, 800); - if(!nsoption_int(window_height)) nsoption_set_int(window_height, 600); - #ifndef __amigaos4__ nsoption_set_bool(download_notify, false); nsoption_set_bool(context_menu, false); @@ -745,10 +758,7 @@ void ami_openscreen(void) dri = GetScreenDrawInfo(scrn); ami_font_setdevicedpi(id); -/* TODO: Reset system colours so they are correct for the new screen - gui_system_colour_finalize(); - gui_system_colour_init(); -*/ + ami_set_screen_defaults(scrn); //ami_help_new_screen(scrn); } diff --git a/amiga/plotters.c b/amiga/plotters.c index a4ddb61..d95915c 100755 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -102,9 +102,6 @@ const struct plotter_table amiplot = { .option_knockout = true, }; -colour ami_abgr_to_argb(colour c) { - return ns_color_to_nscss(c); -} #ifdef NS_AMIGA_CAIRO void ami_cairo_set_colour(cairo_t *cr,colour c) @@ -288,7 +285,7 @@ static void ami_plot_setapen(ULONG colour) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_APenColor, - ami_abgr_to_argb(colour), + ns_color_to_nscss(colour), TAG_DONE); } else { ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); @@ -300,7 +297,7 @@ static void ami_plot_setopen(ULONG colour) { if(palette_mapped == false) { SetRPAttrs(glob->rp, RPTAG_OPenColor, - ami_abgr_to_argb(colour), + ns_color_to_nscss(colour), TAG_DONE); } else { ULONG pen = ami_plot_obtain_pen(glob->shared_pens, colour); -- NetSurf Browser