index 1c1171d35c0c474626f28ac626aada592f0ab71c..9cc37a1a0c5b6b1c5a885b3a33d737a1b828164b 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"
+#include "inkscape.h"
+#include "sodipodi-ctrlrect.h"
+#if ENABLE_LCMS
+#include "color-profile-fns.h"
+#endif // ENABLE_LCMS
+#include "display/rendermode.h"
-enum {
- RENDERMODE_NORMAL,
- RENDERMODE_NOAA,
- RENDERMODE_OUTLINE
-};
+// Define this to visualize the regions to be redrawn
+//#define DEBUG_REDRAW 1;
-const gint sp_canvas_update_priority = G_PRIORITY_HIGH_IDLE;
+// Tiles are a way to minimize the number of redraws, eliminating too small redraws.
+// The canvas stores a 2D array of ints, each representing a TILE_SIZExTILE_SIZE pixels tile.
+// If any part of it is dirtied, the entire tile is dirtied (its int is nonzero) and repainted.
+#define TILE_SIZE 16
+
+static gint const sp_canvas_update_priority = G_PRIORITY_HIGH_IDLE;
#define SP_CANVAS_WINDOW(c) (((GtkWidget *) (c))->window)
static void sp_canvas_item_class_init (SPCanvasItemClass *klass);
static void sp_canvas_item_init (SPCanvasItem *item);
static void sp_canvas_item_dispose (GObject *object);
-static void sp_canvas_item_construct (SPCanvasItem *item, SPCanvasGroup *parent, const gchar *first_arg_name, va_list args);
+static void sp_canvas_item_construct (SPCanvasItem *item, SPCanvasGroup *parent, gchar const *first_arg_name, va_list args);
static int emit_event (SPCanvas *canvas, GdkEvent *event);
{
static GType type = 0;
if (!type) {
- static const GTypeInfo info = {
+ static GTypeInfo const info = {
sizeof (SPCanvasItemClass),
NULL, NULL,
(GClassInitFunc) sp_canvas_item_class_init,
item_signals[ITEM_EVENT] = g_signal_new ("event",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (SPCanvasItemClass, event),
+ ((glong)((guint8*)&(klass->event) - (guint8*)klass)),
NULL, NULL,
sp_marshal_BOOLEAN__POINTER,
G_TYPE_BOOLEAN, 1,
* Constructs new SPCanvasItem on SPCanvasGroup.
*/
SPCanvasItem *
-sp_canvas_item_new (SPCanvasGroup *parent, GtkType type, const gchar *first_arg_name, ...)
+sp_canvas_item_new (SPCanvasGroup *parent, GtkType type, gchar const *first_arg_name, ...)
{
va_list args;
@@ -175,7 +187,7 @@ sp_canvas_item_new (SPCanvasGroup *parent, GtkType type, const gchar *first_arg_
* We make it static for encapsulation reasons since it was nowhere used.
*/
static void
-sp_canvas_item_construct (SPCanvasItem *item, SPCanvasGroup *parent, const gchar *first_arg_name, va_list args)
+sp_canvas_item_construct (SPCanvasItem *item, SPCanvasGroup *parent, gchar const *first_arg_name, va_list args)
{
g_return_if_fail (SP_IS_CANVAS_GROUP (parent));
g_return_if_fail (SP_IS_CANVAS_ITEM (item));
@@ -188,8 +200,6 @@ sp_canvas_item_construct (SPCanvasItem *item, SPCanvasGroup *parent, const gchar
group_add (SP_CANVAS_GROUP (item->parent), item);
sp_canvas_item_request_update (item);
- sp_canvas_request_redraw (item->canvas, (int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1));
- item->canvas->need_repick = TRUE;
}
/**
redraw_if_visible (SPCanvasItem *item)
{
if (item->flags & SP_CANVAS_ITEM_VISIBLE) {
- sp_canvas_request_redraw (item->canvas, (int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1));
+ int x0 = (int)(item->x1);
+ int x1 = (int)(item->x2);
+ int y0 = (int)(item->y1);
+ int y1 = (int)(item->y2);
+
+ if (x0 !=0 || x1 !=0 || y0 !=0 || y1 !=0) {
+ sp_canvas_request_redraw (item->canvas, (int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1));
+ }
}
}
{
SPCanvasItem *item = SP_CANVAS_ITEM (object);
- redraw_if_visible (item);
+ // Hack: if this is a ctrlrect, move it to 0,0;
+ // this redraws only the stroke of the rect to be deleted,
+ // avoiding redraw of the entire area
+ if (SP_IS_CTRLRECT(item)) {
+ SP_CTRLRECT(object)->setRectangle(NR::Rect(NR::Point(0,0),NR::Point(0,0)));
+ SP_CTRLRECT(object)->update(item->xform, 0);
+ } else {
+ redraw_if_visible (item);
+ }
item->flags &= ~SP_CANVAS_ITEM_VISIBLE;
if (item == item->canvas->current_item) {
@@ -268,11 +293,11 @@ sp_canvas_item_invoke_update (SPCanvasItem *item, NR::Matrix const &affine, unsi
GTK_OBJECT_UNSET_FLAGS (item, SP_CANVAS_ITEM_NEED_AFFINE);
}
-/**
- * Helper function to invoke the point method of the item.
+/**
+ * Helper function to invoke the point method of the item.
*
- * The argument x, y should be in the parent's item-relative coordinate
- * system. This routine applies the inverse of the item's transform,
+ * The argument x, y should be in the parent's item-relative coordinate
+ * system. This routine applies the inverse of the item's transform,
* maintaining the affine invariant.
*/
static double
@@ -287,12 +312,12 @@ sp_canvas_item_invoke_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **act
/**
* Makes the item's affine transformation matrix be equal to the specified
* matrix.
- *
+ *
* @item: A canvas item.
* @affine: An affine transformation matrix.
*/
void
-sp_canvas_item_affine_absolute (SPCanvasItem *item, NR::Matrix const& affine)
+sp_canvas_item_affine_absolute (SPCanvasItem *item, NR::Matrix const &affine)
{
item->xform = affine;
}
/**
- * Convenience function to reorder items in a group's child list.
+ * Convenience function to reorder items in a group's child list.
*
* This puts the specified link after the "before" link.
*/
/**
* Raises the item in its parent's stack by the specified number of positions.
- *
+ *
* \param item A canvas item.
* \param positions Number of steps to raise the item.
*
item->flags |= SP_CANVAS_ITEM_VISIBLE;
- sp_canvas_request_redraw (item->canvas, (int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1));
- item->canvas->need_repick = TRUE;
+ int x0 = (int)(item->x1);
+ int x1 = (int)(item->x2);
+ int y0 = (int)(item->y1);
+ int y1 = (int)(item->y2);
+
+ if (x0 !=0 || x1 !=0 || y0 !=0 || y1 !=0) {
+ sp_canvas_request_redraw (item->canvas, (int)(item->x1), (int)(item->y1), (int)(item->x2 + 1), (int)(item->y2 + 1));
+ item->canvas->need_repick = TRUE;
+ }
}
/**
item->flags &= ~SP_CANVAS_ITEM_VISIBLE;
- sp_canvas_request_redraw (item->canvas, (int)item->x1, (int)item->y1, (int)(item->x2 + 1), (int)(item->y2 + 1));
- item->canvas->need_repick = TRUE;
+ int x0 = (int)(item->x1);
+ int x1 = (int)(item->x2);
+ int y0 = (int)(item->y1);
+ int y1 = (int)(item->y2);
+
+ if (x0 !=0 || x1 !=0 || y0 !=0 || y1 !=0) {
+ sp_canvas_request_redraw (item->canvas, (int)item->x1, (int)item->y1, (int)(item->x2 + 1), (int)(item->y2 + 1));
+ item->canvas->need_repick = TRUE;
+ }
}
/**
* Grab item under cursor.
- *
+ *
* \pre !canvas->grabbed_item && item->flags & SP_CANVAS_ITEM_VISIBLE
*/
int
@@ -507,7 +546,7 @@ sp_canvas_item_grab (SPCanvasItem *item, guint event_mask, GdkCursor *cursor, gu
/**
* Ungrabs the item, which must have been grabbed in the canvas, and ungrabs the
* mouse.
- *
+ *
* \param item A canvas item that holds a grab.
* \param etime The timestamp for ungrabbing the mouse.
*/
/**
* Requests that the canvas queue an update for the specified item.
- *
+ *
* To be used only by item implementations.
*/
void
/**
* Registers SPCanvasGroup class with Gtk and returns its type number.
*/
-GtkType
-sp_canvas_group_get_type (void)
+GType sp_canvas_group_get_type(void)
{
- static GtkType group_type = 0;
-
- if (!group_type) {
- static const GtkTypeInfo group_info = {
- "SPCanvasGroup",
- sizeof (SPCanvasGroup),
- sizeof (SPCanvasGroupClass),
- (GtkClassInitFunc) sp_canvas_group_class_init,
- (GtkObjectInitFunc) sp_canvas_group_init,
- NULL, NULL, NULL
+ static GType type = 0;
+ if (!type) {
+ GTypeInfo info = {
+ sizeof(SPCanvasGroupClass),
+ 0, // base_init
+ 0, // base_finalize
+ (GClassInitFunc)sp_canvas_group_class_init,
+ 0, // class_finalize
+ 0, // class_data
+ sizeof(SPCanvasGroup),
+ 0, // n_preallocs
+ (GInstanceInitFunc)sp_canvas_group_init,
+ 0 // value_table
};
-
- group_type = gtk_type_unique (sp_canvas_item_get_type (), &group_info);
+ type = g_type_register_static(sp_canvas_item_get_type(), "SPCanvasGroup", &info, static_cast<GTypeFlags>(0));
}
-
- return group_type;
+ return type;
}
/**
}
/**
- * Callback that destroys all items in group and calls group's virtual
+ * Callback that destroys all items in group and calls group's virtual
* destroy() function.
*/
static void
g_return_if_fail (object != NULL);
g_return_if_fail (SP_IS_CANVAS_GROUP (object));
- const SPCanvasGroup *group = SP_CANVAS_GROUP (object);
+ SPCanvasGroup const *group = SP_CANVAS_GROUP (object);
GList *list = group->items;
while (list) {
static void
sp_canvas_group_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
{
- const SPCanvasGroup *group = SP_CANVAS_GROUP (item);
+ SPCanvasGroup const *group = SP_CANVAS_GROUP (item);
NR::ConvexHull corners(NR::Point(0, 0));
bool empty=true;
@@ -735,11 +774,16 @@ sp_canvas_group_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
}
}
- NR::Rect const &bounds = corners.bounds();
- item->x1 = bounds.min()[NR::X];
- item->y1 = bounds.min()[NR::Y];
- item->x2 = bounds.max()[NR::X];
- item->y2 = bounds.max()[NR::Y];
+ NR::Maybe<NR::Rect> const bounds = corners.bounds();
+ if (bounds) {
+ item->x1 = bounds->min()[NR::X];
+ item->y1 = bounds->min()[NR::Y];
+ item->x2 = bounds->max()[NR::X];
+ item->y2 = bounds->max()[NR::Y];
+ } else {
+ // FIXME ?
+ item->x1 = item->x2 = item->y1 = item->y2 = 0;
+ }
}
/**
@@ -748,9 +792,9 @@ sp_canvas_group_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned i
static double
sp_canvas_group_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_item)
{
- const SPCanvasGroup *group = SP_CANVAS_GROUP (item);
- const double x = p[NR::X];
- const double y = p[NR::Y];
+ SPCanvasGroup const *group = SP_CANVAS_GROUP (item);
+ double const x = p[NR::X];
+ double const y = p[NR::Y];
int x1 = (int)(x - item->canvas->close_enough);
int y1 = (int)(y - item->canvas->close_enough);
int x2 = (int)(x + item->canvas->close_enough);
@@ -790,7 +834,7 @@ sp_canvas_group_point (SPCanvasItem *item, NR::Point p, SPCanvasItem **actual_it
static void
sp_canvas_group_render (SPCanvasItem *item, SPCanvasBuf *buf)
{
- const SPCanvasGroup *group = SP_CANVAS_GROUP (item);
+ SPCanvasGroup const *group = SP_CANVAS_GROUP (item);
for (GList *list = group->items; list; list = list->next) {
SPCanvasItem *child = (SPCanvasItem *)list->data;
sp_canvas_item_request_update (item);
}
-/**
+/**
* Removes an item from a canvas group
*/
static void
static GtkWidgetClass *canvas_parent_class;
-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 void sp_canvas_resize_tiles(SPCanvas* canvas, int nl, int nt, int nr, int nb);
+static void sp_canvas_dirty_rect(SPCanvas* canvas, int nl, int nt, int nr, int nb);
+static void sp_canvas_mark_rect(SPCanvas* canvas, int nl, int nt, int nr, int nb, uint8_t val);
+static int do_update (SPCanvas *canvas);
/**
* Registers the SPCanvas class if necessary, and returns the type ID
*
* \return The type ID of the SPCanvas class.
**/
-GtkType
-sp_canvas_get_type (void)
-{
- static GtkType canvas_type = 0;
-
- if (!canvas_type) {
- static const GtkTypeInfo canvas_info = {
- "SPCanvas",
- sizeof (SPCanvas),
- sizeof (SPCanvasClass),
- (GtkClassInitFunc) sp_canvas_class_init,
- (GtkObjectInitFunc) sp_canvas_init,
- NULL, NULL, NULL
+GType sp_canvas_get_type(void)
+{
+ static GType type = 0;
+ if (!type) {
+ GTypeInfo info = {
+ sizeof(SPCanvasClass),
+ 0, // base_init
+ 0, // base_finalize
+ (GClassInitFunc)sp_canvas_class_init,
+ 0, // class_finalize
+ 0, // class_data
+ sizeof(SPCanvas),
+ 0, // n_preallocs
+ (GInstanceInitFunc)sp_canvas_init,
+ 0 // value_table
};
-
- canvas_type = gtk_type_unique (GTK_TYPE_WIDGET, &canvas_info);
+ type = g_type_register_static(GTK_TYPE_WIDGET, "SPCanvas", &info, static_cast<GTypeFlags>(0));
}
-
- return canvas_type;
+ return type;
}
/**
widget_class->focus_out_event = sp_canvas_focus_out;
}
-/**
+/**
* Callback: object initialization for SPCanvas.
*/
static void
canvas->need_repick = TRUE;
+ // See comment at in sp-canvas.h.
+ canvas->gen_all_enter_events = false;
+
canvas->tiles=NULL;
canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0;
canvas->tileH=canvas->tileV=0;
+
+ canvas->forced_redraw_count = 0;
+ canvas->forced_redraw_limit = -1;
+
+#if ENABLE_LCMS
+ canvas->enable_cms_display_adj = false;
+ canvas->cms_key = new Glib::ustring("");
+#endif // ENABLE_LCMS
+
+ canvas->is_scrolling = false;
+
}
/**
if (canvas->need_redraw) {
canvas->need_redraw = FALSE;
}
- if ( canvas->tiles ) free(canvas->tiles);
+ if ( canvas->tiles ) g_free(canvas->tiles);
canvas->tiles=NULL;
canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0;
canvas->tileH=canvas->tileV=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);
+
+ widget->style = gtk_style_attach (widget->style, widget->window);
GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
{
SPCanvas *canvas = SP_CANVAS (widget);
+ canvas->current_item = NULL;
+ canvas->grabbed_item = NULL;
+ canvas->focused_item = NULL;
+
shutdown_transients (canvas);
gdk_gc_destroy (canvas->pixmap_gc);
}
widget->allocation = *allocation;
-
+
if (GTK_WIDGET_REALIZED (widget)) {
gdk_window_move_resize (widget->window,
widget->allocation.x, widget->allocation.y,
}
/**
- * Helper that emits an event for an item in the canvas, be it the current
+ * Helper that emits an event for an item in the canvas, be it the current
* item, grabbed item, or focused item, as appropriate.
*/
static int
}
/**
- * Helper that re-picks the current item in the canvas, based on the event's
+ * Helper that re-picks the current item in the canvas, based on the event's
* coordinates and emits enter/leave events for items as appropriate.
*/
static int
pick_current_item (SPCanvas *canvas, GdkEvent *event)
{
+ 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) {
+ // If a button is down, we'll perform enter and leave events on the
+ // current item, but not enter on any other item. This is more or
+ // less like X pointer grabbing for canvas items.
+ //
+ button_down = canvas->state & (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK |
+ GDK_BUTTON3_MASK | GDK_BUTTON4_MASK | GDK_BUTTON5_MASK);
+
+ if (!button_down) canvas->left_grabbed_item = FALSE;
+ }
+
/* Save the event in the canvas. This is used to synthesize enter and
* leave events in case the current item changes. It is also used to
* re-pick the current item if the current one gets deleted. Also,
canvas->in_repick = FALSE;
}
+ if (canvas->gen_all_enter_events == false) {
+ // new_current_item may have been set to NULL during the call to
+ // emit_event() above
+ if ((canvas->new_current_item != canvas->current_item) && button_down) {
+ canvas->left_grabbed_item = TRUE;
+ return retval;
+ }
+ }
+
/* Handle the rest of cases */
canvas->left_grabbed_item = FALSE;
/* dispatch normally regardless of the event's window if an item has
has a pointer grab in effect */
- if (!canvas->grabbed_item &&
+ if (!canvas->grabbed_item &&
event->window != SP_CANVAS_WINDOW (canvas))
return retval;
if (event->window != SP_CANVAS_WINDOW (canvas))
return FALSE;
+ if (canvas->pixmap_gc == NULL) // canvas being deleted
+ return FALSE;
+
if (canvas->grabbed_event_mask & GDK_POINTER_MOTION_HINT_MASK) {
gint x, y;
gdk_window_get_pointer (widget->window, &x, &y, NULL);
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 != Inkscape::RENDERMODE_OUTLINE) {
+ buf.buf = nr_pixelstore_256K_new (FALSE, 0);
+ } else {
+ buf.buf = nr_pixelstore_1M_new (FALSE, 0);
+ }
+
+ // Mark the region clean
+ sp_canvas_mark_rect(canvas, x0, y0, x1, y1, 0);
+
+ buf.buf_rowstride = sw * 3; // CAIRO FIXME: for cairo output, the buffer must be RGB unpacked, i.e. sw * 4
+ 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);
+ }
- int bw = draw_x2 - draw_x1;
- int bh = draw_y2 - draw_y1;
+#if ENABLE_LCMS
+ cmsHTRANSFORM transf = 0;
+ long long int fromDisplay = prefs_get_int_attribute_limited( "options.displayprofile", "from_display", 0, 0, 1 );
+ if ( fromDisplay ) {
+ transf = Inkscape::colorprofile_get_display_per( canvas->cms_key ? *(canvas->cms_key) : "" );
+ } else {
+ transf = Inkscape::colorprofile_get_display_transform();
+ }
+#endif // ENABLE_LCMS
+
+ if (buf.is_empty) {
+#if ENABLE_LCMS
+ if ( transf && canvas->enable_cms_display_adj ) {
+ cmsDoTransform( transf, &buf.bg_color, &buf.bg_color, 1 );
+ }
+#endif // ENABLE_LCMS
+ 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 {
+/*
+// CAIRO FIXME: after SPCanvasBuf is made 32bpp throughout, this rgb_draw below can be replaced with the below.
+// Why this must not be done currently:
+// - all canvas items (handles, nodes etc) paint themselves assuming 24bpp
+// - cairo assumes bgra, but we have rgba, so r and b get swapped (until we paint all with cairo too)
+// - it does not seem to be any faster; in fact since with 32bpp, buf contains less pixels,
+// we need more bufs to paint a given area and as a result it's even a bit slower
+
+ cairo_surface_t* cst = cairo_image_surface_create_for_data (
+ buf.buf,
+ CAIRO_FORMAT_RGB24, // unpacked, i.e. 32 bits! one byte is unused
+ x1 - x0, y1 - y0,
+ buf.buf_rowstride
+ );
+ cairo_t *ct = gdk_cairo_create(SP_CANVAS_WINDOW (canvas));
+ cairo_set_source_surface (ct, cst, x0 - canvas->x0, y0 - canvas->y0);
+ cairo_paint (ct);
+ cairo_destroy (ct);
+ cairo_surface_finish (cst);
+ cairo_surface_destroy (cst);
+*/
+
+#if ENABLE_LCMS
+ if ( transf && canvas->enable_cms_display_adj ) {
+ for ( gint yy = 0; yy < (y1 - y0); yy++ ) {
+ guchar* p = buf.buf + (sw * 3) * yy;
+ cmsDoTransform( transf, p, p, (x1 - x0) );
+ }
+ }
+#endif // ENABLE_LCMS
+
+ 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 != Inkscape::RENDERMODE_OUTLINE) {
+ nr_pixelstore_256K_free (buf.buf);
+ } else {
+ nr_pixelstore_1M_free (buf.buf);
+ }
+}
+
+struct PaintRectSetup {
+ SPCanvas* canvas;
+ NRRectL big_rect;
+ GTimeVal start_time;
+ int max_pixels;
+ NR::Point mouse_loc;
+};
+
+/**
+ * Paint the given rect, recursively subdividing the region until it is the size of a single
+ * buffer.
+ *
+ * @return true if the drawing completes
+ */
+static int
+sp_canvas_paint_rect_internal (PaintRectSetup const *setup, NRRectL this_rect)
+{
+ GTimeVal now;
+ g_get_current_time (&now);
+
+ glong elapsed = (now.tv_sec - setup->start_time.tv_sec) * 1000000
+ + (now.tv_usec - setup->start_time.tv_usec);
+
+ // Allow only very fast buffers to be run together;
+ // as soon as the total redraw time exceeds 1ms, cancel;
+ // this returns control to the idle loop and allows Inkscape to process user input
+ // (potentially interrupting the redraw); as soon as Inkscape has some more idle time,
+ // it will get back and finish painting what remains to paint.
+ if (elapsed > 1000) {
+
+ // Interrupting redraw isn't always good.
+ // For example, when you drag one node of a big path, only the buffer containing
+ // the mouse cursor will be redrawn again and again, and the rest of the path
+ // will remain stale because Inkscape never has enough idle time to redraw all
+ // of the screen. To work around this, such operations set a forced_redraw_limit > 0.
+ // If this limit is set, and if we have aborted redraw more times than is allowed,
+ // interrupting is blocked and we're forced to redraw full screen once
+ // (after which we can again interrupt forced_redraw_limit times).
+ if (setup->canvas->forced_redraw_limit < 0 ||
+ setup->canvas->forced_redraw_count < setup->canvas->forced_redraw_limit) {
+
+ if (setup->canvas->forced_redraw_limit != -1) {
+ setup->canvas->forced_redraw_count++;
+ }
+
+ return false;
+ }
+ }
+
+ // Find the optimal buffer dimensions
+ int bw = this_rect.x1 - this_rect.x0;
+ int bh = this_rect.y1 - this_rect.y0;
if ((bw < 1) || (bh < 1))
- return;
+ return 0;
+
+ if (bw * bh < setup->max_pixels) {
+ // We are small enough
+ sp_canvas_paint_single_buffer (setup->canvas,
+ this_rect.x0, this_rect.y0,
+ this_rect.x1, this_rect.y1,
+ setup->big_rect.x0, setup->big_rect.y0,
+ setup->big_rect.x1, setup->big_rect.y1, bw);
+ return 1;
+ }
+
+ NRRectL lo = this_rect;
+ NRRectL hi = this_rect;
+
+/*
+This test determines the redraw strategy:
+
+bw < bh (strips mode) splits across the smaller dimension of the rect and therefore (on
+horizontally-stretched windows) results in redrawing in horizontal strips (from cursor point, in
+both directions if the cursor is in the middle). This is traditional for Inkscape since old days,
+and seems to be faster for drawings with many smaller objects at zoom-out.
+
+bw > bh (chunks mode) splits across the larger dimension of the rect and therefore paints in
+almost-square chunks, again from the cursor point. It's sometimes faster for drawings with few slow
+(e.g. blurred) objects crossing the entire screen. It also appears to be somewhat psychologically
+faster.
- 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 */
- if (bw * bh < 87381) { // 256K/3
- // We can go with single buffer
- sw = bw;
- sh = bh;
- } else if (bw <= (16 * 341)) {
- // Go with row buffer
- sw = bw;
- sh = 87381 / bw;
- } else if (bh <= (16 * 256)) {
- // Go with column buffer
- sw = 87381 / bh;
- sh = bh;
+The default for now is the strips mode.
+*/
+ if (bw < bh || bh < 2 * TILE_SIZE) {
+ // to correctly calculate the mean of two ints, we need to sum them into a larger int type
+ int mid = ((long long) this_rect.x0 + (long long) this_rect.x1) / 2;
+ // Make sure that mid lies on a tile boundary
+ mid = (mid / TILE_SIZE) * TILE_SIZE;
+
+ lo.x1 = mid;
+ hi.x0 = mid;
+
+ if (setup->mouse_loc[NR::X] < mid) {
+ // Always paint towards the mouse first
+ return sp_canvas_paint_rect_internal(setup, lo)
+ && sp_canvas_paint_rect_internal(setup, hi);
} else {
- sw = 341;
- sh = 256;
+ return sp_canvas_paint_rect_internal(setup, hi)
+ && sp_canvas_paint_rect_internal(setup, lo);
}
- } else { // paths only, so 1M works faster
- /* 1M is the cached buffer and we need 3 channels */
- if (bw * bh < 349525) { // 1M/3
- // We can go with single buffer
- sw = bw;
- sh = bh;
- } else if (bw <= (16 * 682)) {
- // Go with row buffer
- sw = bw;
- sh = 349525 / bw;
- } else if (bh <= (16 * 512)) {
- // Go with column buffer
- sw = 349525 / bh;
- sh = bh;
+ } else {
+ // to correctly calculate the mean of two ints, we need to sum them into a larger int type
+ int mid = ((long long) this_rect.y0 + (long long) this_rect.y1) / 2;
+ // Make sure that mid lies on a tile boundary
+ mid = (mid / TILE_SIZE) * TILE_SIZE;
+
+ lo.y1 = mid;
+ hi.y0 = mid;
+
+ if (setup->mouse_loc[NR::Y] < mid) {
+ // Always paint towards the mouse first
+ return sp_canvas_paint_rect_internal(setup, lo)
+ && sp_canvas_paint_rect_internal(setup, hi);
} else {
- sw = 682;
- sh = 512;
+ return sp_canvas_paint_rect_internal(setup, hi)
+ && sp_canvas_paint_rect_internal(setup, lo);
}
}
+}
- // As we can come from expose, we have to tile here
- 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;
- 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);
- }
+/**
+ * Helper that draws a specific rectangular part of the canvas.
+ *
+ * @return true if the rectangle painting succeeds.
+ */
+static bool
+sp_canvas_paint_rect (SPCanvas *canvas, int xx0, int yy0, int xx1, int yy1)
+{
+ g_return_val_if_fail (!canvas->need_update, false);
+
+ 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);
+
+#ifdef DEBUG_REDRAW
+ // paint the area to redraw yellow
+ gdk_rgb_gc_set_foreground (canvas->pixmap_gc, 0xFFFF00);
+ gdk_draw_rectangle (SP_CANVAS_WINDOW (canvas),
+ canvas->pixmap_gc,
+ TRUE,
+ rect.x0 - canvas->x0, rect.y0 - canvas->y0,
+ rect.x1 - rect.x0, rect.y1 - rect.y0);
+#endif
- }
+ PaintRectSetup setup;
+
+ setup.canvas = canvas;
+ setup.big_rect = rect;
+
+ // Save the mouse location
+ gint x, y;
+ gdk_window_get_pointer (GTK_WIDGET(canvas)->window, &x, &y, NULL);
+ setup.mouse_loc = sp_canvas_window_to_world (canvas, NR::Point(x,y));
+
+ // CAIRO FIXME: the sw/sh calculations below all assume 24bpp, need fixing for 32bpp
+ if (canvas->rendermode != Inkscape::RENDERMODE_OUTLINE) {
+ // use 256K as a compromise to not slow down gradients
+ // 256K is the cached buffer and we need 3 channels
+ setup.max_pixels = 87381; // 256K/3
+ } else {
+ // paths only, so 1M works faster
+ // 1M is the cached buffer and we need 3 channels
+ setup.max_pixels = 349525;
}
+
+ // Start the clock
+ g_get_current_time(&(setup.start_time));
+
+ // Go
+ return sp_canvas_paint_rect_internal(&setup, rect);
+}
+
+/**
+ * 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;
}
/**
{
SPCanvas *canvas = SP_CANVAS (widget);
- if (!GTK_WIDGET_DRAWABLE (widget) ||
+ if (!GTK_WIDGET_DRAWABLE (widget) ||
(event->window != SP_CANVAS_WINDOW (canvas)))
return FALSE;
for (int i = 0; i < n_rects; i++) {
NRRectL rect;
-
+
rect.x0 = rects[i].x + canvas->x0;
rect.y0 = rects[i].y + canvas->y0;
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)
/**
* Helper that repaints the areas in the canvas that need it.
+ *
+ * @return true if all the dirty parts have been redrawn
*/
static int
paint (SPCanvas *canvas)
if (!canvas->need_redraw)
return TRUE;
- GtkWidget const *widget = GTK_WIDGET(canvas);
- int const canvas_x1 = canvas->x0 + widget->allocation.width;
- int const canvas_y1 = canvas->y0 + widget->allocation.height;
-
- NRRectL topaint;
- topaint.x0 = topaint.y0 = topaint.x1 = topaint.y1 = 0;
-
- for (int j=canvas->tTop&(~3);j<canvas->tBottom;j+=4) {
- for (int i=canvas->tLeft&(~3);i<canvas->tRight;i+=4) {
- int mode=0;
-
- int pl=i+1,pr=i,pt=j+4,pb=j;
- for (int l=MAX(j,canvas->tTop);l<MIN(j+4,canvas->tBottom);l++) {
- for (int k=MAX(i,canvas->tLeft);k<MIN(i+4,canvas->tRight);k++) {
- if ( canvas->tiles[(k-canvas->tLeft)+(l-canvas->tTop)*canvas->tileH] ) {
- mode|=1<<((k-i)+(l-j)*4);
- if ( k < pl ) pl=k;
- if ( k+1 > pr ) pr=k+1;
- if ( l < pt ) pt=l;
- if ( l+1 > pb ) pb=l+1;
- }
- canvas->tiles[(k-canvas->tLeft)+(l-canvas->tTop)*canvas->tileH]=0;
- }
- }
-
- if ( mode ) {
- NRRectL tile;
- tile.x0 = MAX (pl*32, canvas->x0);
- tile.y0 = MAX (pt*32, canvas->y0);
- tile.x1 = MIN (pr*32, canvas_x1);
- tile.y1 = MIN (pb*32, canvas_y1);
- if ((tile.x0 < tile.x1) && (tile.y0 < tile.y1)) {
- nr_rect_l_union (&topaint, &topaint, &tile);
- }
+ Gdk::Region to_paint;
+ for (int j=canvas->tTop; j<canvas->tBottom; j++) {
+ for (int i=canvas->tLeft; i<canvas->tRight; i++) {
+ int tile_index = (i - canvas->tLeft) + (j - canvas->tTop)*canvas->tileH;
+
+ if ( canvas->tiles[tile_index] ) { // if this tile is dirtied (nonzero)
+ to_paint.union_with_rect(Gdk::Rectangle(i*TILE_SIZE, j*TILE_SIZE,
+ TILE_SIZE, TILE_SIZE));
}
+
}
}
- sp_canvas_paint_rect (canvas, topaint.x0, topaint.y0, topaint.x1, topaint.y1);
+ if (!to_paint.empty()) {
+ Glib::ArrayHandle<Gdk::Rectangle> rect = to_paint.get_rectangles();
+ typedef Glib::ArrayHandle<Gdk::Rectangle>::const_iterator Iter;
+ for (Iter i=rect.begin(); i != rect.end(); ++i) {
+ int x0 = (*i).get_x();
+ int y0 = (*i).get_y();
+ int x1 = x0 + (*i).get_width();
+ int y1 = y0 + (*i).get_height();
+ if (!sp_canvas_paint_rect(canvas, x0, y0, x1, y1)) {
+ // Aborted
+ return FALSE;
+ };
+ }
+ }
canvas->need_redraw = FALSE;
+
+ // we've had a full unaborted redraw, reset the full redraw counter
+ if (canvas->forced_redraw_limit != -1) {
+ canvas->forced_redraw_count = 0;
+ }
+
return TRUE;
}
static int
do_update (SPCanvas *canvas)
{
+ if (!canvas->root || !canvas->pixmap_gc) // 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);
SPCanvas *canvas = SP_CANVAS (data);
- const int ret = do_update (canvas);
+ int const ret = do_update (canvas);
if (ret) {
/* Reset idle id */
}
/**
- * Scrolls canvas to specific position.
+ * Scrolls canvas to specific position (cx and cy are measured in screen pixels)
*/
void
-sp_canvas_scroll_to (SPCanvas *canvas, double cx, double cy, unsigned int clear)
+sp_canvas_scroll_to (SPCanvas *canvas, double cx, double cy, unsigned int clear, bool is_scrolling)
{
g_return_if_fail (canvas != NULL);
g_return_if_fail (SP_IS_CANVAS (canvas));
- int ix = (int) (cx + 0.5);
- int iy = (int) (cy + 0.5);
- int dx = ix - canvas->x0;
- int dy = iy - canvas->y0;
+ int ix = (int) round(cx); // ix and iy are the new canvas coordinates (integer screen pixels)
+ int iy = (int) round(cy); // cx might be negative, so (int)(cx + 0.5) will not do!
+ int dx = ix - canvas->x0; // dx and dy specify the displacement (scroll) of the
+ int dy = iy - canvas->y0; // canvas w.r.t its previous position
- canvas->dx0 = cx;
+ canvas->dx0 = cx; // here the 'd' stands for double, not delta!
canvas->dy0 = cy;
canvas->x0 = ix;
canvas->y0 = iy;
- sp_canvas_resize_tiles(canvas,canvas->x0,canvas->y0,canvas->x0+canvas->widget.allocation.width,canvas->y0+canvas->widget.allocation.height);
+ sp_canvas_resize_tiles (canvas, canvas->x0, canvas->y0, canvas->x0+canvas->widget.allocation.width, canvas->y0+canvas->widget.allocation.height);
if (!clear) {
// scrolling without zoom; redraw only the newly exposed areas
if ((dx != 0) || (dy != 0)) {
- int width, height;
- width = canvas->widget.allocation.width;
- height = canvas->widget.allocation.height;
+ canvas->is_scrolling = is_scrolling;
if (GTK_WIDGET_REALIZED (canvas)) {
gdk_window_scroll (SP_CANVAS_WINDOW (canvas), -dx, -dy);
- gdk_window_process_updates (SP_CANVAS_WINDOW (canvas), TRUE);
- }
- if (dx < 0) {
- sp_canvas_request_redraw (canvas, ix + 0, iy + 0, ix - dx, iy + height);
- } else if (dx > 0) {
- sp_canvas_request_redraw (canvas, ix + width - dx, iy + 0, ix + width, iy + height);
- }
- if (dy < 0) {
- sp_canvas_request_redraw (canvas, ix + 0, iy + 0, ix + width, iy - dy);
- } else if (dy > 0) {
- sp_canvas_request_redraw (canvas, ix + 0, iy + height - dy, ix + width, iy + height);
}
}
} else {
@@ -1852,7 +2120,7 @@ sp_canvas_scroll_to (SPCanvas *canvas, double cx, double cy, unsigned int clear)
}
}
-/**
+/**
* Updates canvas if necessary.
*/
void
canvas->need_redraw))
return;
- remove_idle (canvas);
do_update (canvas);
}
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);
}
@@ -1975,33 +2242,42 @@ bool sp_canvas_world_pt_inside_window(SPCanvas const *canvas, NR::Point const &w
}
/**
- * Return canvas window coordinates as NRRect.
+ * Return canvas window coordinates as NR::Rect.
*/
NR::Rect SPCanvas::getViewbox() const
{
GtkWidget const *w = GTK_WIDGET(this);
-
return NR::Rect(NR::Point(dx0, dy0),
NR::Point(dx0 + w->allocation.width, dy0 + w->allocation.height));
}
+/**
+ * Return canvas window coordinates as IRect (a rectangle defined by integers).
+ */
+NR::IRect SPCanvas::getViewboxIntegers() const
+{
+ GtkWidget const *w = GTK_WIDGET(this);
+ return NR::IRect(NR::IPoint(x0, y0),
+ NR::IPoint(x0 + w->allocation.width, y0 + w->allocation.height));
+}
+
inline int sp_canvas_tile_floor(int x)
{
- return (x&(~31))/32;
+ return (x & (~(TILE_SIZE - 1))) / TILE_SIZE;
}
inline int sp_canvas_tile_ceil(int x)
{
- return ((x+31)&(~31))/32;
+ return ((x + (TILE_SIZE - 1)) & (~(TILE_SIZE - 1))) / TILE_SIZE;
}
/**
- * Helper that changes tile size for canvas redraw.
+ * Helper that allocates a new tile array for the canvas, copying overlapping tiles from the old array
*/
-void sp_canvas_resize_tiles(SPCanvas* canvas,int nl,int nt,int nr,int nb)
+static void sp_canvas_resize_tiles(SPCanvas* canvas, int nl, int nt, int nr, int nb)
{
if ( nl >= nr || nt >= nb ) {
- if ( canvas->tiles ) free(canvas->tiles);
+ if ( canvas->tiles ) g_free(canvas->tiles);
canvas->tLeft=canvas->tTop=canvas->tRight=canvas->tBottom=0;
canvas->tileH=canvas->tileV=0;
canvas->tiles=NULL;
int tr=sp_canvas_tile_ceil(nr);
int tb=sp_canvas_tile_ceil(nb);
- int nh=tr-tl,nv=tb-tt;
- uint8_t* ntiles=(uint8_t*)malloc(nh*nv*sizeof(uint8_t));
- for (int i=tl;i<tr;i++) {
- for (int j=tt;j<tb;j++) {
- int ind=(i-tl)+(j-tt)*nh;
+ int nh = tr-tl, nv = tb-tt;
+ uint8_t* ntiles = (uint8_t*)g_malloc(nh*nv*sizeof(uint8_t));
+ for (int i=tl; i<tr; i++) {
+ for (int j=tt; j<tb; j++) {
+ int ind = (i-tl) + (j-tt)*nh;
if ( i >= canvas->tLeft && i < canvas->tRight && j >= canvas->tTop && j < canvas->tBottom ) {
- ntiles[ind]=canvas->tiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH];
+ ntiles[ind]=canvas->tiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH]; // copy from the old tile
} else {
- ntiles[ind]=0;
+ ntiles[ind]=0; // newly exposed areas get 0
}
}
}
- if ( canvas->tiles ) free(canvas->tiles);
+ if ( canvas->tiles ) g_free(canvas->tiles);
canvas->tiles=ntiles;
canvas->tLeft=tl;
canvas->tTop=tt;
canvas->tileV=nv;
}
+/*
+ * Helper that queues a canvas rectangle for redraw
+ */
+static void sp_canvas_dirty_rect(SPCanvas* canvas, int nl, int nt, int nr, int nb) {
+ canvas->need_redraw = TRUE;
+
+ sp_canvas_mark_rect(canvas, nl, nt, nr, nb, 1);
+}
+
/**
- * Helper that marks specific canvas rectangle for redraw.
+ * Helper that marks specific canvas rectangle as clean (val == 0) or dirty (otherwise)
*/
-void sp_canvas_dirty_rect(SPCanvas* canvas,int nl,int nt,int nr,int nb)
+void sp_canvas_mark_rect(SPCanvas* canvas, int nl, int nt, int nr, int nb, uint8_t val)
{
if ( nl >= nr || nt >= nb ) {
return;
if ( tt < canvas->tTop ) tt=canvas->tTop;
if ( tb > canvas->tBottom ) tb=canvas->tBottom;
- canvas->need_redraw = TRUE;
-
- for (int i=tl;i<tr;i++) {
- for (int j=tt;j<tb;j++) {
- canvas->tiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH]=1;
+ for (int i=tl; i<tr; i++) {
+ for (int j=tt; j<tb; j++) {
+ canvas->tiles[(i-canvas->tLeft)+(j-canvas->tTop)*canvas->tileH] = val;
}
}
}
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :