/* GObject - GLib Type, Object, Parameter and Signal Library
- * Copyright (C) 1998, 1999, 2000 Tim Janik and Red Hat, Inc.
+ * 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
* Boston, MA 02111-1307, USA.
*/
+/*
+ * MT safe
+ */
+
#include <string.h>
+#include "gobjectalias.h"
#include "genums.h"
#include "gvalue.h"
gpointer class_data);
static void g_flags_class_init (GFlagsClass *class,
gpointer class_data);
-static void g_value_enum_init (GValue *value);
-static void g_value_enum_copy_value (const GValue *src_value,
+static void value_flags_enum_init (GValue *value);
+static void value_flags_enum_copy_value (const GValue *src_value,
GValue *dest_value);
-static gchar* g_value_enum_collect_value (GValue *value,
- guint nth_value,
- GType *collect_type,
- GTypeCValue *collect_value);
-static gchar* g_value_enum_lcopy_value (const GValue *value,
- guint nth_value,
- GType *collect_type,
- GTypeCValue *collect_value);
-
+static gchar* value_flags_enum_collect_value (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags);
+static gchar* value_flags_enum_lcopy_value (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags);
/* --- functions --- */
void
-g_enum_types_init (void) /* sync with gtype.c */
+g_enum_types_init (void)
{
static gboolean initialized = FALSE;
- static const GTypeFundamentalInfo finfo = {
- G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_DERIVABLE,
+ static const GTypeValueTable flags_enum_value_table = {
+ value_flags_enum_init, /* value_init */
+ NULL, /* value_free */
+ value_flags_enum_copy_value, /* value_copy */
+ NULL, /* value_peek_pointer */
+ "i", /* collect_format */
+ value_flags_enum_collect_value, /* collect_value */
+ "p", /* lcopy_format */
+ value_flags_enum_lcopy_value, /* lcopy_value */
};
static GTypeInfo info = {
- 0 /* class_size */,
- NULL /* base_init */,
- NULL /* base_finalize */,
- NULL /* class_init */,
- NULL /* class_finalize */,
- NULL /* class_data */,
+ 0, /* class_size */
+ NULL, /* base_init */
+ NULL, /* base_destroy */
+ NULL, /* class_init */
+ NULL, /* class_destroy */
+ NULL, /* class_data */
+ 0, /* instance_size */
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ &flags_enum_value_table, /* value_table */
};
- static const GTypeValueTable value_table = {
- g_value_enum_init, /* value_init */
- NULL, /* value_free */
- g_value_enum_copy_value, /* value_copy */
- G_VALUE_COLLECT_INT, /* collect_type */
- g_value_enum_collect_value, /* collect_value */
- G_VALUE_COLLECT_POINTER, /* lcopy_type */
- g_value_enum_lcopy_value, /* lcopy_value */
+ static const GTypeFundamentalInfo finfo = {
+ G_TYPE_FLAG_CLASSED | G_TYPE_FLAG_DERIVABLE,
};
GType type;
g_return_if_fail (initialized == FALSE);
initialized = TRUE;
-
- info.value_table = &value_table;
-
+
/* G_TYPE_ENUM
*/
info.class_size = sizeof (GEnumClass);
- type = g_type_register_fundamental (G_TYPE_ENUM, "GEnum", &info, &finfo);
+ type = g_type_register_fundamental (G_TYPE_ENUM, "GEnum", &info, &finfo,
+ G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT);
g_assert (type == G_TYPE_ENUM);
/* G_TYPE_FLAGS
*/
info.class_size = sizeof (GFlagsClass);
- type = g_type_register_fundamental (G_TYPE_FLAGS, "GFlags", &info, &finfo);
+ type = g_type_register_fundamental (G_TYPE_FLAGS, "GFlags", &info, &finfo,
+ G_TYPE_FLAG_ABSTRACT | G_TYPE_FLAG_VALUE_ABSTRACT);
g_assert (type == G_TYPE_FLAGS);
}
+static void
+value_flags_enum_init (GValue *value)
+{
+ value->data[0].v_long = 0;
+}
+
+static void
+value_flags_enum_copy_value (const GValue *src_value,
+ GValue *dest_value)
+{
+ dest_value->data[0].v_long = src_value->data[0].v_long;
+}
+
+static gchar*
+value_flags_enum_collect_value (GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
+{
+ value->data[0].v_long = collect_values[0].v_int;
+
+ return NULL;
+}
+
+static gchar*
+value_flags_enum_lcopy_value (const GValue *value,
+ guint n_collect_values,
+ GTypeCValue *collect_values,
+ guint collect_flags)
+{
+ gint *int_p = collect_values[0].v_pointer;
+
+ if (!int_p)
+ return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+
+ *int_p = value->data[0].v_long;
+
+ return NULL;
+}
+
GType
g_enum_register_static (const gchar *name,
const GEnumValue *const_static_values)
{
GTypeInfo enum_type_info = {
- sizeof (GEnumClass),
- NULL /* base_init */,
- NULL /* base_finalize */,
+ sizeof (GEnumClass), /* class_size */
+ NULL, /* base_init */
+ NULL, /* base_finalize */
(GClassInitFunc) g_enum_class_init,
- NULL /* class_finalize */,
- NULL /* class_data */,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ 0, /* instance_size */
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL, /* value_table */
};
GType type;
enum_type_info.class_data = const_static_values;
- type = g_type_register_static (G_TYPE_ENUM, name, &enum_type_info);
+ type = g_type_register_static (G_TYPE_ENUM, name, &enum_type_info, 0);
return type;
}
const GFlagsValue *const_static_values)
{
GTypeInfo flags_type_info = {
- sizeof (GFlagsClass),
- NULL /* base_init */,
- NULL /* base_finalize */,
+ sizeof (GFlagsClass), /* class_size */
+ NULL, /* base_init */
+ NULL, /* base_finalize */
(GClassInitFunc) g_flags_class_init,
- NULL /* class_finalize */,
- NULL /* class_data */,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ 0, /* instance_size */
+ 0, /* n_preallocs */
+ NULL, /* instance_init */
+ NULL, /* value_table */
};
GType type;
flags_type_info.class_data = const_static_values;
- type = g_type_register_static (G_TYPE_FLAGS, name, &flags_type_info);
+ type = g_type_register_static (G_TYPE_FLAGS, name, &flags_type_info, 0);
return type;
}
GFlagsValue *flags_value;
for (flags_value = flags_class->values; flags_value->value_name; flags_value++)
- if ((flags_value->value & value) > 0)
+ if ((flags_value->value & value) == flags_value->value)
return flags_value;
}
g_value_set_enum (GValue *value,
gint v_enum)
{
- g_return_if_fail (G_IS_VALUE_ENUM (value));
-
+ g_return_if_fail (G_VALUE_HOLDS_ENUM (value));
+
value->data[0].v_long = v_enum;
}
gint
-g_value_get_enum (GValue *value)
+g_value_get_enum (const GValue *value)
{
- g_return_val_if_fail (G_IS_VALUE_ENUM (value), 0);
-
+ g_return_val_if_fail (G_VALUE_HOLDS_ENUM (value), 0);
+
return value->data[0].v_long;
}
g_value_set_flags (GValue *value,
guint v_flags)
{
- g_return_if_fail (G_IS_VALUE_FLAGS (value));
-
+ g_return_if_fail (G_VALUE_HOLDS_FLAGS (value));
+
value->data[0].v_ulong = v_flags;
}
guint
-g_value_get_flags (GValue *value)
-{
- g_return_val_if_fail (G_IS_VALUE_FLAGS (value), 0);
-
- return value->data[0].v_ulong;
-}
-
-static void
-g_value_enum_init (GValue *value)
-{
- value->data[0].v_long = 0;
-}
-
-static void
-g_value_enum_copy_value (const GValue *src_value,
- GValue *dest_value)
+g_value_get_flags (const GValue *value)
{
- dest_value->data[0].v_long = src_value->data[0].v_long;
-}
-
-static gchar*
-g_value_enum_collect_value (GValue *value,
- guint nth_value,
- GType *collect_type,
- GTypeCValue *collect_value)
-{
- value->data[0].v_long = collect_value->v_int;
-
- *collect_type = 0;
- return NULL;
-}
-
-static gchar*
-g_value_enum_lcopy_value (const GValue *value,
- guint nth_value,
- GType *collect_type,
- GTypeCValue *collect_value)
-{
- gint *int_p = collect_value->v_pointer;
-
- if (!int_p)
- return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+ g_return_val_if_fail (G_VALUE_HOLDS_FLAGS (value), 0);
- *int_p = value->data[0].v_long;
-
- *collect_type = 0;
- return NULL;
+ return value->data[0].v_ulong;
}
projects / platform / upstream / glib.git / blobdiff