changed prototype of g_boxed_type_register_static() to contain an optional

Wed Mar 7 09:36:33 2001 Tim Janik <timj@gtk.org> * gboxed.[hc]: changed prototype of g_boxed_type_register_static() to contain an optional init function and a hint at whether the boxed structure uses ref counting internally. added g_value_set_boxed_take_ownership(). made G_TYPE_BOXED an abstract value type. * genums.[hc]: made G_TYPE_ENUM and G_TYPE_FLAGS abstract value types. * glib-genmarshal.c: argument type changes, preparation for third-party arg specification. * gobject.[hc]: cleaned up get/set property code. added g_strdup_value_contents() to improve warnings. * gparam.[hc]: added g_param_value_convert(), taking over responsibility of the old g_value_convert(). added G_PARAM_LAX_VALIDATION flag so validation alterations may be valid a part of the property setting process. * gparamspecs.[hc]: made value comparisons stable (for sort applications). added GParamSpecValueArray, a param spec for value arrays and GParamSpecClosure. nuked the value exchange functions and GParamSpecCCallback. * gtype.[hc]: catch unintialized usages of the type system with g_return_val_if_uninitialized(). introduced G_TYPE_FLAG_VALUE_ABSTRACT to flag types that introduce a value table, but can't be used for g_value_init(). cleaned up reserved type ids. * gvalue.[hc]: code cleanups and saner checking. nuked the value exchange API. implemented value transformations, we can't really "convert" values, rather transforms are an anylogy to C casts, real conversions need a param spec for validation, which is why g_param_value_convert() does real conversions now. * gvaluearray.[hc]: new files that implement a GValueArray, a struct that can hold inhomogeneous arrays of value (to that extend that it also allowes undefined values, i.e. G_VALUE_TYPE(value)==0). this is exposed to the type system as a boxed type. * gvaluetransform.c: new file implementing most of the former value exchange functions as single-sided transformations. * gvaluetypes.[hc]: nuked G_TYPE_CCALLBACK, added g_value_set_string_take_ownership(). * *.h: s/G_IS_VALUE_/G_VALUE_HOLDS_/. * *.[hc]: many fixes and cleanups. * many warning improvements. Tue Feb 27 18:35:15 2001 Tim Janik <timj@gtk.org> * gobject.c (g_object_get_valist): urg, pass G_VALUE_NOCOPY_CONTENTS into G_VALUE_LCOPY(), this needs proper documenting. * gparam.c: fixed G_PARAM_USER_MASK. * gtype.c (type_data_make_W): (type_data_last_unref_Wm): fixed invalid memory freeing. * gobject.c (g_object_last_unref): destroy signal handlers associated with object, right before finalization. * gsignal.c (g_signal_parse_name): catch destroyed nodes or signals that don't actually support details. * gobject.[hc]: got rid of property trailers. nuked GObject properties "data" and the "signal" variants. (g_object_connect): new convenience function to do multiple signal connections at once. (g_object_disconnect): likewise, for disconnections. * gparam.[hc] (g_param_spec_pool_lookup): took out trailer support. * gvalue.[hc]: marked g_value_fits_pointer() and g_value_peek_pointer() as private (the latter got renamed from g_value_get_as_pointer()). Wed Mar 7 09:32:06 2001 Tim Janik <timj@gtk.org> * glib-object.h: add gvaluearray.h. * gstring.[hc]: fixup naming of g_string_sprint*. * gtypes.h: fixed GCompareDataFunc naming. Wed Mar 7 09:33:27 2001 Tim Janik <timj@gtk.org> * gobject/Makefile.am: shuffled rules to avoid excessive rebuilds. * gobject/gobject-sections.txt: updates. * gobject/tmpl/*: bunch of updates, added another patch from Eric Lemings <eric.b.lemings@lmco.com>.
2025-07-30 13:53:30 +02:00 · 2001-03-07 14:46:45 +00:00
parent 66107ac7e1
commit 37e4b8c87e
86 changed files with 3513 additions and 2711 deletions
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -1,5 +1,5 @@
 /* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1997, 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * Copyright (C) 1997-1999, 2000-2001 Tim Janik and Red Hat, Inc.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
@@ -31,7 +31,7 @@

 /* --- defines --- */
 #define G_PARAM_SPEC_CLASS(class)		(G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_PARAM, GParamSpecClass))
-#define	G_PARAM_USER_MASK			((1 << G_PARAM_USER_SHIFT) - 1)
+#define	G_PARAM_USER_MASK			(~0 << G_PARAM_USER_SHIFT)
 #define PSPEC_APPLIES_TO_VALUE(pspec, value)	(G_TYPE_CHECK_VALUE_TYPE ((value), G_PARAM_SPEC_VALUE_TYPE (pspec)))
 #define	G_SLOCK(mutex)				g_static_mutex_lock (mutex)
 #define	G_SUNLOCK(mutex)			g_static_mutex_unlock (mutex)
@@ -49,6 +49,8 @@ static void	value_param_init		(GValue		*value);
 static void	value_param_free_value		(GValue		*value);
 static void	value_param_copy_value		(const GValue	*src_value,
 						 GValue		*dest_value);
+static void	value_param_transform_value	(const GValue	*src_value,
+						 GValue		*dest_value);
 static gpointer	value_param_peek_pointer	(const GValue	*value);
 static gchar*	value_param_collect_value	(GValue		*value,
 						 guint           n_collect_values,
@@ -104,6 +106,7 @@ g_param_type_init (void)	/* sync with gtype.c */

  type = g_type_register_fundamental (G_TYPE_PARAM, "GParam", &param_spec_info, &finfo, G_TYPE_FLAG_ABSTRACT);
  g_assert (type == G_TYPE_PARAM);
+  g_value_register_transform_func (G_TYPE_PARAM, G_TYPE_PARAM, value_param_transform_value);
 }

 static void
@@ -345,6 +348,40 @@ g_param_value_validate (GParamSpec *pspec,
  return FALSE;
 }

