Temporarily move the code from display/canvas-text.(h|cpp) to display/canvas-bpath...

diff --git a/src/display/Makefile_insert b/src/display/Makefile_insert
index 40eea17c0ece7abf0d014221abce3ed63bb9e30b..bc74c6f227ec4a894d26300c62ddd604c525f076 100644 (file)
--- a/src/display/Makefile_insert
+++ b/src/display/Makefile_insert
@@ -44,8 +44,6 @@ display_libspdisplay_a_SOURCES = \
        display/canvas-temporary-item.h \
        display/canvas-temporary-item-list.cpp  \
        display/canvas-temporary-item-list.h    \
-       display/canvas-text.cpp \
-       display/canvas-text.h   \
        display/curve.cpp       \
        display/curve.h \
        display/display-forward.h       \

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 9708a66f0e03e3887be6970f2d7c97a61f10a61d..d28f63600ddc2d78170ae00cfcad1a2fa68c6e48 100644 (file)
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -28,6 +28,31 @@
 #include <libnr/nr-path.h>
 #include "helper/geom.h"
 
+/*
+ * FIXME: The following #includes and some other content in this file (see below) should actually
+ * be in a separate file called display/canvas-text.cpp. It temporarily had to be moved here
+ * because of linker errors.
+ */
+
+/**
+#include "display-forward.h"
+#include "sp-canvas-util.h"
+#include "canvas-text.h"
+#include "display/inkscape-cairo.h"
+**/
+#include <sstream>
+#include <string.h>
+
+/**
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <color.h>
+
+#include <libnr/nr-matrix-fns.h>
+#include <libnr/nr-pixops.h>
+**/
+
 void nr_pixblock_render_bpath_rgba (Shape* theS,uint32_t color,NRRectL &area,char* destBuf,int stride);
 
 static void sp_canvas_bpath_class_init (SPCanvasBPathClass *klass);
