#include <stdio.h>
#include <math.h>
+#include <cairo.h>
#include <libgnomecanvas/libgnomecanvas.h>
#include "canvas-simplerect.h"
#include "rgb_macros.h"
+#include "gettext.h"
+#define _(Text) dgettext (PACKAGE,Text)
enum {
- ARG_0,
- ARG_X1,
- ARG_Y1,
- ARG_X2,
- ARG_Y2,
- ARG_OUTLINE_PIXELS,
- ARG_OUTLINE_WHAT,
- ARG_FILL,
- ARG_FILL_COLOR_RGBA,
- ARG_OUTLINE_COLOR_RGBA,
- ARG_DRAW
-
+ PROP_0,
+ PROP_X1,
+ PROP_Y1,
+ PROP_X2,
+ PROP_Y2,
+ PROP_OUTLINE_PIXELS,
+ PROP_OUTLINE_WHAT,
+ PROP_FILL,
+ PROP_FILL_COLOR_RGBA,
+ PROP_OUTLINE_COLOR_RGBA,
+ PROP_DRAW
};
-static void gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class);
-static void gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect);
-static void gnome_canvas_simplerect_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-static void gnome_canvas_simplerect_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
-
-static void gnome_canvas_simplerect_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags);
-static void gnome_canvas_simplerect_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2);
-static double gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
-static void gnome_canvas_simplerect_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
-static void gnome_canvas_simplerect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h);
+static void gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class);
+
+static void gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect);
+
+static void gnome_canvas_simplerect_destroy (GtkObject *object);
+
+static void gnome_canvas_simplerect_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+
+static void gnome_canvas_simplerect_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+static void gnome_canvas_simplerect_update (GnomeCanvasItem *item,
+ double *affine,
+ ArtSVP *clip_path,
+ int flags);
+
+static void gnome_canvas_simplerect_bounds (GnomeCanvasItem *item,
+ double *x1,
+ double *y1,
+ double *x2,
+ double *y2);
+
+static double gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item);
+
+static void gnome_canvas_simplerect_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf);
+
+static void gnome_canvas_simplerect_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h);
static GnomeCanvasItemClass *parent_class;
-GtkType
+GType
gnome_canvas_simplerect_get_type (void)
{
- static GtkType simplerect_type = 0;
+ static GType simplerect_type;
if (!simplerect_type) {
- GtkTypeInfo simplerect_info = {
- "GnomeCanvasSimpleRect",
- sizeof (GnomeCanvasSimpleRect),
+ static const GTypeInfo object_info = {
sizeof (GnomeCanvasSimpleRectClass),
- (GtkClassInitFunc) gnome_canvas_simplerect_class_init,
- (GtkObjectInitFunc) gnome_canvas_simplerect_init,
- NULL, /* reserved_1 */
- NULL, /* reserved_2 */
- (GtkClassInitFunc) NULL
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gnome_canvas_simplerect_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (GnomeCanvasSimpleRect),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gnome_canvas_simplerect_init,
+ NULL /* value_table */
};
- simplerect_type = gtk_type_unique (gnome_canvas_item_get_type (), &simplerect_info);
+ simplerect_type = g_type_register_static (GNOME_TYPE_CANVAS_ITEM, "GnomeCanvasSimpleRect",
+ &object_info, 0);
}
return simplerect_type;
static void
gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class)
{
+ GObjectClass *gobject_class;
GtkObjectClass *object_class;
GnomeCanvasItemClass *item_class;
+ gobject_class = (GObjectClass *) class;
object_class = (GtkObjectClass *) class;
item_class = (GnomeCanvasItemClass *) class;
- parent_class = gtk_type_class (gnome_canvas_item_get_type ());
-
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::x1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X1);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::y1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y1);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::x2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X2);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::y2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y2);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::fill", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_FILL);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::draw", GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_DRAW);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::fill_color_rgba", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_FILL_COLOR_RGBA);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::outline_color_rgba", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_OUTLINE_COLOR_RGBA);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::outline_pixels", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_OUTLINE_PIXELS);
- gtk_object_add_arg_type ("GnomeCanvasSimpleRect::outline_what", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_OUTLINE_WHAT);
-
- object_class->set_arg = gnome_canvas_simplerect_set_arg;
- object_class->get_arg = gnome_canvas_simplerect_get_arg;
+ parent_class = g_type_class_peek_parent (class);
+
+ gobject_class->set_property = gnome_canvas_simplerect_set_property;
+ gobject_class->get_property = gnome_canvas_simplerect_get_property;
+
+ g_object_class_install_property (gobject_class,
+ PROP_X1,
+ g_param_spec_double ("x1",
+ _("x1"),
+ _("x coordinate of upper left corner of rect"),
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_Y1,
+ g_param_spec_double ("y1",
+ _("y1"),
+ _("y coordinate of upper left corner of rect "),
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_X2,
+ g_param_spec_double ("x2",
+ _("x2"),
+ _("x coordinate of lower right corner of rect"),
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_Y2,
+ g_param_spec_double ("y2",
+ _("y2"),
+ _("y coordinate of lower right corner of rect "),
+ -G_MAXDOUBLE,
+ G_MAXDOUBLE,
+ 0.0,
+ G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_OUTLINE_PIXELS,
+ g_param_spec_uint ("outline_pixels",
+ _("outline pixels"),
+ _("width in pixels of outline"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_OUTLINE_WHAT,
+ g_param_spec_uint ("outline_what",
+ _("outline what"),
+ _("which boundaries to outline (mask)"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_FILL,
+ g_param_spec_boolean ("fill",
+ _("fill"),
+ _("fill rectangle"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_DRAW,
+ g_param_spec_boolean ("draw",
+ _("draw"),
+ _("draw rectangle"),
+ TRUE,
+ G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_OUTLINE_COLOR_RGBA,
+ g_param_spec_uint ("outline_color_rgba",
+ _("outline color rgba"),
+ _("color of outline"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+
+
+ g_object_class_install_property (gobject_class,
+ PROP_FILL_COLOR_RGBA,
+ g_param_spec_uint ("fill_color_rgba",
+ _("fill color rgba"),
+ _("color of fill"),
+ 0,
+ G_MAXUINT,
+ 0,
+ G_PARAM_READWRITE));
+
+ object_class->destroy = gnome_canvas_simplerect_destroy;
item_class->update = gnome_canvas_simplerect_update;
+ item_class->draw = gnome_canvas_simplerect_draw;
item_class->bounds = gnome_canvas_simplerect_bounds;
item_class->point = gnome_canvas_simplerect_point;
item_class->render = gnome_canvas_simplerect_render;
- item_class->draw = gnome_canvas_simplerect_draw;
+
}
static void
simplerect->outline_color = 0;
simplerect->outline_pixels = 1;
simplerect->outline_what = 0xf;
+}
+
+static void
+gnome_canvas_simplerect_destroy (GtkObject *object)
+{
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
- GNOME_CANVAS_ITEM(simplerect)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW;
+ /* remember, destroy can be run multiple times! */
+
+ if (GTK_OBJECT_CLASS (parent_class)->destroy)
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static void
*y1 = simplerect->y1;
*x2 = simplerect->x2 + 1;
*y2 = simplerect->y2 + 1;
-
}
-static void
+
+static void
gnome_canvas_simplerect_reset_bounds (GnomeCanvasItem *item)
{
GnomeCanvasSimpleRect* simplerect;
double x1, x2, y1, y2;
double old_x1, old_x2, old_y1, old_y2;
- double a, b;
-
+ ArtDRect unionrect, old, new;
+
old_x1 = item->x1;
old_y1 = item->y1;
old_x2 = item->x2;
gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x1, y1, &simplerect->bbox_ulx, &simplerect->bbox_uly);
gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x2, y2, &simplerect->bbox_lrx, &simplerect->bbox_lry);
- /* now queue redraws for changed areas */
+ /* now queue redraws for changed areas */
- if (item->x1 != old_x1) {
-
- /* left edge changed. redraw the area that altered */
-
- a = MIN(item->x1, old_x1);
- b = MAX(item->x1, old_x1);
- gnome_canvas_request_redraw (item->canvas, a - 1, item->y1, b + 1, item->y2);
- }
-
- if (item->x2 != old_x2) {
-
- /* right edge changed. redraw the area that altered */
-
- a = MIN(item->x2, old_x2);
- b = MAX(item->x2, old_x2);
- gnome_canvas_request_redraw (item->canvas, a - 1, item->y1, b + 1, item->y2);
- }
-
- if (item->y1 != old_y1) {
-
- /* top edge changed. redraw the area that altered */
-
- a = MIN(item->y1, old_y1);
- b = MAX(item->y1, old_y1);
- gnome_canvas_request_redraw (item->canvas, item->x1, a - 1, item->x2, b + 1);
- }
-
- if (item->y2 != old_y2) {
-
- /* lower edge changed. redraw the area that altered */
-
- a = MIN(item->y2, old_y2);
- b = MAX(item->y2, old_y2);
- gnome_canvas_request_redraw (item->canvas, item->x1, a - 1, item->x2, b + 1);
+ if (item->x1 == old_x1 && item->x2 == old_x2) {
+
+ /* no change in x-axis position */
+
+ if (item->y1 == old_y1) {
+ /* top didn't change, so just draw bottom */
+
+ double start_y = MIN (item->y2, old_y2);
+ double end_y = MAX (item->y2, old_y2);
+
+ gnome_canvas_request_redraw (item->canvas, item->x1, start_y - 0.5, item->x2, end_y + 1.5);
+ return;
+
+ } else if (item->y2 == old_y2) {
+
+ /* bottom didn't change, just draw top */
+
+ double start_y = MIN (item->y1, old_y1);
+ double end_y = MAX (item->y1, old_y1);
+
+ gnome_canvas_request_redraw (item->canvas, item->x1, start_y - 0.5, item->x2, end_y + 1.5);
+ return;
+
+ }
+
+ } else if (item->y1 == old_y1 && item->y2 == old_y2) {
+
+ /* no change in y-axis position */
+
+ if (item->x1 == old_x1) {
+ /* start didn't change, so just draw at the end */
+
+ double start_x = MIN (item->x2, old_x2);
+ double end_x = MAX (item->x2, old_x2);
+
+ gnome_canvas_request_redraw (item->canvas, start_x - 0.5, item->y1, end_x + 1.5, item->y2 + 0.5);
+ return;
+
+ } else if (item->x2 == old_x2) {
+
+ /* end didn't change, so just draw at the start */
+
+ double start_x = MIN (item->x1, old_x1);
+ double end_x = MAX (item->x1, old_x1);
+
+ gnome_canvas_request_redraw (item->canvas, start_x - 0.5, item->y1, end_x + 1.5, item->y2 + 0.5);
+ return;
+
+ }
}
+
+ new.x0 = x1;
+ new.y0 = y1;
+ new.x1 = x2;
+ new.y1 = y2;
+
+ old.x0 = old_x1;
+ old.y0 = old_y1;
+ old.x1 = old_x2;
+ old.y1 = old_y2;
+
+ art_drect_union (&unionrect, &old, &new);
+ gnome_canvas_request_redraw (item->canvas,
+ unionrect.x0 - 0.5,
+ unionrect.y0 - 0.5,
+ unionrect.x1 + 1.5,
+ unionrect.y1 + 1.5);
}
-/*
- * CANVAS CALLBACKS
+/*
+ * CANVAS CALLBACKS
*/
static void
-gnome_canvas_simplerect_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gnome_canvas_simplerect_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+
{
- GnomeCanvasItem *item;
+ (void) pspec;
+
GnomeCanvasSimpleRect *simplerect;
- int update;
- int bounds_changed;
+ int update = FALSE;
+ int bounds_changed = FALSE;
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
- item = GNOME_CANVAS_ITEM (object);
simplerect = GNOME_CANVAS_SIMPLERECT (object);
- update = FALSE;
- bounds_changed = FALSE;
-
- switch (arg_id) {
- case ARG_X1:
- if (simplerect->x1 != GTK_VALUE_DOUBLE (*arg)) {
- simplerect->x1 = GTK_VALUE_DOUBLE (*arg);
+ switch (prop_id) {
+ case PROP_X1:
+ if (simplerect->x1 != g_value_get_double (value)) {
+ simplerect->x1 = g_value_get_double (value);
bounds_changed = TRUE;
}
break;
- case ARG_Y1:
- if (simplerect->y1 != GTK_VALUE_DOUBLE (*arg)) {
- simplerect->y1 = GTK_VALUE_DOUBLE (*arg);
+ case PROP_Y1:
+ if (simplerect->y1 != g_value_get_double (value)) {
+ simplerect->y1 = g_value_get_double (value);
bounds_changed = TRUE;
}
break;
- case ARG_X2:
- if (simplerect->x2 != GTK_VALUE_DOUBLE (*arg)) {
- simplerect->x2 = GTK_VALUE_DOUBLE (*arg);
+ case PROP_X2:
+ if (simplerect->x2 != g_value_get_double (value)) {
+ simplerect->x2 = g_value_get_double (value);
bounds_changed = TRUE;
}
break;
- case ARG_Y2:
- if (simplerect->y2 != GTK_VALUE_DOUBLE (*arg)) {
- simplerect->y2 = GTK_VALUE_DOUBLE (*arg);
+ case PROP_Y2:
+ if (simplerect->y2 != g_value_get_double (value)) {
+ simplerect->y2 = g_value_get_double (value);
bounds_changed = TRUE;
}
break;
- case ARG_DRAW:
- if (simplerect->draw != GTK_VALUE_BOOL (*arg)) {
- simplerect->draw = GTK_VALUE_BOOL (*arg);
+ case PROP_DRAW:
+ if (simplerect->draw != g_value_get_boolean (value)) {
+ simplerect->draw = g_value_get_boolean (value);
update = TRUE;
}
break;
- case ARG_FILL:
- if (simplerect->fill != GTK_VALUE_BOOL (*arg)) {
- simplerect->fill = GTK_VALUE_BOOL (*arg);
+ case PROP_FILL:
+ if (simplerect->fill != g_value_get_boolean (value)) {
+ simplerect->fill = g_value_get_boolean (value);
update = TRUE;
}
break;
- case ARG_FILL_COLOR_RGBA:
- if (simplerect->fill_color != GTK_VALUE_INT(*arg)) {
- simplerect->fill_color = GTK_VALUE_INT(*arg);
+ case PROP_FILL_COLOR_RGBA:
+ if (simplerect->fill_color != g_value_get_uint(value)) {
+ simplerect->fill_color = g_value_get_uint(value);
update = TRUE;
}
break;
- case ARG_OUTLINE_COLOR_RGBA:
- if (simplerect->outline_color != GTK_VALUE_INT(*arg)) {
- simplerect->outline_color = GTK_VALUE_INT(*arg);
+ case PROP_OUTLINE_COLOR_RGBA:
+ if (simplerect->outline_color != g_value_get_uint(value)) {
+ simplerect->outline_color = g_value_get_uint(value);
update = TRUE;
}
break;
- case ARG_OUTLINE_PIXELS:
- if (simplerect->outline_pixels != GTK_VALUE_INT(*arg)) {
- simplerect->outline_pixels = GTK_VALUE_INT(*arg);
+ case PROP_OUTLINE_PIXELS:
+ if (simplerect->outline_pixels != g_value_get_uint(value)) {
+ simplerect->outline_pixels = g_value_get_uint(value);
update = TRUE;
}
break;
- case ARG_OUTLINE_WHAT:
- if (simplerect->outline_what != GTK_VALUE_INT(*arg)) {
- simplerect->outline_what = GTK_VALUE_INT(*arg);
+ case PROP_OUTLINE_WHAT:
+ if (simplerect->outline_what != g_value_get_uint(value)) {
+ simplerect->outline_what = g_value_get_uint(value);
update = TRUE;
}
break;
break;
}
- simplerect->full_draw_on_update = update;
+ if (!simplerect->full_draw_on_update) {
+ /* XXX: not sure about this;
+ *
+ * I changed the next line to be conditional, rather than always
+ * being executed. Without the condition, the following bug occurs:
+ *
+ * caller sets a property (e.g. outline colour); this sets update = TRUE and hence full_draw_on_update = TRUE
+ * update is requested (and it is intended, I suppose, that during this update, full_draw_on_update is noted)
+ * ... update does not occur before ...
+ * caller sets the same property again to the same value; this sets update = FALSE and hence full_draw_on_update = FALSE
+ * update now occurs, but full_draw_on_update is FALSE, so the full redraw does not happen,
+ * which results in graphical glitches.
+ *
+ * (Carl, 2/1/2010)
+ */
+ simplerect->full_draw_on_update = update;
+ }
if (update || bounds_changed) {
- gnome_canvas_item_request_update (item);
+ gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(object));
}
}
static void
-gnome_canvas_simplerect_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gnome_canvas_simplerect_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- GnomeCanvasSimpleRect *simplerect;
+ GnomeCanvasSimpleRect *rect = GNOME_CANVAS_SIMPLERECT (object);
- simplerect = GNOME_CANVAS_SIMPLERECT (object);
+ g_return_if_fail (object != NULL);
+ g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object));
- switch (arg_id) {
- case ARG_X1:
- GTK_VALUE_DOUBLE (*arg) = simplerect->x1;
+ switch (prop_id) {
+ case PROP_X1:
+ g_value_set_double (value, rect->x1);
break;
- case ARG_Y1:
- GTK_VALUE_DOUBLE (*arg) = simplerect->y1;
+ case PROP_X2:
+ g_value_set_double (value, rect->x2);
break;
- case ARG_X2:
- GTK_VALUE_DOUBLE (*arg) = simplerect->x2;
+ case PROP_Y1:
+ g_value_set_double (value, rect->y1);
break;
- case ARG_Y2:
- GTK_VALUE_DOUBLE (*arg) = simplerect->y2;
+ case PROP_Y2:
+ g_value_set_double (value, rect->y2);
break;
- case ARG_DRAW:
- GTK_VALUE_BOOL (*arg) = simplerect->draw;
+ case PROP_OUTLINE_WHAT:
+ g_value_set_uint (value, rect->outline_what);
break;
- case ARG_FILL:
- GTK_VALUE_BOOL (*arg) = simplerect->fill;
+ case PROP_FILL:
+ g_value_set_boolean (value, rect->fill);
break;
- case ARG_FILL_COLOR_RGBA:
- GTK_VALUE_INT (*arg) = simplerect->fill_color;
+ case PROP_OUTLINE_PIXELS:
+ g_value_set_uint (value, rect->outline_pixels);
break;
- case ARG_OUTLINE_COLOR_RGBA:
- GTK_VALUE_INT (*arg) = simplerect->outline_color;
+ case PROP_FILL_COLOR_RGBA:
+ g_value_set_uint (value, rect->fill_color);
break;
- case ARG_OUTLINE_PIXELS:
- GTK_VALUE_INT (*arg) = simplerect->outline_pixels;
+ case PROP_OUTLINE_COLOR_RGBA:
+ g_value_set_uint (value, rect->outline_color);
break;
- case ARG_OUTLINE_WHAT:
- GTK_VALUE_INT (*arg) = simplerect->outline_what;
+ case PROP_DRAW:
+ g_value_set_boolean (value, rect->draw);
break;
+
default:
- arg->type = GTK_TYPE_INVALID;
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
+
static void
gnome_canvas_simplerect_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags)
{
GnomeCanvasSimpleRect *simplerect;
- unsigned char foo;
simplerect = GNOME_CANVAS_SIMPLERECT (item);
gnome_canvas_simplerect_reset_bounds (item);
if (simplerect->full_draw_on_update) {
- gnome_canvas_request_redraw (item->canvas,
- simplerect->bbox_ulx,
- simplerect->bbox_uly,
- simplerect->bbox_lrx+1,
- simplerect->bbox_lry+1);
+ gnome_canvas_request_redraw (item->canvas,
+ simplerect->bbox_ulx,
+ simplerect->bbox_uly,
+ simplerect->bbox_lrx+0.5,
+ simplerect->bbox_lry+0.5);
simplerect->full_draw_on_update = FALSE;
}
UINT_TO_RGBA (simplerect->fill_color, &simplerect->fill_r, &simplerect->fill_g, &simplerect->fill_b, &simplerect->fill_a);
- UINT_TO_RGBA (simplerect->outline_color, &simplerect->outline_r, &simplerect->outline_g, &simplerect->outline_b, &foo);
+ UINT_TO_RGBA (simplerect->outline_color, &simplerect->outline_r, &simplerect->outline_g, &simplerect->outline_b, &simplerect->outline_a);
}
-#define SIMPLERECT_FAST_RENDERER
+// this can be useful for debugging/understanding how the canvas redraws
+// stuff.
+
+#undef HARLEQUIN_DEBUGGING
+
+#undef SIMPLERECT_FAST_RENDERER
#ifdef SIMPLERECT_FAST_RENDERER
static void
if (buf->is_bg) {
- // this can be useful for debugging/understanding how the canvas redraws
- // stuff.
-
- // gint randr, randg, randb;
- // randr = random() % 255;
- // randg = random() % 255;
- // randb = random() % 255;
- // PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
-
+#ifdef HARLEQUIN_DEBUGGING
+ gint randr, randg, randb;
+ randr = random() % 255;
+ randg = random() % 255;
+ randb = random() % 255;
+ PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
+#endif
gnome_canvas_buf_ensure_buf (buf);
buf->is_bg = FALSE;
}
if (!simplerect->draw) {
return;
}
-
+
self.x0 = simplerect->bbox_ulx;
self.y0 = simplerect->bbox_uly;
self.x1 = simplerect->bbox_lrx;
ey = simplerect->bbox_lry-1;
if (simplerect->fill) {
-
+
// this can be useful for debugging/understanding how the canvas redraws
// stuff.
-
- // gint randr, randg, randb;
- // randr = random() % 255;
- // randg = random() % 255;
- // randb = random() % 255;
- // PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
-
- FAST_PAINT_BOX (buf, simplerect->fill_r, simplerect->fill_g, simplerect->fill_b, simplerect->fill_a,
- intersection.x0, intersection.y0,
- intersection.x1, intersection.y1);
-
- }
-
- for (i = 0; i < simplerect->outline_pixels; ++i) {
-
- if (simplerect->outline_what & 0x1) {
- if (begin == simplerect->bbox_ulx) {
- PAINT_VERT(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin + i, sy, ey);
- }
- }
- if (simplerect->outline_what & 0x2) {
- if (end == (simplerect->bbox_lrx - 1)) {
- PAINT_VERT(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, end - i, sy, ey + 1);
- }
- }
+#ifdef HARLEQUIN_DEBUGGING
+ gint randr, randg, randb;
+ randr = random() % 255;
+ randg = random() % 255;
+ randb = random() % 255;
+ PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
+#else
+ PAINT_BOX (buf, simplerect->fill_r, simplerect->fill_g, simplerect->fill_b, simplerect->fill_a,
+ intersection.x0, intersection.y0,
+ intersection.x1, intersection.y1);
+#endif
- if (simplerect->outline_what & 0x4) {
- PAINT_HORIZ(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin, end, sy+i);
- }
-
- if (simplerect->outline_what & 0x8) {
- PAINT_HORIZ(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin, end + 1, ey-i);
- }
}
+
+ if (simplerect->outline_a > 0) {
+ for (i = 0; i < simplerect->outline_pixels; ++i) {
+
+ if (simplerect->outline_what & 0x1) {
+ if (begin == simplerect->bbox_ulx) {
+ PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey);
+ }
+ }
+
+ if (simplerect->outline_what & 0x2) {
+ if (end == (simplerect->bbox_lrx - 1)) {
+ PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1);
+ }
+ }
+
+ if (simplerect->outline_what & 0x4) {
+ PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i);
+ }
+
+ if (simplerect->outline_what & 0x8) {
+ PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i);
+ }
+ }
+ }
}
#else /* SIMPLERECT_FAST_RENDERER */
GnomeCanvasSimpleRect *simplerect;
int end, begin;
int ey, sy;
- unsigned int i;
+ int i;
simplerect = GNOME_CANVAS_SIMPLERECT (item);
if (buf->is_bg) {
- // this can be useful for debugging/understanding how the canvas redraws
- // stuff.
-
- // gint randr, randg, randb;
- // randr = random() % 255;
- // randg = random() % 255;
- // randb = random() % 255;
- // PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
-
+#ifdef HARLEQUIN_DEBUGGING
+ gint randr, randg, randb;
+ randr = random() % 255;
+ randg = random() % 255;
+ randb = random() % 255;
+ PAINT_BOX(buf, randr, randg, randb, 255, buf->rect.x0, buf->rect.y0, buf->rect.x1, buf->rect.y1);
+#endif
gnome_canvas_buf_ensure_buf (buf);
buf->is_bg = FALSE;
}
ey = simplerect->bbox_lry-1;
if (simplerect->fill) {
-
- // this can be useful for debugging/understanding how the canvas redraws
- // stuff.
-
- // gint randr, randg, randb;
- // randr = random() % 255;
- // randg = random() % 255;
- // randb = random() % 255;
- // PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
-
+
+#ifdef HARLEQUIN_DEBUGGING
+ gint randr, randg, randb;
+ randr = random() % 255;
+ randg = random() % 255;
+ randb = random() % 255;
+ PAINT_BOX(buf, randr, randg, randb, simplerect->fill_a, begin, sy, end, ey);
+#else
PAINT_BOX(buf, simplerect->fill_r, simplerect->fill_g, simplerect->fill_b, simplerect->fill_a, begin, sy, end, ey);
+#endif
+ }
+
+ if (simplerect->outline_a) {
+ for (i = 0; i < (int) simplerect->outline_pixels; ++i) {
+
+ if (simplerect->outline_what & 0x1) {
+ if (begin == simplerect->bbox_ulx) {
+ PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin + i, sy, ey);
+ }
+ }
+
+ if (simplerect->outline_what & 0x2) {
+ if (end == (simplerect->bbox_lrx - 1)) {
+ PAINT_VERTA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, end - i, sy, ey + 1);
+ }
+ }
+
+ if (simplerect->outline_what & 0x4) {
+ PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end, sy+i);
+ }
+
+ if (simplerect->outline_what & 0x8) {
+ PAINT_HORIZA(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, simplerect->outline_a, begin, end + 1, ey-i);
+ }
+ }
+ }
+}
+#endif /* SIMPLERECT_FAST_RENDERER */
+
+static void
+gnome_canvas_simplerect_draw (GnomeCanvasItem *item,
+ GdkDrawable *drawable,
+ int x, int y,
+ int width, int height)
+{
+ GnomeCanvasSimpleRect *simplerect;
+ cairo_t* cr;
+ double ulx;
+ double uly;
+ double lrx;
+ double lry;
+
+ simplerect = GNOME_CANVAS_SIMPLERECT (item);
+
+ cr = gdk_cairo_create (drawable);
+
+ if (x > simplerect->bbox_ulx) {
+ ulx = x;
+ } else {
+ ulx = simplerect->bbox_ulx;
+ }
+
+ if (y > simplerect->bbox_uly) {
+ uly = y;
+ } else {
+ uly = simplerect->bbox_uly;
+ }
+
+ if (x + width > simplerect->bbox_lrx) {
+ lrx = simplerect->bbox_lrx;
+ } else {
+ lrx = x + width;
+ }
+
+ if (y + height > simplerect->bbox_lry) {
+ lry = simplerect->bbox_lry;
+ } else {
+ lry = y + height;
+ }
+
+ ulx -= x;
+ uly -= y;
+ lrx -= x;
+ lry -= y;
+
+ cairo_rectangle (cr, ulx, uly, lrx - ulx, lry - uly);
+
+ if (simplerect->fill) {
+ cairo_set_source_rgba (cr,
+ simplerect->fill_r/255.0,
+ simplerect->fill_g/255.0,
+ simplerect->fill_b/255.0,
+ simplerect->fill_a/255.0);
+ cairo_fill (cr);
}
- for (i = 0; i < simplerect->outline_pixels; ++i) {
+ if (simplerect->outline_what && simplerect->outline_pixels) {
+
+#define x_in_range(a) (x <= (a) && (a) < x + width)
+#define y_in_range(a) (y <= (a) && (a) < y + height)
+
+ cairo_set_line_width (cr, simplerect->outline_pixels);
+
+ cairo_set_source_rgb (cr,
+ simplerect->outline_r/255.0,
+ simplerect->outline_g/255.0,
+ simplerect->outline_b/255.0);
if (simplerect->outline_what & 0x1) {
- if (begin == simplerect->bbox_ulx) {
- PAINT_VERT(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin + i, sy, ey);
+ /* left edge, if visible */
+ if (x_in_range (simplerect->bbox_ulx)) {
+ cairo_move_to (cr, ulx+0.5, uly+0.5);
+ cairo_line_to (cr, ulx+0.5, lry+0.5);
+ cairo_stroke (cr);
}
}
if (simplerect->outline_what & 0x2) {
- if (end == (simplerect->bbox_lrx - 1)) {
- PAINT_VERT(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, end - i, sy, ey + 1);
+ /* right edge, if visible */
+ if (x_in_range (simplerect->bbox_lrx)) {
+ cairo_move_to (cr, lrx+0.5, uly+0.5);
+ cairo_line_to (cr, lrx+0.5, lry+0.5);
+ cairo_stroke (cr);
}
}
if (simplerect->outline_what & 0x4) {
- PAINT_HORIZ(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin, end, sy+i);
+ /* top edge */
+ if (y_in_range (simplerect->bbox_uly)) {
+ cairo_move_to (cr, ulx+0.5, uly+0.5);
+ cairo_line_to (cr, lrx+0.5, uly+0.5);
+ cairo_stroke (cr);
+ }
}
-
+
if (simplerect->outline_what & 0x8) {
- PAINT_HORIZ(buf, simplerect->outline_r, simplerect->outline_g, simplerect->outline_b, begin, end + 1, ey-i);
+ /* bottom edge */
+ if (y_in_range (simplerect->bbox_lry)) {
+ cairo_move_to (cr, ulx+0.5, lry+0.5);
+ cairo_line_to (cr, lrx+0.5, lry+0.5);
+ cairo_stroke (cr);
+ }
}
}
-}
-#endif /* SIMPLERECT_FAST_RENDERER */
-static void
-gnome_canvas_simplerect_draw (GnomeCanvasItem *item,
- GdkDrawable *drawable,
- int x, int y,
- int width, int height)
-{
- fprintf (stderr, "please don't use the CanvasSimpleRect item in a non-aa Canvas\n");
- abort ();
+ cairo_destroy (cr);
}
static double
gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item)
{
- GnomeCanvasSimpleRect *simplerect;
+ (void) cx;
+ (void) cy;
+
double x1, y1, x2, y2;
double dx, dy;
- simplerect = GNOME_CANVAS_SIMPLERECT (item);
-
*actual_item = item;
/* Find the bounds for the rectangle plus its outline width */
gnome_canvas_simplerect_bounds (item, &x1, &y1, &x2, &y2);
/* Is point inside rectangle */
-
+
if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) {
return 0.0;
}