From 14d43ca9fe28a8309b4a52fa85e2b0c64a92248b Mon Sep 17 00:00:00 2001 From: Taybin Rutkin Date: Sun, 25 Sep 2005 22:26:56 +0000 Subject: Switched to use libgnomecanvas (not the C++ one). git-svn-id: svn://localhost/trunk/ardour2@30 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/canvas-simpleline.c | 152 ++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 76 deletions(-) (limited to 'gtk2_ardour/canvas-simpleline.c') diff --git a/gtk2_ardour/canvas-simpleline.c b/gtk2_ardour/canvas-simpleline.c index 9823975eee..bf0fdeabc6 100644 --- a/gtk2_ardour/canvas-simpleline.c +++ b/gtk2_ardour/canvas-simpleline.c @@ -1,6 +1,6 @@ #include #include -#include +#include #include "canvas-simpleline.h" #include "rgb_macros.h" @@ -14,76 +14,76 @@ enum { ARG_COLOR_RGBA }; -static void gtk_canvas_simpleline_class_init (GtkCanvasSimpleLineClass *class); -static void gtk_canvas_simpleline_init (GtkCanvasSimpleLine *simpleline); -static void gtk_canvas_simpleline_set_arg (GtkObject *object, +static void gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class); +static void gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline); +static void gnome_canvas_simpleline_set_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void gtk_canvas_simpleline_get_arg (GtkObject *object, +static void gnome_canvas_simpleline_get_arg (GtkObject *object, GtkArg *arg, guint arg_id); -static void gtk_canvas_simpleline_update (GtkCanvasItem *item, double *affine, ArtSVP *clip_path, int flags); -static void gtk_canvas_simpleline_bounds (GtkCanvasItem *item, double *x1, double *y1, double *x2, double *y2); -static double gtk_canvas_simpleline_point (GtkCanvasItem *item, double x, double y, int cx, int cy, GtkCanvasItem **actual_item); -static void gtk_canvas_simpleline_render (GtkCanvasItem *item, GtkCanvasBuf *buf); -static void gtk_canvas_simpleline_draw (GtkCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h); +static void gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags); +static void gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2); +static double gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item); +static void gnome_canvas_simpleline_render (GnomeCanvasItem *item, GnomeCanvasBuf *buf); +static void gnome_canvas_simpleline_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int w, int h); -static GtkCanvasItemClass *parent_class; +static GnomeCanvasItemClass *parent_class; GtkType -gtk_canvas_simpleline_get_type (void) +gnome_canvas_simpleline_get_type (void) { static GtkType simpleline_type = 0; if (!simpleline_type) { GtkTypeInfo simpleline_info = { - "GtkCanvasSimpleLine", - sizeof (GtkCanvasSimpleLine), - sizeof (GtkCanvasSimpleLineClass), - (GtkClassInitFunc) gtk_canvas_simpleline_class_init, - (GtkObjectInitFunc) gtk_canvas_simpleline_init, + "GnomeCanvasSimpleLine", + sizeof (GnomeCanvasSimpleLine), + sizeof (GnomeCanvasSimpleLineClass), + (GtkClassInitFunc) gnome_canvas_simpleline_class_init, + (GtkObjectInitFunc) gnome_canvas_simpleline_init, NULL, /* reserved_1 */ NULL, /* reserved_2 */ (GtkClassInitFunc) NULL }; - simpleline_type = gtk_type_unique (gtk_canvas_item_get_type (), &simpleline_info); + simpleline_type = gtk_type_unique (gnome_canvas_item_get_type (), &simpleline_info); } return simpleline_type; } static void -gtk_canvas_simpleline_class_init (GtkCanvasSimpleLineClass *class) +gnome_canvas_simpleline_class_init (GnomeCanvasSimpleLineClass *class) { GtkObjectClass *object_class; - GtkCanvasItemClass *item_class; + GnomeCanvasItemClass *item_class; object_class = (GtkObjectClass *) class; - item_class = (GtkCanvasItemClass *) class; + item_class = (GnomeCanvasItemClass *) class; - parent_class = gtk_type_class (gtk_canvas_item_get_type ()); + parent_class = gtk_type_class (gnome_canvas_item_get_type ()); - gtk_object_add_arg_type ("GtkCanvasSimpleLine::x1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X1); - gtk_object_add_arg_type ("GtkCanvasSimpleLine::y1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y1); - gtk_object_add_arg_type ("GtkCanvasSimpleLine::x2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X2); - gtk_object_add_arg_type ("GtkCanvasSimpleLine::y2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y2); - gtk_object_add_arg_type ("GtkCanvasSimpleLine::color_rgba", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_COLOR_RGBA); + gtk_object_add_arg_type ("GnomeCanvasSimpleLine::x1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X1); + gtk_object_add_arg_type ("GnomeCanvasSimpleLine::y1", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y1); + gtk_object_add_arg_type ("GnomeCanvasSimpleLine::x2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_X2); + gtk_object_add_arg_type ("GnomeCanvasSimpleLine::y2", GTK_TYPE_DOUBLE, GTK_ARG_READWRITE, ARG_Y2); + gtk_object_add_arg_type ("GnomeCanvasSimpleLine::color_rgba", GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_COLOR_RGBA); - object_class->set_arg = gtk_canvas_simpleline_set_arg; - object_class->get_arg = gtk_canvas_simpleline_get_arg; + object_class->set_arg = gnome_canvas_simpleline_set_arg; + object_class->get_arg = gnome_canvas_simpleline_get_arg; - item_class->update = gtk_canvas_simpleline_update; - item_class->bounds = gtk_canvas_simpleline_bounds; - item_class->point = gtk_canvas_simpleline_point; - item_class->render = gtk_canvas_simpleline_render; - item_class->draw = gtk_canvas_simpleline_draw; + item_class->update = gnome_canvas_simpleline_update; + item_class->bounds = gnome_canvas_simpleline_bounds; + item_class->point = gnome_canvas_simpleline_point; + item_class->render = gnome_canvas_simpleline_render; + item_class->draw = gnome_canvas_simpleline_draw; } static void -gtk_canvas_simpleline_init (GtkCanvasSimpleLine *simpleline) +gnome_canvas_simpleline_init (GnomeCanvasSimpleLine *simpleline) { simpleline->x1 = 0.0; simpleline->y1 = 0.0; @@ -91,26 +91,26 @@ gtk_canvas_simpleline_init (GtkCanvasSimpleLine *simpleline) simpleline->y2 = 0.0; simpleline->color = RGBA_TO_UINT(98,123,174,241); simpleline->horizontal = TRUE; /* reset in the _update() method */ - GTK_CANVAS_ITEM(simpleline)->object.flags |= GTK_CANVAS_ITEM_NO_AUTO_REDRAW; + GNOME_CANVAS_ITEM(simpleline)->object.flags |= GNOME_CANVAS_ITEM_NO_AUTO_REDRAW; } static void -gtk_canvas_simpleline_bounds_world (GtkCanvasItem *item, int* ix1, int* iy1, int* ix2, int* iy2) +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]; - GtkCanvasSimpleLine *simpleline = GTK_CANVAS_SIMPLELINE(item); + GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE(item); - gtk_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); + gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); i1.x = x1; i1.y = y1; i2.x = x2; i2.y = y2; - gtk_canvas_item_i2w_affine (item, i2w); + gnome_canvas_item_i2w_affine (item, i2w); art_affine_point (&w1, &i1, i2w); art_affine_point (&w2, &i2, i2w); @@ -131,12 +131,12 @@ gtk_canvas_simpleline_bounds_world (GtkCanvasItem *item, int* ix1, int* iy1, int } static void -gtk_canvas_simpleline_reset_bounds (GtkCanvasItem *item) +gnome_canvas_simpleline_reset_bounds (GnomeCanvasItem *item) { int Ix1, Ix2, Iy1, Iy2; - gtk_canvas_simpleline_bounds_world (item, &Ix1, &Iy1, &Ix2, &Iy2); - gtk_canvas_update_bbox (item, Ix1, Iy1, Ix2, Iy2); + gnome_canvas_simpleline_bounds_world (item, &Ix1, &Iy1, &Ix2, &Iy2); + gnome_canvas_update_bbox (item, Ix1, Iy1, Ix2, Iy2); } /* @@ -144,15 +144,15 @@ gtk_canvas_simpleline_reset_bounds (GtkCanvasItem *item) */ static void -gtk_canvas_simpleline_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) +gnome_canvas_simpleline_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - GtkCanvasItem *item; - GtkCanvasSimpleLine *simpleline; + GnomeCanvasItem *item; + GnomeCanvasSimpleLine *simpleline; int redraw; int calc_bounds; - item = GTK_CANVAS_ITEM (object); - simpleline = GTK_CANVAS_SIMPLELINE (object); + item = GNOME_CANVAS_ITEM (object); + simpleline = GNOME_CANVAS_SIMPLELINE (object); redraw = FALSE; calc_bounds = FALSE; @@ -200,22 +200,22 @@ gtk_canvas_simpleline_set_arg (GtkObject *object, GtkArg *arg, guint arg_id) if (calc_bounds) { - gtk_canvas_item_request_update (item); + gnome_canvas_item_request_update (item); } else if (redraw) { int Ix1, Ix2, Iy1, Iy2; - gtk_canvas_simpleline_bounds_world (item, &Ix1, &Iy1, &Ix2, &Iy2); - gtk_canvas_request_redraw (item->canvas, Ix1, Iy1, Ix2, Iy2); + gnome_canvas_simpleline_bounds_world (item, &Ix1, &Iy1, &Ix2, &Iy2); + gnome_canvas_request_redraw (item->canvas, Ix1, Iy1, Ix2, Iy2); } } static void -gtk_canvas_simpleline_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) +gnome_canvas_simpleline_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) { - GtkCanvasSimpleLine *simpleline; + GnomeCanvasSimpleLine *simpleline; - simpleline = GTK_CANVAS_SIMPLELINE (object); + simpleline = GNOME_CANVAS_SIMPLELINE (object); switch (arg_id) { case ARG_X1: @@ -240,47 +240,47 @@ gtk_canvas_simpleline_get_arg (GtkObject *object, GtkArg *arg, guint arg_id) } static void -gtk_canvas_simpleline_update (GtkCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) +gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, int flags) { - GtkCanvasSimpleLine *simpleline; + GnomeCanvasSimpleLine *simpleline; double x; double y; - simpleline = GTK_CANVAS_SIMPLELINE (item); + simpleline = GNOME_CANVAS_SIMPLELINE (item); if (parent_class->update) (* parent_class->update) (item, affine, clip_path, flags); - gtk_canvas_simpleline_reset_bounds (item); + gnome_canvas_simpleline_reset_bounds (item); x = simpleline->x1; y = simpleline->y1; - gtk_canvas_item_i2w (item, &x, &y); - gtk_canvas_w2c (GTK_CANVAS(item->canvas), x, y, &simpleline->bbox_ulx, &simpleline->bbox_uly); + gnome_canvas_item_i2w (item, &x, &y); + gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &simpleline->bbox_ulx, &simpleline->bbox_uly); x = simpleline->x2; y = simpleline->y2; - gtk_canvas_item_i2w (item, &x, &y); - gtk_canvas_w2c (GTK_CANVAS(item->canvas), x, y, &simpleline->bbox_lrx, &simpleline->bbox_lry); + gnome_canvas_item_i2w (item, &x, &y); + gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x, y, &simpleline->bbox_lrx, &simpleline->bbox_lry); } static void -gtk_canvas_simpleline_render (GtkCanvasItem *item, - GtkCanvasBuf *buf) +gnome_canvas_simpleline_render (GnomeCanvasItem *item, + GnomeCanvasBuf *buf) { - GtkCanvasSimpleLine *simpleline; + GnomeCanvasSimpleLine *simpleline; int end, begin; - simpleline = GTK_CANVAS_SIMPLELINE (item); + simpleline = GNOME_CANVAS_SIMPLELINE (item); if (parent_class->render) { (*parent_class->render) (item, buf); } if (buf->is_bg) { - gtk_canvas_buf_ensure_buf (buf); + gnome_canvas_buf_ensure_buf (buf); buf->is_bg = FALSE; } @@ -302,14 +302,14 @@ gtk_canvas_simpleline_render (GtkCanvasItem *item, } static void -gtk_canvas_simpleline_draw (GtkCanvasItem *item, +gnome_canvas_simpleline_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width, int height) { - GtkCanvasSimpleLine *simpleline; + GnomeCanvasSimpleLine *simpleline; - simpleline = GTK_CANVAS_SIMPLELINE (item); + simpleline = GNOME_CANVAS_SIMPLELINE (item); if (parent_class->draw) { (* parent_class->draw) (item, drawable, x, y, width, height); @@ -320,9 +320,9 @@ gtk_canvas_simpleline_draw (GtkCanvasItem *item, } static void -gtk_canvas_simpleline_bounds (GtkCanvasItem *item, double *x1, double *y1, double *x2, double *y2) +gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2) { - GtkCanvasSimpleLine *simpleline = GTK_CANVAS_SIMPLELINE (item); + GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE (item); *x1 = simpleline->x1; *y1 = simpleline->y1; @@ -331,19 +331,19 @@ gtk_canvas_simpleline_bounds (GtkCanvasItem *item, double *x1, double *y1, doubl } static double -gtk_canvas_simpleline_point (GtkCanvasItem *item, double x, double y, int cx, int cy, GtkCanvasItem **actual_item) +gnome_canvas_simpleline_point (GnomeCanvasItem *item, double x, double y, int cx, int cy, GnomeCanvasItem **actual_item) { - GtkCanvasSimpleLine *simpleline; + GnomeCanvasSimpleLine *simpleline; double x1, y1, x2, y2; double dx, dy; - simpleline = GTK_CANVAS_SIMPLELINE (item); + simpleline = GNOME_CANVAS_SIMPLELINE (item); *actual_item = item; /* Find the bounds for the rectangle plus its outline width */ - gtk_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); + gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); /* Is point inside rectangle */ -- cgit v1.2.3