]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktexttagtable.c
Fix gtk_text_tag_table_lookup transfer introspection notes
[~andy/gtk] / gtk / gtktexttagtable.c
index bf6fc6c998f6fa7ee6b5de8ea7ce699e7957753b..dd9eea941ed60672f2dc113dd34b48c59e87c529 100644 (file)
@@ -1,6 +1,35 @@
-
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * 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.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#include "config.h"
 #include "gtktexttagtable.h"
-#include "gtksignal.h"
+#include "gtkmarshalers.h"
+#include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
+#include "gtkintl.h"
+#include "gtkalias.h"
 
 #include <stdlib.h>
 
@@ -15,88 +44,66 @@ enum {
   LAST_ARG
 };
 
-static void gtk_text_tag_table_init (GtkTextTagTable *table);
-static void gtk_text_tag_table_class_init (GtkTextTagTableClass *klass);
-static void gtk_text_tag_table_destroy (GtkObject *object);
-static void gtk_text_tag_table_finalize (GObject *object);
-static void gtk_text_tag_table_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);
-static void gtk_text_tag_table_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
+static void gtk_text_tag_table_finalize     (GObject              *object);
+static void gtk_text_tag_table_set_property (GObject              *object,
+                                             guint                 prop_id,
+                                             const GValue         *value,
+                                             GParamSpec           *pspec);
+static void gtk_text_tag_table_get_property (GObject              *object,
+                                             guint                 prop_id,
+                                             GValue               *value,
+                                             GParamSpec           *pspec);
 
-static GtkObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
-GtkType
-gtk_text_tag_table_get_type (void)
-{
-  static GtkType our_type = 0;
-
-  if (our_type == 0)
-    {
-      static const GtkTypeInfo our_info =
-      {
-        "GtkTextTagTable",
-        sizeof (GtkTextTagTable),
-        sizeof (GtkTextTagTableClass),
-        (GtkClassInitFunc) gtk_text_tag_table_class_init,
-        (GtkObjectInitFunc) gtk_text_tag_table_init,
-        /* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL
-      };
-
-      our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
-    }
-
-  return our_type;
-}
+G_DEFINE_TYPE (GtkTextTagTable, gtk_text_tag_table, G_TYPE_OBJECT)
 
 static void
 gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
-  object_class->set_arg = gtk_text_tag_table_set_arg;
-  object_class->get_arg = gtk_text_tag_table_get_arg;
-
-  object_class->destroy = gtk_text_tag_table_destroy;
-  gobject_class->finalize = gtk_text_tag_table_finalize;
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  object_class->set_property = gtk_text_tag_table_set_property;
+  object_class->get_property = gtk_text_tag_table_get_property;
+  
+  object_class->finalize = gtk_text_tag_table_finalize;
+  
   signals[TAG_CHANGED] =
-    gtk_signal_new ("tag_changed",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_changed),
-                    gtk_marshal_VOID__OBJECT_BOOLEAN,
-                    GTK_TYPE_NONE,
-                    2,
-                    G_TYPE_OBJECT,
-                    GTK_TYPE_BOOL);
+    g_signal_new (I_("tag-changed"),
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTextTagTableClass, tag_changed),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT_BOOLEAN,
+                  G_TYPE_NONE,
+                  2,
+                  GTK_TYPE_TEXT_TAG,
+                  G_TYPE_BOOLEAN);  
 
   signals[TAG_ADDED] =
-    gtk_signal_new ("tag_added",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_added),
-                    gtk_marshal_VOID__OBJECT,
-                    GTK_TYPE_NONE,
-                    1,
-                    G_TYPE_OBJECT);
+    g_signal_new (I_("tag-added"),
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTextTagTableClass, tag_added),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1,
+                  GTK_TYPE_TEXT_TAG);
 
   signals[TAG_REMOVED] =
-    gtk_signal_new ("tag_removed",
-                    GTK_RUN_LAST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkTextTagTableClass, tag_removed),
-                    gtk_marshal_VOID__OBJECT,
-                    GTK_TYPE_NONE,
-                    1,
-                    G_TYPE_OBJECT);
+    g_signal_new (I_("tag-removed"),  
+                  G_OBJECT_CLASS_TYPE (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GtkTextTagTableClass, tag_removed),
+                  NULL, NULL,
+                  _gtk_marshal_VOID__OBJECT,
+                  G_TYPE_NONE,
+                  1,
+                  GTK_TYPE_TEXT_TAG);
 }
 
-void
+static void
 gtk_text_tag_table_init (GtkTextTagTable *table)
 {
   table->hash = g_hash_table_new (g_str_hash, g_str_equal);
@@ -115,30 +122,31 @@ gtk_text_tag_table_new (void)
 {
   GtkTextTagTable *table;
 
-  table = GTK_TEXT_TAG_TABLE (gtk_type_new (gtk_text_tag_table_get_type ()));
+  table = g_object_new (GTK_TYPE_TEXT_TAG_TABLE, NULL);
 
   return table;
 }
 
-static void
-gtk_text_tag_table_destroy (GtkObject *object)
-{
-  GtkTextTagTable *table;
-
-  table = GTK_TEXT_TAG_TABLE (object);
-
-  (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
-}
-
 static void
 foreach_unref (GtkTextTag *tag, gpointer data)
 {
+  GSList *tmp;
+  
   /* We don't want to emit the remove signal here; so we just unparent
    * and unref the tag.
    */
 
+  tmp = tag->table->buffers;
+  while (tmp != NULL)
+    {
+      _gtk_text_buffer_notify_will_remove_tag (GTK_TEXT_BUFFER (tmp->data),
+                                               tag);
+      
+      tmp = tmp->next;
+    }
+  
   tag->table = NULL;
-  g_object_unref (G_OBJECT (tag));
+  g_object_unref (tag);
 }
 
 static void
@@ -147,43 +155,43 @@ gtk_text_tag_table_finalize (GObject *object)
   GtkTextTagTable *table;
 
   table = GTK_TEXT_TAG_TABLE (object);
-
+  
   gtk_text_tag_table_foreach (table, foreach_unref, NULL);
 
   g_hash_table_destroy (table->hash);
   g_slist_free (table->anonymous);
 
-  (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
+  g_slist_free (table->buffers);
 
+  G_OBJECT_CLASS (gtk_text_tag_table_parent_class)->finalize (object);
+}
 static void
-gtk_text_tag_table_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gtk_text_tag_table_set_property (GObject      *object,
+                                 guint         prop_id,
+                                 const GValue *value,
+                                 GParamSpec   *pspec)
 {
-  GtkTextTagTable *table;
-
-  table = GTK_TEXT_TAG_TABLE (object);
-
-  switch (arg_id)
+  switch (prop_id)
     {
 
     default:
-      g_assert_not_reached ();
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
 
+
 static void
-gtk_text_tag_table_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
+gtk_text_tag_table_get_property (GObject      *object,
+                                 guint         prop_id,
+                                 GValue       *value,
+                                 GParamSpec   *pspec)
 {
-  GtkTextTagTable *table;
-
-  table = GTK_TEXT_TAG_TABLE (object);
-
-  switch (arg_id)
+  switch (prop_id)
     {
 
     default:
-      arg->type = GTK_TYPE_INVALID;
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
     }
 }
@@ -195,7 +203,9 @@ gtk_text_tag_table_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
  *
  * Add a tag to the table. The tag is assigned the highest priority
  * in the table.
- * 
+ *
+ * @tag must not be in a tag table already, and may not have
+ * the same name as an already-added tag.
  **/
 void
 gtk_text_tag_table_add (GtkTextTagTable *table,
@@ -205,12 +215,16 @@ gtk_text_tag_table_add (GtkTextTagTable *table,
 
   g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
   g_return_if_fail (GTK_IS_TEXT_TAG (tag));
-  g_return_if_fail (tag->name == NULL ||
-                    g_hash_table_lookup (table->hash, tag->name) == NULL);
   g_return_if_fail (tag->table == NULL);
 
-  gtk_object_ref (GTK_OBJECT (tag));
-  gtk_object_sink (GTK_OBJECT (tag));
+  if (tag->name && g_hash_table_lookup (table->hash, tag->name))
+    {
+      g_warning ("A tag named '%s' is already in the tag table.",
+                 tag->name);
+      return;
+    }
+  
+  g_object_ref (tag);
 
   if (tag->name)
     g_hash_table_insert (table->hash, tag->name, tag);
@@ -225,11 +239,11 @@ gtk_text_tag_table_add (GtkTextTagTable *table,
   /* We get the highest tag priority, as the most-recently-added
      tag. Note that we do NOT use gtk_text_tag_set_priority,
      as it assumes the tag is already in the table. */
-  size = gtk_text_tag_table_size (table);
+  size = gtk_text_tag_table_get_size (table);
   g_assert (size > 0);
   tag->priority = size - 1;
 
-  gtk_signal_emit (GTK_OBJECT (table), signals[TAG_ADDED], tag);
+  g_signal_emit (table, signals[TAG_ADDED], 0, tag);
 }
 
 /**
@@ -239,7 +253,7 @@ gtk_text_tag_table_add (GtkTextTagTable *table,
  * 
  * Look up a named tag.
  * 
- * Return value: The tag, or %NULL if none by that name is in the table.
+ * Return value: (transfer none): The tag, or %NULL if none by that name is in the table.
  **/
 GtkTextTag*
 gtk_text_tag_table_lookup (GtkTextTagTable *table,
@@ -264,14 +278,28 @@ void
 gtk_text_tag_table_remove (GtkTextTagTable *table,
                            GtkTextTag      *tag)
 {
+  GSList *tmp;
+  
   g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
   g_return_if_fail (GTK_IS_TEXT_TAG (tag));
   g_return_if_fail (tag->table == table);
 
+  /* Our little bad hack to be sure buffers don't still have the tag
+   * applied to text in the buffer
+   */
+  tmp = table->buffers;
+  while (tmp != NULL)
+    {
+      _gtk_text_buffer_notify_will_remove_tag (GTK_TEXT_BUFFER (tmp->data),
+                                               tag);
+      
+      tmp = tmp->next;
+    }
+  
   /* Set ourselves to the highest priority; this means
      when we're removed, there won't be any gaps in the
      priorities of the tags in the table. */
-  gtk_text_tag_set_priority (tag, gtk_text_tag_table_size (table) - 1);
+  gtk_text_tag_set_priority (tag, gtk_text_tag_table_get_size (table) - 1);
 
   tag->table = NULL;
 
@@ -283,9 +311,9 @@ gtk_text_tag_table_remove (GtkTextTagTable *table,
       table->anon_count -= 1;
     }
 
-  gtk_signal_emit (GTK_OBJECT (table), signals[TAG_REMOVED], tag);
+  g_signal_emit (table, signals[TAG_REMOVED], 0, tag);
 
-  gtk_object_unref (GTK_OBJECT (tag));
+  g_object_unref (tag);
 }
 
 struct ForeachData
@@ -321,7 +349,8 @@ list_foreach (gpointer data, gpointer user_data)
  * @data: user data
  *
  * Calls @func on each tag in @table, with user data @data.
- * 
+ * Note that the table may not be modified while iterating 
+ * over it (you can't add/remove tags).
  **/
 void
 gtk_text_tag_table_foreach (GtkTextTagTable       *table,
@@ -341,7 +370,7 @@ gtk_text_tag_table_foreach (GtkTextTagTable       *table,
 }
 
 /**
- * gtk_text_tag_table_size:
+ * gtk_text_tag_table_get_size:
  * @table: a #GtkTextTagTable
  * 
  * Returns the size of the table (number of tags)
@@ -349,9 +378,42 @@ gtk_text_tag_table_foreach (GtkTextTagTable       *table,
  * Return value: number of tags in @table
  **/
 gint
-gtk_text_tag_table_size (GtkTextTagTable *table)
+gtk_text_tag_table_get_size (GtkTextTagTable *table)
 {
   g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), 0);
 
   return g_hash_table_size (table->hash) + table->anon_count;
 }
+
+void
+_gtk_text_tag_table_add_buffer (GtkTextTagTable *table,
+                                gpointer         buffer)
+{
+  g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
+
+  table->buffers = g_slist_prepend (table->buffers, buffer);
+}
+
+static void
+foreach_remove_tag (GtkTextTag *tag, gpointer data)
+{
+  GtkTextBuffer *buffer;
+
+  buffer = GTK_TEXT_BUFFER (data);
+
+  _gtk_text_buffer_notify_will_remove_tag (buffer, tag);
+}
+
+void
+_gtk_text_tag_table_remove_buffer (GtkTextTagTable *table,
+                                   gpointer         buffer)
+{
+  g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
+
+  gtk_text_tag_table_foreach (table, foreach_remove_tag, buffer);
+  
+  table->buffers = g_slist_remove (table->buffers, buffer);
+}
+
+#define __GTK_TEXT_TAG_TABLE_C__
+#include "gtkaliasdef.c"