![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 8ce4a35b483991a24b3ee4b88df61daa292e211c..3247a3e1f6692df3d3bcc2b254021573f79dbf3f 100644 (file)
* Raph Levien <raph@gimp.org>
* Lauris Kaplinski <lauris@kaplinski.com>
* fred
+ * bbyak
*
* Copyright (C) 1998 The Free Software Foundation
- * Copyright (C) 2002 Lauris Kaplinski
+ * Copyright (C) 2002-2006 authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
#include <gtk/gtkmain.h>
#include <gtk/gtksignal.h>
+#include <gtkmm.h>
+
#include <helper/sp-marshal.h>
#include <display/sp-canvas.h>
#include "display-forward.h"
#include <libnr/nr-matrix-fns.h>
#include <libnr/nr-matrix-ops.h>
#include <libnr/nr-convex-hull.h>
+#include "prefs-utils.h"
enum {
RENDERMODE_NORMAL,
void sp_canvas_resize_tiles(SPCanvas* canvas,int nl,int nt,int nr,int nb);
void sp_canvas_dirty_rect(SPCanvas* canvas,int nl,int nt,int nr,int nb);
+static int do_update (SPCanvas *canvas);
/**
* Registers the SPCanvas class if necessary, and returns the type ID
canvas->tiles=NULL;
canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0;
canvas->tileH=canvas->tileV=0;
+
+ canvas->redraw_aborted.x0 = NR_HUGE_L;
+ canvas->redraw_aborted.x1 = -NR_HUGE_L;
+ canvas->redraw_aborted.y0 = NR_HUGE_L;
+ canvas->redraw_aborted.y1 = -NR_HUGE_L;
+
+ canvas->redraw_count = 0;
+
+ canvas->forced_redraw_count = 0;
+ canvas->forced_redraw_limit = -1;
+
+ canvas->slowest_buffer = 0;
}
/**
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask);
gdk_window_set_user_data (widget->window, widget);
- gtk_widget_set_events(widget, attributes.event_mask);
+
+ if ( prefs_get_int_attribute ("options.useextinput", "value", 1) )
+ gtk_widget_set_events(widget, attributes.event_mask);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
int button_down = 0;
double x, y;
+ if (!canvas->root) // canvas may have already be destroyed by closing desktop durring interrupted display!
+ return FALSE;
+
int retval = FALSE;
if (canvas->gen_all_enter_events == false) {
return emit_event (canvas, (GdkEvent *) event);
}
-/**
- * Helper that draws a specific rectangular part of the canvas.
- */
static void
-sp_canvas_paint_rect (SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1)
+sp_canvas_paint_single_buffer (SPCanvas *canvas, int x0, int y0, int x1, int y1, int draw_x1, int draw_y1, int draw_x2, int draw_y2, int sw)
{
- g_return_if_fail (!canvas->need_update);
-
GtkWidget *widget = GTK_WIDGET (canvas);
- int draw_x1 = MAX (xx0, canvas->x0);
- int draw_y1 = MAX (yy0, canvas->y0);
- int draw_x2 = MIN (xx1, canvas->x0/*draw_x1*/ + GTK_WIDGET (canvas)->allocation.width);
- int draw_y2 = MIN (yy1, canvas->y0/*draw_y1*/ + GTK_WIDGET (canvas)->allocation.height);
+ SPCanvasBuf buf;
+ if (canvas->rendermode != RENDERMODE_OUTLINE) {
+ buf.buf = nr_pixelstore_256K_new (FALSE, 0);
+ } else {
+ buf.buf = nr_pixelstore_1M_new (FALSE, 0);
+ }
+ buf.buf_rowstride = sw * 3;
+ buf.rect.x0 = x0;
+ buf.rect.y0 = y0;
+ buf.rect.x1 = x1;
+ buf.rect.y1 = y1;
+ buf.visible_rect.x0 = draw_x1;
+ buf.visible_rect.y0 = draw_y1;
+ buf.visible_rect.x1 = draw_x2;
+ buf.visible_rect.y1 = draw_y2;
+ GdkColor *color = &widget->style->bg[GTK_STATE_NORMAL];
+ buf.bg_color = (((color->red & 0xff00) << 8)
+ | (color->green & 0xff00)
+ | (color->blue >> 8));
+ buf.is_empty = true;
+
+ if (canvas->root->flags & SP_CANVAS_ITEM_VISIBLE) {
+ SP_CANVAS_ITEM_GET_CLASS (canvas->root)->render (canvas->root, &buf);
+ }
+
+ if (buf.is_empty) {
+ gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color);
+ gdk_draw_rectangle (SP_CANVAS_WINDOW (canvas),
+ canvas->pixmap_gc,
+ TRUE,
+ x0 - canvas->x0, y0 - canvas->y0,
+ x1 - x0, y1 - y0);
+ } else {
+ gdk_draw_rgb_image_dithalign (SP_CANVAS_WINDOW (canvas),
+ canvas->pixmap_gc,
+ x0 - canvas->x0, y0 - canvas->y0,
+ x1 - x0, y1 - y0,
+ GDK_RGB_DITHER_MAX,
+ buf.buf,
+ sw * 3,
+ x0 - canvas->x0, y0 - canvas->y0);
+ }
+
+ if (canvas->rendermode != RENDERMODE_OUTLINE) {
+ nr_pixelstore_256K_free (buf.buf);
+ } else {
+ nr_pixelstore_1M_free (buf.buf);
+ }
+}
+
+/* Paint the given rect, while updating canvas->redraw_aborted and running iterations after each
+ * buffer; make sure canvas->redraw_aborted never goes past aborted_limit (used for 2-rect
+ * optimized repaint)
+ */
+static int
+sp_canvas_paint_rect_internal (SPCanvas *canvas, NRRectL *rect, NR::ICoord *x_aborted_limit, NR::ICoord *y_aborted_limit)
+{
+ int draw_x1 = rect->x0;
+ int draw_x2 = rect->x1;
+ int draw_y1 = rect->y0;
+ int draw_y2 = rect->y1;
+
+ // Here we'll store the time it took to draw the slowest buffer of this paint.
+ glong slowest_buffer = 0;
+
+ // Find the optimal buffer dimensions
int bw = draw_x2 - draw_x1;
int bh = draw_y2 - draw_y1;
if ((bw < 1) || (bh < 1))
- return;
-
+ return 0;
int sw, sh;
if (canvas->rendermode != RENDERMODE_OUTLINE) { // use 256K as a compromise to not slow down gradients
/* 256K is the cached buffer and we need 3 channels */
@@ -1546,65 +1624,230 @@ sp_canvas_paint_rect (SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1)
sh = 512;
}
}
+
+ // Will this paint require more than one buffer?
+ bool multiple_buffers = (((draw_y2 - draw_y1) > sh) || ((draw_x2 - draw_x1) > sw)); // or two_rects
+
+ // remember the counter during this paint
+ long this_count = canvas->redraw_count;
+
+ // Time values to measure each buffer's paint time
+ GTimeVal tstart, tfinish;
- // As we can come from expose, we have to tile here
+ // This is the main loop which corresponds to the visible left-to-right, top-to-bottom drawing
+ // of screen blocks (buffers).
for (int y0 = draw_y1; y0 < draw_y2; y0 += sh) {
int y1 = MIN (y0 + sh, draw_y2);
for (int x0 = draw_x1; x0 < draw_x2; x0 += sw) {
int x1 = MIN (x0 + sw, draw_x2);
- SPCanvasBuf buf;
- if (canvas->rendermode != RENDERMODE_OUTLINE) {
- buf.buf = nr_pixelstore_256K_new (FALSE, 0);
- } else {
- buf.buf = nr_pixelstore_1M_new (FALSE, 0);
- }
-
- buf.buf_rowstride = sw * 3;
- buf.rect.x0 = x0;
- buf.rect.y0 = y0;
- buf.rect.x1 = x1;
- buf.rect.y1 = y1;
- buf.visible_rect.x0 = draw_x1;
- buf.visible_rect.y0 = draw_y1;
- buf.visible_rect.x1 = draw_x2;
- buf.visible_rect.y1 = draw_y2;
- GdkColor *color = &widget->style->bg[GTK_STATE_NORMAL];
- buf.bg_color = (((color->red & 0xff00) << 8)
- | (color->green & 0xff00)
- | (color->blue >> 8));
- buf.is_empty = true;
-
- if (canvas->root->flags & SP_CANVAS_ITEM_VISIBLE) {
- SP_CANVAS_ITEM_GET_CLASS (canvas->root)->render (canvas->root, &buf);
+ // OPTIMIZATION IDEA: if drawing is really slow (as measured by canvas->slowest
+ // buffer), process some events even BEFORE we do any buffers?
+
+ // Paint one buffer; measure how long it takes.
+ g_get_current_time (&tstart);
+ sp_canvas_paint_single_buffer (canvas, x0, y0, x1, y1, draw_x1, draw_y1, draw_x2, draw_y2, sw);
+ g_get_current_time (&tfinish);
+
+ // Remember the slowest_buffer of this paint.
+ glong this_buffer = (tfinish.tv_sec - tstart.tv_sec) * 1000000 + (tfinish.tv_usec - tstart.tv_usec);
+ if (this_buffer > slowest_buffer)
+ slowest_buffer = this_buffer;
+
+ // After each successful buffer, reduce the rect remaining to redraw by what is already redrawn
+ if (x1 >= draw_x2 && canvas->redraw_aborted.y0 < y1)
+ canvas->redraw_aborted.y0 = y1;
+ if (y_aborted_limit != NULL && canvas->redraw_aborted.y0 > *y_aborted_limit)
+ canvas->redraw_aborted.y0 = *y_aborted_limit;
+
+ if (y1 >= draw_y2 && canvas->redraw_aborted.x0 < x1)
+ canvas->redraw_aborted.x0 = x1;
+ if (x_aborted_limit != NULL && canvas->redraw_aborted.x0 > *x_aborted_limit)
+ canvas->redraw_aborted.x0 = *x_aborted_limit;
+
+ // INTERRUPTIBLE DISPLAY:
+ // Process events that may have arrived while we were busy drawing;
+ // only if we're drawing multiple buffers, and only if this one was not very fast,
+ // and only if we're allowed to interrupt this redraw
+ bool ok_to_interrupt = (multiple_buffers && this_buffer > 25000);
+ if (ok_to_interrupt && (canvas->forced_redraw_limit != -1)) {
+ ok_to_interrupt = (canvas->forced_redraw_count < canvas->forced_redraw_limit);
}
-
- if (buf.is_empty) {
- gdk_rgb_gc_set_foreground (canvas->pixmap_gc, buf.bg_color);
- gdk_draw_rectangle (SP_CANVAS_WINDOW (canvas),
- canvas->pixmap_gc,
- TRUE,
- x0 - canvas->x0, y0 - canvas->y0,
- x1 - x0, y1 - y0);
+
+ if (ok_to_interrupt) {
+ // Run at most max_iterations of the main loop; we cannot process ALL events
+ // here because some things (e.g. rubberband) flood with dirtying events but will
+ // not redraw themselves
+ int max_iterations = 10;
+ int iterations = 0;
+ while (Gtk::Main::events_pending() && iterations++ < max_iterations) {
+ Gtk::Main::iteration(false);
+ // If one of the iterations has redrawn by itself, abort
+ if (this_count != canvas->redraw_count) {
+ canvas->slowest_buffer = slowest_buffer;
+ if (canvas->forced_redraw_limit != -1) {
+ canvas->forced_redraw_count++;
+ }
+ return 1; // interrupted
+ }
+ }
+
+ // If not aborted so far, check if the events set redraw or update flags;
+ // if so, force update and abort
+ if (canvas->need_redraw || canvas->need_update) {
+ canvas->slowest_buffer = slowest_buffer;
+ if (canvas->forced_redraw_limit != -1) {
+ canvas->forced_redraw_count++;
+ }
+ do_update (canvas);
+ return 1; // interrupted
+ }
+ }
+ }
+ }
+
+ // Remember the slowest buffer of this paint in canvas
+ canvas->slowest_buffer = slowest_buffer;
+
+ return 0; // finished
+}
+
+
+/**
+ * Helper that draws a specific rectangular part of the canvas.
+ */
+static void
+sp_canvas_paint_rect (SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1)
+{
+ g_return_if_fail (!canvas->need_update);
+
+ // Monotonously increment the canvas-global counter on each paint. This will let us find out
+ // when a new paint happened in event processing during this paint, so we can abort it.
+ canvas->redraw_count++;
+
+ NRRectL rect;
+ rect.x0 = xx0;
+ rect.x1 = xx1;
+ rect.y0 = yy0;
+ rect.y1 = yy1;
+
+ // Clip rect-to-draw by the current visible area
+ rect.x0 = MAX (rect.x0, canvas->x0);
+ rect.y0 = MAX (rect.y0, canvas->y0);
+ rect.x1 = MIN (rect.x1, canvas->x0/*draw_x1*/ + GTK_WIDGET (canvas)->allocation.width);
+ rect.y1 = MIN (rect.y1, canvas->y0/*draw_y1*/ + GTK_WIDGET (canvas)->allocation.height);
+
+ // Clip rect-aborted-last-time by the current visible area
+ canvas->redraw_aborted.x0 = MAX (canvas->redraw_aborted.x0, canvas->x0);
+ canvas->redraw_aborted.y0 = MAX (canvas->redraw_aborted.y0, canvas->y0);
+ canvas->redraw_aborted.x1 = MIN (canvas->redraw_aborted.x1, canvas->x0/*draw_x1*/ + GTK_WIDGET (canvas)->allocation.width);
+ canvas->redraw_aborted.y1 = MIN (canvas->redraw_aborted.y1, canvas->y0/*draw_y1*/ + GTK_WIDGET (canvas)->allocation.height);
+
+ if (canvas->redraw_aborted.x0 < canvas->redraw_aborted.x1 && canvas->redraw_aborted.y0 < canvas->redraw_aborted.y1) {
+ // There was an aborted redraw last time, now we need to redraw BOTH it and the new rect.
+
+ // save the old aborted rect in case we decide to paint it separately (see below)
+ NRRectL aborted = canvas->redraw_aborted;
+
+ // calculate the rectangle union of the both rects (the smallest rectangle which covers both)
+ NRRectL nion;
+ nr_rect_l_union (&nion, &rect, &aborted);
+
+ // subtract one of the rects-to-draw from the other (the smallest rectangle which covers
+ // all of the first not covered by the second)
+ NRRectL rect_minus_aborted;
+ nr_rect_l_subtract (&rect_minus_aborted, &rect, &aborted);
+
+ // Initially, the rect to redraw later (in case we're aborted) is the same as the union of both rects
+ canvas->redraw_aborted = nion;
+
+ // calculate areas of the three rects
+ if ((nr_rect_l_area(&rect_minus_aborted) + nr_rect_l_area(&aborted)) * 1.2 < nr_rect_l_area(&nion)) {
+ // If the summary area of the two rects is significantly (at least by 20%) less than
+ // the area of their rectangular union, it makes sense to paint the two rects
+ // separately instead of painting their union. This gives a significant speedup when,
+ // for example, your current canvas is almost painted, with only a strip at bottom
+ // left, and at that moment you abort it by scrolling down which reveals a new strip at
+ // the top. Straightforward painting of the union of the aborted rect and the new rect
+ // will have to repaint the entire canvas! By contrast, the optimized approach below
+ // paints the two narrow strips in order which is much faster.
+
+ // find out which rect to draw first - compare them first by y then by x of the top left corners
+ NRRectL *first;
+ NRRectL *second;
+ if (rect.y0 == aborted.y0) {
+ if (rect.x0 < aborted.x0) {
+ first = ▭
+ second = &aborted;
+ } else {
+ second = ▭
+ first = &aborted;
+ }
+ } else if (rect.y0 < aborted.y0) {
+ first = ▭
+ second = &aborted;
} else {
- gdk_draw_rgb_image_dithalign (SP_CANVAS_WINDOW (canvas),
- canvas->pixmap_gc,
- x0 - canvas->x0, y0 - canvas->y0,
- x1 - x0, y1 - y0,
- GDK_RGB_DITHER_MAX,
- buf.buf,
- sw * 3,
- x0 - canvas->x0, y0 - canvas->y0);
+ second = ▭
+ first = &aborted;
+ }
+
+ NRRectL second_minus_first;
+ nr_rect_l_subtract (&second_minus_first, second, first);
+
+ // paint the first rect;
+ if (sp_canvas_paint_rect_internal (canvas, first, &(second_minus_first.x0), &(second_minus_first.y0))) {
+ // aborted!
+ return;
+ }
+
+ // if not aborted, assign (second rect minus first) as the new redraw_aborted and paint the same
+ canvas->redraw_aborted = second_minus_first;
+ if (sp_canvas_paint_rect_internal (canvas, &second_minus_first, NULL, NULL)) {
+ return; // aborted
+ }
+
+ } else {
+ // no need for separate drawing, just draw the union as one rect
+ if (sp_canvas_paint_rect_internal (canvas, &nion, NULL, NULL)) {
+ return; // aborted
}
+ }
+ } else {
+ // Nothing was aborted last time, just draw the rect we're given
- if (canvas->rendermode != RENDERMODE_OUTLINE) {
- nr_pixelstore_256K_free (buf.buf);
- } else {
- nr_pixelstore_1M_free (buf.buf);
- }
+ // Initially, the rect to redraw later (in case we're aborted) is the same as the one we're going to draw now.
+ canvas->redraw_aborted = rect;
+ if (sp_canvas_paint_rect_internal (canvas, &rect, NULL, NULL)) {
+ return; // aborted
}
}
+
+ // we've had a full unaborted redraw, reset the full redraw counter
+ if (canvas->forced_redraw_limit != -1) {
+ canvas->forced_redraw_count = 0;
+ }
+}
+
+/**
+ * Force a full redraw after a specified number of interrupted redraws
+ */
+void
+sp_canvas_force_full_redraw_after_interruptions(SPCanvas *canvas, unsigned int count) {
+ g_return_if_fail(canvas != NULL);
+
+ canvas->forced_redraw_limit = count;
+ canvas->forced_redraw_count = 0;
+}
+
+/**
+ * End forced full redraw requests
+ */
+void
+sp_canvas_end_forced_full_redraws(SPCanvas *canvas) {
+ g_return_if_fail(canvas != NULL);
+
+ canvas->forced_redraw_limit = -1;
}
/**
rect.x1 = rect.x0 + rects[i].width;
rect.y1 = rect.y0 + rects[i].height;
- if (canvas->need_update || canvas->need_redraw) {
- sp_canvas_request_redraw (canvas, rect.x0, rect.y0, rect.x1, rect.y1);
- } else {
- /* No pending updates, draw exposed area immediately */
- sp_canvas_paint_rect (canvas, rect.x0, rect.y0, rect.x1, rect.y1);
- }
+ sp_canvas_request_redraw (canvas, rect.x0, rect.y0, rect.x1, rect.y1);
}
if (n_rects > 0)
}
}
+ canvas->need_redraw = FALSE;
sp_canvas_paint_rect (canvas, topaint.x0, topaint.y0, topaint.x1, topaint.y1);
- canvas->need_redraw = FALSE;
return TRUE;
}
static int
do_update (SPCanvas *canvas)
{
+ if (!canvas->root) // canvas may have already be destroyed by closing desktop durring interrupted display!
+ return TRUE;
+
/* Cause the update if necessary */
if (canvas->need_update) {
sp_canvas_item_invoke_update (canvas->root, NR::identity(), 0);
nr_rect_l_intersect (&clip, &bbox, &visible);
- sp_canvas_dirty_rect(canvas,x0,y0,x1,y1);
+ sp_canvas_dirty_rect(canvas, clip.x0, clip.y0, clip.x1, clip.y1);
add_idle (canvas);
}