mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-22 08:58:54 +02:00
fixed dealing with collection/lcopy of NULL values.
Mon Dec 11 04:44:11 2000 Tim Janik <timj@gtk.org> * gboxed.c: fixed dealing with collection/lcopy of NULL values. * gclosure.h: removed insane ramblings, added G_CALLBACK() a casting convenience macro. * Makefile.am: cleanups, marshaller generation rules. * gmarshal.[hc]: new files with GRuntime standard marshallers. * glib-genmarshal.c: fix log domain, support gruntime standard marshallers, suport G_TYPE_PARAM, come with extern "C" and #include gmarshal.h. * glib-genmarshal.1: reflect glib-genmarshal.c updates. * gobject.[hc]: implement object constructor. rework parameter changed notification queueing, we support queue freezes now and don't dispatch from an idle handler anymore. parameter->property rename hassle. implemented ::properties_changed and ::notify::* signals for property change notification (the later supports property names as details). added signal connection and named data properties. (g_signal_connect_object): new function to setup while_alive connections. (g_object_class_install_property): sink properties now, since they are initially floating. (g_object_steal_data): (g_object_set_data_full): (g_object_set_data): (g_object_get_data): set/get data by using g_datalist_*() functions directly. (g_object_queue_param_changed): nuked. (g_object_freeze_notify): start queueing of property changes (freeze/ thaw calls stack). (g_object_notify): announce changes of a certain property directly. (g_object_thaw_notify): process queue of property changes, therefore emitting GObject::notify::detail with detail being the changed properties names. (G_OBJECT_WARN_INVALID_PROPERTY_ID): saner macro variant of former G_WARN_INVALID_PARAM_ID(). * gparam.[hc]: param specs are now initially floating and need to be sunken with g_param_spec_sink(), support G_TYPE_PARAM values. added G_PARAM_CONSTRUCT and G_PARAM_CONSTRUCT_ONLY parameter flags, required by GObjectClass.constructor(). * gparamspecs.[hc]: added GParamSpecParam, GParamSpecPointer and GParamSpecCCallback, param specs for G_TYPE_PARAM, G_TYPE_POINTER and G_TYPE_CCALLBACK respectively. * gsignal.[hc]: cleanups. (signal_id_lookup): after walking the anchestry, try interfaces as well. (g_signal_new): new function to create signals from varargs type list. (g_signal_connect_closure): closure connection variant that works from signal name+detail. (g_signal_connect_data): c handler connection variant that works from signal name+detail. (g_signal_emit_valist): emit signal for an instance with paraneters collected from a va_list. (g_signal_emit): emit signal, taking parameters from varargs list. (g_signal_emit_by_name): same as g_signal_emit, working from signal name+detail. (signal_emit_R): return whether return_value needs to be altered. * gtype.[hc]: set log-domain to GRuntime, i'm slowly getting to all the points that need to reflect the upcoming rename. melt g_type_conforms_to() functionality into g_type_is_a(), as that is what we really want (liskov substitution principle). assorted changes to other files due to conforms_to->is_a. * gvalue.[hc]: implemented g_value_set_instance() that sets a value from an instantiatable type via the value_table's collect_value() function (based on an idea from James Henstridge <james@daa.com.au>). cleanups/fixes. * gvaluetypes.[hc]: implement G_TYPE_CCALLBACK and G_TYPE_PARAM.
This commit is contained in:
Tim Janik
Tim Janik
@@ -540,6 +540,103 @@ param_string_values_cmp (GParamSpec *pspec,
|
||||
return strcmp (value1->data[0].v_pointer, value2->data[0].v_pointer);
|
||||
}
|
||||
|
||||
static void
|
||||
param_spec_param_init (GParamSpec *pspec)
|
||||
{
|
||||
GParamSpecParam *spec = G_PARAM_SPEC_PARAM (pspec);
|
||||
|
||||
spec->param_type = G_TYPE_PARAM;
|
||||
}
|
||||
|
||||
static void
|
||||
param_param_set_default (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
value->data[0].v_pointer = NULL;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
param_param_validate (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
GParamSpecParam *spec = G_PARAM_SPEC_PARAM (pspec);
|
||||
GParamSpec *param = value->data[0].v_pointer;
|
||||
guint changed = 0;
|
||||
|
||||
if (param && !g_type_is_a (G_PARAM_SPEC_TYPE (param), spec->param_type))
|
||||
{
|
||||
g_param_spec_unref (param);
|
||||
value->data[0].v_pointer = NULL;
|
||||
changed++;
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
static void
|
||||
param_spec_pointer_init (GParamSpec *pspec)
|
||||
{
|
||||
/* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
|
||||
}
|
||||
|
||||
static void
|
||||
param_pointer_set_default (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
value->data[0].v_pointer = NULL;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
param_pointer_validate (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
/* GParamSpecPointer *spec = G_PARAM_SPEC_POINTER (pspec); */
|
||||
guint changed = 0;
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
static gint
|
||||
param_pointer_values_cmp (GParamSpec *pspec,
|
||||
const GValue *value1,
|
||||
const GValue *value2)
|
||||
{
|
||||
return value1->data[0].v_pointer != value2->data[0].v_pointer;
|
||||
}
|
||||
|
||||
static void
|
||||
param_spec_ccallback_init (GParamSpec *pspec)
|
||||
{
|
||||
/* GParamSpecCCallback *spec = G_PARAM_SPEC_CCALLBACK (pspec); */
|
||||
}
|
||||
|
||||
static void
|
||||
param_ccallback_set_default (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
value->data[0].v_pointer = NULL;
|
||||
value->data[1].v_pointer = NULL;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
param_ccallback_validate (GParamSpec *pspec,
|
||||
GValue *value)
|
||||
{
|
||||
/* GParamSpecCCallback *spec = G_PARAM_SPEC_CCALLBACK (pspec); */
|
||||
guint changed = 0;
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
static gint
|
||||
param_ccallback_values_cmp (GParamSpec *pspec,
|
||||
const GValue *value1,
|
||||
const GValue *value2)
|
||||
{
|
||||
return (value1->data[0].v_pointer != value2->data[0].v_pointer ||
|
||||
value1->data[1].v_pointer != value2->data[1].v_pointer);
|
||||
}
|
||||
|
||||
static void
|
||||
param_spec_object_init (GParamSpec *pspec)
|
||||
{
|
||||
@@ -919,6 +1016,57 @@ g_param_spec_types_init (void) /* sync with gtype.c */
|
||||
g_assert (type == G_TYPE_PARAM_STRING);
|
||||
}
|
||||
|
||||
/* G_TYPE_PARAM_PARAM
|
||||
*/
|
||||
{
|
||||
static const GParamSpecTypeInfo pspec_info = {
|
||||
sizeof (GParamSpecParam), /* instance_size */
|
||||
16, /* n_preallocs */
|
||||
param_spec_param_init, /* instance_init */
|
||||
G_TYPE_PARAM, /* value_type */
|
||||
NULL, /* finalize */
|
||||
param_param_set_default, /* value_set_default */
|
||||
param_param_validate, /* value_validate */
|
||||
param_pointer_values_cmp, /* values_cmp */
|
||||
};
|
||||
type = g_param_type_register_static ("GParamParam", &pspec_info);
|
||||
g_assert (type == G_TYPE_PARAM_PARAM);
|
||||
}
|
||||
|
||||
/* G_TYPE_PARAM_POINTER
|
||||
*/
|
||||
{
|
||||
static const GParamSpecTypeInfo pspec_info = {
|
||||
sizeof (GParamSpecPointer), /* instance_size */
|
||||
0, /* n_preallocs */
|
||||
param_spec_pointer_init, /* instance_init */
|
||||
G_TYPE_POINTER, /* value_type */
|
||||
NULL, /* finalize */
|
||||
param_pointer_set_default, /* value_set_default */
|
||||
param_pointer_validate, /* value_validate */
|
||||
param_pointer_values_cmp, /* values_cmp */
|
||||
};
|
||||
type = g_param_type_register_static ("GParamPointer", &pspec_info);
|
||||
g_assert (type == G_TYPE_PARAM_POINTER);
|
||||
}
|
||||
|
||||
/* G_TYPE_PARAM_CCALLBACK
|
||||
*/
|
||||
{
|
||||
static const GParamSpecTypeInfo pspec_info = {
|
||||
sizeof (GParamSpecCCallback), /* instance_size */
|
||||
0, /* n_preallocs */
|
||||
param_spec_ccallback_init, /* instance_init */
|
||||
G_TYPE_CCALLBACK, /* value_type */
|
||||
NULL, /* finalize */
|
||||
param_ccallback_set_default, /* value_set_default */
|
||||
param_ccallback_validate, /* value_validate */
|
||||
param_ccallback_values_cmp, /* values_cmp */
|
||||
};
|
||||
type = g_param_type_register_static ("GParamCCallback", &pspec_info);
|
||||
g_assert (type == G_TYPE_PARAM_CCALLBACK);
|
||||
}
|
||||
|
||||
/* G_TYPE_PARAM_OBJECT
|
||||
*/
|
||||
{
|
||||
@@ -1280,6 +1428,59 @@ g_param_spec_string_c (const gchar *name,
|
||||
return G_PARAM_SPEC (sspec);
|
||||
}
|
||||
|
||||
GParamSpec*
|
||||
g_param_spec_param (const gchar *name,
|
||||
const gchar *nick,
|
||||
const gchar *blurb,
|
||||
GType param_type,
|
||||
GParamFlags flags)
|
||||
{
|
||||
GParamSpecParam *pspec;
|
||||
|
||||
g_return_val_if_fail (G_TYPE_IS_PARAM (param_type), NULL);
|
||||
|
||||
pspec = g_param_spec_internal (G_TYPE_PARAM_PARAM,
|
||||
name,
|
||||
nick,
|
||||
blurb,
|
||||
flags);
|
||||
pspec->param_type = param_type;
|
||||
|
||||
return G_PARAM_SPEC (pspec);
|
||||
}
|
||||
|
||||
GParamSpec*
|
||||
g_param_spec_pointer (const gchar *name,
|
||||
const gchar *nick,
|
||||
const gchar *blurb,
|
||||
GParamFlags flags)
|
||||
{
|
||||
GParamSpecPointer *pspec;
|
||||
|
||||
pspec = g_param_spec_internal (G_TYPE_PARAM_POINTER,
|
||||
name,
|
||||
nick,
|
||||
blurb,
|
||||
flags);
|
||||
return G_PARAM_SPEC (pspec);
|
||||
}
|
||||
|
||||
GParamSpec*
|
||||
g_param_spec_ccallback (const gchar *name,
|
||||
const gchar *nick,
|
||||
const gchar *blurb,
|
||||
GParamFlags flags)
|
||||
{
|
||||
GParamSpecCCallback *cspec;
|
||||
|
||||
cspec = g_param_spec_internal (G_TYPE_PARAM_CCALLBACK,
|
||||
name,
|
||||
nick,
|
||||
blurb,
|
||||
flags);
|
||||
return G_PARAM_SPEC (cspec);
|
||||
}
|
||||
|
||||
GParamSpec*
|
||||
g_param_spec_object (const gchar *name,
|
||||
const gchar *nick,
|
||||
|
||||
Reference in New Issue
Block a user