gucharmap r1836 - trunk/gucharmap

[chpe svn gnome org]

Author: chpe
Date: Mon Jul 21 20:26:08 2008
New Revision: 1836
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1836&view=rev

Log:
Add properties for start/end and make the _new function trivial.


Modified:
   trunk/gucharmap/gucharmap-block-codepoint-list.c

Modified: trunk/gucharmap/gucharmap-block-codepoint-list.c
==============================================================================
--- trunk/gucharmap/gucharmap-block-codepoint-list.c	(original)
+++ trunk/gucharmap/gucharmap-block-codepoint-list.c	Mon Jul 21 20:26:08 2008
@@ -28,6 +28,15 @@
   gunichar end;
 };
 
+enum
+{
+  PROP_0,
+  PROP_FIRST_CODEPOINT,
+  PROP_LAST_CODEPOINT
+};
+
+G_DEFINE_TYPE (GucharmapBlockCodepointList, gucharmap_block_codepoint_list, GUCHARMAP_TYPE_CODEPOINT_LIST)
+
 static gunichar
 get_char (GucharmapCodepointList *list,
           gint                    index)
@@ -69,24 +78,121 @@
   list->priv = G_TYPE_INSTANCE_GET_PRIVATE (list, GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, GucharmapBlockCodepointListPrivate);
 }
 
+static GObject *
+gucharmap_block_codepoint_list_constructor (GType type,
+                                            guint n_construct_properties,
+                                            GObjectConstructParam *construct_params)
+{
+  GObject *object;
+  GucharmapBlockCodepointList *block_codepoint_list;
+  GucharmapBlockCodepointListPrivate *priv;
+
+  object = G_OBJECT_CLASS (gucharmap_block_codepoint_list_parent_class)->constructor
+             (type, n_construct_properties, construct_params);
+
+  block_codepoint_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (object);
+  priv = block_codepoint_list->priv;
+
+  g_assert (priv->start <= priv->end);
+
+  return object;
+}
+
+static void
+gucharmap_block_codepoint_list_set_property (GObject *object,
+                                             guint prop_id,
+                                             const GValue *value,
+                                             GParamSpec *pspec)
+{
+  GucharmapBlockCodepointList *block_codepoint_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (object);
+  GucharmapBlockCodepointListPrivate *priv = block_codepoint_list->priv;
+
+  switch (prop_id) {
+    case PROP_FIRST_CODEPOINT:
+      priv->start = g_value_get_uint (value);
+      break;
+    case PROP_LAST_CODEPOINT:
+      priv->end = g_value_get_uint (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gucharmap_block_codepoint_list_get_property (GObject *object,
+                                             guint prop_id,
+                                             GValue *value,
+                                             GParamSpec *pspec)
+{
+  GucharmapBlockCodepointList *block_codepoint_list = GUCHARMAP_BLOCK_CODEPOINT_LIST (object);
+  GucharmapBlockCodepointListPrivate *priv = block_codepoint_list->priv;
+
+  switch (prop_id) {
+    case PROP_FIRST_CODEPOINT:
+      g_value_set_uint (value, priv->start);
+      break;
+    case PROP_LAST_CODEPOINT:
+      g_value_set_uint (value, priv->end);
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
 static void
 gucharmap_block_codepoint_list_class_init (GucharmapBlockCodepointListClass *klass)
 {
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GucharmapCodepointListClass *codepoint_list_class = GUCHARMAP_CODEPOINT_LIST_CLASS (klass);
 
+  object_class->get_property = gucharmap_block_codepoint_list_get_property;
+  object_class->set_property = gucharmap_block_codepoint_list_set_property;
+  object_class->constructor = gucharmap_block_codepoint_list_constructor;
+
   g_type_class_add_private (klass, sizeof (GucharmapBlockCodepointListPrivate));
 
   codepoint_list_class->get_char = get_char;
   codepoint_list_class->get_index = get_index;
   codepoint_list_class->get_last_index = get_last_index;
-}
 
-G_DEFINE_TYPE (GucharmapBlockCodepointList, gucharmap_block_codepoint_list, GUCHARMAP_TYPE_CODEPOINT_LIST)
+  /* Not using g_param_spec_unichar on purpose, since it disallows certain values
+   * we want (it's performing a g_unichar_validate).
+   */
+  g_object_class_install_property
+    (object_class,
+     PROP_FIRST_CODEPOINT,
+     g_param_spec_uint ("first-codepoint", NULL, NULL,
+                        0,
+                        UNICHAR_MAX,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY |
+                        G_PARAM_STATIC_NAME |
+                        G_PARAM_STATIC_NICK |
+                        G_PARAM_STATIC_BLURB));
+
+  g_object_class_install_property
+    (object_class,
+     PROP_LAST_CODEPOINT,
+     g_param_spec_uint ("last-codepoint", NULL, NULL,
+                        0,
+                        UNICHAR_MAX,
+                        0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT_ONLY |
+                        G_PARAM_STATIC_NAME |
+                        G_PARAM_STATIC_NICK |
+                        G_PARAM_STATIC_BLURB));
+}
 
 /**
  * gucharmap_block_codepoint_list_new:
+ * @start: the first codepoint
+ * @end: the last codepoint
  *
- * Creates a new codepoint list.
+ * Creates a new codepoint list for the range @start   end 
  *
  * Return value: the newly-created #GucharmapBlockCodepointList. Use
  * g_object_unref() to free the result.
@@ -95,22 +201,10 @@
 gucharmap_block_codepoint_list_new (gunichar start,
                                     gunichar end)
 {
-  GucharmapCodepointList *list;
-  GucharmapBlockCodepointListPrivate *priv;
-
   g_return_val_if_fail (start <= end, NULL);
 
-  list = g_object_new (GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST, NULL);
-  priv = GUCHARMAP_BLOCK_CODEPOINT_LIST (list)->priv;
-
-  /* XXX: what to do if start > end, etc */
-
-  priv->start = start;
-
-  if (end <= UNICHAR_MAX)
-    priv->end = end;
-  else
-    priv->end = UNICHAR_MAX;
-
-  return list;
+  return g_object_new (GUCHARMAP_TYPE_BLOCK_CODEPOINT_LIST,
+                       "first-codepoint", (guint) start,
+                       "last-codepoint", (guint) end,
+                       NULL);
 }