Author: chris_y
Date: Sat Apr 28 18:23:29 2012
New Revision: 13896
URL:
http://source.netsurf-browser.org?rev=13896&view=rev
Log:
Make simple refresh a configurable option
Modified:
trunk/netsurf/amiga/gui.c
trunk/netsurf/amiga/options.h
Modified: trunk/netsurf/amiga/gui.c
URL:
http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=13896&...
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sat Apr 28 18:23:29 2012
@@ -2475,6 +2475,7 @@
char closetab[100],closetab_s[100],closetab_g[100];
char addtab[100],addtab_s[100],addtab_g[100];
char tabthrobber[100];
+ ULONG refresh_mode = WA_SmartRefresh;
if (!scrn) ami_openscreenfirst();
@@ -2576,6 +2577,12 @@
newprefs_hook.h_Entry = (void *)ami_gui_newprefs_hook;
newprefs_hook.h_Data = 0;
+
+ if(nsoption_bool(window_simple_refresh) == true) {
+ refresh_mode = WA_SimpleRefresh;
+ } else {
+ refresh_mode = WA_SmartRefresh;
+ }
if(!nsoption_bool(kiosk_mode))
{
@@ -2703,29 +2710,20 @@
WA_Height,curh,
WA_CustomScreen,scrn,
WA_ReportMouse,TRUE,
-#ifdef AMI_SIMPLEREFRESH
- WA_SimpleRefresh,TRUE,
-#else
- WA_SmartRefresh,TRUE,
-#endif
+ refresh_mode, TRUE,
WA_SizeBBottom, TRUE,
WA_IDCMP,IDCMP_MENUPICK | IDCMP_MOUSEMOVE |
IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE |
IDCMP_RAWKEY | IDCMP_SIZEVERIFY |
IDCMP_GADGETUP | IDCMP_IDCMPUPDATE |
-#ifdef AMI_SIMPLEREFRESH
IDCMP_REFRESHWINDOW |
-#endif
IDCMP_ACTIVEWINDOW | IDCMP_EXTENDEDMOUSE,
WINDOW_IconifyGadget, iconifygadget,
WINDOW_NewMenu, gwin->shared->menu,
WINDOW_VertProp,1,
WINDOW_NewPrefsHook,&newprefs_hook,
WINDOW_IDCMPHook,&gwin->shared->scrollerhook,
- WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE |
-#ifdef AMI_SIMPLEREFRESH
- IDCMP_REFRESHWINDOW |
-#endif
+ WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE | IDCMP_REFRESHWINDOW |
IDCMP_EXTENDEDMOUSE | IDCMP_SIZEVERIFY,
WINDOW_SharedPort,sport,
WINDOW_BuiltInScroll,TRUE,
@@ -2904,17 +2902,19 @@
WA_Width, scrn->Width,
WA_Height, scrn->Height,
WA_SizeGadget, FALSE,
- WA_CustomScreen,scrn,
- WA_ReportMouse,TRUE,
- WA_IDCMP,IDCMP_MENUPICK | IDCMP_MOUSEMOVE |
+ WA_CustomScreen, scrn,
+ WA_ReportMouse, TRUE,
+ refresh_mode, TRUE,
+ WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE |
IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE |
- IDCMP_RAWKEY | // IDCMP_INTUITICKS |
+ IDCMP_RAWKEY | IDCMP_REFRESHWINDOW |
IDCMP_GADGETUP | IDCMP_IDCMPUPDATE |
IDCMP_EXTENDEDMOUSE,
WINDOW_HorizProp,1,
WINDOW_VertProp,1,
WINDOW_IDCMPHook,&gwin->shared->scrollerhook,
- WINDOW_IDCMPHookBits,IDCMP_IDCMPUPDATE | IDCMP_EXTENDEDMOUSE,
+ WINDOW_IDCMPHookBits, IDCMP_IDCMPUPDATE |
+ IDCMP_EXTENDEDMOUSE | IDCMP_REFRESHWINDOW,
WINDOW_SharedPort,sport,
WINDOW_UserData,gwin->shared,
WINDOW_BuiltInScroll,TRUE,
@@ -3527,11 +3527,10 @@
g->new_content = false;
}
-#if AMI_SIMPLEREFRESH
-// simplerefresh only
-
void ami_refresh_window(struct gui_window_2 *gwin)
{
+ /* simplerefresh only */
+
struct IBox *bbox;
int x0, x1, y0, y1, sx, sy;
struct RegionRectangle *regrect, *nregrect;
@@ -3572,22 +3571,8 @@
ami_do_redraw_limits(gwin->bw->window, gwin->bw, x0, y0, x1, y1);
}
-/* quick refresh - scuppered by shared offscreen bitmap
- BltBitMapTags(BLITA_SrcType, BLITT_BITMAP,
- BLITA_Source, browserglob.bm,
- BLITA_SrcX, 0,
- BLITA_SrcY, 0,
- BLITA_DestType, BLITT_RASTPORT,
- BLITA_Dest, gwin->win->RPort,
- BLITA_DestX, bbox->Left,
- BLITA_DestY, bbox->Top,
- BLITA_Width, bbox->Width,
- BLITA_Height, bbox->Height,
- TAG_DONE);
-*/
EndRefresh(gwin->win, TRUE);
}
-#endif
void ami_get_hscroll_pos(struct gui_window_2 *gwin, ULONG *xs)
{
@@ -4051,16 +4036,13 @@
case IDCMP_SIZEVERIFY:
break;
-#ifdef AMI_SIMPLEREFRESH
case IDCMP_REFRESHWINDOW:
-//printf("refreshing\n");
ami_refresh_window(gwin);
break;
default:
printf("UNHANDLED EVENT %ld\n",msg->Class);
break;
-#endif
}
// ReplyMsg((struct Message *)msg);
}
Modified: trunk/netsurf/amiga/options.h
URL:
http://source.netsurf-browser.org/trunk/netsurf/amiga/options.h?rev=13896...
==============================================================================
--- trunk/netsurf/amiga/options.h (original)
+++ trunk/netsurf/amiga/options.h Sat Apr 28 18:23:29 2012
@@ -70,6 +70,7 @@
int cookies_window_ysize; \
int cairo_renderer; \
bool direct_render; \
+ bool window_simple_refresh; \
int redraw_tile_size_x; \
int redraw_tile_size_y; \
int monitor_aspect_x; \
@@ -125,6 +126,7 @@
.cookies_window_ysize = 0, \
.cairo_renderer = 1, \
.direct_render = false, \
+ .window_simple_refresh = false, \
.redraw_tile_size_x = 400, \
.redraw_tile_size_y = 150, \
.monitor_aspect_x = 0, \
@@ -179,6 +181,7 @@
{ "cookies_window_ysize", OPTION_INTEGER, &nsoptions.cookies_window_ysize},
\
{ "cairo_renderer", OPTION_INTEGER, &nsoptions.cairo_renderer}, \
{ "direct_render", OPTION_BOOL, &nsoptions.direct_render}, \
+{ "window_simple_refresh", OPTION_BOOL, &nsoptions.window_simple_refresh},
\
{ "redraw_tile_size_x", OPTION_INTEGER, &nsoptions.redraw_tile_size_x}, \
{ "redraw_tile_size_y", OPTION_INTEGER, &nsoptions.redraw_tile_size_y}, \
{ "monitor_aspect_x", OPTION_INTEGER, &nsoptions.monitor_aspect_x}, \