+gboolean
+g_param_value_convert (GParamSpec   *pspec,
+		       const GValue *src_value,
+		       GValue       *dest_value,
+		       gboolean	     strict_validation)
+{
+  GValue tmp_value = { 0, };
+
+  g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
+  g_return_val_if_fail (G_IS_VALUE (src_value), FALSE);
+  g_return_val_if_fail (G_IS_VALUE (dest_value), FALSE);
+  g_return_val_if_fail (PSPEC_APPLIES_TO_VALUE (pspec, dest_value), FALSE);
+
+  /* better leave dest_value untouched when returning FALSE */
+
+  g_value_init (&tmp_value, G_VALUE_TYPE (dest_value));
+  if (g_value_transform (src_value, &tmp_value) &&
+      (!g_param_value_validate (pspec, &tmp_value) || !strict_validation))
+    {
+      g_value_unset (dest_value);
+      
+      /* values are relocatable */
+      memcpy (dest_value, &tmp_value, sizeof (tmp_value));
+      
+      return TRUE;
+    }
+  else
+    {
+      g_value_unset (&tmp_value);
+      
+      return FALSE;
+    }
+}
+
 gint
 g_param_values_cmp (GParamSpec   *pspec,
 		    const GValue *value1,
@@ -386,9 +423,21 @@ static void
 value_param_copy_value (const GValue *src_value,
 			GValue       *dest_value)
 {
-  dest_value->data[0].v_pointer = (src_value->data[0].v_pointer
-				   ? g_param_spec_ref (src_value->data[0].v_pointer)
-				   : NULL);
+  if (src_value->data[0].v_pointer)
+    dest_value->data[0].v_pointer = g_param_spec_ref (src_value->data[0].v_pointer);
+  else
+    dest_value->data[0].v_pointer = NULL;
+}
+
+static void
+value_param_transform_value (const GValue *src_value,
+			     GValue       *dest_value)
+{
+  if (src_value->data[0].v_pointer &&
+      g_type_is_a (G_PARAM_SPEC_TYPE (dest_value->data[0].v_pointer), G_VALUE_TYPE (dest_value)))
+    dest_value->data[0].v_pointer = g_param_spec_ref (src_value->data[0].v_pointer);
+  else
+    dest_value->data[0].v_pointer = NULL;
 }

 static gpointer
@@ -412,7 +461,7 @@ value_param_collect_value (GValue      *value,
 			    G_VALUE_TYPE_NAME (value),
 			    "'",
 			    NULL);
-      else if (!g_type_is_a (G_PARAM_SPEC_TYPE (param), G_VALUE_TYPE (value)))
+      else if (!g_value_type_compatible (G_PARAM_SPEC_TYPE (param), G_VALUE_TYPE (value)))
 	return g_strconcat ("invalid param spec type `",
 			    G_PARAM_SPEC_TYPE_NAME (param),
 			    "' for value type `",
@@ -601,8 +650,7 @@ GParamSpec*
 g_param_spec_pool_lookup (GParamSpecPool *pool,
 			  const gchar    *param_name,
 			  GType           owner_type,
-			  gboolean        walk_ancestors,
-			  const gchar   **trailer_p)
+			  gboolean        walk_ancestors)
 {
  GParamSpec *pspec;
  gchar *delim;
@@ -615,13 +663,11 @@ g_param_spec_pool_lookup (GParamSpecPool *pool,

  G_SLOCK (&pool->smutex);

-  delim = strchr (param_name, ':');
+  delim = pool->type_prefixing ? strchr (param_name, ':') : NULL;

-  /* try quick and away, i.e. no prefix, no trailer */
+  /* try quick and away, i.e. without prefix */
  if (!delim)
    {
-      if (trailer_p)
-	*trailer_p = NULL;
      pspec = param_spec_ht_lookup (pool->hash_table, param_name, owner_type, walk_ancestors);
      G_SUNLOCK (&pool->smutex);

@@ -645,48 +691,20 @@ g_param_spec_pool_lookup (GParamSpecPool *pool,
 	  /* sanity check, these cases don't make a whole lot of sense */
 	  if ((!walk_ancestors && type != owner_type) || !g_type_is_a (owner_type, type))
 	    {
-	      if (trailer_p)
-		*trailer_p = NULL;
 	      G_SUNLOCK (&pool->smutex);

 	      return NULL;
 	    }
 	  owner_type = type;
 	  param_name += l + 2;
-	  delim = strchr (param_name, ':');
-	  if (!delim)		/* good, can still forget about trailer */
-	    {
-	      if (trailer_p)
-		*trailer_p = NULL;
-	      pspec = param_spec_ht_lookup (pool->hash_table, param_name, owner_type, walk_ancestors);
-              G_SUNLOCK (&pool->smutex);
+	  pspec = param_spec_ht_lookup (pool->hash_table, param_name, owner_type, walk_ancestors);
+	  G_SUNLOCK (&pool->smutex);

-	      return pspec;
-	    }
+	  return pspec;
 	}
    }
-
-  /* ok, no prefix, handle trailer */
-  if (delim[1] == ':')
-    {
-      guint l = delim - param_name;
-      gchar stack_buffer[32], *buffer = l < 32 ? stack_buffer : g_new (gchar, l + 1);
-      
-      strncpy (buffer, param_name, delim - param_name);
-      buffer[l] = 0;
-      pspec = param_spec_ht_lookup (pool->hash_table, buffer, owner_type, walk_ancestors);
-      if (l >= 32)
-	g_free (buffer);
-      if (trailer_p)
-	*trailer_p = pspec ? delim + 2 : NULL;
-      G_SUNLOCK (&pool->smutex);
-
-      return pspec;
-    }
-
  /* malformed param_name */
-  if (trailer_p)
-    *trailer_p = NULL;
+
  G_SUNLOCK (&pool->smutex);

  return NULL;
@@ -784,7 +802,7 @@ void
 g_value_set_param (GValue     *value,
 		   GParamSpec *param)
 {
-  g_return_if_fail (G_IS_VALUE_PARAM (value));
+  g_return_if_fail (G_VALUE_HOLDS_PARAM (value));
  if (param)
    g_return_if_fail (G_IS_PARAM_SPEC (param));

@@ -798,7 +816,7 @@ g_value_set_param (GValue     *value,
 GParamSpec*
 g_value_get_param (const GValue *value)
 {
-  g_return_val_if_fail (G_IS_VALUE_PARAM (value), NULL);
+  g_return_val_if_fail (G_VALUE_HOLDS_PARAM (value), NULL);

  return value->data[0].v_pointer;
 }
@@ -806,7 +824,7 @@ g_value_get_param (const GValue *value)
 GParamSpec*
 g_value_dup_param (const GValue *value)
 {
-  g_return_val_if_fail (G_IS_VALUE_PARAM (value), NULL);
+  g_return_val_if_fail (G_VALUE_HOLDS_PARAM (value), NULL);

  return value->data[0].v_pointer ? g_param_spec_ref (value->data[0].v_pointer) : NULL;
 }