X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fcanvas-simpleline.c;h=efff5034f95f4ca7070b8b337dec98e8404aca99;hb=786cb746d0ce387a6194555e6757ec64c937690b;hp=4ba3d6bc76f5ca692cff346b2775a0c2db086847;hpb=81ef56fba962ff7b16658cc2831720947aacc8b5;p=ardour.git diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c index 4ba3d6bc76..efff5034f9 100644 --- a/gtk2_ardour/canvas-simpleline.c +++ b/gtk2_ardour/canvas-simpleline.c @@ -1,5 +1,6 @@ #include #include +#include #include #include "canvas-simpleline.h" @@ -103,7 +104,7 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) gobject_class->set_property = gnome_canvas_simpleline_set_property; gobject_class->get_property = gnome_canvas_simpleline_get_property; - + g_object_class_install_property (gobject_class, PROP_X1, g_param_spec_double ("x1", @@ -112,8 +113,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_Y1, g_param_spec_double ("y1", @@ -122,8 +123,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_X2, @@ -133,8 +134,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + g_object_class_install_property (gobject_class, PROP_Y2, g_param_spec_double ("y2", @@ -143,7 +144,7 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, - G_PARAM_READWRITE)); + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_COLOR_RGBA, g_param_spec_uint ("color_rgba", @@ -152,8 +153,8 @@ gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) 0, G_MAXUINT, 0, - G_PARAM_READWRITE)); - + G_PARAM_READWRITE)); + object_class->destroy = gnome_canvas_simpleline_destroy; item_class->update = gnome_canvas_simpleline_update; @@ -171,72 +172,20 @@ gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline) simpleline->x2 = 0.0; simpleline->y2 = 0.0; simpleline->color = RGBA_TO_UINT(98,123,174,241); - simpleline->horizontal = TRUE; /* reset in the _update() method */ - // GTK2FIX - // GNOME_CANVAS_ITEM(simpleline)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW; } static void gnome_canvas_simpleline_destroy (GtkObject *object) { - GnomeCanvasSimpleLine *line; - g_return_if_fail (object != NULL); g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object)); - line = GNOME_CANVAS_SIMPLELINE (object); - if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); } -static void -gnome_canvas_simpleline_bounds_world (GnomeCanvasItem *item, int* ix1, int* iy1, int* ix2, int* iy2) -{ - double x1, x2, y1, y2; - ArtPoint i1, i2; - ArtPoint w1, w2; - double i2w[6]; - GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE(item); - - gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); - - i1.x = x1; - i1.y = y1; - i2.x = x2; - i2.y = y2; - - gnome_canvas_item_i2w_affine (item, i2w); - art_affine_point (&w1, &i1, i2w); - art_affine_point (&w2, &i2, i2w); - - *ix1 = (int) rint(w1.x); - *ix2 = (int) rint(w2.x); - *iy1 = (int) rint(w1.y); - *iy2 = (int) rint(w2.y); - - /* the update rect has to be of non-zero width and height */ - - if (x1 == x2) { - simpleline->horizontal = FALSE; - *ix2 += 1; - } else { - simpleline->horizontal = TRUE; - *iy2 += 1; - } -} - -static void -gnome_canvas_simpleline_reset_bounds (GnomeCanvasItem *item) -{ - int Ix1, Ix2, Iy1, Iy2; - - gnome_canvas_simpleline_bounds_world (item, &Ix1, &Iy1, &Ix2, &Iy2); - gnome_canvas_update_bbox (item, Ix1, Iy1, Ix2, Iy2); -} - -/* - * CANVAS CALLBACKS +/* + * CANVAS CALLBACKS */ static void @@ -246,9 +195,12 @@ gnome_canvas_simpleline_set_property (GObject *object, GParamSpec *pspec) { + (void) pspec; + GnomeCanvasSimpleLine *simpleline; int update = FALSE; int bounds_changed = FALSE; + double d; g_return_if_fail (object != NULL); g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object)); @@ -257,33 +209,37 @@ gnome_canvas_simpleline_set_property (GObject *object, switch (prop_id) { case PROP_X1: - if (simpleline->x1 != g_value_get_double (value)) { - simpleline->x1 = g_value_get_double (value); + d = g_value_get_double (value); + if (simpleline->x1 != d) { + simpleline->x1 = d; bounds_changed = TRUE; } break; case PROP_Y1: - if (simpleline->y1 != g_value_get_double (value)) { - simpleline->y1 = g_value_get_double (value); + d = g_value_get_double (value); + if (simpleline->y1 != d) { + simpleline->y1 = d; bounds_changed = TRUE; } break; case PROP_X2: - if (simpleline->x2 != g_value_get_double (value)) { - simpleline->x2 = g_value_get_double (value); + d = g_value_get_double (value); + if (simpleline->x2 != d) { + simpleline->x2 = d; bounds_changed = TRUE; } break; case PROP_Y2: - if (simpleline->y2 != g_value_get_double (value)) { - simpleline->y2 = g_value_get_double (value); + d = g_value_get_double (value); + if (simpleline->y2 != d) { + simpleline->y2 = d; bounds_changed = TRUE; } break; - + case PROP_COLOR_RGBA: if (simpleline->color != g_value_get_uint(value)) { simpleline->color = g_value_get_uint(value); @@ -308,7 +264,7 @@ gnome_canvas_simpleline_get_property (GObject *object, { g_return_if_fail (object != NULL); g_return_if_fail (GNOME_IS_CANVAS_SIMPLELINE (object)); - + GnomeCanvasSimpleLine *line = GNOME_CANVAS_SIMPLELINE (object); switch (prop_id) { @@ -337,80 +293,108 @@ static void gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) { GnomeCanvasSimpleLine *simpleline; - double x; - double y; + double x1, x2, y1, y2; simpleline = GNOME_CANVAS_SIMPLELINE (item); if (parent_class->update) (* parent_class->update) (item, affine, clip_path, flags); - gnome_canvas_simpleline_reset_bounds (item); + /* redraw old location */ + + gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); + + /* get current bounding box in parent-relative world coordinates */ + + gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); - x = simpleline->x1; - y = simpleline->y1; + /* convert parent-relative item coordinates to world coordinates */ - gnome_canvas_item_i2w (item, &x, &y); - gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &simpleline->bbox_ulx, &simpleline->bbox_uly); + gnome_canvas_item_i2w (item, &x1, &y1); + gnome_canvas_item_i2w (item, &x2, &y2); - x = simpleline->x2; - y = simpleline->y2; + /* don't suffer from rounding errors */ - gnome_canvas_item_i2w (item, &x, &y); - gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &simpleline->bbox_lrx, &simpleline->bbox_lry); + x1 = floor (x1); + y1 = floor (y1); + x2 = ceil (x2); + y2 = ceil (y2); + + /* force non-zero dimensionality for both axes */ + + if (x1 == x2) { + x2 += 1.0; + } + + if (y1 == y2) { + y2 += 1.0; + } + + /* reset item bounding box (canvas coordinates, so integral. but stored in doubles) */ + + gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x1, y1, &item->x1, &item->y1); + gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x2, y2, &item->x2, &item->y2); + + /* redraw new location */ + + gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2); + + /* store actual line coords as canvas coordinates for use in render() */ + + x1 = simpleline->x1; + y1 = simpleline->y1; + x2 = simpleline->x2; + y2 = simpleline->y2; + /* convert to world */ + gnome_canvas_item_i2w (item, &x1, &y1); + gnome_canvas_item_i2w (item, &x2, &y2); + /* avoid rounding errors */ + x1 = (int) floor (item->x1); + y1 = (int) floor (item->y1); + x2 = (int) ceil (item->x2); + y2 = (int) ceil (item->y2); + /* convert to canvas coordinates, integral, stored in integers */ + gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x1, y1, &simpleline->cx1, &simpleline->cy1); + gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x2, y2, &simpleline->cx2, &simpleline->cy2); } static void gnome_canvas_simpleline_render (GnomeCanvasItem *item, - GnomeCanvasBuf *buf) + GnomeCanvasBuf *buf) { GnomeCanvasSimpleLine *simpleline; - int end, begin; + int x1, x2; + int y1, y2; simpleline = GNOME_CANVAS_SIMPLELINE (item); - if (parent_class->render) { - (*parent_class->render) (item, buf); - } + x1 = simpleline->cx1; + x2 = simpleline->cx2; + y1 = simpleline->cy1; if (buf->is_bg) { gnome_canvas_buf_ensure_buf (buf); buf->is_bg = FALSE; } - //begin = MAX(simpleline->bbox_ulx,buf->rect.x0); - //end = MIN(simpleline->bbox_lrx,buf->rect.x1); - - begin = simpleline->bbox_ulx; - end = simpleline->bbox_lrx; - - if (simpleline->color != 0) { - if (simpleline->horizontal) { - PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, - begin, end, simpleline->bbox_uly); - } else { - PAINT_VERTA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, - begin, simpleline->bbox_uly, simpleline->bbox_lry); - } - } + if (simpleline->x1 != simpleline->x2) { + PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, + x1, x2, y1); + } else { + y2 = simpleline->cy2; + PAINT_VERTA (buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, + x1, y1, y2); + + } } static void -gnome_canvas_simpleline_draw (GnomeCanvasItem *item, - GdkDrawable *drawable, - int x, int y, - int width, int height) +gnome_canvas_simpleline_draw (GnomeCanvasItem* canvas, + GdkDrawable* drawable, + int x, int y, + int width, int height) { - GnomeCanvasSimpleLine *simpleline; - - simpleline = GNOME_CANVAS_SIMPLELINE (item); - - if (parent_class->draw) { - (* parent_class->draw) (item, drawable, x, y, width, height); - } - - fprintf (stderr, "please don't use the CanvasSimpleLine item in a non-aa Canvas\n"); - abort (); + /* XXX not implemented */ } static void @@ -418,34 +402,33 @@ gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, d { GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE (item); - *x1 = simpleline->x1; - *y1 = simpleline->y1; - *x2 = simpleline->x2; - *y2 = simpleline->y2; + *x1 = simpleline->x1; + *y1 = simpleline->y1; + *x2 = simpleline->x1; + *y2 = simpleline->y2; } static double gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item) { - GnomeCanvasSimpleLine *simpleline; + (void) cx; + (void) cy; + double x1, y1, x2, y2; double dx, dy; - simpleline = GNOME_CANVAS_SIMPLELINE (item); - *actual_item = item; - /* Find the bounds for the rectangle plus its outline width */ + /* Find the bounds for the line */ gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); - /* Is point inside rectangle */ - + /* Is point inside line */ + if ((x >= x1) && (y >= y1) && (x <= x2) && (y <= y2)) { return 0.0; } - - /* Point is outside rectangle */ + /* Point is outside line */ if (x < x1) dx = x1 - x;