mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-13 04:46:15 +01:00
37e4b8c87e
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>.
159 lines
5.4 KiB
C
159 lines
5.4 KiB
C
/* GObject - GLib Type, Object, Parameter and Signal Library
|
|
* Copyright (C) 1998-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
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* 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.
|
|
*
|
|
* gvaluecollector.h: GValue varargs stubs
|
|
*/
|
|
#ifndef __G_VALUE_COLLECTOR_H__
|
|
#define __G_VALUE_COLLECTOR_H__
|
|
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
|
|
|
|
/* we may want to add aggregate types here some day, if requested
|
|
* by users. the basic C types are covered already, everything
|
|
* smaller than an int is promoted to an integer and floats are
|
|
* always promoted to doubles for varargs call constructions.
|
|
*/
|
|
enum /*< skip >*/
|
|
{
|
|
G_VALUE_COLLECT_INT = 'i',
|
|
G_VALUE_COLLECT_LONG = 'l',
|
|
G_VALUE_COLLECT_DOUBLE = 'd',
|
|
G_VALUE_COLLECT_POINTER = 'p'
|
|
};
|
|
|
|
|
|
/* vararg union holding actuall values collected
|
|
*/
|
|
union _GTypeCValue
|
|
{
|
|
gint v_int;
|
|
glong v_long;
|
|
gdouble v_double;
|
|
gpointer v_pointer;
|
|
};
|
|
|
|
|
|
/* G_VALUE_COLLECT() collects a variable argument value
|
|
* from a va_list. we have to implement the varargs collection as a
|
|
* macro, because on some systems va_list variables cannot be passed
|
|
* by reference.
|
|
* value is supposed to be initialized according to the value
|
|
* type to be collected.
|
|
* var_args is the va_list variable and may be evaluated multiple times.
|
|
* __error is a gchar** variable that will be modified to hold a g_new()
|
|
* allocated error messages if something fails.
|
|
*/
|
|
#define G_VALUE_COLLECT(value, var_args, flags, __error) \
|
|
G_STMT_START { \
|
|
GValue *_value = (value); \
|
|
guint _flags = (flags); \
|
|
GType _value_type = G_VALUE_TYPE (_value); \
|
|
GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \
|
|
gchar *_collect_format = _vtable->collect_format; \
|
|
GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \
|
|
guint _n_values = 0; \
|
|
\
|
|
if (_vtable->value_free) \
|
|
_vtable->value_free (_value); \
|
|
_value->g_type = _value_type; /* value_meminit() from gvalue.c */ \
|
|
memset (_value->data, 0, sizeof (_value->data)); \
|
|
while (*_collect_format) \
|
|
{ \
|
|
GTypeCValue *_cvalue = _cvalues + _n_values++; \
|
|
\
|
|
switch (*_collect_format++) \
|
|
{ \
|
|
case G_VALUE_COLLECT_INT: \
|
|
_cvalue->v_int = va_arg ((var_args), gint); \
|
|
break; \
|
|
case G_VALUE_COLLECT_LONG: \
|
|
_cvalue->v_long = va_arg ((var_args), glong); \
|
|
break; \
|
|
case G_VALUE_COLLECT_DOUBLE: \
|
|
_cvalue->v_double = va_arg ((var_args), gdouble); \
|
|
break; \
|
|
case G_VALUE_COLLECT_POINTER: \
|
|
_cvalue->v_pointer = va_arg ((var_args), gpointer); \
|
|
break; \
|
|
default: \
|
|
g_assert_not_reached (); \
|
|
} \
|
|
} \
|
|
*(__error) = _vtable->collect_value (_value, \
|
|
_n_values, \
|
|
_cvalues, \
|
|
_flags); \
|
|
} G_STMT_END
|
|
|
|
|
|
/* G_VALUE_LCOPY() collects a value's variable argument
|
|
* locations from a va_list. usage is analogous to G_VALUE_COLLECT().
|
|
*/
|
|
#define G_VALUE_LCOPY(value, var_args, flags, __error) \
|
|
G_STMT_START { \
|
|
GValue *_value = (value); \
|
|
guint _flags = (flags); \
|
|
GType _value_type = G_VALUE_TYPE (_value); \
|
|
GTypeValueTable *_vtable = g_type_value_table_peek (_value_type); \
|
|
gchar *_lcopy_format = _vtable->lcopy_format; \
|
|
GTypeCValue _cvalues[G_VALUE_COLLECT_FORMAT_MAX_LENGTH] = { { 0, }, }; \
|
|
guint _n_values = 0; \
|
|
\
|
|
while (*_lcopy_format) \
|
|
{ \
|
|
GTypeCValue *_cvalue = _cvalues + _n_values++; \
|
|
\
|
|
switch (*_lcopy_format++) \
|
|
{ \
|
|
case G_VALUE_COLLECT_INT: \
|
|
_cvalue->v_int = va_arg ((var_args), gint); \
|
|
break; \
|
|
case G_VALUE_COLLECT_LONG: \
|
|
_cvalue->v_long = va_arg ((var_args), glong); \
|
|
break; \
|
|
case G_VALUE_COLLECT_DOUBLE: \
|
|
_cvalue->v_double = va_arg ((var_args), gdouble); \
|
|
break; \
|
|
case G_VALUE_COLLECT_POINTER: \
|
|
_cvalue->v_pointer = va_arg ((var_args), gpointer); \
|
|
break; \
|
|
default: \
|
|
g_assert_not_reached (); \
|
|
} \
|
|
} \
|
|
*(__error) = _vtable->lcopy_value (_value, \
|
|
_n_values, \
|
|
_cvalues, \
|
|
_flags); \
|
|
} G_STMT_END
|
|
|
|
|
|
#define G_VALUE_COLLECT_FORMAT_MAX_LENGTH (8)
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* __cplusplus */
|
|
|
|
#endif /* __G_VALUE_COLLECTOR_H__ */
|