Added "virtual pads" to

  - SPFeFuncNode
  - SPFeDistantLight
  - SPFeMergeNode
  - SPFePointLight
  - SPFeSpotLight
  - SPFilter
  - SPFont
  - SPGuide

Changes in SPItem and SPNamedView.

(bzr r11608.1.49)

1 files changed, 218 insertions, 31 deletions

diff --git a/src/sp-font.cpp b/src/sp-font.cpp
index c91abdaba..ec7af0dd1 100644
--- a/src/sp-font.cpp
+++ b/src/sp-font.cpp
@@ -86,8 +86,18 @@ double FNT_DEFAULT_ADV = 90; // TODO determine proper default
 double FNT_DEFAULT_ASCENT = 90; // TODO determine proper default
 double FNT_UNITS_PER_EM = 90; // TODO determine proper default
 
+CFont::CFont(SPFont* font) : CObject(font) {
+	this->spfont = font;
+}
+
+CFont::~CFont() {
+}
+
 static void sp_font_init(SPFont *font)
 {
+	font->cfont = new CFont(font);
+	font->cobject = font->cfont;
+
     font->horiz_origin_x = 0;
     font->horiz_origin_y = 0;
     font->horiz_adv_x = FNT_DEFAULT_ADV;
@@ -96,25 +106,37 @@ static void sp_font_init(SPFont *font)
     font->vert_adv_y = FNT_UNITS_PER_EM;
 }
 
-static void sp_font_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
-{
+//static void sp_font_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+//{
 //    if (((SPObjectClass *) (parent_class))->build) {
 //        ((SPObjectClass *) (parent_class))->build(object, document, repr);
 //    }
-	// CPPIFY: todo
-
-
-    object->readAttr( "horiz-origin-x" );
-    object->readAttr( "horiz-origin-y" );
-    object->readAttr( "horiz-adv-x" );
-    object->readAttr( "vert-origin-x" );
-    object->readAttr( "vert-origin-y" );
-    object->readAttr( "vert-adv-y" );
-
-    document->addResource("font", object);
+//
+//    object->readAttr( "horiz-origin-x" );
+//    object->readAttr( "horiz-origin-y" );
+//    object->readAttr( "horiz-adv-x" );
+//    object->readAttr( "vert-origin-x" );
+//    object->readAttr( "vert-origin-y" );
+//    object->readAttr( "vert-adv-y" );
+//
+//    document->addResource("font", object);
+//}
+
+void CFont::onBuild(SPDocument *document, Inkscape::XML::Node *repr) {
+	CObject::onBuild(document, repr);
+
+	SPFont* object = this->spfont;
+
+	object->readAttr( "horiz-origin-x" );
+	object->readAttr( "horiz-origin-y" );
+	object->readAttr( "horiz-adv-x" );
+	object->readAttr( "vert-origin-x" );
+	object->readAttr( "vert-origin-y" );
+	object->readAttr( "vert-adv-y" );
+
+	document->addResource("font", object);
 }
 
-
 static void sp_font_children_modified(SPFont */*sp_font*/)
 {
 }
@@ -125,10 +147,23 @@ static void sp_font_children_modified(SPFont */*sp_font*/)
 static void
 sp_font_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML::Node *ref)
 {
-    SPFont *f = SP_FONT(object);
+//    SPFont *f = SP_FONT(object);
+//
+//    if (((SPObjectClass *) parent_class)->child_added)
+//        (* ((SPObjectClass *) parent_class)->child_added)(object, child, ref);
+//
+//    sp_font_children_modified(f);
+//    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+	((SPFont*)object)->cfont->onChildAdded(child, ref);
+}
 
