mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add tiled refresh, with tiles of max size option_redraw_tile_size. This 

reduces the size of our off-screen bitmap and associated memory.
Only works with browser windows at present. History and treeviews still
have full window refresh/bitmap.
Setting the option to 0 brings back the old behaviour.

svn path=/trunk/netsurf/; revision=13468
This commit is contained in:
Chris Young 2012-02-25 18:42:33 +00:00
parent 174b52a0fd
commit 79c5485e27
4 changed files with 98 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
amiga/gui.c
View File

@ -1840,7 +1840,7 @@ void ami_handle_msg(void)
break;
default:
// printf("class: %ld\n",(result & WMHI_CLASSMASK));
//printf("class: %ld\n",(result & WMHI_CLASSMASK));
break;
}
@ -2081,7 +2081,7 @@ void ami_get_msg(void)
if(signal & schedulesig)
{
if(timermsg = (struct TimerRequest *)GetMsg(msgport))
while(timermsg = (struct TimerRequest *)GetMsg(msgport))
{
ReplyMsg((struct Message *)timermsg);
schedule_run(FALSE);
@ -3214,6 +3214,72 @@ void gui_window_set_title(struct gui_window *g, const char *title)
}
}
void ami_do_redraw_tiled(struct gui_window_2 *gwin,
ULONG left, ULONG top, ULONG width, ULONG height,
ULONG sx, ULONG sy, struct IBox *bbox, struct redraw_context *ctx)
{
ULONG x, y;
struct rect clip;
if(top < 0) {
height += top;
top = 0;
}
if(left < 0) {
width += left;
left = 0;
}
if(top < sy) {
height += (top - sy);
top = sy;
}
if(left < sx) {
width += (left - sx);
left = sx;
}
if(((top - sy) + height) > bbox->Height)
height = bbox->Height - (top - sy);
if(((left - sx) + width) > bbox->Width)
width = bbox->Width - (left - sx);
if(width <= 0) return;
if(height <= 0) return;
for(y = top; y < (top + height); y += option_redraw_tile_size) {
clip.y0 = 0;
clip.y1 = option_redraw_tile_size;
if(((top + height) - y) < option_redraw_tile_size) clip.y1 = (top + height) - y;
for(x = left; x < (left + width); x += option_redraw_tile_size) {
clip.x0 = 0;
clip.x1 = option_redraw_tile_size;
if(((left + width) - x) < option_redraw_tile_size) clip.x1 = (left + width) - x;
if(browser_window_redraw(gwin->bw, clip.x0 - (x / gwin->bw->scale), clip.y0 - (y / gwin->bw->scale), &clip, ctx))
{
ami_clearclipreg(&browserglob);
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 + x - sx,
BLITA_DestY, bbox->Top + y - sy,
BLITA_Width, clip.x1,
BLITA_Height, clip.y1,
TAG_DONE);
}
}
}
}
/**
* Redraw an area of the browser window - Amiga-specific function
*
@ -3252,87 +3318,17 @@ void ami_do_redraw_limits(struct gui_window *g, struct browser_window *bw,
g->shared->objects[GID_TABS], (ULONG *)&cur_tab);
if(!((cur_tab == g->tab) || (g->shared->tabs <= 1)))
{
return;
}
GetAttr(SPACE_AreaBox, g->shared->objects[GID_BROWSER], (ULONG *)&bbox);
width=bbox->Width / bw->scale;
height=bbox->Height / bw->scale;
xoffset=bbox->Left;
yoffset=bbox->Top;
x0 *= g->shared->bw->scale;
x1 *= g->shared->bw->scale;
y0 *= g->shared->bw->scale;
y1 *= g->shared->bw->scale;
if((y1<sy) || (y0>sy+height)) return;
if((x1<sx) || (x0>sx+width)) return;
if((x0-(int)sx)<0) x0 = sx;
if((y0-(int)sy)<0) y0 = sy;
/* Check this - xoffset/yoffset are window-relative, not bitmap-relative */
if((x1-x0)+(xoffset+x0-sx)>(width)) x1 = (width-(x0-sx)+x0);
if((y1-y0)+(yoffset+y0-sy)>(height)) y1 = (height-(y0-sy)+y0);
glob = &browserglob;
if(option_direct_render == false)
{
clip.x0 = (x0 - sx);
clip.y0 = (y0 - sy);
clip.x1 = (x1 - sx);
clip.y1 = (y1 - sy);
posx = - sx;
posy = - sy;
}
else
{
temprp = browserglob.rp;
browserglob.rp = g->shared->win->RPort;
clip.x0 = (x0 - sx) + bbox->Left;
clip.y0 = (y0 - sy) + bbox->Top;
clip.x1 = (x1 - sx) + bbox->Left;
clip.y1 = (y1 - sy) + bbox->Top;
posx = bbox->Left - sx;
posy = bbox->Top - sy;
}
if(browser_window_redraw(bw, posx, posy, &clip, &ctx))
{
ami_clearclipreg(&browserglob);
if(option_direct_render == false)
{
/* This is identical to the below, but for some reason doesn't blit anything.
* Probably some values are wrong and BltBitMapTags is fussier.
BltBitMapTags(BLITA_SrcType, BLITT_BITMAP,
BLITA_Source, browserglob.bm,
BLITA_SrcX, clip.x0 * g->shared->bw->scale,
BLITA_SrcY, clip.y0 * g->shared->bw->scale,
BLITA_DestType, BLITT_RASTPORT,
BLITA_Dest, g->shared->win->RPort,
BLITA_DestX, xoffset + (clip.x0 * g->shared->bw->scale),
BLITA_DestY, yoffset + (clip.y0 * g->shared->bw->scale),
BLITA_Width, (x1 - x0) * g->shared->bw->scale,
BLITA_Height, (y1 - y0) * g->shared->bw->scale,
TAG_DONE);
*/
BltBitMapRastPort(browserglob.bm,
clip.x0 * g->shared->bw->scale,
clip.y0 * g->shared->bw->scale,
g->shared->win->RPort,
xoffset + (clip.x0 * g->shared->bw->scale),
yoffset + (clip.y0 * g->shared->bw->scale),
(x1 - x0) * g->shared->bw->scale,
(y1 - y0) * g->shared->bw->scale,
0x0C0);
}
else
{
browserglob.rp = temprp;
}
}
ami_do_redraw_tiled(g->shared, x0, y0, x1 - x0, y1 - y0, sx, sy, bbox, &ctx);
return;
}
void gui_window_redraw_window(struct gui_window *g)
@ -3398,7 +3394,7 @@ void ami_do_redraw(struct gui_window_2 *g)
if(g->new_content) g->redraw_scroll = false;
if(g->bw->scale != 1.0) g->redraw_scroll = false;
//if(g->bw->scale != 1.0) g->redraw_scroll = false;
}
if(g->redraw_scroll)
@ -3414,30 +3410,30 @@ void ami_do_redraw(struct gui_window_2 *g)
if(vcurrent>oldv)
{
ami_do_redraw_limits(g->bw->window, g->bw,
hcurrent, (height / g->bw->scale) + oldv - 1,
hcurrent + (width / g->bw->scale),
vcurrent + (height / g->bw->scale) + 1);
hcurrent / g->bw->scale, (height + oldv - 1) / g->bw->scale,
(hcurrent + width) / g->bw->scale,
(vcurrent + height + 1) / g->bw->scale);
}
else if(vcurrent<oldv)
{
ami_do_redraw_limits(g->bw->window, g->bw,
hcurrent, vcurrent,
hcurrent + (width / g->bw->scale),
oldv);
hcurrent / g->bw->scale, vcurrent / g->bw->scale,
(hcurrent + width) / g->bw->scale,
oldv / g->bw->scale);
}
if(hcurrent>oldh)
{
ami_do_redraw_limits(g->bw->window, g->bw,
(width / g->bw->scale) + oldh, vcurrent,
hcurrent + (width / g->bw->scale),
vcurrent + (height / g->bw->scale));
(width + oldh) / g->bw->scale, vcurrent / g->bw->scale,
(hcurrent + width) / g->bw->scale,
(vcurrent + height) / g->bw->scale);
}
else if(hcurrent<oldh)
{
ami_do_redraw_limits(g->bw->window, g->bw,
hcurrent, vcurrent,
oldh, vcurrent+(height / g->bw->scale));
hcurrent / g->bw->scale, vcurrent / g->bw->scale,
oldh / g->bw->scale, (vcurrent + height) / g->bw->scale);
}
}
else
@ -3453,10 +3449,7 @@ void ami_do_redraw(struct gui_window_2 *g)
if(option_direct_render == false)
{
clip.x0 = 0;
clip.y0 = 0;
clip.x1 = width;
clip.y1 = height;
ami_do_redraw_tiled(g, hcurrent, vcurrent, width, height, hcurrent, vcurrent, bbox, &ctx);
}
else
{
@ -3466,28 +3459,10 @@ void ami_do_redraw(struct gui_window_2 *g)
clip.y0 = bbox->Top;
clip.x1 = bbox->Left + bbox->Width;
clip.y1 = bbox->Top + bbox->Height;
}
if(browser_window_redraw(g->bw, clip.x0 - hcurrent, clip.y0 - vcurrent, &clip, &ctx))
{
ami_clearclipreg(&browserglob);
if(option_direct_render == false)
{
BltBitMapTags(BLITA_SrcType, BLITT_BITMAP,
BLITA_Source, browserglob.bm,
BLITA_SrcX, 0,
BLITA_SrcY, 0,
BLITA_DestType, BLITT_RASTPORT,
BLITA_Dest, g->win->RPort,
BLITA_DestX, bbox->Left,
BLITA_DestY, bbox->Top,
BLITA_Width, bbox->Width,
BLITA_Height, bbox->Height,
TAG_DONE);
}
else
{
browserglob.rp = temprp;
}
}

