1 files changed, 80 insertions, 0 deletions

diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index f799dbe54..cd8c53c65 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -23,6 +23,7 @@
 #include "xml/repr.h"
 #include "sp-filter.h"
 #include "display/nr-filter-primitive.h"
+#include "display/nr-filter-types.h"
 
 /* FilterPrimitive base class */
 
@@ -80,6 +81,8 @@ sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass)
 static void
 sp_filter_primitive_init(SPFilterPrimitive *filter_primitive)
 {
+    filter_primitive->image_in = NR::NR_FILTER_SLOT_NOT_SET;
+    filter_primitive->image_out = NR::NR_FILTER_SLOT_NOT_SET;
 }
 
 /**
@@ -94,6 +97,9 @@ sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML:
         ((SPObjectClass *) filter_primitive_parent_class)->build(object, document, repr);
     }
 
+    sp_object_read_attr(object, "in");
+    sp_object_read_attr(object, "result");
+
     if (object->parent)
         add_primitive((SPFilter*)object->parent, (SPFilterPrimitive*)object);
 }
@@ -118,6 +124,32 @@ sp_filter_primitive_set(SPObject *object, unsigned int key, gchar const *value)
     SPFilterPrimitive *filter_primitive = SP_FILTER_PRIMITIVE(object);
     (void)filter_primitive;
 
+    int image_nr;
+    switch (key) {
+        case SP_ATTR_IN:
+            if (value) {
+                image_nr = sp_filter_primitive_read_in(filter_primitive, value);
+            } else {
+                image_nr = NR::NR_FILTER_SLOT_NOT_SET;
+            }
+            if (image_nr != filter_primitive->image_in) {
+                filter_primitive->image_in = image_nr;
+                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+        case SP_ATTR_RESULT:
+            if (value) {
+                image_nr = sp_filter_primitive_read_result(filter_primitive, value);
+            } else {
+                image_nr = NR::NR_FILTER_SLOT_NOT_SET;
+            }
+            if (image_nr != filter_primitive->image_out) {
+                filter_primitive->image_out = image_nr;
+                object->parent->requestModified(SP_OBJECT_MODIFIED_FLAG);
+            }
+            break;
+    }
+
     /* See if any parents need this value. */
     if (((SPObjectClass *) filter_primitive_parent_class)->set) {
         ((SPObjectClass *) filter_primitive_parent_class)->set(object, key, value);
@@ -169,12 +201,60 @@ sp_filter_primitive_write(SPObject *object, Inkscape::XML::Node *repr, guint fla
     return repr;
 }
 
+int sp_filter_primitive_read_in(SPFilterPrimitive *prim, gchar const *name)
+{
+    if (!name) return NR::NR_FILTER_SLOT_NOT_SET;
+    // TODO: are these case sensitive or not? (assumed yes)
+    switch (name[0]) {
+        case 'S':
+            if (strcmp(name, "SourceGraphic") == 0)
+                return NR::NR_FILTER_SOURCEGRAPHIC;
+            if (strcmp(name, "SourceAlpha") == 0)
+                return NR::NR_FILTER_SOURCEALPHA;
+            if (strcmp(name, "StrokePaint") == 0)
+                return NR::NR_FILTER_STROKEPAINT;
+            break;
+        case 'B':
+            if (strcmp(name, "BackgroundImage") == 0)
+                return NR::NR_FILTER_BACKGROUNDIMAGE;
+            if (strcmp(name, "BackgroundAlpha") == 0)
+                return NR::NR_FILTER_BACKGROUNDALPHA;
+            break;
+        case 'F':
+            if (strcmp(name, "FillPaint") == 0)
+                return NR::NR_FILTER_FILLPAINT;
+            break;
+    }
+
+    SPFilter *parent = SP_FILTER(prim->parent);
+    int ret = sp_filter_get_image_name(parent, name);
+    if (ret >= 0) return ret;
+
+    return NR::NR_FILTER_SLOT_NOT_SET;
+}
+
+int sp_filter_primitive_read_result(SPFilterPrimitive *prim, gchar const *name)
+{
+    SPFilter *parent = SP_FILTER(prim->parent);
+    int ret = sp_filter_get_image_name(parent, name);
+    if (ret >= 0) return ret;
+
+    ret = sp_filter_set_image_name(parent, name);
+    if (ret >= 0) return ret;
+
+    return NR::NR_FILTER_SLOT_NOT_SET;
+}
+
 /* Common initialization for filter primitives */
 void sp_filter_primitive_renderer_common(SPFilterPrimitive *sp_prim, NR::FilterPrimitive *nr_prim)
 {
     g_assert(sp_prim != NULL);
     g_assert(nr_prim != NULL);
 
+    
+    nr_prim->set_input(sp_prim->image_in);
+    nr_prim->set_output(sp_prim->image_out);
+
     /* TODO: place here code to handle input images, filter area etc. */
 }