luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

define gstring in terms of gchar*. this typedef reflects the type name of

Browse Source 
Fri Jun 23 17:20:26 2000  Tim Janik  <timj@gtk.org>

        * glib.h: define gstring in terms of gchar*. this typedef reflects
        the type name of the primitive G_TYPE_STRING in the gobject module.

Sat Jun 24 23:03:04 2000  Tim Janik  <timj@gtk.org>

        * gtype.[hc]: provide G_TYPE_CHAR, G_TYPE_UCHAR, G_TYPE_BOOLEAN,
        G_TYPE_INT, G_TYPE_UINT, G_TYPE_LONG, G_TYPE_ULONG, G_TYPE_FLOAT,
        G_TYPE_DOUBLE and G_TYPE_STRING fundamental types.
        added a GTypeValueTable* pointer to GTypeInfo structure for types
        to implement GValue handling functions.
        GTypeValueTable contains the following members:
          value_init(): initialize a GValue structure.
          value_free(): free GValue structure contents (optional).
          value_copy(): copy one GValue contents to another GValue structure of
          collect_type: varargs collection type for the first variable argument
          to be collected by collect_value().
          collect_value(): variable arguments collection function (optional).
          lcopy_type: varargs collection type for the first variable argument
          to be location copyied by lcopy_value().
          lcopy_value(): variable arguments location copy function (optional).
        g_type_value_table_peek(): new function to retrive the GTypeValueTable*
        for a type node. ValueTables get inherited from parent types, unless
        overridden through the GTypeInfo structure. internally, GTypeValueTable
        support means an added overhead of one pointer per static or used
        dynamic type node.
        g_type_add_class_cache_func(): provide a cache_func/data pair to be
        called  prior to a type nodes last_unref() function, this can be used
        to prevent premature class destruction. multiple installed cache_func()
        will be chained upon last_unref() untill one of them returns TRUE.
        the cache_func()s have to check the type id passed in to figure whether
        they actually wants to cache the class of this type (since any types are
        routed through the cache_func() chain).
        g_type_remove_class_cache_func(): remove a previously installed
        cache_func/data pair. the cache maintained by this function has to be
        clear when calling g_type_remove_class_cache_func() to avoid leaks.
        g_type_class_unref_uncached(): class unref function for cache_func()
        implementations, unreferences a class omitting the cache chain (and
        therefore unref->cache->unref->... loops).

        * gvaluetypes.[hc]: provide the value setters/getters for the primitive
        fundamental types boolean, char, uchar, int, uint, long, ulong, float,
        double and string.

        * gvalue.[hc]: provide G_TYPE_IS_VALUE() in terms of whether a
        GTypeValueTable is provided for this type.
        removed g_value_init_default(), g_value_validate(), g_value_defaults(),
        g_value_set_default() and g_values_cmp() as these are supplied by the
        GParamSpec API now.
        moved g_values_exchange() into the "implementation details" section,
        since it just provides the underlying functionality for
        g_value_convert().

        * gvaluecollector.h: renamed the varargs value container from
        GParamCValue to GTypeCValue as the value collection methods are
        supplied by the type system now.
        G_PARAM_COLLECT_VALUE() and G_PARAM_LCOPY_VALUE() got renamed to
        G_VALUE_COLLECT() and G_VALUE_LCOPY() and operate without a
        GParamSpec structure now.

        * genums.h: macros cleanups/fixes.

        * genum.c: provide G_TYPE_ENUM and G_TYPE_FLAGS type
        and assorted g_value_{s|g}et_{enum|flags}() implementations.

        * gobject.[hc]:
        provide G_IS_VALUE_OBJECT(), G_TYPE_OBJECT ValueTable methods
        and g_value_{s|g}et_object().

        * gparam.[hc]: reduced class to value_set_default(),
        value_validate() and values_cmp(). also parameters now need to fill
        in a GType value_type; field to indicate the GValue type they
        are handling. provide g_param_value_set_default(),
        g_param_value_defaults(), g_param_value_validate() and
        g_param_values_cmp().

        * gparamspecs.[hc]: got rid of the g_value_* functions and
        the G_IS_VALUE_* macros. adapted param spec implementations
        according to the GParamSpecClass changes.
This commit is contained in:
Tim Janik
2000-06-24 22:30:10 +00:00
committed by Tim Janik
parent 0891c64816
commit 09f8e937f2
29 changed files with 1996 additions and 1526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
gobject/gvalue.c
View File

