X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simplerect.c;h=55175c94c3de466bbd24050ecef7451a3ec09f9f;hb=91e6c1b176d93f43bab6713574c590ea97801bdc;hp=92c05e7f76a3d37c714a9d17eea9e7ed306725d2;hpb=0c8284ca6a83312cd5794485519fc278eb4472aa;p=ardour.git diff --git a/gtk2_ardour/canvas-simplerect.c b/gtk2_ardour/canvas-simplerect.c index 92c05e7f76..55175c94c3 100644 --- a/gtk2_ardour/canvas-simplerect.c +++ b/gtk2_ardour/canvas-simplerect.c @@ -1,5 +1,6 @@ #include #include +#include #include #include "canvas-simplerect.h" @@ -19,46 +20,65 @@ enum { 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_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 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; @@ -67,18 +87,20 @@ gnome_canvas_simplerect_get_type (void) static void gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) { - GObjectClass *object_class; + GObjectClass *gobject_class; + GtkObjectClass *object_class; GnomeCanvasItemClass *item_class; - object_class = G_OBJECT_CLASS (class); + gobject_class = (GObjectClass *) class; + object_class = (GtkObjectClass *) class; item_class = (GnomeCanvasItemClass *) class; - parent_class = gtk_type_class (gnome_canvas_item_get_type ()); + 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; - object_class->set_property = gnome_canvas_simplerect_set_property; - object_class->get_property = gnome_canvas_simplerect_get_property; - - g_object_class_install_property (object_class, + g_object_class_install_property (gobject_class, PROP_X1, g_param_spec_double ("x1", _("x1"), @@ -86,9 +108,9 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_Y1, g_param_spec_double ("y1", _("y1"), @@ -96,10 +118,10 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + - g_object_class_install_property (object_class, + g_object_class_install_property (gobject_class, PROP_X2, g_param_spec_double ("x2", _("x2"), @@ -107,9 +129,9 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, + G_PARAM_READWRITE)); + + g_object_class_install_property (gobject_class, PROP_Y2, g_param_spec_double ("y2", _("y2"), @@ -117,10 +139,10 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + - g_object_class_install_property (object_class, + g_object_class_install_property (gobject_class, PROP_OUTLINE_PIXELS, g_param_spec_uint ("outline_pixels", _("outline pixels"), @@ -128,10 +150,10 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); - g_object_class_install_property (object_class, + + g_object_class_install_property (gobject_class, PROP_OUTLINE_WHAT, g_param_spec_uint ("outline_what", _("outline what"), @@ -139,28 +161,28 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + - g_object_class_install_property (object_class, + 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 (object_class, + 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_PARAM_READWRITE)); + - g_object_class_install_property (object_class, + g_object_class_install_property (gobject_class, PROP_OUTLINE_COLOR_RGBA, g_param_spec_uint ("outline_color_rgba", _("outline color rgba"), @@ -168,10 +190,10 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); - g_object_class_install_property (object_class, + + g_object_class_install_property (gobject_class, PROP_FILL_COLOR_RGBA, g_param_spec_uint ("fill_color_rgba", _("fill color rgba"), @@ -179,13 +201,16 @@ gnome_canvas_simplerect_class_init (GnomeCanvasSimpleRectClass *class) 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); - + 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 @@ -202,9 +227,22 @@ gnome_canvas_simplerect_init (GnomeCanvasSimpleRect *simplerect) simplerect->outline_color = 0; simplerect->outline_pixels = 1; simplerect->outline_what = 0xf; +} + +static void +gnome_canvas_simplerect_destroy (GtkObject *object) +{ + GnomeCanvasSimpleRect *rect; + + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object)); + + rect = GNOME_CANVAS_SIMPLERECT (object); - // GTK2FIX - // 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 @@ -216,17 +254,17 @@ gnome_canvas_simplerect_bounds (GnomeCanvasItem *item, double *x1, double *y1, d *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; @@ -248,47 +286,79 @@ gnome_canvas_simplerect_reset_bounds (GnomeCanvasItem *item) 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); + 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 @@ -298,9 +368,13 @@ gnome_canvas_simplerect_set_property (GObject *object, GParamSpec *pspec) { + (void) pspec; + GnomeCanvasSimpleRect *simplerect; int update = FALSE; int bounds_changed = FALSE; + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object)); simplerect = GNOME_CANVAS_SIMPLERECT (object); @@ -380,7 +454,23 @@ gnome_canvas_simplerect_set_property (GObject *object, 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 (GNOME_CANVAS_ITEM(object)); @@ -394,7 +484,10 @@ gnome_canvas_simplerect_get_property (GObject *object, GParamSpec *pspec) { GnomeCanvasSimpleRect *rect = GNOME_CANVAS_SIMPLERECT (object); - + + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_CANVAS_SIMPLERECT (object)); + switch (prop_id) { case PROP_X1: g_value_set_double (value, rect->x1); @@ -426,7 +519,7 @@ gnome_canvas_simplerect_get_property (GObject *object, case PROP_DRAW: g_value_set_boolean (value, rect->draw); break; - + default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; @@ -448,11 +541,11 @@ gnome_canvas_simplerect_update (GnomeCanvasItem *item, double *affine, ArtSVP *c 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; } @@ -460,7 +553,12 @@ gnome_canvas_simplerect_update (GnomeCanvasItem *item, double *affine, ArtSVP *c UINT_TO_RGBA (simplerect->outline_color, &simplerect->outline_r, &simplerect->outline_g, &simplerect->outline_b, &foo); } -#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 @@ -482,15 +580,13 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *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; } @@ -498,7 +594,7 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, if (!simplerect->draw) { return; } - + self.x0 = simplerect->bbox_ulx; self.y0 = simplerect->bbox_uly; self.x1 = simplerect->bbox_lrx; @@ -513,20 +609,22 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, 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); - + +#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 + } for (i = 0; i < simplerect->outline_pixels; ++i) { @@ -546,7 +644,7 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, 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); } @@ -572,15 +670,13 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *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; } @@ -596,17 +692,16 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, 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 } for (i = 0; i < simplerect->outline_pixels; ++i) { @@ -626,7 +721,7 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, 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); } @@ -636,17 +731,119 @@ gnome_canvas_simplerect_render (GnomeCanvasItem *item, static void gnome_canvas_simplerect_draw (GnomeCanvasItem *item, - GdkDrawable *drawable, - int x, int y, - int width, int height) + 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 (); + 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); + } + + 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) { + /* 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) { + /* 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) { + /* 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) { + /* 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); + } + } + } + + cairo_destroy (cr); } static double gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item) { + (void) cx; + (void) cy; + GnomeCanvasSimpleRect *simplerect; double x1, y1, x2, y2; double dx, dy; @@ -660,7 +857,7 @@ gnome_canvas_simplerect_point (GnomeCanvasItem *item, double x, double y, int cx 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; }