X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-filter-primitive.cpp;h=ccde93889d0c0a4b85a302d67c7bb668c58994bf;hb=429ce09996dfe0ef44a115a89465c69eb4d376a6;hp=c0027e7c38346484a128f6001af12291ca911ee5;hpb=91934be261c16d036521379306a74b0991720e67;p=inkscape.git diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp index c0027e7c3..ccde93889 100644 --- a/src/sp-filter-primitive.cpp +++ b/src/sp-filter-primitive.cpp @@ -7,8 +7,9 @@ /* * Authors: * Kees Cook + * Niko Kiirala * - * Copyright (C) 2004 Kees Cook + * Copyright (C) 2004-2007 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -17,10 +18,14 @@ # include "config.h" #endif +#include + #include "attributes.h" #include "sp-filter-primitive.h" #include "xml/repr.h" #include "sp-filter.h" +#include "display/nr-filter-primitive.h" +#include "display/nr-filter-types.h" /* FilterPrimitive base class */ @@ -31,7 +36,7 @@ static void sp_filter_primitive_build(SPObject *object, SPDocument *document, In static void sp_filter_primitive_release(SPObject *object); static void sp_filter_primitive_set(SPObject *object, unsigned int key, gchar const *value); static void sp_filter_primitive_update(SPObject *object, SPCtx *ctx, guint flags); -static Inkscape::XML::Node *sp_filter_primitive_write(SPObject *object, Inkscape::XML::Node *repr, guint flags); +static Inkscape::XML::Node *sp_filter_primitive_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags); static SPObjectClass *filter_primitive_parent_class; @@ -69,11 +74,17 @@ sp_filter_primitive_class_init(SPFilterPrimitiveClass *klass) sp_object_class->write = sp_filter_primitive_write; sp_object_class->set = sp_filter_primitive_set; sp_object_class->update = sp_filter_primitive_update; + + /* This should never be called on this base class, but only on derived + * classes. */ + klass->build_renderer = NULL; } 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; } /** @@ -88,8 +99,8 @@ sp_filter_primitive_build(SPObject *object, SPDocument *document, Inkscape::XML: ((SPObjectClass *) filter_primitive_parent_class)->build(object, document, repr); } - if (object->parent) - add_primitive((SPFilter*)object->parent, (SPFilterPrimitive*)object); + sp_object_read_attr(object, "in"); + sp_object_read_attr(object, "result"); } /** @@ -112,6 +123,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); @@ -126,10 +163,9 @@ sp_filter_primitive_update(SPObject *object, SPCtx *ctx, guint flags) { //SPFilterPrimitive *filter_primitive = SP_FILTER_PRIMITIVE(object); - if (flags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG | - SP_OBJECT_VIEWPORT_MODIFIED_FLAG)) { - - /* do something to trigger redisplay, updates? */ + if (flags & SP_OBJECT_MODIFIED_FLAG) { + sp_object_read_attr(object, "in"); + sp_object_read_attr(object, "result"); } if (((SPObjectClass *) filter_primitive_parent_class)->update) { @@ -141,7 +177,7 @@ sp_filter_primitive_update(SPObject *object, SPCtx *ctx, guint flags) * Writes its settings to an incoming repr object, if any. */ static Inkscape::XML::Node * -sp_filter_primitive_write(SPObject *object, Inkscape::XML::Node *repr, guint flags) +sp_filter_primitive_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags) { //SPFilterPrimitive *filterPrimitive = SP_FILTER_PRIMITIVE(object); @@ -151,17 +187,75 @@ sp_filter_primitive_write(SPObject *object, Inkscape::XML::Node *repr, guint fla // is this sane? //repr->mergeFrom(SP_OBJECT_REPR(object), "id"); } else { - repr = SP_OBJECT_REPR(object)->duplicate(); + repr = SP_OBJECT_REPR(object)->duplicate(doc); } } if (((SPObjectClass *) filter_primitive_parent_class)->write) { - ((SPObjectClass *) filter_primitive_parent_class)->write(object, repr, flags); + ((SPObjectClass *) filter_primitive_parent_class)->write(object, doc, repr, flags); } 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. */ +} + + /* Local Variables: