Pass whether background images are wanted in redraw_context.

svn path=/trunk/netsurf/; revision=13335
This commit is contained in:
Michael Drake 2011-12-23 22:39:25 +00:00
parent 879383e21e
commit 67f2470d5a
33 changed files with 614 additions and 576 deletions

View File

@ -3170,6 +3170,7 @@ void ami_do_redraw_limits(struct gui_window *g, struct browser_window *bw,
int posx, posy;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &amiplot
};
@ -3373,6 +3374,7 @@ void ami_do_redraw(struct gui_window_2 *g)
struct rect clip;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &amiplot
};

View File

@ -159,6 +159,7 @@ void ami_history_redraw(struct history_window *hw)
ULONG xs,ys;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &amiplot
};

View File

@ -44,6 +44,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
int plot_height;
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &amiplot
};

View File

@ -1218,6 +1218,7 @@ void ami_tree_redraw_request(int x, int y, int width, int height, void *data)
int pos_x, pos_y;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &amiplot
};

View File

@ -619,6 +619,7 @@ static void browser_redraw_content( struct gui_window * gw, int xoff, int yoff,
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &atari_plotters
};

View File

@ -419,6 +419,7 @@ void tb_url_redraw( struct gui_window * gw )
const struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &atari_plotters
};
short todo[4];

View File

@ -274,6 +274,7 @@ void atari_treeview_redraw( NSTREEVIEW tv)
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &atari_plotters
};

View File

@ -1387,6 +1387,7 @@ gboolean nsbeos_history_expose_event(beosWidget *widget,
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &nsbeos_plotters
};

View File

@ -73,6 +73,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
struct redraw_context ctx;
ctx.interactive = false;
ctx.background_images = true;
ctx.plot = &nsbeos_plotters;
assert(content);

View File

@ -783,7 +783,7 @@ void nsbeos_window_expose_event(BView *view, gui_window *g, BMessage *message)
float scale = g->bw->scale;
struct rect clip;
struct redraw_context ctx = { true, &nsbeos_plotters };
struct redraw_context ctx = { true, true, &nsbeos_plotters };
assert(g);
assert(g->bw);

View File

@ -148,6 +148,7 @@ static inline NSRect cocoa_get_caret_rect( BrowserView *view )
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &cocoa_plotters
};

View File

@ -59,6 +59,7 @@
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &cocoa_plotters
};

View File

@ -127,6 +127,7 @@ static void tree_get_window_dimensions( int *width, int *height, void *data )
{
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &cocoa_plotters
};

View File

@ -34,6 +34,7 @@ bool thumbnail_create(struct hlcache_handle *content, struct bitmap *bitmap,
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &cocoa_plotters
};

View File

@ -304,6 +304,7 @@ fb_redraw(fbtk_widget_t *widget,
struct rect clip;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &fb_plotters
};

View File

@ -62,6 +62,7 @@ localhistory_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi)
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &fb_plotters
};

View File

@ -43,6 +43,7 @@ thumbnail_create(struct hlcache_handle *content,
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &fb_plotters
};

View File

@ -1512,6 +1512,7 @@ static gboolean nsgtk_history_expose_event(GtkWidget *widget,
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &nsgtk_plotters
};

View File

@ -63,6 +63,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &nsgtk_plotters
};

View File

@ -171,6 +171,7 @@ gboolean nsgtk_tree_window_expose_event(GtkWidget *widget,
struct tree *tree = (struct tree *) g;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &nsgtk_plotters
};
int x, y, width, height;

View File

@ -145,6 +145,7 @@ static gboolean nsgtk_window_expose_event(GtkWidget *widget,
struct rect clip;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &nsgtk_plotters
};

View File

@ -449,6 +449,7 @@ monkey_window_handle_redraw(int argc, char **argv)
struct rect clip;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &monkey_plotters
};

View File

@ -584,6 +584,7 @@ void ro_gui_url_bar_redraw(struct url_bar *url_bar, wimp_draw *redraw)
struct content_redraw_data data;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &ro_plotters
};

View File

@ -141,6 +141,7 @@ void ro_gui_history_redraw(wimp_draw *redraw)
os_error *error;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &ro_plotters
};

View File

@ -686,6 +686,7 @@ bool print_document(struct gui_window *g, const char *filename)
/* TODO: turn knockout off for print */
struct redraw_context ctx = {
.interactive = false,
.background_images = false,
.plot = &ro_plotters
};
@ -806,6 +807,7 @@ const char *print_declare_fonts(hlcache_handle *h)
os_error *error;
struct redraw_context ctx = {
.interactive = false,
.background_images = false,
.plot = &print_fonts_plotters
};

View File

@ -95,6 +95,7 @@ bool save_as_draw(hlcache_handle *h, const char *path)
os_error *error;
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &ro_save_draw_plotters
};

View File

@ -88,6 +88,7 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
_kernel_oserror *error;
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &ro_plotters
};

View File

@ -445,6 +445,7 @@ void ro_treeview_redraw_loop(wimp_draw *redraw, ro_treeview *tv, osbool more)
os_error *error;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &ro_plotters
};

View File

@ -1419,6 +1419,7 @@ void ro_gui_window_redraw(wimp_draw *redraw)
os_error *error;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &ro_plotters
};
@ -4097,6 +4098,7 @@ void ro_gui_window_update_boxes(void)
struct gui_window *g;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &ro_plotters
};

View File

@ -39,6 +39,9 @@ struct redraw_context {
* etc. Should be off for printing. */
bool interactive;
/** Render background images. May want it off for printing. */
bool background_images;
/** Current plotters, must be assigned before use. */
const struct plotter_table *plot;
};

View File

@ -307,6 +307,7 @@ nsws_drawable_paint(struct gui_window *gw, HWND hwnd)
PAINTSTRUCT ps;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &win_plotters
};

View File

@ -81,6 +81,7 @@ static void nsws_localhistory_up(struct nsws_localhistory *l, struct gui_window
HDC tmp_hdc;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &win_plotters
};
@ -274,6 +275,7 @@ nsws_localhistory_event_callback(HWND hwnd, UINT msg,
HDC hdc, tmp_hdc;
struct redraw_context ctx = {
.interactive = true,
.background_images = true,
.plot = &win_plotters
};

View File

@ -40,6 +40,7 @@ thumbnail_create(hlcache_handle *content,
HDC hdc, bufferdc, minidc;
struct redraw_context ctx = {
.interactive = false,
.background_images = true,
.plot = &win_plotters
};