From 0804c43bf1afa0cb9d851ceb89e29ec8096f272f Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 22 Mar 2016 23:47:07 +0000 Subject: Allocate uncompressed bitmap data in extended memory. This currently isn't working correctly - it simply freezes at some point after loading the page. --- frontends/amiga/bitmap.c | 74 ++++++++++++++++++++++++++++++++++++++++++++--- frontends/amiga/options.h | 5 +++- 2 files changed, 74 insertions(+), 5 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index c6e23b241..84c555c2a 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -40,6 +40,7 @@ #endif #ifdef __amigaos4__ +#include #include #endif #include "assert.h" @@ -67,6 +68,8 @@ struct bitmap { int width; int height; UBYTE *pixdata; + struct ExtMemIFace *iextmem; + uint32 size; bool opaque; int native; struct BitMap *nativebm; @@ -113,7 +116,25 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) bitmap = ami_memory_itempool_alloc(pool_bitmap, sizeof(struct bitmap)); if(bitmap == NULL) return NULL; - bitmap->pixdata = ami_memory_clear_alloc(width*height*4, 0xff); + bitmap->size = width * height * 4; + +#ifdef __amigaos4__ + if(nsoption_bool(use_extmem) == true) { + uint64 size64 = bitmap->size; + bitmap->iextmem = AllocSysObjectTags(ASOT_EXTMEM, + ASOEXTMEM_Size, &size64, + ASOEXTMEM_AllocationPolicy, EXTMEMPOLICY_IMMEDIATE, + TAG_END); + + bitmap->pixdata = NULL; + UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap); + memset(pixdata, 0xff, bitmap->size); + } else +#endif + { + bitmap->pixdata = ami_memory_clear_alloc(bitmap->size, 0xff); + } + bitmap->width = width; bitmap->height = height; @@ -133,11 +154,27 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) return bitmap; } +static inline void amiga_bitmap_unmap_buffer(struct bitmap *bm) +{ +#ifdef __amigaos4__ + if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) { + bm->iextmem->Unmap(bm->pixdata, bm->size); + bm->pixdata = NULL; + } +#endif +} /* exported function documented in amiga/bitmap.h */ unsigned char *amiga_bitmap_get_buffer(void *bitmap) { struct bitmap *bm = bitmap; + +#ifdef __amigaos4__ + if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) { + bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); + } +#endif + return bm->pixdata; } @@ -169,8 +206,17 @@ void amiga_bitmap_destroy(void *bitmap) } if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height); - if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); - ami_memory_clear_free(bm->pixdata); + +#ifdef __amigaos4__ + if(nsoption_bool(use_extmem) == true) { + amiga_bitmap_unmap_buffer(bm); + FreeSysObject(ASOT_EXTMEM, bm->iextmem); + } else +#endif + { + if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); + ami_memory_clear_free(bm->pixdata); + } if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); @@ -218,7 +264,11 @@ void amiga_bitmap_modified(void *bitmap) { struct bitmap *bm = bitmap; - if((bm->nativebm)) // && (bm->native == AMI_NSBM_TRUECOLOUR)) +#ifdef __amigaos4__ + amiga_bitmap_unmap_buffer(bm); +#endif + + if((bm->nativebm)) ami_rtg_freebitmap(bm->nativebm); if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); @@ -387,6 +437,10 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap) bitmap_get_width(bitmap), bitmap_get_height(bitmap)); } +#ifdef __amigaos4__ + amiga_bitmap_unmap_buffer(bitmap); +#endif + return dto; } @@ -416,6 +470,10 @@ struct bitmap *ami_bitmap_from_datatype(char *filename) DisposeDTObject(dto); } +#ifdef __amigaos4__ + amiga_bitmap_unmap_buffer(bm); +#endif + return bm; } @@ -587,6 +645,10 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, } } +#ifdef __amigaos4__ + amiga_bitmap_unmap_buffer(bitmap); +#endif + return tbm; } @@ -706,6 +768,10 @@ static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *conte ami_free_layers(&bm_globals); amiga_bitmap_set_opaque(bitmap, true); +#ifdef __amigaos4__ + amiga_bitmap_unmap_buffer(bitmap); +#endif + /* Restore previous render area. This is set when plotting starts, * but if bitmap_render is called *during* a browser render then * having an invalid pointer here causes NetSurf to crash. diff --git a/frontends/amiga/options.h b/frontends/amiga/options.h index 3aa845140..b5b2b3b07 100644 --- a/frontends/amiga/options.h +++ b/frontends/amiga/options.h @@ -89,8 +89,11 @@ NSOPTION_INTEGER(monitor_aspect_x, 0) NSOPTION_INTEGER(monitor_aspect_y, 0) NSOPTION_BOOL(accept_lang_locale, true) NSOPTION_STRING(local_charset, "ISO-8859-1") +#ifdef __amigaos4__ +/* Options relevant for OS4 only */ +NSOPTION_BOOL(use_extmem, true) +#else /* Options relevant for OS3 only */ -#ifndef __amigaos4__ NSOPTION_BOOL(friend_bitmap, false) #endif -- cgit v1.2.3 From a83afda7918cdb7ebc28db204ceb3e0f3d1cb0d3 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 28 Apr 2016 19:56:31 +0100 Subject: Disable ExtMem in palette-mapped modes Something handling palette mapped images causes a freeze. --- frontends/amiga/gui.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'frontends') diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index a51d8c2db..f485e0b6b 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -545,6 +545,10 @@ static void ami_set_screen_defaults(struct Screen *screen) nsoption_default_set_int(redraw_tile_size_x, screen->Width); nsoption_default_set_int(redraw_tile_size_y, screen->Height); + if((screen != NULL) && (GetBitMapAttr(screen->RastPort.BitMap, BMA_DEPTH) < 24)) { + nsoption_set_bool(use_extmem, false); + } + /* set system colours for amiga ui */ colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveBorder, screen, 0x00000000); colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveCaption, screen, 0x00dddddd); -- cgit v1.2.3 From 493036a920aba5cf470637b7aa2ca69f7f57b41c Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 12:01:14 +0100 Subject: Documentation --- frontends/amiga/dist/NetSurf.guide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontends') diff --git a/frontends/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide index dd2f46d0e..8fc6cc3a0 100755 --- a/frontends/amiga/dist/NetSurf.guide +++ b/frontends/amiga/dist/NetSurf.guide @@ -145,7 +145,7 @@ There are a couple of Amiga-specific options which can only be changed directly @{b}web_search_width@{ub} Defaults to 0. Larger values will increase the size of the web search gadget next to the URL bar. @{b}mask_alpha@{ub} Threshold to use when determining which alpha values to convert to full transparency (0 - 255, where 255 will convert even opaque pixels to transparent). Defaults to 0. This is only used in palette-mapped modes where alpha blending is not currently supported. @{b}tab_new_session{ub} If NetSurf is already running, this will cause any passed URLs to open in a new tab rather than a new window. - +@{b}use_extmem@{ub} Defaults to 0 (disabled). Setting to 1 will make NetSurf use Extended Memory to store uncompressed images. OS4 only; does not work on Pegasus 2. @{b}url_file@{ub} Path to URL database file @{b}hotlist_file@{ub} Path to Hotlist file @{b}arexx_dir@{ub} Path to ARexx scripts dir -- cgit v1.2.3 From 937dce4f2eef86c563bb93ded5c355c1446bf88c Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 12:23:56 +0100 Subject: Schedule unmapping the extmem object to ensure it releases main memory --- frontends/amiga/bitmap.c | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 84c555c2a..b81e7d63c 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -58,6 +58,7 @@ #include "amiga/memory.h" #include "amiga/misc.h" #include "amiga/rtg.h" +#include "amiga/schedule.h" // disable use of "triangle mode" for scaling #ifdef AMI_NS_TRIANGLE_SCALING @@ -154,9 +155,11 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) return bitmap; } -static inline void amiga_bitmap_unmap_buffer(struct bitmap *bm) +static void amiga_bitmap_unmap_buffer(void *p) { #ifdef __amigaos4__ + struct bitmap *bm = p; + if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) { bm->iextmem->Unmap(bm->pixdata, bm->size); bm->pixdata = NULL; @@ -172,6 +175,9 @@ unsigned char *amiga_bitmap_get_buffer(void *bitmap) #ifdef __amigaos4__ if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) { bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); + + /* unmap the buffer after one second */ + ami_schedule(1000, amiga_bitmap_unmap_buffer, bm); } #endif @@ -209,6 +215,7 @@ void amiga_bitmap_destroy(void *bitmap) #ifdef __amigaos4__ if(nsoption_bool(use_extmem) == true) { + ami_schedule(-1, amiga_bitmap_unmap_buffer, bm); amiga_bitmap_unmap_buffer(bm); FreeSysObject(ASOT_EXTMEM, bm->iextmem); } else @@ -268,9 +275,7 @@ void amiga_bitmap_modified(void *bitmap) amiga_bitmap_unmap_buffer(bm); #endif - if((bm->nativebm)) - ami_rtg_freebitmap(bm->nativebm); - + if(bm->nativebm) ami_rtg_freebitmap(bm->nativebm); if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); if(bm->native_mask) FreeRaster(bm->native_mask, bm->width, bm->height); bm->nativebm = NULL; @@ -437,10 +442,6 @@ Object *ami_datatype_object_from_bitmap(struct bitmap *bitmap) bitmap_get_width(bitmap), bitmap_get_height(bitmap)); } -#ifdef __amigaos4__ - amiga_bitmap_unmap_buffer(bitmap); -#endif - return dto; } @@ -470,10 +471,6 @@ struct bitmap *ami_bitmap_from_datatype(char *filename) DisposeDTObject(dto); } -#ifdef __amigaos4__ - amiga_bitmap_unmap_buffer(bm); -#endif - return bm; } @@ -645,10 +642,6 @@ static inline struct BitMap *ami_bitmap_get_generic(struct bitmap *bitmap, } } -#ifdef __amigaos4__ - amiga_bitmap_unmap_buffer(bitmap); -#endif - return tbm; } @@ -768,10 +761,6 @@ static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *conte ami_free_layers(&bm_globals); amiga_bitmap_set_opaque(bitmap, true); -#ifdef __amigaos4__ - amiga_bitmap_unmap_buffer(bitmap); -#endif - /* Restore previous render area. This is set when plotting starts, * but if bitmap_render is called *during* a browser render then * having an invalid pointer here causes NetSurf to crash. -- cgit v1.2.3 From 205abcf18950bf3ee8600c4a4e4945b096985f9e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 12:34:26 +0100 Subject: Debug logging --- frontends/amiga/bitmap.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index b81e7d63c..fb30ab521 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -161,6 +161,7 @@ static void amiga_bitmap_unmap_buffer(void *p) struct bitmap *bm = p; if((nsoption_bool(use_extmem) == true) && (bm->pixdata != NULL)) { + LOG("Unmapping ExtMem object %p for bitmap %p", bm->iextmem, bm); bm->iextmem->Unmap(bm->pixdata, bm->size); bm->pixdata = NULL; } @@ -174,6 +175,7 @@ unsigned char *amiga_bitmap_get_buffer(void *bitmap) #ifdef __amigaos4__ if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) { + LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm); bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); /* unmap the buffer after one second */ -- cgit v1.2.3 From 982a59744f634aee73dc11d4a30c93b4652a1e7e Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 12:34:42 +0100 Subject: Revert "Disable ExtMem in palette-mapped modes" This reverts commit 4db40c3f27d0ade8fc76f57cd383e5ff52ad7c93. --- frontends/amiga/gui.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index f485e0b6b..a51d8c2db 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -545,10 +545,6 @@ static void ami_set_screen_defaults(struct Screen *screen) nsoption_default_set_int(redraw_tile_size_x, screen->Width); nsoption_default_set_int(redraw_tile_size_y, screen->Height); - if((screen != NULL) && (GetBitMapAttr(screen->RastPort.BitMap, BMA_DEPTH) < 24)) { - nsoption_set_bool(use_extmem, false); - } - /* set system colours for amiga ui */ colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveBorder, screen, 0x00000000); colour_option_from_pen(FILLPEN, NSOPTION_sys_colour_ActiveCaption, screen, 0x00dddddd); -- cgit v1.2.3 From adac4d98bb9acdeb76725c946e53ff0e2c0235df Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 12:53:17 +0100 Subject: More logging --- frontends/amiga/bitmap.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index fb30ab521..3ce74a3a1 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -702,6 +702,7 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, int width, int height, struct BitMap *friendbm) { if(bitmap == NULL) return NULL; + LOG("Getting native BitMap for %p", bitmap); if(__builtin_expect(ami_plot_screen_is_palettemapped() == true, 0)) { return ami_bitmap_get_palettemapped(bitmap, width, height, friendbm); @@ -719,6 +720,8 @@ void ami_bitmap_fini(void) static nserror bitmap_render(struct bitmap *bitmap, struct hlcache_handle *content) { #ifdef __amigaos4__ + LOG("Entering bitmap_render"); + struct redraw_context ctx = { .interactive = false, .background_images = true, -- cgit v1.2.3 From 570212add2ec6b70474eb49b74259d7c73733c03 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 1 May 2016 15:11:07 +0100 Subject: Don't map an extmem area is it is already mapped, just extend the lifetime --- frontends/amiga/bitmap.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 3ce74a3a1..02d811696 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -174,9 +174,11 @@ unsigned char *amiga_bitmap_get_buffer(void *bitmap) struct bitmap *bm = bitmap; #ifdef __amigaos4__ - if((nsoption_bool(use_extmem) == true) && (bm->pixdata == NULL)) { - LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm); - bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); + if(nsoption_bool(use_extmem) == true) { + if(bm->pixdata == NULL) { + LOG("Mapping ExtMem object %p for bitmap %p", bm->iextmem, bm); + bm->pixdata = bm->iextmem->Map(NULL, bm->size, 0LL, 0); + } /* unmap the buffer after one second */ ami_schedule(1000, amiga_bitmap_unmap_buffer, bm); -- cgit v1.2.3 From b7551fec72372df4cb40384818da5419904e4c98 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 22 May 2016 15:05:54 +0100 Subject: NULL iextmem --- frontends/amiga/bitmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 02d811696..06d1f1f90 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -129,7 +129,7 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) bitmap->pixdata = NULL; UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap); - memset(pixdata, 0xff, bitmap->size); + memset(bitmap->pixdata, 0xff, bitmap->size); } else #endif { @@ -222,6 +222,7 @@ void amiga_bitmap_destroy(void *bitmap) ami_schedule(-1, amiga_bitmap_unmap_buffer, bm); amiga_bitmap_unmap_buffer(bm); FreeSysObject(ASOT_EXTMEM, bm->iextmem); + bm->iextmem = NULL; } else #endif { -- cgit v1.2.3 From 43bbdc520dd054acdf46088fbbee5d4a3b638d24 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 22 May 2016 15:10:51 +0100 Subject: Fix merge error --- frontends/amiga/bitmap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 06d1f1f90..8c0f0b336 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -129,7 +129,7 @@ void *amiga_bitmap_create(int width, int height, unsigned int state) bitmap->pixdata = NULL; UBYTE *pixdata = amiga_bitmap_get_buffer(bitmap); - memset(bitmap->pixdata, 0xff, bitmap->size); + memset(pixdata, 0xff, bitmap->size); } else #endif { @@ -230,6 +230,11 @@ void amiga_bitmap_destroy(void *bitmap) ami_memory_clear_free(bm->pixdata); } +<<<<<<< HEAD +======= + if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); + +>>>>>>> Fix merge error if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); -- cgit v1.2.3 From 36b26b861f375de5b2be3ff9de37288049f05a26 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 31 Dec 2016 14:17:22 +0000 Subject: Update to test ExtMem on OS4.1FEU1 Mostly works, but falls over when there are lots of tiny GIF anims on screen --- frontends/amiga/bitmap.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index 8c0f0b336..fe84a94b7 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -230,11 +230,6 @@ void amiga_bitmap_destroy(void *bitmap) ami_memory_clear_free(bm->pixdata); } -<<<<<<< HEAD -======= - if(bm->drawhandle) ReleaseDrawHandle(bm->drawhandle); - ->>>>>>> Fix merge error if(bm->url) nsurl_unref(bm->url); if(bm->title) free(bm->title); -- cgit v1.2.3 From 8af9a8407bc9f65fc34eecfe0fbd4beb6dacdfac Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 31 Dec 2016 14:43:06 +0000 Subject: Don't unmap ExtMem immediately as: (a) it is upsetting the gif decoder (although I suspect it is caused by the OS struggling with the excessive remaps) (b) We are probably going to need to map it back in imminently for display --- frontends/amiga/bitmap.c | 3 ++- frontends/amiga/gui.c | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'frontends') diff --git a/frontends/amiga/bitmap.c b/frontends/amiga/bitmap.c index fe84a94b7..5b5d6bb1e 100644 --- a/frontends/amiga/bitmap.c +++ b/frontends/amiga/bitmap.c @@ -277,7 +277,8 @@ void amiga_bitmap_modified(void *bitmap) struct bitmap *bm = bitmap; #ifdef __amigaos4__ - amiga_bitmap_unmap_buffer(bm); + /* unmap the buffer after 0.5s - we might need it imminently */ + ami_schedule(500, amiga_bitmap_unmap_buffer, bm); #endif if(bm->nativebm) ami_rtg_freebitmap(bm->nativebm); diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index a51d8c2db..ba0a786e3 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2015 Chris Young + * Copyright 2008-2016 Chris Young * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -616,6 +616,11 @@ static nserror ami_set_options(struct nsoption_s *defaults) /* Some OS-specific overrides */ #ifdef __amigaos4__ + if(!LIB_IS_AT_LEAST((struct Library *)SysBase, 53, 89)) { + /* Disable ExtMem usage pre-OS4.1FEU1 */ + nsoption_set_bool(use_extmem, false); + } + if(codeset == 0) codeset = 4; /* ISO-8859-1 */ const char *encname = (const char *)ObtainCharsetInfo(DFCS_NUMBER, codeset, DFCS_MIMENAME); -- cgit v1.2.3 From 86a0f14d0aa13c7808b57bbb6092ac6805babf02 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sat, 31 Dec 2016 14:47:33 +0000 Subject: Make the documentation reflect reality. ExtMem is enabled by default for now to give it a good workout. Disabled may be a more sensible default. --- frontends/amiga/dist/NetSurf.guide | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontends') diff --git a/frontends/amiga/dist/NetSurf.guide b/frontends/amiga/dist/NetSurf.guide index 8fc6cc3a0..754cdbeb9 100755 --- a/frontends/amiga/dist/NetSurf.guide +++ b/frontends/amiga/dist/NetSurf.guide @@ -145,7 +145,7 @@ There are a couple of Amiga-specific options which can only be changed directly @{b}web_search_width@{ub} Defaults to 0. Larger values will increase the size of the web search gadget next to the URL bar. @{b}mask_alpha@{ub} Threshold to use when determining which alpha values to convert to full transparency (0 - 255, where 255 will convert even opaque pixels to transparent). Defaults to 0. This is only used in palette-mapped modes where alpha blending is not currently supported. @{b}tab_new_session{ub} If NetSurf is already running, this will cause any passed URLs to open in a new tab rather than a new window. -@{b}use_extmem@{ub} Defaults to 0 (disabled). Setting to 1 will make NetSurf use Extended Memory to store uncompressed images. OS4 only; does not work on Pegasus 2. +@{b}use_extmem@{ub} Defaults to 1 (enabled). Setting to 0 will prevent NetSurf using Extended Memory to store uncompressed images - this may have a performance benefit and no disadvantage for <2GB configurations. OS4.1FEU1 only. @{b}url_file@{ub} Path to URL database file @{b}hotlist_file@{ub} Path to Hotlist file @{b}arexx_dir@{ub} Path to ARexx scripts dir -- cgit v1.2.3