@@ -256,6 +281,233 @@ sp_canvas_bpath_set_stroke (SPCanvasBPath *cbp, guint32 rgba, gdouble width, SPS
 
 
 
+/*
+ * FIXME: The following code should actually be in a separate file called
+ * display/canvas-text.cpp. It temporarily had to be moved here because of linker errors.
+ */
+
+static void sp_canvastext_class_init (SPCanvasTextClass *klass);
+static void sp_canvastext_init (SPCanvasText *canvastext);
+static void sp_canvastext_destroy (GtkObject *object);
+
+static void sp_canvastext_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags);
+static void sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf);
+
+static SPCanvasItemClass *parent_class_ct;
+
+GtkType
+sp_canvastext_get_type (void)
+{
+    static GtkType type = 0;
+
+    if (!type) {
+        GtkTypeInfo info = {
+            (gchar *)"SPCanvasText",
+            sizeof (SPCanvasText),
+            sizeof (SPCanvasTextClass),
+            (GtkClassInitFunc) sp_canvastext_class_init,
+            (GtkObjectInitFunc) sp_canvastext_init,
+            NULL, NULL, NULL
+        };
+        type = gtk_type_unique (SP_TYPE_CANVAS_ITEM, &info);
+    }
+    return type;
+}
+
+static void
+sp_canvastext_class_init (SPCanvasTextClass *klass)
+{
+    GtkObjectClass *object_class = (GtkObjectClass *) klass;
+    SPCanvasItemClass *item_class = (SPCanvasItemClass *) klass;
+
+    parent_class_ct = (SPCanvasItemClass*)gtk_type_class (SP_TYPE_CANVAS_ITEM);
+
+    object_class->destroy = sp_canvastext_destroy;
+
+    item_class->update = sp_canvastext_update;
+    item_class->render = sp_canvastext_render;
+}
+
+static void
+sp_canvastext_init (SPCanvasText *canvastext)
+{
+    canvastext->rgba = 0x0000ff7f;
+    canvastext->s[NR::X] = canvastext->s[NR::Y] = 0.0;
+    canvastext->affine = NR::identity();
+    canvastext->fontsize = 10.0;
+    canvastext->item = NULL;
+    canvastext->text = NULL;
+}
+
+static void
+sp_canvastext_destroy (GtkObject *object)
+{
+    g_return_if_fail (object != NULL);
+    g_return_if_fail (SP_IS_CANVASTEXT (object));
+
+    SPCanvasText *canvastext = SP_CANVASTEXT (object);
+
+    canvastext->item=NULL;
+
+    if (GTK_OBJECT_CLASS (parent_class_ct)->destroy)
+        (* GTK_OBJECT_CLASS (parent_class_ct)->destroy) (object);
+}
+
+// FIXME: remove this as soon as we know how to correctly determine the text extent
+static const double arbitrary_factor = 0.7;
+
+// these are set in sp_canvastext_update() and then re-used in sp_canvastext_render(), which is called afterwards
+static double anchor_offset_x = 0;
+static double anchor_offset_y = 0;
+
+static void
+sp_canvastext_render (SPCanvasItem *item, SPCanvasBuf *buf)
+{
+    SPCanvasText *cl = SP_CANVASTEXT (item);
+
+    if (!buf->ct)
+        return;
+
+    guint32 rgba = cl->rgba;
+    cairo_set_source_rgba(buf->ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
+
+    NR::Point s = cl->s * cl->affine;
+    double offsetx = s[NR::X] - buf->rect.x0;
+    double offsety = s[NR::Y] - buf->rect.y0;
+    offsetx -= anchor_offset_x;
+    offsety += anchor_offset_y;
+
+    cairo_move_to(buf->ct, offsetx, offsety);
+    cairo_set_font_size(buf->ct, cl->fontsize);
+    cairo_show_text(buf->ct, cl->text);
+    cairo_stroke(buf->ct);
+
+    cairo_new_path(buf->ct);
+}
+
+static void
+sp_canvastext_update (SPCanvasItem *item, NR::Matrix const &affine, unsigned int flags)
+{
+    SPCanvasText *cl = SP_CANVASTEXT (item);
+
+    sp_canvas_request_redraw (item->canvas, (int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
+
+    if (parent_class_ct->update)
+        (* parent_class_ct->update) (item, affine, flags);
+
+    sp_canvas_item_reset_bounds (item);
+
+    cl->affine = affine;
+
+    NR::Point s = cl->s * affine;
+
+    // set up a temporary cairo_t to measure the text extents; it would be better to compute this in the render()
+    // method but update() seems to be called before so we don't have the information available when we need it
+    /**
+    cairo_t tmp_buf;
+    cairo_text_extents_t bbox;
+    cairo_text_extents(&tmp_buf, cl->text, &bbox);
+    **/
+    item->x1 = s[NR::X] + 0;
+    item->y1 = s[NR::Y] - cl->fontsize;
+    item->x2 = s[NR::X] + cl->fontsize * strlen(cl->text);
+    item->y2 = s[NR::Y] + cl->fontsize * 0.5; // for letters below the baseline
+
+    // adjust update region according to anchor shift
+    // FIXME: use the correct text extent
+    anchor_offset_x = arbitrary_factor * cl->fontsize * strlen(cl->text) * (cl->anchor_x + 1.0) / 2.0;
+    anchor_offset_y = cl->fontsize * (cl->anchor_y + 1.0) / 2.0;
+    item->x1 -= anchor_offset_x;
+    item->x2 -= anchor_offset_x;
+    item->y1 += anchor_offset_y;
+    item->y2 += anchor_offset_y;
+
+    sp_canvas_request_redraw (item->canvas, (int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
+}
+
+SPCanvasItem *
+sp_canvastext_new(SPCanvasGroup *parent, Geom::Point pos, char *new_text)
+{
+    SPCanvasItem *item = sp_canvas_item_new(parent, SP_TYPE_CANVASTEXT, NULL);
+
+    SPCanvasText *ct = SP_CANVASTEXT(item);
+
+    ct->s = pos;
+    g_free(ct->text);
+    ct->text = g_strdup(new_text);
+
+    // TODO: anything else to do?
+
+    return item;
+}
+
+
+void
+sp_canvastext_set_rgba32 (SPCanvasText *ct, guint32 rgba)
+{
+    g_return_if_fail (ct != NULL);
+    g_return_if_fail (SP_IS_CANVASTEXT (ct));
+
+    if (rgba != ct->rgba) {
+        SPCanvasItem *item;
+        ct->rgba = rgba;
+        item = SP_CANVAS_ITEM (ct);
+        sp_canvas_request_redraw (item->canvas, (int)item->x1, (int)item->y1, (int)item->x2, (int)item->y2);
+    }
+    sp_canvas_item_request_update (SP_CANVAS_ITEM (ct));
+}
+
+#define EPSILON 1e-6
+#define DIFFER(a,b) (fabs ((a) - (b)) > EPSILON)
+
+void
+sp_canvastext_set_coords (SPCanvasText *ct, gdouble x0, gdouble y0)
+{
+    g_return_if_fail (ct != NULL);
+    g_return_if_fail (SP_IS_CANVASTEXT (ct));
+
+    if (DIFFER (x0, ct->s[NR::X]) || DIFFER (y0, ct->s[NR::Y])) {
+        ct->s[NR::X] = x0;
+        ct->s[NR::Y] = y0;
+        sp_canvas_item_request_update (SP_CANVAS_ITEM (ct));
+    }
+    sp_canvas_item_request_update (SP_CANVAS_ITEM (ct));
+}
+
+void
+sp_canvastext_set_coords (SPCanvasText *ct, const NR::Point start)
+{
+    sp_canvastext_set_coords(ct, start[0], start[1]);
+}
+
+void
+sp_canvastext_set_text (SPCanvasText *ct, const char* new_text)
+{
+    g_free (ct->text);
+    ct->text = g_strdup(new_text);
+    sp_canvas_item_request_update (SP_CANVAS_ITEM (ct));
+}
+
+void
+sp_canvastext_set_number_as_text (SPCanvasText *ct, int num)
+{
+    std::ostringstream number;
+    number << num;
+    sp_canvastext_set_text(ct, number.str().c_str());
+}
+
+void
+sp_canvastext_set_fontsize (SPCanvasText *ct, double size)
+{
+    ct->fontsize = size;
+}
+
+void
+sp_canvastext_set_anchor (SPCanvasText *ct, double anchor_x, double anchor_y)
+{
+    ct->anchor_x = anchor_x;
+    ct->anchor_y = anchor_y;
+}
 
 /*
   Local Variables:

diff --git a/src/display/canvas-bpath.h b/src/display/canvas-bpath.h
index e3ef70831e22e359c71629fa35c541de0411c891..0f0b444844dbf018883e8be40eba84fd88996b3d 100644 (file)
--- a/src/display/canvas-bpath.h
+++ b/src/display/canvas-bpath.h
@@ -95,6 +95,51 @@ void sp_canvas_bpath_set_fill (SPCanvasBPath *cbp, guint32 rgba, SPWindRule rule
 void sp_canvas_bpath_set_stroke (SPCanvasBPath *cbp, guint32 rgba, gdouble width, SPStrokeJoinType join, SPStrokeCapType cap);
 
 
+/*
+ * FIXME: The following code should actually be in a separate file called display/canvas-text.h. It
+ * temporarily had to be moved here because of linker errors.
+ */
+
+struct SPItem;
+
+#define SP_TYPE_CANVASTEXT (sp_canvastext_get_type ())
+#define SP_CANVASTEXT(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_CANVASTEXT, SPCanvasText))
+#define SP_IS_CANVASTEXT(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_CANVASTEXT))
+
+struct SPCanvasText : public SPCanvasItem{
+    SPItem *item;  // the item to which this line belongs in some sense; may be NULL for some users
+    guint32 rgba;
+
+    char* text;
+    NR::Point s;
+    NR::Matrix affine;
+    double fontsize;
+    double anchor_x;
+    double anchor_y;
+};
+struct SPCanvasTextClass : public SPCanvasItemClass{};
+
+GtkType sp_canvastext_get_type (void);
+
+SPCanvasItem *sp_canvastext_new(SPCanvasGroup *parent, Geom::Point pos, char *text);
+
+void sp_canvastext_set_rgba32 (SPCanvasText *ct, guint32 rgba);
+void sp_canvastext_set_coords (SPCanvasText *ct, gdouble x0, gdouble y0);
+void sp_canvastext_set_coords (SPCanvasText *ct, const NR::Point start);
+void sp_canvastext_set_text (SPCanvasText *ct, const char* new_text);
+void sp_canvastext_set_number_as_text (SPCanvasText *ct, int num);
+void sp_canvastext_set_fontsize (SPCanvasText *ct, double size);
+void sp_canvastext_set_anchor (SPCanvasText *ct, double anchor_x, double anchor_y);
 
 #endif
 
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :

diff --git a/src/live_effects/parameter/text.h b/src/live_effects/parameter/text.h
index d98bbf4417231775e4e942c233ee0e4b589fb6b7..432ceeed193a82daeebd001d4e9e77a60bd3f9c6 100644 (file)
--- a/src/live_effects/parameter/text.h
+++ b/src/live_effects/parameter/text.h
@@ -15,7 +15,8 @@
 
 #include <glib/gtypes.h>
 
-#include "display/canvas-text.h"
+//#include "display/canvas-text.h"
+#include "display/canvas-bpath.h"
 #include "live_effects/parameter/parameter.h"
 
 namespace Inkscape {