[tokkee]

tokkee.org

Code

projects / inkscape.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added fix from Dale Harvey to expand incomplete JIDs specified in user
[inkscape.git] / src / style.cpp
diff --git a/src/style.cpp b/src/style.cpp
index deffba366670dca9018b8e66ba5ed195e7142511..c826c2831c46f8fd819eababa700e4e50cd53dbe 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -148,7 +148,7 @@ static gint sp_style_write_itextdecoration(gchar *p, gint const len, gchar const
 
 static void css2_unescape_unquote(SPIString *val);
 
-static void sp_style_paint_clear(SPStyle *style, SPIPaint *paint, unsigned hunref, unsigned unset);
+static void sp_style_paint_clear(SPStyle *style, SPIPaint *paint);
 
 #define SPS_READ_IENUM_IF_UNSET(v,s,d,i) if (!(v)->set) {sp_style_read_ienum((v), (s), (d), (i));}
 #define SPS_READ_PENUM_IF_UNSET(v,r,k,d,i) if (!(v)->set) {sp_style_read_penum((v), (r), (k), (d), (i));}
@@ -391,11 +391,9 @@ sp_style_new()
 
     style->cloned = false;
 
-    style->color_hreffed = false;
     style->fill_hreffed = false;
     style->stroke_hreffed = false;
 
-    style->color_listening = false;
     style->fill_listening = false;
     style->stroke_listening = false;
 
@@ -455,8 +453,8 @@ sp_style_unref(SPStyle *style)
             g_signal_handlers_disconnect_matched(G_OBJECT(style->object),
                                                  G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, style);
         if (style->text) sp_text_style_unref(style->text);
-        sp_style_paint_clear(style, &style->fill, TRUE, FALSE);
-        sp_style_paint_clear(style, &style->stroke, TRUE, FALSE);
+        sp_style_paint_clear(style, &style->fill);
+        sp_style_paint_clear(style, &style->stroke);
         g_free(style->stroke_dash.dash);
         g_free(style);
     }
@@ -1936,13 +1934,13 @@ sp_style_paint_server_release(SPPaintServer *server, SPStyle *style)
     if ((style->fill.type == SP_PAINT_TYPE_PAINTSERVER)
         && (server == style->fill.value.paint.server))
     {
-        sp_style_paint_clear(style, &style->fill, TRUE, FALSE);
+        sp_style_paint_clear(style, &style->fill);
     }
 
     if ((style->stroke.type == SP_PAINT_TYPE_PAINTSERVER)
         && (server == style->stroke.value.paint.server))
     {
-        sp_style_paint_clear(style, &style->stroke, TRUE, FALSE);
+        sp_style_paint_clear(style, &style->stroke);
     }
 }
 
@@ -1990,7 +1988,7 @@ sp_style_paint_server_modified(SPPaintServer *server, guint flags, SPStyle *styl
 static void
 sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
 {
-    sp_style_paint_clear(style, paint, TRUE, FALSE);
+    sp_style_paint_clear(style, paint);
 
     if ((paint->set && paint->currentcolor) || parent->currentcolor) {
         paint->currentcolor = TRUE;
@@ -2012,10 +2010,9 @@ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
                     sp_object_href(SP_OBJECT(paint->value.paint.server), style);
                     if (paint == &style->fill) {
                         style->fill_hreffed = true;
-                    } else if (paint == &style->stroke) {
+                    } else {
+                        assert(paint == &style->stroke);
                         style->stroke_hreffed = true;
-                    } else if (paint == &style->color) {
-                        style->color_hreffed = true;
                     }
                 }
                 if (style->object || style->cloned) { // connect to signals for style of real objects or clones (this excludes temp styles)
@@ -2025,10 +2022,9 @@ sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
                                      G_CALLBACK(sp_style_paint_server_modified), style);
                     if (paint == &style->fill) {
                         style->fill_listening = true;
-                    } else if (paint == &style->stroke) {
+                    } else {
+                        assert(paint == &style->stroke);
                         style->stroke_listening = true;
-                    } else if (paint == &style->color) {
-                        style->color_listening = true;
                     }
                 }
             }
@@ -2306,8 +2302,8 @@ sp_style_clear(SPStyle *style)
 {
     g_return_if_fail(style != NULL);
 
-    sp_style_paint_clear(style, &style->fill, TRUE, FALSE);
-    sp_style_paint_clear(style, &style->stroke, TRUE, FALSE);
+    sp_style_paint_clear(style, &style->fill);
+    sp_style_paint_clear(style, &style->stroke);
     if (style->stroke_dash.dash) {
         g_free(style->stroke_dash.dash);
     }
@@ -2838,6 +2834,8 @@ sp_style_read_icolor(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
 
 /**
  * Set SPIPaint object from string.
+ *
+ * \pre paint == \&style.fill || paint == \&style.stroke.
  */
 static void
 sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocument *document)
@@ -2850,16 +2848,16 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
         paint->set = TRUE;
         paint->inherit = TRUE;
         paint->currentcolor = FALSE;
-    } else if (streq(str, "currentColor")) {
+    } else if (streq(str, "currentColor") && paint != &style->color) {
         paint->set = TRUE;
         paint->inherit = FALSE;
         paint->currentcolor = TRUE;
-    } else if (streq(str, "none")) {
+    } else if (streq(str, "none") && paint != &style->color) {
         paint->type = SP_PAINT_TYPE_NONE;
         paint->set = TRUE;
         paint->inherit = FALSE;
         paint->currentcolor = FALSE;
-    } else if (strneq(str, "url", 3)) {
+    } else if (strneq(str, "url", 3) && paint != &style->color) {
         // this is alloc'd uri, but seems to be shared with a parent
         // potentially, so it's not any easy g_free case...
         paint->value.paint.uri = extract_uri(str);
@@ -2879,10 +2877,9 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
                     sp_object_href(SP_OBJECT(paint->value.paint.server), style);
                     if (paint == &style->fill) {
                         style->fill_hreffed = true;
-                    } else if (paint == &style->stroke) {
+                    } else {
+                        assert(paint == &style->stroke);
                         style->stroke_hreffed = true;
-                    } else if (paint == &style->color) {
-                        style->color_hreffed = true;
                     }
                 }
                 if (style->object || style->cloned) {
@@ -2892,10 +2889,9 @@ sp_style_read_ipaint(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
                                      G_CALLBACK(sp_style_paint_server_modified), style);
                     if (paint == &style->fill) {
                         style->fill_listening = true;
-                    } else if (paint == &style->stroke) {
+                    } else {
+                        assert(paint == &style->stroke);
                         style->stroke_listening = true;
-                    } else if (paint == &style->color) {
-                        style->color_listening = true;
                     }
                 }
             } else {
@@ -3427,13 +3423,12 @@ sp_style_write_ifontsize(gchar *p, gint const len, gchar const *key,
 
 
 /**
- * Clear paint object; conditionally disconnect style from paintserver.
+ * Clear paint object, and disconnect style from paintserver (if present).
  */
 static void
-sp_style_paint_clear(SPStyle *style, SPIPaint *paint,
-                     unsigned hunref, unsigned unset)
+sp_style_paint_clear(SPStyle *style, SPIPaint *paint)
 {
-    if (hunref && (paint->type == SP_PAINT_TYPE_PAINTSERVER) && paint->value.paint.server) {
+    if ((paint->type == SP_PAINT_TYPE_PAINTSERVER) && paint->value.paint.server) {
         if (paint == &style->fill) {
             if (style->fill_hreffed) {
                 sp_object_hunref(SP_OBJECT(paint->value.paint.server), style);
@@ -3444,7 +3439,8 @@ sp_style_paint_clear(SPStyle *style, SPIPaint *paint,
                                                  G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, style);
                 style->fill_listening = false;
             }
-        } else if (paint == &style->stroke) {
+        } else {
+            assert(paint == &style->stroke);  // Only fill & stroke can have a paint server.
             if (style->stroke_hreffed) {
                 sp_object_hunref(SP_OBJECT(paint->value.paint.server), style);
                 style->stroke_hreffed = false;
@@ -3454,27 +3450,12 @@ sp_style_paint_clear(SPStyle *style, SPIPaint *paint,
                                                  G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, style);
                 style->stroke_listening = false;
             }
-        } else if (paint == &style->color) {
-            if (style->color_hreffed) {
-                sp_object_hunref(SP_OBJECT(paint->value.paint.server), style);
-                style->color_hreffed = false;
-            }
-            if (style->color_listening) {
-                g_signal_handlers_disconnect_matched(G_OBJECT(paint->value.paint.server),
-                                                 G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, style);
-                style->color_listening = false;
-            }
         }
 
         paint->value.paint.server = NULL;
         paint->value.paint.uri = NULL;
         paint->type = SP_PAINT_TYPE_NONE;
     }
-
-    if (unset) {
-        paint->set = FALSE;
-        paint->inherit = FALSE;
-    }
 }
 
 /**
OpenSource vector graphics editor (BZR clone)