Mercurial > hg > forks > geeqie
changeset 1841:c8128aed97f2
renderer interface cleanup
| author | Vladimir Nadvornik <nadvornik@suse.cz> |
|---|---|
| date | Fri, 25 Mar 2011 23:25:15 +0100 |
| parents | e4bd0c06294d |
| children | 5438c8aaac7e |
| files | src/pixbuf-renderer.c src/pixbuf-renderer.h src/renderer-tiles.c |
| diffstat | 3 files changed, 6 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/src/pixbuf-renderer.c Fri Mar 25 23:14:01 2011 +0100 +++ b/src/pixbuf-renderer.c Fri Mar 25 23:25:15 2011 +0100 @@ -930,8 +930,8 @@ static void pr_border_clear(PixbufRenderer *pr) { - pr->renderer->border_draw(pr->renderer, 0, 0, pr->viewport_width, pr->viewport_height); - if (pr->renderer2) pr->renderer2->border_draw(pr->renderer2, 0, 0, pr->viewport_width, pr->viewport_height); + pr->renderer->border_clear(pr->renderer); + if (pr->renderer2) pr->renderer2->border_clear(pr->renderer2); } void pixbuf_renderer_set_color(PixbufRenderer *pr, GdkColor *color)
--- a/src/pixbuf-renderer.h Fri Mar 25 23:14:01 2011 +0100 +++ b/src/pixbuf-renderer.h Fri Mar 25 23:25:15 2011 +0100 @@ -80,7 +80,7 @@ gint clamp, ImageRenderType render, gboolean new_data, gboolean only_existing); void (*area_changed)(void *renderer, gint src_x, gint src_y, gint src_w, gint src_h); void (*queue_clear)(void *renderer); - void (*border_draw)(void *renderer, gint x, gint y, gint w, gint h); + void (*border_clear)(void *renderer); void (*invalidate_all)(void *renderer); void (*invalidate_region)(void *renderer, gint x, gint y, gint w, gint h); void (*scroll)(void *renderer, gint x_off, gint y_off);
--- a/src/renderer-tiles.c Fri Mar 25 23:14:01 2011 +0100 +++ b/src/renderer-tiles.c Fri Mar 25 23:25:15 2011 +0100 @@ -154,13 +154,7 @@ static void rt_queue(RendererTiles *rt, gint x, gint y, gint w, gint h, gint clamp, ImageRenderType render, gboolean new_data, gboolean only_existing); -static void rt_redraw(RendererTiles *rt, gboolean new_data); - - -static void rt_signals_connect(RendererTiles *rt); -static void rt_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer data); static void rt_hierarchy_changed_cb(GtkWidget *widget, GtkWidget *previous_toplevel, gpointer data); -static void pixbuf_renderer_paint(RendererTiles *rt, GdkRectangle *area); static gint rt_queue_draw_idle_cb(gpointer data); #define GET_RIGHT_PIXBUF_OFFSET(rt) \ @@ -1888,14 +1882,6 @@ } } -static void rt_redraw(RendererTiles *rt, gboolean new_data) -{ - PixbufRenderer *pr = rt->pr; - rt_queue_clear(rt); - rt_queue(rt, 0, 0, pr->width, pr->height, TRUE, TILE_RENDER_ALL, new_data, FALSE); -} - - static void rt_scroll(RendererTiles *rt, gint x_off, gint y_off) { PixbufRenderer *pr = rt->pr; @@ -2044,10 +2030,9 @@ rt_queue_clear((RendererTiles *)renderer); } -static void renderer_border_draw(void *renderer, gint x, gint y, gint w, gint h) +static void renderer_border_clear(void *renderer) { - RendererTiles *rt = (RendererTiles *)renderer; - rt_border_draw((RendererTiles *)renderer, x, y, w, h); + rt_border_clear((RendererTiles *)renderer); } @@ -2132,7 +2117,7 @@ rt->f.redraw = renderer_redraw; rt->f.area_changed = renderer_area_changed; rt->f.queue_clear = renderer_queue_clear; - rt->f.border_draw = renderer_border_draw; + rt->f.border_clear = renderer_border_clear; rt->f.free = renderer_free; rt->f.invalidate_all = renderer_invalidate_all; rt->f.invalidate_region = renderer_invalidate_region;