-    if (((SPObjectClass *) parent_class)->child_added)
-        (* ((SPObjectClass *) parent_class)->child_added)(object, child, ref);
+void CFont::onChildAdded(Inkscape::XML::Node *child, Inkscape::XML::Node *ref) {
+	SPFont* object = this->spfont;
+    SPFont *f = SP_FONT(object);
+//
+//    if (((SPObjectClass *) parent_class)->child_added)
+//        (* ((SPObjectClass *) parent_class)->child_added)(object, child, ref);
+    CObject::onChildAdded(child, ref);
 
     sp_font_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -141,10 +176,23 @@ sp_font_child_added(SPObject *object, Inkscape::XML::Node *child, Inkscape::XML:
 static void
 sp_font_remove_child(SPObject *object, Inkscape::XML::Node *child)
 {
+//    SPFont *f = SP_FONT(object);
+//
+//    if (((SPObjectClass *) parent_class)->remove_child)
+//        (* ((SPObjectClass *) parent_class)->remove_child)(object, child);
+//
+//    sp_font_children_modified(f);
+//    object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+	((SPFont*)object)->cfont->onRemoveChild(child);
+}
+
+void CFont::onRemoveChild(Inkscape::XML::Node* child) {
+	SPFont* object = this->spfont;
     SPFont *f = SP_FONT(object);
 
-    if (((SPObjectClass *) parent_class)->remove_child)
-        (* ((SPObjectClass *) parent_class)->remove_child)(object, child);
+//    if (((SPObjectClass *) parent_class)->remove_child)
+//        (* ((SPObjectClass *) parent_class)->remove_child)(object, child);
+    CObject::onRemoveChild(child);
 
     sp_font_children_modified(f);
     object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
@@ -152,16 +200,98 @@ sp_font_remove_child(SPObject *object, Inkscape::XML::Node *child)
 
 static void sp_font_release(SPObject *object)
 {
+//    //SPFont *font = SP_FONT(object);
+//    object->document->removeResource("font", object);
+//
+//    if (((SPObjectClass *) parent_class)->release) {
+//        ((SPObjectClass *) parent_class)->release(object);
+//    }
+	((SPFont*)object)->cfont->onRelease();
+}
+
+void CFont::onRelease() {
     //SPFont *font = SP_FONT(object);
+	SPFont* object = this->spfont;
+
     object->document->removeResource("font", object);
 
-    if (((SPObjectClass *) parent_class)->release) {
-        ((SPObjectClass *) parent_class)->release(object);
-    }
+//    if (((SPObjectClass *) parent_class)->release) {
+//        ((SPObjectClass *) parent_class)->release(object);
+//    }
+    CObject::onRelease();
 }
 
 static void sp_font_set(SPObject *object, unsigned int key, const gchar *value)
 {
+//    SPFont *font = SP_FONT(object);
+//
+//    // TODO these are floating point, so some epsilon comparison would be good
+//    switch (key) {
+//        case SP_ATTR_HORIZ_ORIGIN_X:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : 0;
+//            if (number != font->horiz_origin_x){
+//                font->horiz_origin_x = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        case SP_ATTR_HORIZ_ORIGIN_Y:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : 0;
+//            if (number != font->horiz_origin_y){
+//                font->horiz_origin_y = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        case SP_ATTR_HORIZ_ADV_X:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : FNT_DEFAULT_ADV;
+//            if (number != font->horiz_adv_x){
+//                font->horiz_adv_x = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        case SP_ATTR_VERT_ORIGIN_X:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : FNT_DEFAULT_ADV / 2.0;
+//            if (number != font->vert_origin_x){
+//                font->vert_origin_x = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        case SP_ATTR_VERT_ORIGIN_Y:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : FNT_DEFAULT_ASCENT;
+//            if (number != font->vert_origin_y){
+//                font->vert_origin_y = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        case SP_ATTR_VERT_ADV_Y:
+//        {
+//            double number = value ? g_ascii_strtod(value, 0) : FNT_UNITS_PER_EM;
+//            if (number != font->vert_adv_y){
+//                font->vert_adv_y = number;
+//                object->requestModified(SP_OBJECT_MODIFIED_FLAG);
+//            }
+//            break;
+//        }
+//        default:
+//            if (((SPObjectClass *) (parent_class))->set) {
+//                ((SPObjectClass *) (parent_class))->set(object, key, value);
+//            }
+//            break;
+//    }
+	((SPFont*)object)->cfont->onSet(key, value);
+}
+
+void CFont::onSet(unsigned int key, const gchar *value) {
+	SPFont* object = this->spfont;
     SPFont *font = SP_FONT(object);
 
     // TODO these are floating point, so some epsilon comparison would be good
@@ -221,9 +351,10 @@ static void sp_font_set(SPObject *object, unsigned int key, const gchar *value)
             break;
         }
         default:
-            if (((SPObjectClass *) (parent_class))->set) {
-                ((SPObjectClass *) (parent_class))->set(object, key, value);
-            }
+//            if (((SPObjectClass *) (parent_class))->set) {
+//                ((SPObjectClass *) (parent_class))->set(object, key, value);
+//            }
+        	CObject::onSet(key, value);
             break;
     }
 }
@@ -234,6 +365,24 @@ static void sp_font_set(SPObject *object, unsigned int key, const gchar *value)
 static void
 sp_font_update(SPObject *object, SPCtx *ctx, guint flags)
 {
+//    if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
+//        object->readAttr( "horiz-origin-x" );
+//        object->readAttr( "horiz-origin-y" );
+//        object->readAttr( "horiz-adv-x" );
+//        object->readAttr( "vert-origin-x" );
+//        object->readAttr( "vert-origin-y" );
+//        object->readAttr( "vert-adv-y" );
+//    }
+//
+//    if (((SPObjectClass *) parent_class)->update) {
+//        ((SPObjectClass *) parent_class)->update(object, ctx, flags);
+//    }
+	((SPFont*)object)->cfont->onUpdate(ctx, flags);
+}
+
+void CFont::onUpdate(SPCtx *ctx, guint flags) {
+	SPFont* object = this->spfont;
+
     if (flags & (SP_OBJECT_MODIFIED_FLAG)) {
         object->readAttr( "horiz-origin-x" );
         object->readAttr( "horiz-origin-y" );
@@ -243,15 +392,51 @@ sp_font_update(SPObject *object, SPCtx *ctx, guint flags)
         object->readAttr( "vert-adv-y" );
     }
 
-    if (((SPObjectClass *) parent_class)->update) {
-        ((SPObjectClass *) parent_class)->update(object, ctx, flags);
-    }
+//    if (((SPObjectClass *) parent_class)->update) {
+//        ((SPObjectClass *) parent_class)->update(object, ctx, flags);
+//    }
+    CObject::onUpdate(ctx, flags);
 }
 
 #define COPY_ATTR(rd,rs,key) (rd)->setAttribute((key), rs->attribute(key));
 
 static Inkscape::XML::Node *sp_font_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
 {
+//    SPFont *font = SP_FONT(object);
+//
+//    if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
+//        repr = xml_doc->createElement("svg:font");
+//    }
+//
+//    sp_repr_set_svg_double(repr, "horiz-origin-x", font->horiz_origin_x);
+//    sp_repr_set_svg_double(repr, "horiz-origin-y", font->horiz_origin_y);
+//    sp_repr_set_svg_double(repr, "horiz-adv-x", font->horiz_adv_x);
+//    sp_repr_set_svg_double(repr, "vert-origin-x", font->vert_origin_x);
+//    sp_repr_set_svg_double(repr, "vert-origin-y", font->vert_origin_y);
+//    sp_repr_set_svg_double(repr, "vert-adv-y", font->vert_adv_y);
+//
+//    if (repr != object->getRepr()) {
+//        // All the below COPY_ATTR funtions are directly using
+//        //  the XML Tree while they shouldn't
+//        COPY_ATTR(repr, object->getRepr(), "horiz-origin-x");
+//        COPY_ATTR(repr, object->getRepr(), "horiz-origin-y");
+//        COPY_ATTR(repr, object->getRepr(), "horiz-adv-x");
+//        COPY_ATTR(repr, object->getRepr(), "vert-origin-x");
+//        COPY_ATTR(repr, object->getRepr(), "vert-origin-y");
+//        COPY_ATTR(repr, object->getRepr(), "vert-adv-y");
+//    }
+//
+//    if (((SPObjectClass *) (parent_class))->write) {
+//        ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
+//    }
+//
+//    return repr;
+
+	return ((SPFont*)object)->cfont->onWrite(xml_doc, repr, flags);
+}
+
+Inkscape::XML::Node* CFont::onWrite(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) {
+	SPFont* object = this->spfont;
     SPFont *font = SP_FONT(object);
 
     if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
@@ -276,12 +461,14 @@ static Inkscape::XML::Node *sp_font_write(SPObject *object, Inkscape::XML::Docum
         COPY_ATTR(repr, object->getRepr(), "vert-adv-y");
     }
 
-    if (((SPObjectClass *) (parent_class))->write) {
-        ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
-    }
+//    if (((SPObjectClass *) (parent_class))->write) {
+//        ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
+//    }
+    CObject::onWrite(xml_doc, repr, flags);
 
     return repr;
 }
+
 #endif //#ifdef ENABLE_SVG_FONTS
 /*
   Local Variables: