]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkstyleproperty.c
label: refactor code
[~andy/gtk] / gtk / gtkstyleproperty.c
index 204e1e8d0d9f79aa21d2595e786d26cb07cf8320..74245d6ce2b59bbcdeee637bed9822123643a8b6 100644 (file)
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
 
 #include "gtkstylepropertyprivate.h"
 
-#include <errno.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <cairo-gobject.h>
-
 #include "gtkcssprovider.h"
 #include "gtkcssparserprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkprivatetypebuiltins.h"
 #include "gtkstylepropertiesprivate.h"
 
-/* the actual parsers we have */
-#include "gtkanimationdescription.h"
-#include "gtkbindings.h"
-#include "gtkgradient.h"
-#include "gtkshadowprivate.h"
-#include "gtkthemingengine.h"
-#include "gtktypebuiltins.h"
-#include "gtkwin32themeprivate.h"
-
-/* this is in case round() is not provided by the compiler, 
- * such as in the case of C89 compilers, like MSVC
- */
-#include "fallback-c89.c"
-
 enum {
   PROP_0,
   PROP_NAME,
@@ -152,947 +128,106 @@ _gtk_style_property_init (GtkStyleProperty *property)
   property->value_type = G_TYPE_NONE;
 }
 
-static void
-string_append_double (GString *string,
-                      double   d)
-{
-  char buf[G_ASCII_DTOSTR_BUF_SIZE];
-
-  g_ascii_dtostr (buf, sizeof (buf), d);
-  g_string_append (string, buf);
-}
-
-static void
-string_append_string (GString    *str,
-                      const char *string)
-{
-  gsize len;
-
-  g_string_append_c (str, '"');
-
-  do {
-    len = strcspn (string, "\"\n\r\f");
-    g_string_append (str, string);
-    string += len;
-    switch (*string)
-      {
-      case '\0':
-        break;
-      case '\n':
-        g_string_append (str, "\\A ");
-        break;
-      case '\r':
-        g_string_append (str, "\\D ");
-        break;
-      case '\f':
-        g_string_append (str, "\\C ");
-        break;
-      case '\"':
-        g_string_append (str, "\\\"");
-        break;
-      default:
-        g_assert_not_reached ();
-        break;
-      }
-  } while (*string);
-
-  g_string_append_c (str, '"');
-}
-
-/*** IMPLEMENTATIONS ***/
-
-static void
-enum_print (int         value,
-           GType       type,
-           GString    *string)
-{
-  GEnumClass *enum_class;
-  GEnumValue *enum_value;
-
-  enum_class = g_type_class_ref (type);
-  enum_value = g_enum_get_value (enum_class, value);
-
-  g_string_append (string, enum_value->value_nick);
-
-  g_type_class_unref (enum_class);
-}
-
-static gboolean
-font_family_parse (GtkCssParser *parser,
-                   GFile        *base,
-                   GValue       *value)
-{
-  GPtrArray *names;
-  char *name;
-
-  /* We don't special case generic families. Pango should do
-   * that for us */
-
-  names = g_ptr_array_new ();
-
-  do {
-    name = _gtk_css_parser_try_ident (parser, TRUE);
-    if (name)
-      {
-        GString *string = g_string_new (name);
-        g_free (name);
-        while ((name = _gtk_css_parser_try_ident (parser, TRUE)))
-          {
-            g_string_append_c (string, ' ');
-            g_string_append (string, name);
-            g_free (name);
-          }
-        name = g_string_free (string, FALSE);
-      }
-    else 
-      {
-        name = _gtk_css_parser_read_string (parser);
-        if (name == NULL)
-          {
-            g_ptr_array_free (names, TRUE);
-            return FALSE;
-          }
-      }
-
-    g_ptr_array_add (names, name);
-  } while (_gtk_css_parser_try (parser, ",", TRUE));
-
-  /* NULL-terminate array */
-  g_ptr_array_add (names, NULL);
-  g_value_set_boxed (value, g_ptr_array_free (names, FALSE));
-  return TRUE;
-}
-
-static void
-font_family_value_print (const GValue *value,
-                         GString      *string)
-{
-  const char **names = g_value_get_boxed (value);
-
-  if (names == NULL || *names == NULL)
-    {
-      g_string_append (string, "none");
-      return;
-    }
-
-  string_append_string (string, *names);
-  names++;
-  while (*names)
-    {
-      g_string_append (string, ", ");
-      string_append_string (string, *names);
-      names++;
-    }
-}
-
-static gboolean 
-bindings_value_parse (GtkCssParser *parser,
-                      GFile        *base,
-                      GValue       *value)
-{
-  GPtrArray *array;
-  GtkBindingSet *binding_set;
-  char *name;
-
-  array = g_ptr_array_new ();
-
-  do {
-      name = _gtk_css_parser_try_ident (parser, TRUE);
-      if (name == NULL)
-        {
-          _gtk_css_parser_error (parser, "Not a valid binding name");
-          g_ptr_array_free (array, TRUE);
-          return FALSE;
-        }
-
-      binding_set = gtk_binding_set_find (name);
-
-      if (!binding_set)
-        {
-          _gtk_css_parser_error (parser, "No binding set named '%s'", name);
-          g_free (name);
-          continue;
-        }
-
-      g_ptr_array_add (array, binding_set);
-      g_free (name);
-    }
-  while (_gtk_css_parser_try (parser, ",", TRUE));
-
-  g_value_take_boxed (value, array);
-
-  return TRUE;
-}
-
-static void
-bindings_value_print (const GValue *value,
-                      GString      *string)
-{
-  GPtrArray *array;
-  guint i;
-
-  array = g_value_get_boxed (value);
-
-  for (i = 0; i < array->len; i++)
-    {
-      GtkBindingSet *binding_set = g_ptr_array_index (array, i);
-
-      if (i > 0)
-        g_string_append (string, ", ");
-      g_string_append (string, binding_set->set_name);
-    }
-}
-
-static gboolean 
-border_corner_radius_value_parse (GtkCssParser *parser,
-                                  GFile        *base,
-                                  GValue       *value)
-{
-  GtkCssBorderCornerRadius corner;
-
-  if (!_gtk_css_parser_try_double (parser, &corner.horizontal))
-    {
-      _gtk_css_parser_error (parser, "Expected a number");
-      return FALSE;
-    }
-  else if (corner.horizontal < 0)
-    goto negative;
-
-  if (!_gtk_css_parser_try_double (parser, &corner.vertical))
-    corner.vertical = corner.horizontal;
-  else if (corner.vertical < 0)
-    goto negative;
-
-  g_value_set_boxed (value, &corner);
-  return TRUE;
-
-negative:
-  _gtk_css_parser_error (parser, "Border radius values cannot be negative");
-  return FALSE;
-}
-
-static void
-border_corner_radius_value_print (const GValue *value,
-                                  GString      *string)
-{
-  GtkCssBorderCornerRadius *corner;
-
-  corner = g_value_get_boxed (value);
-
-  if (corner == NULL)
-    {
-      g_string_append (string, "none");
-      return;
-    }
-
-  string_append_double (string, corner->horizontal);
-  if (corner->horizontal != corner->vertical)
-    {
-      g_string_append_c (string, ' ');
-      string_append_double (string, corner->vertical);
-    }
-}
-
-/*** API ***/
-
-gboolean
+/**
+ * _gtk_style_property_parse_value:
+ * @property: the property
+ * @parser: the parser to parse from
+ *
+ * Tries to parse the given @property from the given @parser into
+ * @value. The type that @value will be assigned is dependant on
+ * the parser and no assumptions must be made about it. If the
+ * parsing fails, %FALSE will be returned and @value will be
+ * left uninitialized.
+ *
+ * Only if @property is a #GtkCssShorthandProperty, the @value will
+ * always be a #GtkCssValue whose values can be queried with
+ * _gtk_css_array_value_get_nth().
+ *
+ * Returns: %NULL on failure or the parsed #GtkCssValue
+ **/
+GtkCssValue *
 _gtk_style_property_parse_value (GtkStyleProperty *property,
-                                 GValue           *value,
-                                 GtkCssParser     *parser,
-                                 GFile            *base)
-{
-  g_return_val_if_fail (value != NULL, FALSE);
-  g_return_val_if_fail (parser != NULL, FALSE);
-
-  if (property)
-    {
-      if (_gtk_css_parser_try (parser, "initial", TRUE))
-        {
-          /* the initial value can be explicitly specified with the
-           * ‘initial’ keyword which all properties accept.
-           */
-          g_value_unset (value);
-          g_value_init (value, GTK_TYPE_CSS_SPECIAL_VALUE);
-          g_value_set_enum (value, GTK_CSS_INITIAL);
-          return TRUE;
-        }
-      else if (_gtk_css_parser_try (parser, "inherit", TRUE))
-        {
-          /* All properties accept the ‘inherit’ value which
-           * explicitly specifies that the value will be determined
-           * by inheritance. The ‘inherit’ value can be used to
-           * strengthen inherited values in the cascade, and it can
-           * also be used on properties that are not normally inherited.
-           */
-          g_value_unset (value);
-          g_value_init (value, GTK_TYPE_CSS_SPECIAL_VALUE);
-          g_value_set_enum (value, GTK_CSS_INHERIT);
-          return TRUE;
-        }
-      else if (property->property_parse_func)
-        {
-          GError *error = NULL;
-          char *value_str;
-          gboolean success;
-          
-          value_str = _gtk_css_parser_read_value (parser);
-          if (value_str == NULL)
-            return FALSE;
-          
-          success = (*property->property_parse_func) (value_str, value, &error);
-
-          g_free (value_str);
-
-          return success;
-        }
-
-      if (property->parse_func)
-        return (* property->parse_func) (parser, base, value);
-    }
-
-  return _gtk_css_style_parse_value (value, parser, base);
-}
-
-void
-_gtk_style_property_print_value (GtkStyleProperty *property,
-                                 const GValue     *value,
-                                 GString          *string)
-{
-  if (G_VALUE_HOLDS (value, GTK_TYPE_CSS_SPECIAL_VALUE))
-    enum_print (g_value_get_enum (value), GTK_TYPE_CSS_SPECIAL_VALUE, string);
-  else if (property && property->print_func)
-    (* property->print_func) (value, string);
-  else
-    _gtk_css_style_print_value (value, string);
-}
-
-static void
-_gtk_style_property_default_value (GtkStyleProperty   *property,
-                                   GtkStyleProperties *properties,
-                                   GtkStateFlags       state,
-                                   GValue             *value)
-{
-  g_value_copy (_gtk_css_style_property_get_initial_value (GTK_CSS_STYLE_PROPERTY (property)), value);
-}
-
-static gboolean
-resolve_color (GtkStyleProperties *props,
-              GValue             *value)
+                                 GtkCssParser     *parser)
 {
-  GdkRGBA color;
-
-  /* Resolve symbolic color to GdkRGBA */
-  if (!gtk_symbolic_color_resolve (g_value_get_boxed (value), props, &color))
-    return FALSE;
-
-  /* Store it back, this is where GdkRGBA caching happens */
-  g_value_unset (value);
-  g_value_init (value, GDK_TYPE_RGBA);
-  g_value_set_boxed (value, &color);
-
-  return TRUE;
-}
-
-static gboolean
-resolve_color_rgb (GtkStyleProperties *props,
-                   GValue             *value)
-{
-  GdkColor color = { 0 };
-  GdkRGBA rgba;
-
-  if (!gtk_symbolic_color_resolve (g_value_get_boxed (value), props, &rgba))
-    return FALSE;
-
-  color.red = rgba.red * 65535. + 0.5;
-  color.green = rgba.green * 65535. + 0.5;
-  color.blue = rgba.blue * 65535. + 0.5;
-
-  g_value_unset (value);
-  g_value_init (value, GDK_TYPE_COLOR);
-  g_value_set_boxed (value, &color);
-
-  return TRUE;
-}
-
-static gboolean
-resolve_win32_theme_part (GtkStyleProperties *props,
-                         GValue             *value,
-                         GValue             *value_out,
-                         GtkStylePropertyContext *context)
-{
-  GtkWin32ThemePart  *part;
-  cairo_pattern_t *pattern;
-
-  part = g_value_get_boxed (value);
-  if (part == NULL)
-    return FALSE;
-
-  pattern = _gtk_win32_theme_part_render (part, context->width, context->height);
-
-  g_value_take_boxed (value_out, pattern);
-
-  return TRUE;
-}
-
-
-static gboolean
-resolve_gradient (GtkStyleProperties *props,
-                  GValue             *value)
-{
-  cairo_pattern_t *gradient;
-
-  if (!gtk_gradient_resolve (g_value_get_boxed (value), props, &gradient))
-    return FALSE;
-
-  /* Store it back, this is where cairo_pattern_t caching happens */
-  g_value_unset (value);
-  g_value_init (value, CAIRO_GOBJECT_TYPE_PATTERN);
-  g_value_take_boxed (value, gradient);
-
-  return TRUE;
-}
-
-static gboolean
-resolve_shadow (GtkStyleProperties *props,
-                GValue *value)
-{
-  GtkShadow *resolved, *base;
-
-  base = g_value_get_boxed (value);
-
-  if (base == NULL)
-    return TRUE;
-  
-  if (_gtk_shadow_get_resolved (base))
-    return TRUE;
-
-  resolved = _gtk_shadow_resolve (base, props);
-  if (resolved == NULL)
-    return FALSE;
-
-  g_value_take_boxed (value, resolved);
-
-  return TRUE;
-}
-
-static void
-_gtk_style_property_resolve (GtkStyleProperty       *property,
-                             GtkStyleProperties     *props,
-                             GtkStateFlags           state,
-                            GtkStylePropertyContext *context,
-                             GValue                 *val,
-                            GValue                 *val_out)
-{
-  if (G_VALUE_TYPE (val) == GTK_TYPE_CSS_SPECIAL_VALUE)
-    {
-      GtkCssSpecialValue special = g_value_get_enum (val);
-
-      g_value_unset (val);
-      switch (special)
-        {
-        case GTK_CSS_CURRENT_COLOR:
-          g_assert (property->pspec->value_type == GDK_TYPE_RGBA);
-          gtk_style_properties_get_property (props, "color", state, val);
-          break;
-        case GTK_CSS_INHERIT:
-        case GTK_CSS_INITIAL:
-        default:
-          g_assert_not_reached ();
-        }
-    }
-  else if (G_VALUE_TYPE (val) == GTK_TYPE_SYMBOLIC_COLOR)
-    {
-      if (property->pspec->value_type == GDK_TYPE_RGBA)
-        {
-          if (resolve_color (props, val))
-            goto out;
-        }
-      else if (property->pspec->value_type == GDK_TYPE_COLOR)
-        {
-          if (resolve_color_rgb (props, val))
-            goto out;
-        }
-      
-      g_value_unset (val);
-      g_value_init (val, property->pspec->value_type);
-      _gtk_style_property_default_value (property, props, state, val);
-    }
-  else if (G_VALUE_TYPE (val) == GDK_TYPE_RGBA)
-    {
-      if (g_value_get_boxed (val) == NULL)
-        _gtk_style_property_default_value (property, props, state, val);
-    }
-  else if (G_VALUE_TYPE (val) == GTK_TYPE_GRADIENT)
-    {
-      g_return_if_fail (property->pspec->value_type == CAIRO_GOBJECT_TYPE_PATTERN);
-
-      if (!resolve_gradient (props, val))
-        {
-          g_value_unset (val);
-          g_value_init (val, CAIRO_GOBJECT_TYPE_PATTERN);
-          _gtk_style_property_default_value (property, props, state, val);
-        }
-    }
-  else if (G_VALUE_TYPE (val) == GTK_TYPE_SHADOW)
-    {
-      if (!resolve_shadow (props, val))
-        _gtk_style_property_default_value (property, props, state, val);
-    }
-  else if (G_VALUE_TYPE (val) == GTK_TYPE_WIN32_THEME_PART)
-    {
-      if (resolve_win32_theme_part (props, val, val_out, context))
-       return; /* Don't copy val, this sets val_out */
-      _gtk_style_property_default_value (property, props, state, val);
-    }
-
- out:
-  g_value_copy (val, val_out);
-}
-
-GParameter *
-_gtk_style_property_unpack (GtkStyleProperty *property,
-                            const GValue     *value,
-                            guint            *n_params)
-{
-  g_return_val_if_fail (property != NULL, NULL);
-  g_return_val_if_fail (property->unpack_func != NULL, NULL);
-  g_return_val_if_fail (value != NULL, NULL);
-  g_return_val_if_fail (n_params != NULL, NULL);
+  GtkStylePropertyClass *klass;
 
-  return property->unpack_func (value, n_params);
-}
+  g_return_val_if_fail (GTK_IS_STYLE_PROPERTY (property), NULL);
+  g_return_val_if_fail (parser != NULL, NULL);
 
-static void
-_gtk_style_property_pack (GtkStyleProperty   *property,
-                          GtkStyleProperties *props,
-                          GtkStateFlags       state,
-                         GtkStylePropertyContext *context,
-                          GValue             *value)
-{
-  g_return_if_fail (property != NULL);
-  g_return_if_fail (property->pack_func != NULL);
-  g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
-  g_return_if_fail (G_IS_VALUE (value));
+  klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-  property->pack_func (value, props, state, context);
+  return klass->parse_value (property, parser);
 }
 
+/**
+ * _gtk_style_property_assign:
+ * @property: the property
+ * @props: The properties to assign to
+ * @state: The state to assign
+ * @value: (out): the #GValue with the value to be
+ *     assigned
+ *
+ * This function is called by gtk_style_properties_set() and in
+ * turn gtk_style_context_set() and similar functions to set the
+ * value from code using old APIs.
+ **/
 void
 _gtk_style_property_assign (GtkStyleProperty   *property,
                             GtkStyleProperties *props,
                             GtkStateFlags       state,
                             const GValue       *value)
 {
+  GtkStylePropertyClass *klass;
+
   g_return_if_fail (GTK_IS_STYLE_PROPERTY (property));
   g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
   g_return_if_fail (value != NULL);
 
-  if (GTK_IS_CSS_SHORTHAND_PROPERTY (property))
-    {
-      GParameter *parameters;
-      guint i, n_parameters;
-
-      parameters = _gtk_style_property_unpack (property, value, &n_parameters);
+  klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-      for (i = 0; i < n_parameters; i++)
-        {
-          _gtk_style_property_assign (_gtk_style_property_lookup (parameters[i].name),
-                                      props,
-                                      state,
-                                      &parameters[i].value);
-          g_value_unset (&parameters[i].value);
-        }
-      g_free (parameters);
-      return;
-    }
-  else if (GTK_IS_CSS_STYLE_PROPERTY (property))
-    {
-      _gtk_style_properties_set_property_by_property (props,
-                                                      GTK_CSS_STYLE_PROPERTY (property),
-                                                      state,
-                                                      value);
-    }
-  else
-    {
-      g_assert_not_reached ();
-    }
+  klass->assign (property, props, state, value);
 }
 
+/**
+ * _gtk_style_property_query:
+ * @property: the property
+ * @value: (out): an uninitialized #GValue to be filled with the
+ *   contents of the lookup
+ * @query_func: The function to use to query properties
+ * @query_data: The data to pass to @query_func
+ *
+ * This function is called by gtk_style_properties_get() and in
+ * turn gtk_style_context_get() and similar functions to get the
+ * value to return to code using old APIs.
+ **/
 void
-_gtk_style_property_query (GtkStyleProperty        *property,
-                           GtkStyleProperties      *props,
-                           GtkStateFlags            state,
-                          GtkStylePropertyContext *context,
-                           GValue                  *value)
+_gtk_style_property_query (GtkStyleProperty  *property,
+                           GValue            *value,
+                           GtkStyleQueryFunc  query_func,
+                           gpointer           query_data)
 {
+  GtkStylePropertyClass *klass;
 
-  g_return_if_fail (property != NULL);
-  g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
-  g_return_if_fail (context != NULL);
   g_return_if_fail (value != NULL);
+  g_return_if_fail (GTK_IS_STYLE_PROPERTY (property));
+  g_return_if_fail (query_func != NULL);
 
-  g_value_init (value, property->pspec->value_type);
+  klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-  if (GTK_IS_CSS_STYLE_PROPERTY (property))
-    {
-      const GValue *val;
-      
-      val = _gtk_style_properties_peek_property (props, GTK_CSS_STYLE_PROPERTY (property), state);
-      if (val)
-        _gtk_style_property_resolve (property, props, state, context, (GValue *) val, value);
-      else
-        _gtk_style_property_default_value (property, props, state, value);
-    }
-  else if (GTK_IS_CSS_SHORTHAND_PROPERTY (property))
-    {
-      _gtk_style_property_pack (property, props, state, context, value);
-    }
-  else
-    {
-      g_assert_not_reached ();
-    }
+  return klass->query (property, value, query_func, query_data);
 }
 
-#define rgba_init(rgba, r, g, b, a) G_STMT_START{ \
-  (rgba)->red = (r); \
-  (rgba)->green = (g); \
-  (rgba)->blue = (b); \
-  (rgba)->alpha = (a); \
-}G_STMT_END
-static void
-gtk_style_property_init_properties (void)
+void
+_gtk_style_property_init_properties (void)
 {
   static gboolean initialized = FALSE;
-  GValue value = { 0, };
-  char *default_font_family[] = { "Sans", NULL };
-  GdkRGBA rgba;
 
   if (G_LIKELY (initialized))
     return;
 
   initialized = TRUE;
 
-  g_value_init (&value, GDK_TYPE_RGBA);
-  rgba_init (&rgba, 1, 1, 1, 1);
-  g_value_set_boxed (&value, &rgba);
-  _gtk_style_property_register           (g_param_spec_boxed ("color",
-                                          "Foreground color",
-                                          "Foreground color",
-                                          GDK_TYPE_RGBA, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  rgba_init (&rgba, 0, 0, 0, 0);
-  g_value_set_boxed (&value, &rgba);
-  _gtk_style_property_register           (g_param_spec_boxed ("background-color",
-                                          "Background color",
-                                          "Background color",
-                                          GDK_TYPE_RGBA, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  g_value_unset (&value);
-
-  g_value_init (&value, G_TYPE_STRV);
-  g_value_set_boxed (&value, default_font_family);
-  _gtk_style_property_register           (g_param_spec_boxed ("font-family",
-                                                              "Font family",
-                                                              "Font family",
-                                                              G_TYPE_STRV, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          font_family_parse,
-                                          font_family_value_print,
-                                          &value);
-  g_value_unset (&value);
-  _gtk_style_property_register           (g_param_spec_enum ("font-style",
-                                                             "Font style",
-                                                             "Font style",
-                                                             PANGO_TYPE_STYLE,
-                                                             PANGO_STYLE_NORMAL, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL);
-  _gtk_style_property_register           (g_param_spec_enum ("font-variant",
-                                                             "Font variant",
-                                                             "Font variant",
-                                                             PANGO_TYPE_VARIANT,
-                                                             PANGO_VARIANT_NORMAL, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL);
-  /* xxx: need to parse this properly, ie parse the numbers */
-  _gtk_style_property_register           (g_param_spec_enum ("font-weight",
-                                                             "Font weight",
-                                                             "Font weight",
-                                                             PANGO_TYPE_WEIGHT,
-                                                             PANGO_WEIGHT_NORMAL, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL);
-  g_value_init (&value, G_TYPE_DOUBLE);
-  g_value_set_double (&value, 10);
-  _gtk_style_property_register           (g_param_spec_double ("font-size",
-                                                               "Font size",
-                                                               "Font size",
-                                                               0, G_MAXDOUBLE, 0, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  g_value_unset (&value);
-
-  _gtk_style_property_register           (g_param_spec_boxed ("text-shadow",
-                                                              "Text shadow",
-                                                              "Text shadow",
-                                                              GTK_TYPE_SHADOW, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL);
-
-  _gtk_style_property_register           (g_param_spec_boxed ("icon-shadow",
-                                                              "Icon shadow",
-                                                              "Icon shadow",
-                                                              GTK_TYPE_SHADOW, 0),
-                                          GTK_STYLE_PROPERTY_INHERIT,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          NULL);
-
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("box-shadow",
-                                                              "Box shadow",
-                                                              "Box shadow",
-                                                              GTK_TYPE_SHADOW, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("margin-top",
-                                                            "margin top",
-                                                            "Margin at top",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("margin-left",
-                                                            "margin left",
-                                                            "Margin at left",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("margin-bottom",
-                                                            "margin bottom",
-                                                            "Margin at bottom",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("margin-right",
-                                                            "margin right",
-                                                            "Margin at right",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("padding-top",
-                                                            "padding top",
-                                                            "Padding at top",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("padding-left",
-                                                            "padding left",
-                                                            "Padding at left",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("padding-bottom",
-                                                            "padding bottom",
-                                                            "Padding at bottom",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("padding-right",
-                                                            "padding right",
-                                                            "Padding at right",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("border-top-width",
-                                                            "border top width",
-                                                            "Border width at top",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("border-left-width",
-                                                            "border left width",
-                                                            "Border width at left",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("border-bottom-width",
-                                                            "border bottom width",
-                                                            "Border width at bottom",
-                                                            0, G_MAXINT, 0, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_int ("border-right-width",
-                                                            "border right width",
-                                                            "Border width at right",
-                                                            0, G_MAXINT, 0, 0));
-
-  _gtk_style_property_register           (g_param_spec_boxed ("border-top-left-radius",
-                                                              "Border top left radius",
-                                                              "Border radius of top left corner, in pixels",
-                                                              GTK_TYPE_CSS_BORDER_CORNER_RADIUS, 0),
-                                          0,
-                                          NULL,
-                                          border_corner_radius_value_parse,
-                                          border_corner_radius_value_print,
-                                          NULL);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-top-right-radius",
-                                                              "Border top right radius",
-                                                              "Border radius of top right corner, in pixels",
-                                                              GTK_TYPE_CSS_BORDER_CORNER_RADIUS, 0),
-                                          0,
-                                          NULL,
-                                          border_corner_radius_value_parse,
-                                          border_corner_radius_value_print,
-                                          NULL);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-bottom-right-radius",
-                                                              "Border bottom right radius",
-                                                              "Border radius of bottom right corner, in pixels",
-                                                              GTK_TYPE_CSS_BORDER_CORNER_RADIUS, 0),
-                                          0,
-                                          NULL,
-                                          border_corner_radius_value_parse,
-                                          border_corner_radius_value_print,
-                                          NULL);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-bottom-left-radius",
-                                                              "Border bottom left radius",
-                                                              "Border radius of bottom left corner, in pixels",
-                                                              GTK_TYPE_CSS_BORDER_CORNER_RADIUS, 0),
-                                          0,
-                                          NULL,
-                                          border_corner_radius_value_parse,
-                                          border_corner_radius_value_print,
-                                          NULL);
-
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_enum ("border-style",
-                                                             "Border style",
-                                                             "Border style",
-                                                             GTK_TYPE_BORDER_STYLE,
-                                                             GTK_BORDER_STYLE_NONE, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_enum ("background-clip",
-                                                             "Background clip",
-                                                             "Background clip",
-                                                             GTK_TYPE_CSS_AREA,
-                                                             GTK_CSS_AREA_BORDER_BOX, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_enum ("background-origin",
-                                                             "Background origin",
-                                                             "Background origin",
-                                                             GTK_TYPE_CSS_AREA,
-                                                             GTK_CSS_AREA_PADDING_BOX, 0));
-  g_value_init (&value, GTK_TYPE_CSS_SPECIAL_VALUE);
-  g_value_set_enum (&value, GTK_CSS_CURRENT_COLOR);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-top-color",
-                                                              "Border top color",
-                                                              "Border top color",
-                                                              GDK_TYPE_RGBA, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-right-color",
-                                                              "Border right color",
-                                                              "Border right color",
-                                                              GDK_TYPE_RGBA, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-bottom-color",
-                                                              "Border bottom color",
-                                                              "Border bottom color",
-                                                              GDK_TYPE_RGBA, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-left-color",
-                                                              "Border left color",
-                                                              "Border left color",
-                                                              GDK_TYPE_RGBA, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  g_value_unset (&value);
-
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("background-image",
-                                                              "Background Image",
-                                                              "Background Image",
-                                                              CAIRO_GOBJECT_TYPE_PATTERN, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("background-repeat",
-                                                              "Background repeat",
-                                                              "Background repeat",
-                                                              GTK_TYPE_CSS_BACKGROUND_REPEAT, 0));
-
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("border-image-source",
-                                                              "Border image source",
-                                                              "Border image source",
-                                                              CAIRO_GOBJECT_TYPE_PATTERN, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("border-image-repeat",
-                                                              "Border image repeat",
-                                                              "Border image repeat",
-                                                              GTK_TYPE_CSS_BORDER_IMAGE_REPEAT, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("border-image-slice",
-                                                              "Border image slice",
-                                                              "Border image slice",
-                                                              GTK_TYPE_BORDER, 0));
-  g_value_init (&value, GTK_TYPE_BORDER);
-  _gtk_style_property_register           (g_param_spec_boxed ("border-image-width",
-                                                              "Border image width",
-                                                              "Border image width",
-                                                              GTK_TYPE_BORDER, 0),
-                                          0,
-                                          NULL,
-                                          NULL,
-                                          NULL,
-                                          &value);
-  g_value_unset (&value);
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_object ("engine",
-                                                               "Theming Engine",
-                                                               "Theming Engine",
-                                                               GTK_TYPE_THEMING_ENGINE, 0));
-  gtk_style_properties_register_property (NULL,
-                                          g_param_spec_boxed ("transition",
-                                                              "Transition animation description",
-                                                              "Transition animation description",
-                                                              GTK_TYPE_ANIMATION_DESCRIPTION, 0));
-
-  /* Private property holding the binding sets */
-  _gtk_style_property_register           (g_param_spec_boxed ("gtk-key-bindings",
-                                                              "Key bindings",
-                                                              "Key bindings",
-                                                              G_TYPE_PTR_ARRAY, 0),
-                                          0,
-                                          NULL,
-                                          bindings_value_parse,
-                                          bindings_value_print,
-                                          NULL);
-
+  _gtk_css_style_property_init_properties ();
   /* initialize shorthands last, they depend on the real properties existing */
   _gtk_css_shorthand_property_init_properties ();
 }
@@ -1114,7 +249,7 @@ _gtk_style_property_lookup (const char *name)
 
   g_return_val_if_fail (name != NULL, NULL);
 
-  gtk_style_property_init_properties ();
+  _gtk_style_property_init_properties ();
 
   klass = g_type_class_peek (GTK_TYPE_STYLE_PROPERTY);
 
@@ -1155,53 +290,3 @@ _gtk_style_property_get_value_type (GtkStyleProperty *property)
 
   return property->value_type;
 }
-
-
-void
-_gtk_style_property_register (GParamSpec               *pspec,
-                              GtkStylePropertyFlags     flags,
-                              GtkStylePropertyParser    property_parse_func,
-                              GtkStyleParseFunc         parse_func,
-                              GtkStylePrintFunc         print_func,
-                              const GValue *            initial_value)
-{
-  GtkStyleProperty *node;
-  GValue initial_fallback = { 0, };
-
-  if (initial_value == NULL)
-    {
-      g_value_init (&initial_fallback, pspec->value_type);
-      if (pspec->value_type == GTK_TYPE_THEMING_ENGINE)
-        g_value_set_object (&initial_fallback, gtk_theming_engine_load (NULL));
-      else if (pspec->value_type == PANGO_TYPE_FONT_DESCRIPTION)
-        g_value_take_boxed (&initial_fallback, pango_font_description_from_string ("Sans 10"));
-      else if (pspec->value_type == GDK_TYPE_RGBA)
-        {
-          GdkRGBA color;
-          gdk_rgba_parse (&color, "pink");
-          g_value_set_boxed (&initial_fallback, &color);
-        }
-      else if (pspec->value_type == GTK_TYPE_BORDER)
-        {
-          g_value_take_boxed (&initial_fallback, gtk_border_new ());
-        }
-      else
-        g_param_value_set_default (pspec, &initial_fallback);
-
-      initial_value = &initial_fallback;
-    }
-
-  node = g_object_new (GTK_TYPE_CSS_STYLE_PROPERTY,
-                       "inherit", (flags & GTK_STYLE_PROPERTY_INHERIT) ? TRUE : FALSE,
-                       "initial-value", initial_value,
-                       "name", pspec->name,
-                       "value-type", pspec->value_type,
-                       NULL);
-  node->pspec = pspec;
-  node->property_parse_func = property_parse_func;
-  node->parse_func = parse_func;
-  node->print_func = print_func;
-
-  if (G_IS_VALUE (&initial_fallback))
-    g_value_unset (&initial_fallback);
-}