@@ -19,10 +19,6 @@
#include "gvalue.h"
/* --- defines --- */
#define G_PARAM_SPEC_CLASS(class) (G_TYPE_CHECK_CLASS_CAST ((class), G_TYPE_PARAM, GParamSpecClass))
/* --- typedefs & structures --- */
typedef struct
{
@@ -42,179 +38,73 @@ void
g_value_init (GValue *value,
GType g_type)
{
GParamSpecClass *pclass;
g_return_if_fail (value != NULL);
g_return_if_fail (G_VALUE_TYPE (value) == 0);
g_type = g_type_next_base (g_type, G_TYPE_PARAM);
g_return_if_fail (G_TYPE_IS_VALUE (g_type));
memset (value, 0, sizeof (*value));
value->g_type = g_type;
pclass = g_type_class_ref (G_VALUE_TYPE (value));
pclass->param_init (value, NULL);
g_type_class_unref (pclass);
}
void
g_value_init_default (GValue *value,
GParamSpec *pspec)
{
g_return_if_fail (value != NULL);
g_return_if_fail (G_VALUE_TYPE (value) == 0);
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
memset (value, 0, sizeof (*value));
value->g_type = g_type_next_base (G_PARAM_SPEC_TYPE (pspec), G_TYPE_PARAM);
G_PARAM_SPEC_GET_CLASS (pspec)->param_init (value, pspec);
}
gboolean
g_value_validate (GValue *value,
GParamSpec *pspec)
{
g_return_val_if_fail (G_IS_VALUE (value), FALSE);
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
g_return_val_if_fail (g_type_is_a (G_PARAM_SPEC_TYPE (pspec), G_VALUE_TYPE (value)), FALSE);
if (G_PARAM_SPEC_GET_CLASS (pspec)->param_validate)
{
GValue oval = *value;
if (G_PARAM_SPEC_GET_CLASS (pspec)->param_validate (value, pspec) ||
memcmp (&oval.data, &value->data, sizeof (oval.data)))
return TRUE;
}
return FALSE;
}
gboolean
g_value_defaults (const GValue *value,
GParamSpec *pspec)
{
GValue dflt_value = { 0, };
gboolean defaults;
g_return_val_if_fail (G_IS_VALUE (value), FALSE);
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE);
g_return_val_if_fail (g_type_is_a (G_PARAM_SPEC_TYPE (pspec), G_VALUE_TYPE (value)), FALSE);
GTypeValueTable *value_table = g_type_value_table_peek (g_type);
dflt_value.g_type = g_type_next_base (G_PARAM_SPEC_TYPE (pspec), G_TYPE_PARAM);
G_PARAM_SPEC_GET_CLASS (pspec)->param_init (&dflt_value, pspec);
defaults = g_values_cmp (value, &dflt_value, pspec) == 0;
g_value_unset (&dflt_value);
return defaults;
}
void
g_value_set_default (GValue *value,
GParamSpec *pspec)
{
GValue tmp_value = { 0, };
g_return_if_fail (G_IS_VALUE (value));
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
g_return_if_fail (g_type_is_a (G_PARAM_SPEC_TYPE (pspec), G_VALUE_TYPE (value)));
/* retrive default value */
tmp_value.g_type = g_type_next_base (G_PARAM_SPEC_TYPE (pspec), G_TYPE_PARAM);
G_PARAM_SPEC_GET_CLASS (pspec)->param_init (&tmp_value, pspec);
/* set default value */
g_values_exchange (&tmp_value, value);
g_value_unset (&tmp_value);
}
gint
g_values_cmp (const GValue *value1,
const GValue *value2,
GParamSpec *pspec)
{
GParamSpecClass *pclass;
gint cmp;
/* param_values_cmp() effectively does: value1 - value2
* so the return values are:
* -1) value1 < value2
* 0) value1 == value2
* 1) value1 > value2
*/
g_return_val_if_fail (G_IS_VALUE (value1), 0);
g_return_val_if_fail (G_IS_VALUE (value2), 0);
g_return_val_if_fail (G_VALUE_TYPE (value1) == G_VALUE_TYPE (value2), 0);
if (pspec)
g_return_if_fail (value != NULL);
g_return_if_fail (G_VALUE_TYPE (value) == 0);
if (value_table)
{
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), 0);
g_return_val_if_fail (g_type_is_a (G_PARAM_SPEC_TYPE (pspec), G_VALUE_TYPE (value1)), FALSE);
memset (value, 0, sizeof (*value));
value->g_type = g_type;
value_table->value_init (value);
}
pclass = g_type_class_ref (G_VALUE_TYPE (value1));
cmp = pclass->param_values_cmp (value1, value2, pspec);
g_type_class_unref (pclass);
return CLAMP (cmp, -1, 1);
else
g_warning (G_STRLOC ": cannot initialize value of type `%s' which has no GTypeValueTable",
g_type_name (g_type));
}
void
g_value_copy (const GValue *src_value,
GValue *dest_value)
{
GTypeValueTable *value_table = g_type_value_table_peek (G_VALUE_TYPE (dest_value));
g_return_if_fail (G_IS_VALUE (src_value));
g_return_if_fail (G_IS_VALUE (dest_value));
g_return_if_fail (G_VALUE_TYPE (src_value) == G_VALUE_TYPE (dest_value));
g_return_if_fail (g_type_is_a (G_VALUE_TYPE (src_value), G_VALUE_TYPE (dest_value)));
if (!value_table)
g_return_if_fail (g_type_value_table_peek (G_VALUE_TYPE (dest_value)) != NULL);
if (src_value != dest_value)
{
GParamSpecClass *pclass = g_type_class_ref (G_VALUE_TYPE (src_value));
/* make sure dest_value's value is free()d and zero initialized */
g_value_reset (dest_value);
if (pclass->param_copy_value)
pclass->param_copy_value (src_value, dest_value);
else
memcpy (&dest_value->data, &src_value->data, sizeof (src_value->data));
g_type_class_unref (pclass);
value_table->value_copy (src_value, dest_value);
}
}
void
g_value_unset (GValue *value)
{
GParamSpecClass *pclass;
GTypeValueTable *value_table = g_type_value_table_peek (G_VALUE_TYPE (value));
g_return_if_fail (G_IS_VALUE (value));
pclass = g_type_class_ref (G_VALUE_TYPE (value));
if (pclass->param_free_value)
pclass->param_free_value (value);
if (!value_table)
g_return_if_fail (g_type_value_table_peek (G_VALUE_TYPE (value)) != NULL);
if (value_table->value_free)
value_table->value_free (value);
memset (value, 0, sizeof (*value));
g_type_class_unref (pclass);
}
void
g_value_reset (GValue *value)
{
GParamSpecClass *pclass;
GTypeValueTable *value_table = g_type_value_table_peek (G_VALUE_TYPE (value));
GType g_type;
g_return_if_fail (G_IS_VALUE (value));
g_type = G_VALUE_TYPE (value);
pclass = g_type_class_ref (g_type);
if (pclass->param_free_value)
pclass->param_free_value (value);
memset (value, 0, sizeof (*value));
value->g_type = g_type;
pclass->param_init (value, NULL);
g_type_class_unref (pclass);
g_return_if_fail (G_IS_VALUE (value));
g_type = G_VALUE_TYPE (value);
if (value_table->value_free)
value_table->value_free (value);
memset (value, 0, sizeof (*value));
value->g_type = g_type;
value_table->value_init (value);
}
static gint
@@ -223,7 +113,7 @@ exchange_entries_equal (gconstpointer v1,
{
const ExchangeEntry *entry1 = v1;
const ExchangeEntry *entry2 = v2;
return (entry1->value_type1 == entry2->value_type1 &&
entry1->value_type2 == entry2->value_type2);
}
@@ -232,7 +122,7 @@ static guint
exchange_entry_hash (gconstpointer key)
{
const ExchangeEntry *entry = key;
return entry->value_type1 ^ entry->value_type2;
}
@@ -241,7 +131,7 @@ value_exchange_memcpy (GValue *value1,
GValue *value2)
{
GValue tmp_value;
memcpy (&tmp_value.data, &value1->data, sizeof (value1->data));
memcpy (&value1->data, &value2->data, sizeof (value1->data));
memcpy (&value2->data, &tmp_value.data, sizeof (value2->data));
@@ -256,20 +146,36 @@ exchange_func_lookup (GType value_type1,
return value_exchange_memcpy;
else
{
ExchangeEntry entry, *ret;
GType type1 = value_type1;
entry.value_type1 = MIN (value_type1, value_type2);
entry.value_type2 = MAX (value_type1, value_type2);
ret = g_hash_table_lookup (param_exchange_ht, &entry);
if (ret)
do
{
if (need_swap)
*need_swap = ret->first_type == value_type1;
return ret->func;
GType type2 = value_type2;
do
{
ExchangeEntry entry, *ret;
entry.value_type1 = MIN (type1, type2);
entry.value_type2 = MAX (type1, type2);
ret = g_hash_table_lookup (param_exchange_ht, &entry);
if (ret)
{
if (need_swap)
*need_swap = ret->first_type == type2;
return ret->func;
}
type2 = g_type_parent (type2);
}
while (type2);
type1 = g_type_parent (type1);
}
while (type1);
}
return NULL;
}
@@ -278,30 +184,29 @@ g_value_register_exchange_func (GType value_type1,
GType value_type2,
GValueExchange func)
{
GType type1, type2;
ExchangeEntry entry;
g_return_if_fail (G_TYPE_IS_VALUE (value_type1));
g_return_if_fail (G_TYPE_IS_VALUE (value_type2));
g_return_if_fail (func != NULL);
type1 = g_type_next_base (value_type1, G_TYPE_PARAM);
type2 = g_type_next_base (value_type2, G_TYPE_PARAM);
if (param_exchange_ht && exchange_func_lookup (type1, type2, NULL))
entry.value_type1 = MIN (value_type1, value_type2);
entry.value_type2 = MAX (value_type1, value_type2);
if (param_exchange_ht && g_hash_table_lookup (param_exchange_ht, &entry))
g_warning (G_STRLOC ": cannot re-register param value exchange function "
"for `%s' and `%s'",
g_type_name (type1),
g_type_name (type2));
g_type_name (value_type1),
g_type_name (value_type2));
else
{
ExchangeEntry *entry = g_new (ExchangeEntry, 1);
if (!param_exchange_ht)
param_exchange_ht = g_hash_table_new (exchange_entry_hash, exchange_entries_equal);
entry->value_type1 = MIN (type1, type2);
entry->value_type2 = MAX (type1, type2);
entry->value_type1 = MIN (value_type1, value_type2);
entry->value_type2 = MAX (value_type1, value_type2);
entry->func = func;
entry->first_type = type1;
entry->first_type = value_type1;
g_hash_table_insert (param_exchange_ht, entry, entry);
}
}
@@ -310,15 +215,10 @@ gboolean
g_value_types_exchangable (GType value_type1,
GType value_type2)
{
GType type1, type2;
g_return_val_if_fail (G_TYPE_IS_VALUE (value_type1), FALSE);
g_return_val_if_fail (G_TYPE_IS_VALUE (value_type2), FALSE);
type1 = g_type_next_base (value_type1, G_TYPE_PARAM);
type2 = g_type_next_base (value_type2, G_TYPE_PARAM);
return exchange_func_lookup (type1, type2, NULL) != NULL;
return exchange_func_lookup (value_type1, value_type2, NULL) != NULL;
}
gboolean
@@ -327,14 +227,12 @@ g_values_exchange (GValue *value1,
{
g_return_val_if_fail (G_IS_VALUE (value1), FALSE);
g_return_val_if_fail (G_IS_VALUE (value2), FALSE);
if (value1 != value2)
{
GType type1 = g_type_next_base (G_VALUE_TYPE (value1), G_TYPE_PARAM);
GType type2 = g_type_next_base (G_VALUE_TYPE (value2), G_TYPE_PARAM);
gboolean need_swap;
GValueExchange value_exchange = exchange_func_lookup (type1,
type2,
GValueExchange value_exchange = exchange_func_lookup (G_VALUE_TYPE (value1),
G_VALUE_TYPE (value2),
&need_swap);
if (value_exchange)
{
@@ -343,10 +241,10 @@ g_values_exchange (GValue *value1,
else
value_exchange (value1, value2);
}
return value_exchange != NULL;
}
return TRUE;
}
@@ -355,20 +253,20 @@ g_value_convert (const GValue *src_value,
GValue *dest_value)
{
gboolean success = TRUE;
g_return_val_if_fail (G_IS_VALUE (src_value), FALSE);
g_return_val_if_fail (G_IS_VALUE (dest_value), FALSE);
if (src_value != dest_value)
{
GValue tmp_value = { 0, };
g_value_init (&tmp_value, G_VALUE_TYPE (src_value));
g_value_copy (src_value, &tmp_value);
success = g_values_exchange (&tmp_value, dest_value);
g_value_unset (&tmp_value);
}
return success;
}