![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-glyph.cpp b/src/sp-glyph.cpp
index eaae6d4ded25d021b3140fd54d454c5afc2d9d4c..8af78a0aaf55111113cd1f056e2a98ac5036b454 100644 (file)
--- a/src/sp-glyph.cpp
+++ b/src/sp-glyph.cpp
-#define __SP_ANCHOR_C__
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#ifdef ENABLE_SVG_FONTS
+#define __SP_GLYPH_C__
/*
* SVG <glyph> element implementation
static void sp_glyph_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
static void sp_glyph_release(SPObject *object);
static void sp_glyph_set(SPObject *object, unsigned int key, const gchar *value);
-static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
+static void sp_glyph_update(SPObject *object, SPCtx *ctx, guint flags);
static SPObjectClass *parent_class;
{
SPObjectClass *sp_object_class = (SPObjectClass *) gc;
- parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
+ parent_class = (SPObjectClass*)g_type_class_peek_parent(gc);
sp_object_class->build = sp_glyph_build;
sp_object_class->release = sp_glyph_release;
sp_object_class->set = sp_glyph_set;
sp_object_class->write = sp_glyph_write;
+ sp_object_class->update = sp_glyph_update;
}
static void sp_glyph_init(SPGlyph *glyph)
{
//TODO: correct these values:
- glyph->unicode = NULL;
- glyph->glyph_name = NULL;
+
+ new (&glyph->unicode) Glib::ustring();
+ new (&glyph->glyph_name) Glib::ustring();
glyph->d = NULL;
glyph->orientation = GLYPH_ORIENTATION_BOTH;
glyph->arabic_form = GLYPH_ARABIC_FORM_INITIAL;
@@ -144,22 +152,19 @@ static void sp_glyph_set(SPObject *object, unsigned int key, const gchar *value)
switch (key) {
case SP_ATTR_UNICODE:
- if (glyph->unicode) g_free(glyph->unicode);
- glyph->unicode = g_strdup(value);
+ glyph->unicode.clear();
+ if (value) glyph->unicode.append(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
-g_warning("SP_ATTR_UNICODE: %s", value);
- break;
+ break;
case SP_ATTR_GLYPH_NAME:
- if (glyph->glyph_name) g_free(glyph->glyph_name);
- glyph->glyph_name = g_strdup(value);
+ glyph->glyph_name.clear();
+ if (value) glyph->glyph_name.append(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
-g_warning("SP_ATTR_GLYPH_NAME: %s", value);
- break;
+ break;
case SP_ATTR_D:
if (glyph->d) g_free(glyph->d);
glyph->d = g_strdup(value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
-g_warning("SP_ATTR_D: %s", value);
break;
case SP_ATTR_ORIENTATION:
orient = sp_glyph_read_orientation(value);
glyph->orientation = orient;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
-g_warning("SP_ATTR_ORIENTATION: %d", orient);
break;
case SP_ATTR_ARABIC_FORM:
form = sp_glyph_read_arabic_form(value);
glyph->arabic_form = form;
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
-g_warning("SP_ATTR_ARABIC_FORM: %d", glyph->arabic_form);
break;
case SP_ATTR_LANG:
if (glyph->lang) g_free(glyph->lang);
glyph->lang = g_strdup(value);
-g_warning("SP_ATTR_LANG: %s", value);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
break;
case SP_ATTR_HORIZ_ADV_X:
number = helperfns_read_number(value);
if (number != glyph->horiz_adv_x){
glyph->horiz_adv_x = number;
-g_warning("SP_ATTR_HORIZ_ADV_X: %f", number);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
break;
number = helperfns_read_number(value);
if (number != glyph->vert_origin_x){
glyph->vert_origin_x = number;
-g_warning("SP_ATTR_VERT_ORIGIN_X: %f", number);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
break;
number = helperfns_read_number(value);
if (number != glyph->vert_origin_y){
glyph->vert_origin_y = number;
-g_warning("SP_ATTR_VERT_ORIGIN_Y: %f", number);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
break;
number = helperfns_read_number(value);
if (number != glyph->vert_adv_y){
glyph->vert_adv_y = number;
-g_warning("SP_ATTR_VERT_ADV_Y: %f", number);
object->requestModified(SP_OBJECT_MODIFIED_FLAG);
}
break;
}
}
+/**
+ * * Receives update notifications.
+ * */
+static void
+sp_glyph_update(SPObject *object, SPCtx *ctx, guint flags)
+{
+ SPGlyph *glyph = SP_GLYPH(object);
+ (void)glyph;
+
+ if (flags & SP_OBJECT_MODIFIED_FLAG) {
+ /* do something to trigger redisplay, updates? */
+ sp_object_read_attr(object, "unicode");
+ sp_object_read_attr(object, "glyph-name");
+ sp_object_read_attr(object, "d");
+ sp_object_read_attr(object, "orientation");
+ sp_object_read_attr(object, "arabic-form");
+ sp_object_read_attr(object, "lang");
+ sp_object_read_attr(object, "horiz-adv-x");
+ sp_object_read_attr(object, "vert-origin-x");
+ sp_object_read_attr(object, "vert-origin-y");
+ sp_object_read_attr(object, "vert-adv-y");
+ }
+
+ if (((SPObjectClass *) parent_class)->update) {
+ ((SPObjectClass *) parent_class)->update(object, ctx, flags);
+ }
+}
+
#define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key));
-static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
// SPGlyph *glyph = SP_GLYPH(object);
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
repr = xml_doc->createElement("svg:glyph");
}
@@ -260,12 +285,12 @@ static Inkscape::XML::Node *sp_glyph_write(SPObject *object, Inkscape::XML::Node
}
if (((SPObjectClass *) (parent_class))->write) {
- ((SPObjectClass *) (parent_class))->write(object, repr, flags);
+ ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
}
return repr;
}
-
+#endif //#ifdef ENABLE_SVG_FONTS
/*
Local Variables:
mode:c++