2
amiga/history_local.c
View File

@ -83,7 +83,7 @@ void ami_history_open(struct browser_window *bw, struct history *history)
{
hwindow = AllocVec(sizeof(struct history_window),MEMF_CLEAR | MEMF_PRIVATE);
ami_init_layers(&hwindow->gg, 0, 0);
ami_init_layers(&hwindow->gg, scrn->Width, scrn->Height);
hwindow->bw = bw;
history_size(history, &width, &height);

5
amiga/options.h
View File

@ -65,6 +65,7 @@ extern int option_cookies_window_ysize;
extern int option_cairo_renderer;
extern bool option_direct_render;
extern int option_amiga_ydpi;
extern int option_redraw_tile_size;
extern int option_monitor_aspect_x;
extern int option_monitor_aspect_y;
extern bool option_accept_lang_locale;
@ -75,7 +76,7 @@ char *option_url_file = 0; \
char *option_hotlist_file = 0; \
char *option_use_pubscreen = 0; \
char *option_modeid = 0; \
extern int option_screen_compositing = -1; \
int option_screen_compositing = -1; \
int option_cache_bitmaps = 0; \
char *option_theme = 0; \
bool option_utf8_clipboard = false; \
@ -116,6 +117,7 @@ int option_cookies_window_ysize = 0; \
int option_cairo_renderer = 1; \
bool option_direct_render = false; \
int option_amiga_ydpi = 72; \
int option_redraw_tile_size = 300; \
int option_monitor_aspect_x = 0; \
int option_monitor_aspect_y = 0; \
bool option_accept_lang_locale = true; \
@ -167,6 +169,7 @@ int option_menu_refresh = 0; \
{ "cairo_renderer", OPTION_INTEGER, &option_cairo_renderer}, \
{ "direct_render", OPTION_BOOL, &option_direct_render}, \
{ "amiga_ydpi", OPTION_INTEGER, &option_amiga_ydpi}, \
{ "redraw_tile_size", OPTION_INTEGER, &option_redraw_tile_size}, \
{ "monitor_aspect_x", OPTION_INTEGER, &option_monitor_aspect_x}, \
{ "monitor_aspect_y", OPTION_INTEGER, &option_monitor_aspect_y}, \
{ "accept_lang_locale", OPTION_BOOL, &option_accept_lang_locale}, \

5
amiga/plotters.c
View File

@ -121,8 +121,9 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
struct BitMap *friend = NULL; /* Required to be NULL for Cairo and ARGB bitmaps */
if(!width) width = scrn->Width;
if(!height) height = scrn->Width;
if(option_redraw_tile_size <= 0) option_redraw_tile_size = scrn->Width;
if(!width) width = option_redraw_tile_size;
if(!height) height = option_redraw_tile_size;
gg->layerinfo = NewLayerInfo();
gg->areabuf = AllocVec(100,MEMF_PRIVATE | MEMF_CLEAR);