[dia] formatting: cleanup interactive renderer
- From: Zander <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] formatting: cleanup interactive renderer
- Date: Wed, 28 Aug 2019 00:17:29 +0000 (UTC)
commit 3e2c19be5f733a328e0b4d4913b7e5e9d94ba7a2
Author: Zander Brown <zbrown gnome org>
Date: Tue Jul 23 13:41:23 2019 +0100
formatting: cleanup interactive renderer
lib/renderer/diacairo-interactive.c | 688 ++++++++++++++++--------------------
lib/renderer/diacairo.h | 11 +-
2 files changed, 317 insertions(+), 382 deletions(-)
---
diff --git a/lib/renderer/diacairo-interactive.c b/lib/renderer/diacairo-interactive.c
index 12a0d7d1..1f117c82 100644
--- a/lib/renderer/diacairo-interactive.c
+++ b/lib/renderer/diacairo-interactive.c
@@ -31,19 +31,7 @@
#include "object.h"
#include "textline.h"
-#define DIA_TYPE_CAIRO_INTERACTIVE_RENDERER (dia_cairo_interactive_renderer_get_type ())
-#define DIA_CAIRO_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj),
DIA_TYPE_CAIRO_INTERACTIVE_RENDERER, DiaCairoInteractiveRenderer))
-#define DIA_CAIRO_INTERACTIVE_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass),
DIA_TYPE_CAIRO_INTERACTIVE_RENDERER, DiaCairoInteractiveRendererClass))
-#define DIA_CAIRO_IS_INTERACTIVE_RENDERER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj),
DIA_TYPE_CAIRO_INTERACTIVE_RENDERER))
-#define DIA_CAIRO_INTERACTIVE_RENDERER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),
DIA_TYPE_CAIRO_INTERACTIVE_RENDERER, DiaCairoInteractiveRendererClass))
-
-GType dia_cairo_interactive_renderer_get_type (void) G_GNUC_CONST;
-
-typedef struct _DiaCairoInteractiveRenderer DiaCairoInteractiveRenderer;
-typedef struct _DiaCairoInteractiveRendererClass DiaCairoInteractiveRendererClass;
-
-struct _DiaCairoInteractiveRenderer
-{
+struct _DiaCairoInteractiveRenderer {
DiaCairoRenderer parent_instance;
/*< private >*/
@@ -66,43 +54,10 @@ struct _DiaCairoInteractiveRenderer
Color *highlight_color;
};
-struct _DiaCairoInteractiveRendererClass
-{
- DiaRendererClass parent_class;
-};
+static void dia_cairo_interactive_renderer_iface_init (DiaInteractiveRendererInterface* iface);
-static void clip_region_clear(DiaRenderer *renderer);
-static void clip_region_add_rect(DiaRenderer *renderer,
- Rectangle *rect);
-
-static void draw_pixel_line(DiaRenderer *renderer,
- int x1, int y1,
- int x2, int y2,
- Color *color);
-static void draw_pixel_rect(DiaRenderer *renderer,
- int x, int y,
- int width, int height,
- Color *color);
-static void fill_pixel_rect(DiaRenderer *renderer,
- int x, int y,
- int width, int height,
- Color *color);
-static void set_size (DiaRenderer *renderer,
- gpointer window,
- int width, int height);
-static void paint (DiaRenderer *renderer,
- cairo_t *ctx,
- int width,
- int height);
-
-static void cairo_interactive_renderer_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void cairo_interactive_renderer_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+G_DEFINE_TYPE_WITH_CODE (DiaCairoInteractiveRenderer, dia_cairo_interactive_renderer,
DIA_CAIRO_TYPE_RENDERER,
+ G_IMPLEMENT_INTERFACE (DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
dia_cairo_interactive_renderer_iface_init))
enum {
PROP_0,
@@ -110,32 +65,11 @@ enum {
PROP_RECT
};
-
-static int
-get_width_pixels (DiaRenderer *object)
-{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- return renderer->width;
-}
-
-static int
-get_height_pixels (DiaRenderer *object)
-{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- return renderer->height;
-}
-
-/* gobject boiler plate */
-static void cairo_interactive_renderer_init (DiaCairoInteractiveRenderer *r, void *p);
-static void cairo_interactive_renderer_class_init (DiaCairoInteractiveRendererClass *klass);
-
-static gpointer parent_class = NULL;
-
static void
-cairo_interactive_renderer_init (DiaCairoInteractiveRenderer *object, void *p)
+dia_cairo_interactive_renderer_init (DiaCairoInteractiveRenderer *object)
{
DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- DiaRenderer *dia_renderer = DIA_RENDERER(object);
+ DiaRenderer *dia_renderer = DIA_RENDERER (object);
dia_renderer->is_interactive = 1;
@@ -145,203 +79,79 @@ cairo_interactive_renderer_init (DiaCairoInteractiveRenderer *object, void *p)
}
static void
-cairo_interactive_renderer_finalize (GObject *object)
+dia_cairo_interactive_renderer_finalize (GObject *object)
{
DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
DiaCairoRenderer *base_renderer = DIA_CAIRO_RENDERER (object);
- if (base_renderer->cr)
+ if (base_renderer->cr) {
cairo_destroy (base_renderer->cr);
+ }
base_renderer->cr = NULL;
- if (renderer->surface)
- cairo_surface_destroy (renderer->surface);
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-/* Get the width of the given text in cm */
-static real
-get_text_width(DiaRenderer *object,
- const gchar *text, int length)
-{
- real result;
- TextLine *text_line;
-
- if (length != g_utf8_strlen(text, -1)) {
- char *shorter;
- int ulen;
- ulen = g_utf8_offset_to_pointer(text, length)-text;
- if (!g_utf8_validate(text, ulen, NULL)) {
- g_warning ("Text at char %d not valid\n", length);
- }
- shorter = g_strndup(text, ulen);
- text_line = text_line_new(shorter, object->font, object->font_height);
- g_free (shorter);
- } else {
- text_line = text_line_new(text, object->font, object->font_height);
+ if (renderer->surface) {
+ cairo_surface_destroy (renderer->surface);
}
- result = text_line_get_width(text_line);
- text_line_destroy(text_line);
- return result;
-}
-/** Used as background? for text editing */
-static Color text_edit_color = {1.0, 1.0, 0.7 };
-
-static real
-calculate_relative_luminance (const Color *c)
-{
- real R, G, B;
-
- R = (c->red <= 0.03928) ? c->red / 12.92 : pow((c->red+0.055)/1.055, 2.4);
- G = (c->green <= 0.03928) ? c->green / 12.92 : pow((c->green+0.055)/1.055, 2.4);
- B = (c->blue <= 0.03928) ? c->blue / 12.92 : pow((c->blue+0.055)/1.055, 2.4);
+ renderer->surface = NULL;
- return 0.2126 * R + 0.7152 * G + 0.0722 * B;
+ G_OBJECT_CLASS (dia_cairo_interactive_renderer_parent_class)->finalize (object);
}
-static void
-draw_text_line (DiaRenderer *self, TextLine *text_line,
- Point *pos, Alignment alignment, Color *color)
-{
- DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (self);
- DiaCairoInteractiveRenderer *interactive = DIA_CAIRO_INTERACTIVE_RENDERER (self);
-
- if (interactive->highlight_color) {
- /* the high_light color is just taken as a hint, alternative needs
- * to have some contrast to cursor color (curently hard coded black)
- */
- static Color alternate_color = { 0.5, 0.5, 0.4 };
- real rl, cr1, cr2;
-
- /* just draw the box */
- real h = text_line_get_height (text_line);
- real w = text_line_get_width (text_line);
- real x = pos->x;
- real y = pos->y;
-
- y -= text_line_get_ascent(text_line);
- x -= text_line_get_alignment_adjustment (text_line, alignment);
- rl = calculate_relative_luminance (color) + 0.05;
- cr1 = calculate_relative_luminance (interactive->highlight_color) + 0.05;
- cr1 = (cr1 > rl) ? cr1 / rl : rl / cr1;
- cr2 = calculate_relative_luminance (&alternate_color) + 0.05;
- cr2 = (cr2 > rl) ? cr2 / rl : rl / cr2;
-
- /* use color giving the better contrast ratio, if necessary
- * http://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast-contrast
- */
- if (cr1 > cr2)
- cairo_set_source_rgba (renderer->cr,
- interactive->highlight_color->red,
- interactive->highlight_color->green,
- interactive->highlight_color->blue,
- 1.0);
- else
- cairo_set_source_rgba (renderer->cr,
- alternate_color.red,
- alternate_color.green,
- alternate_color.blue,
- 1.0);
-
- cairo_rectangle (renderer->cr, x, y, w, h);
- cairo_fill (renderer->cr);
- }
- DIA_RENDERER_CLASS (parent_class)->draw_text_line (self, text_line, pos, alignment, color);
-}
static void
-draw_object_highlighted (DiaRenderer *self,
- DiaObject *object,
- DiaHighlightType type)
+dia_cairo_interactive_renderer_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
- DiaCairoInteractiveRenderer *interactive = DIA_CAIRO_INTERACTIVE_RENDERER (self);
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- switch (type) {
- case DIA_HIGHLIGHT_TEXT_EDIT:
- interactive->highlight_color = &text_edit_color;
- break;
- case DIA_HIGHLIGHT_CONNECTIONPOINT_MAIN:
- case DIA_HIGHLIGHT_CONNECTIONPOINT:
- case DIA_HIGHLIGHT_NONE:
- interactive->highlight_color = NULL;
- break;
+ switch (prop_id) {
+ case PROP_ZOOM:
+ renderer->zoom_factor = g_value_get_pointer (value);
+ break;
+ case PROP_RECT:
+ renderer->visible = g_value_get_pointer (value);
+ break;
+ default:
+ break;
}
- /* usually this method would need to draw the object twice,
- * once with highlight and once without. But due to our
- * draw_text_line implementation we only need one run */
- object->ops->draw(object, self);
- /* always reset when done with this object */
- interactive->highlight_color = NULL;
}
static void
-set_selection (DiaRenderer *renderer,
- gboolean has_selection,
- double x,
- double y,
- double width,
- double height)
+dia_cairo_interactive_renderer_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- DiaCairoInteractiveRenderer *self = DIA_CAIRO_INTERACTIVE_RENDERER (renderer);
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- self->has_selection = has_selection;
- self->selection_x = x;
- self->selection_y = y;
- self->selection_width = width;
- self->selection_height = height;
+ switch (prop_id) {
+ case PROP_ZOOM:
+ g_value_set_pointer (value, renderer->zoom_factor);
+ break;
+ case PROP_RECT:
+ g_value_set_pointer (value, renderer->visible);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
}
-static void
-dia_cairo_interactive_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+static int
+dia_cairo_interactive_renderer_get_width_pixels (DiaRenderer *object)
{
- iface->clip_region_clear = clip_region_clear;
- iface->clip_region_add_rect = clip_region_add_rect;
- iface->draw_pixel_line = draw_pixel_line;
- iface->draw_pixel_rect = draw_pixel_rect;
- iface->fill_pixel_rect = fill_pixel_rect;
- iface->paint = paint;
- iface->set_size = set_size;
- iface->draw_object_highlighted = draw_object_highlighted;
- iface->set_selection = set_selection;
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
+
+ return renderer->width;
}
-GType
-dia_cairo_interactive_renderer_get_type (void)
+static int
+dia_cairo_interactive_renderer_get_height_pixels (DiaRenderer *object)
{
- static GType object_type = 0;
-
- if (!object_type)
- {
- static const GTypeInfo object_info =
- {
- sizeof (DiaCairoInteractiveRendererClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) cairo_interactive_renderer_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (DiaCairoInteractiveRenderer),
- 0, /* n_preallocs */
- (GInstanceInitFunc) cairo_interactive_renderer_init /* init */
- };
-
- static const GInterfaceInfo irenderer_iface_info =
- {
- (GInterfaceInitFunc) dia_cairo_interactive_renderer_iface_init,
- NULL, /* iface_finalize */
- NULL /* iface_data */
- };
-
- object_type = g_type_register_static (DIA_CAIRO_TYPE_RENDERER,
- "DiaCairoInteractiveRenderer",
- &object_info, 0);
-
- /* register the interactive renderer interface */
- g_type_add_interface_static (object_type,
- DIA_TYPE_INTERACTIVE_RENDERER_INTERFACE,
- &irenderer_iface_info);
-
- }
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- return object_type;
+ return renderer->height;
}
/*
@@ -369,7 +179,8 @@ _gdk_cairo_region (cairo_t *cr,
}
static void
-begin_render(DiaRenderer *self, const Rectangle *update)
+dia_cairo_interactive_renderer_begin_render (DiaRenderer *self,
+ const Rectangle *update)
{
DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (self);
DiaCairoRenderer *base_renderer = DIA_CAIRO_RENDERER (self);
@@ -384,7 +195,7 @@ begin_render(DiaRenderer *self, const Rectangle *update)
/* Setup clipping for this sequence of render operations */
/* Must be done before the scaling because the clip is in pixel coords */
_gdk_cairo_region (base_renderer->cr, renderer->clip_region);
- cairo_clip(base_renderer->cr);
+ cairo_clip (base_renderer->cr);
cairo_scale (base_renderer->cr, *renderer->zoom_factor, *renderer->zoom_factor);
cairo_translate (base_renderer->cr, -renderer->visible->left, -renderer->visible->top);
@@ -409,7 +220,7 @@ begin_render(DiaRenderer *self, const Rectangle *update)
}
static void
-end_render(DiaRenderer *self)
+dia_cairo_interactive_renderer_end_render (DiaRenderer *self)
{
DiaCairoRenderer *base_renderer = DIA_CAIRO_RENDERER (self);
@@ -418,157 +229,154 @@ end_render(DiaRenderer *self)
base_renderer->cr = NULL;
}
-static void
-cairo_interactive_renderer_class_init (DiaCairoInteractiveRendererClass *klass)
+/* Get the width of the given text in cm */
+static real
+dia_cairo_interactive_renderer_get_text_width (DiaRenderer *object,
+ const gchar *text,
+ int length)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- DiaRendererClass *renderer_class = DIA_RENDERER_CLASS (klass);
+ real result;
+ TextLine *text_line;
- parent_class = g_type_class_peek_parent (klass);
+ if (length != g_utf8_strlen (text, -1)) {
+ char *shorter;
+ int ulen;
+ ulen = g_utf8_offset_to_pointer (text, length) - text;
+ if (!g_utf8_validate (text, ulen, NULL)) {
+ g_warning ("Text at char %d not valid\n", length);
+ }
+ shorter = g_strndup (text, ulen);
+ text_line = text_line_new (shorter, object->font, object->font_height);
+ g_free (shorter);
+ } else {
+ text_line = text_line_new (text, object->font, object->font_height);
+ }
+ result = text_line_get_width (text_line);
+ text_line_destroy (text_line);
+ return result;
+}
- gobject_class->finalize = cairo_interactive_renderer_finalize;
+static real
+calculate_relative_luminance (const Color *c)
+{
+ real R, G, B;
- gobject_class->set_property = cairo_interactive_renderer_set_property;
- gobject_class->get_property = cairo_interactive_renderer_get_property;
+ R = (c->red <= 0.03928) ? c->red / 12.92 : pow ((c->red+0.055)/1.055, 2.4);
+ G = (c->green <= 0.03928) ? c->green / 12.92 : pow ((c->green+0.055)/1.055, 2.4);
+ B = (c->blue <= 0.03928) ? c->blue / 12.92 : pow ((c->blue+0.055)/1.055, 2.4);
- g_object_class_install_property (gobject_class,
- PROP_ZOOM,
- g_param_spec_pointer ("zoom",
- _("Zoom pointer"),
- _("Zoom pointer"),
- G_PARAM_READWRITE));
+ return 0.2126 * R + 0.7152 * G + 0.0722 * B;
+}
- g_object_class_install_property (gobject_class,
- PROP_RECT,
- g_param_spec_pointer ("rect",
- _("Visible rect pointer"),
- _("Visible rect pointer"),
- G_PARAM_READWRITE));
+static void
+dia_cairo_interactive_renderer_draw_text_line (DiaRenderer *self,
+ TextLine *text_line,
+ Point *pos,
+ Alignment alignment,
+ Color *color)
+{
+ DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (self);
+ DiaCairoInteractiveRenderer *interactive = DIA_CAIRO_INTERACTIVE_RENDERER (self);
- /* renderer members */
- renderer_class->get_width_pixels = get_width_pixels;
- renderer_class->get_height_pixels = get_height_pixels;
+ if (interactive->highlight_color) {
+ /* the high_light color is just taken as a hint, alternative needs
+ * to have some contrast to cursor color (curently hard coded black)
+ */
+ static Color alternate_color = { 0.5, 0.5, 0.4 };
+ real rl, cr1, cr2;
- renderer_class->begin_render = begin_render;
- renderer_class->end_render = end_render;
+ /* just draw the box */
+ real h = text_line_get_height (text_line);
+ real w = text_line_get_width (text_line);
+ real x = pos->x;
+ real y = pos->y;
- /* mostly for cursor placement */
- renderer_class->get_text_width = get_text_width;
- /* highlight for text editing is special */
- renderer_class->draw_text_line = draw_text_line;
-}
+ y -= text_line_get_ascent (text_line);
+ x -= text_line_get_alignment_adjustment (text_line, alignment);
-static void
-cairo_interactive_renderer_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
+ rl = calculate_relative_luminance (color) + 0.05;
+ cr1 = calculate_relative_luminance (interactive->highlight_color) + 0.05;
+ cr1 = (cr1 > rl) ? cr1 / rl : rl / cr1;
+ cr2 = calculate_relative_luminance (&alternate_color) + 0.05;
+ cr2 = (cr2 > rl) ? cr2 / rl : rl / cr2;
- switch (prop_id) {
- case PROP_ZOOM:
- renderer->zoom_factor = g_value_get_pointer(value);
- break;
- case PROP_RECT:
- renderer->visible = g_value_get_pointer(value);
- break;
- default:
- break;
+ /* use color giving the better contrast ratio, if necessary
+ * http://www.w3.org/TR/2008/REC-WCAG20-20081211/#visual-audio-contrast-contrast
+ */
+ if (cr1 > cr2) {
+ cairo_set_source_rgba (renderer->cr,
+ interactive->highlight_color->red,
+ interactive->highlight_color->green,
+ interactive->highlight_color->blue,
+ 1.0);
+ } else {
+ cairo_set_source_rgba (renderer->cr,
+ alternate_color.red,
+ alternate_color.green,
+ alternate_color.blue,
+ 1.0);
}
-}
-static void
-cairo_interactive_renderer_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
+ cairo_rectangle (renderer->cr, x, y, w, h);
+ cairo_fill (renderer->cr);
+ }
- switch (prop_id) {
- case PROP_ZOOM:
- g_value_set_pointer (value, renderer->zoom_factor);
- break;
- case PROP_RECT:
- g_value_set_pointer (value, renderer->visible);
- break;
- default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
- }
+ DIA_RENDERER_CLASS (dia_cairo_interactive_renderer_parent_class)->draw_text_line (self, text_line, pos,
alignment, color);
}
static void
-set_size(DiaRenderer *object, gpointer window,
- int width, int height)
+dia_cairo_interactive_renderer_class_init (DiaCairoInteractiveRendererClass *klass)
{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- DiaCairoRenderer *base_renderer = DIA_CAIRO_RENDERER (object);
+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ DiaRendererClass *renderer_class = DIA_RENDERER_CLASS (klass);
- renderer->width = width;
- renderer->height = height;
- renderer->surface = gdk_window_create_similar_surface (GDK_WINDOW (window),
- CAIRO_CONTENT_COLOR,
- width, height);
+ gobject_class->finalize = dia_cairo_interactive_renderer_finalize;
- if (base_renderer->surface != NULL)
- cairo_surface_destroy(base_renderer->surface);
-}
+ gobject_class->set_property = dia_cairo_interactive_renderer_set_property;
+ gobject_class->get_property = dia_cairo_interactive_renderer_get_property;
-static void
-paint (DiaRenderer *object,
- cairo_t *ctx,
- int width,
- int height)
-{
- DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- double dashes[1] = {3};
- cairo_save (ctx);
- cairo_set_source_surface (ctx, renderer->surface, 0.0, 0.0);
- cairo_rectangle (ctx, 0, 0, width > 0 ? width : -width, height > 0 ? height : -height);
- cairo_clip (ctx);
- cairo_paint (ctx);
+ g_object_class_install_property (gobject_class,
+ PROP_ZOOM,
+ g_param_spec_pointer ("zoom",
+ _("Zoom pointer"),
+ _("Zoom pointer"),
+ G_PARAM_READWRITE));
- /* If there should be a selection rectange */
- if (renderer->has_selection) {
- /* Use a dark gray */
- cairo_set_source_rgba (ctx, 0.1, 0.1, 0.1, 0.8);
- cairo_set_line_cap (ctx, CAIRO_LINE_CAP_BUTT);
- cairo_set_line_join (ctx, CAIRO_LINE_JOIN_MITER);
- cairo_set_line_width (ctx, 1);
- cairo_set_dash (ctx, dashes, 1, 0);
+ g_object_class_install_property (gobject_class,
+ PROP_RECT,
+ g_param_spec_pointer ("rect",
+ _("Visible rect pointer"),
+ _("Visible rect pointer"),
+ G_PARAM_READWRITE));
- /* Set the selected area */
- cairo_rectangle (ctx,
- renderer->selection_x,
- renderer->selection_y,
- renderer->selection_width,
- renderer->selection_height);
- /* Add a dashed gray outline */
- cairo_stroke_preserve (ctx);
- /* Very light blue tint fill */
- cairo_set_source_rgba (ctx, 0, 0, 0.85, 0.05);
- cairo_fill (ctx);
- }
+ /* renderer members */
+ renderer_class->get_width_pixels = dia_cairo_interactive_renderer_get_width_pixels;
+ renderer_class->get_height_pixels = dia_cairo_interactive_renderer_get_height_pixels;
- cairo_restore (ctx);
+ renderer_class->begin_render = dia_cairo_interactive_renderer_begin_render;
+ renderer_class->end_render = dia_cairo_interactive_renderer_end_render;
+
+ /* mostly for cursor placement */
+ renderer_class->get_text_width = dia_cairo_interactive_renderer_get_text_width;
+ /* highlight for text editing is special */
+ renderer_class->draw_text_line = dia_cairo_interactive_renderer_draw_text_line;
}
static void
-clip_region_clear(DiaRenderer *object)
+dia_cairo_interactive_renderer_clip_region_clear (DiaRenderer *object)
{
DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
- if (renderer->clip_region != NULL)
+ if (renderer->clip_region != NULL) {
cairo_region_destroy (renderer->clip_region);
+ }
renderer->clip_region = cairo_region_create();
}
static void
-clip_region_add_rect(DiaRenderer *object,
- Rectangle *rect)
+dia_cairo_interactive_renderer_clip_region_add_rect (DiaRenderer *object,
+ Rectangle *rect)
{
DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
cairo_rectangle_int_t clip_rect;
@@ -577,10 +385,10 @@ clip_region_add_rect(DiaRenderer *object,
DiaTransform *transform; /* Our link to the display settings */
- transform = dia_transform_new(renderer->visible,renderer->zoom_factor);
- dia_transform_coords(transform, rect->left, rect->top, &x1, &y1);
- dia_transform_coords(transform, rect->right, rect->bottom, &x2, &y2);
- g_object_unref(transform);
+ transform = dia_transform_new (renderer->visible,renderer->zoom_factor);
+ dia_transform_coords (transform, rect->left, rect->top, &x1, &y1);
+ dia_transform_coords (transform, rect->right, rect->bottom, &x2, &y2);
+ g_object_unref (transform);
clip_rect.x = x1;
clip_rect.y = y1;
@@ -591,10 +399,12 @@ clip_region_add_rect(DiaRenderer *object,
}
static void
-draw_pixel_line(DiaRenderer *object,
- int x1, int y1,
- int x2, int y2,
- Color *color)
+dia_cairo_interactive_renderer_draw_pixel_line (DiaRenderer *object,
+ int x1,
+ int y1,
+ int x2,
+ int y2,
+ Color *color)
{
DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (object);
double x1u = x1 + .5, y1u = y1 + .5, x2u = x2 + .5, y2u = y2 + .5;
@@ -614,10 +424,12 @@ draw_pixel_line(DiaRenderer *object,
}
static void
-draw_pixel_rect(DiaRenderer *object,
- int x, int y,
- int width, int height,
- Color *color)
+dia_cairo_interactive_renderer_draw_pixel_rect (DiaRenderer *object,
+ int x,
+ int y,
+ int width,
+ int height,
+ Color *color)
{
DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (object);
double x1u = x + .5, y1u = y + .5, x2u = x + width + .5, y2u = y + height + .5;
@@ -636,10 +448,12 @@ draw_pixel_rect(DiaRenderer *object,
}
static void
-fill_pixel_rect(DiaRenderer *object,
- int x, int y,
- int width, int height,
- Color *color)
+dia_cairo_interactive_renderer_fill_pixel_rect (DiaRenderer *object,
+ int x,
+ int y,
+ int width,
+ int height,
+ Color *color)
{
DiaCairoRenderer *renderer = DIA_CAIRO_RENDERER (object);
double x1u = x + .5, y1u = y + .5, x2u = x + width + .5, y2u = y + height + .5;
@@ -657,8 +471,128 @@ fill_pixel_rect(DiaRenderer *object,
cairo_fill (renderer->cr);
}
+static void
+dia_cairo_interactive_renderer_paint (DiaRenderer *object,
+ cairo_t *ctx,
+ int width,
+ int height)
+{
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
+ double dashes[1] = {3};
+
+ cairo_save (ctx);
+ cairo_set_source_surface (ctx, renderer->surface, 0.0, 0.0);
+ cairo_rectangle (ctx, 0, 0, width > 0 ? width : -width, height > 0 ? height : -height);
+ cairo_clip (ctx);
+ cairo_paint (ctx);
+
+ /* If there should be a selection rectange */
+ if (renderer->has_selection) {
+ /* Use a dark gray */
+ cairo_set_source_rgba (ctx, 0.1, 0.1, 0.1, 0.8);
+ cairo_set_line_cap (ctx, CAIRO_LINE_CAP_BUTT);
+ cairo_set_line_join (ctx, CAIRO_LINE_JOIN_MITER);
+ cairo_set_line_width (ctx, 1);
+ cairo_set_dash (ctx, dashes, 1, 0);
+
+ /* Set the selected area */
+ cairo_rectangle (ctx,
+ renderer->selection_x,
+ renderer->selection_y,
+ renderer->selection_width,
+ renderer->selection_height);
+ /* Add a dashed gray outline */
+ cairo_stroke_preserve (ctx);
+ /* Very light blue tint fill */
+ cairo_set_source_rgba (ctx, 0, 0, 0.85, 0.05);
+ cairo_fill (ctx);
+ }
+
+ cairo_restore (ctx);
+}
+
+static void
+dia_cairo_interactive_renderer_set_size (DiaRenderer *object,
+ gpointer window,
+ int width,
+ int height)
+{
+ DiaCairoInteractiveRenderer *renderer = DIA_CAIRO_INTERACTIVE_RENDERER (object);
+ DiaCairoRenderer *base_renderer = DIA_CAIRO_RENDERER (object);
+
+ renderer->width = width;
+ renderer->height = height;
+ renderer->surface = gdk_window_create_similar_surface (GDK_WINDOW (window),
+ CAIRO_CONTENT_COLOR,
+ width, height);
+
+ if (base_renderer->surface != NULL) {
+ cairo_surface_destroy (base_renderer->surface);
+ }
+}
+
+/** Used as background? for text editing */
+static Color text_edit_color = {1.0, 1.0, 0.7 };
+
+static void
+dia_cairo_interactive_renderer_draw_object_highlighted (DiaRenderer *self,
+ DiaObject *object,
+ DiaHighlightType type)
+{
+ DiaCairoInteractiveRenderer *interactive = DIA_CAIRO_INTERACTIVE_RENDERER (self);
+
+ switch (type) {
+ case DIA_HIGHLIGHT_TEXT_EDIT:
+ interactive->highlight_color = &text_edit_color;
+ break;
+ case DIA_HIGHLIGHT_CONNECTIONPOINT_MAIN:
+ case DIA_HIGHLIGHT_CONNECTIONPOINT:
+ case DIA_HIGHLIGHT_NONE:
+ interactive->highlight_color = NULL;
+ break;
+ }
+
+ /* usually this method would need to draw the object twice,
+ * once with highlight and once without. But due to our
+ * draw_text_line implementation we only need one run */
+ object->ops->draw (object, self);
+ /* always reset when done with this object */
+ interactive->highlight_color = NULL;
+}
+
+static void
+dia_cairo_interactive_renderer_set_selection (DiaRenderer *renderer,
+ gboolean has_selection,
+ double x,
+ double y,
+ double width,
+ double height)
+{
+ DiaCairoInteractiveRenderer *self = DIA_CAIRO_INTERACTIVE_RENDERER (renderer);
+
+ self->has_selection = has_selection;
+ self->selection_x = x;
+ self->selection_y = y;
+ self->selection_width = width;
+ self->selection_height = height;
+}
+
+static void
+dia_cairo_interactive_renderer_iface_init (DiaInteractiveRendererInterface* iface)
+{
+ iface->clip_region_clear = dia_cairo_interactive_renderer_clip_region_clear;
+ iface->clip_region_add_rect = dia_cairo_interactive_renderer_clip_region_add_rect;
+ iface->draw_pixel_line = dia_cairo_interactive_renderer_draw_pixel_line;
+ iface->draw_pixel_rect = dia_cairo_interactive_renderer_draw_pixel_rect;
+ iface->fill_pixel_rect = dia_cairo_interactive_renderer_fill_pixel_rect;
+ iface->paint = dia_cairo_interactive_renderer_paint;
+ iface->set_size = dia_cairo_interactive_renderer_set_size;
+ iface->draw_object_highlighted = dia_cairo_interactive_renderer_draw_object_highlighted;
+ iface->set_selection = dia_cairo_interactive_renderer_set_selection;
+}
+
DiaRenderer *
dia_cairo_interactive_renderer_new ()
{
- return g_object_new (DIA_TYPE_CAIRO_INTERACTIVE_RENDERER, NULL);
+ return g_object_new (DIA_CAIRO_TYPE_INTERACTIVE_RENDERER, NULL);
}
diff --git a/lib/renderer/diacairo.h b/lib/renderer/diacairo.h
index a9ed1d9a..6cc5977c 100644
--- a/lib/renderer/diacairo.h
+++ b/lib/renderer/diacairo.h
@@ -93,15 +93,16 @@ typedef enum OutputKind
OUTPUT_CAIRO_SCRIPT
} OutputKind;
+#define DIA_CAIRO_TYPE_INTERACTIVE_RENDERER dia_cairo_interactive_renderer_get_type ()
+
+G_DECLARE_FINAL_TYPE (DiaCairoInteractiveRenderer, dia_cairo_interactive_renderer, DIA_CAIRO,
INTERACTIVE_RENDERER, DiaCairoRenderer)
+
+DiaRenderer *dia_cairo_interactive_renderer_new ();
+
gboolean cairo_export_data (DiagramData *data,
DiaContext *ctx,
const gchar *filename,
const gchar *diafilename,
void *user_data);
-/* FIXME: need to think about proper registration */
-GType dia_cairo_interactive_renderer_get_type (void) G_GNUC_CONST;
-
-DiaRenderer *dia_cairo_interactive_renderer_new ();
-
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
