]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktexttagtable.c
Use the correct screen for getting the height. (Fix from Stephen Browne,
[~andy/gtk] / gtk / gtktexttagtable.c
index 57f23ec4e9676544b15861899722d249b3d2b065..5e685eab48a215ff4ccaf3c32dea9709d6b8d5ad 100644 (file)
@@ -1,6 +1,7 @@
 
 #include "gtktexttagtable.h"
-#include "gtksignal.h"
+#include "gtkmarshalers.h"
+#include "gtktextbuffer.h" /* just for the lame notify_will_remove_tag hack */
 
 #include <stdlib.h>
 
@@ -15,37 +16,44 @@ 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 GtkObjectClass *parent_class = NULL;
+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_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 GObjectClass *parent_class = NULL;
 static guint signals[LAST_SIGNAL] = { 0 };
 
-GtkType
+GType
 gtk_text_tag_table_get_type (void)
 {
-  static GtkType our_type = 0;
+  static GType our_type = 0;
 
   if (our_type == 0)
     {
-      static const GtkTypeInfo our_info =
+      static const GTypeInfo 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
+        (GBaseInitFunc) NULL,
+        (GBaseFinalizeFunc) NULL,
+        (GClassInitFunc) gtk_text_tag_table_class_init,
+        NULL,           /* class_finalize */
+        NULL,           /* class_data */
+        sizeof (GtkTextTagTable),
+        0,              /* n_preallocs */
+        (GInstanceInitFunc) gtk_text_tag_table_init
       };
 
-    our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
-  }
+      our_type = g_type_register_static (G_TYPE_OBJECT, "GtkTextTagTable",
+                                         &our_info, 0);
+    }
 
   return our_type;
 }
@@ -53,87 +61,94 @@ gtk_text_tag_table_get_type (void)
 static void
 gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
 {
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  parent_class = g_type_class_peek_parent (klass);
 
-  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
+  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_NONE__POINTER_INT,
-                    GTK_TYPE_NONE,
-                    2,
-                    GTK_TYPE_OBJECT,
-                    GTK_TYPE_BOOL);
+    g_signal_new ("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_NONE__POINTER,
-                    GTK_TYPE_NONE,
-                    1,
-                    GTK_TYPE_OBJECT);
+    g_signal_new ("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_NONE__POINTER,
-                    GTK_TYPE_NONE,
-                    1,
-                    GTK_TYPE_OBJECT);
-
-  
-  gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
-  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;
+    g_signal_new ("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);  
+  table->hash = g_hash_table_new (g_str_hash, g_str_equal);
 }
 
+/**
+ * gtk_text_tag_table_new:
+ * 
+ * Creates a new #GtkTextTagTable. The table contains no tags by
+ * default.
+ * 
+ * Return value: a new #GtkTextTagTable
+ **/
 GtkTextTagTable*
 gtk_text_tag_table_new (void)
 {
   GtkTextTagTable *table;
 
-  table = GTK_TEXT_TAG_TABLE (gtk_type_new (gtk_text_tag_table_get_type ()));
-  
-  return table;
-}
-
-static void
-gtk_text_tag_table_destroy (GtkObject *object)
-{
-  GtkTextTagTable *table;
-
-  table = GTK_TEXT_TAG_TABLE(object);
+  table = g_object_new (GTK_TYPE_TEXT_TAG_TABLE, NULL);
 
-  (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
+  return table;
 }
 
 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
@@ -141,116 +156,174 @@ gtk_text_tag_table_finalize (GObject *object)
 {
   GtkTextTagTable *table;
 
-  table = GTK_TEXT_TAG_TABLE(object);
-
-  gtk_text_tag_table_foreach (table, foreach_unref, NULL);
+  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 (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)
+  table = GTK_TEXT_TAG_TABLE (object);
+
+  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);
+  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;
     }
 }
 
+/**
+ * gtk_text_tag_table_add:
+ * @table: a #GtkTextTagTable
+ * @tag: a #GtkTextTag
+ *
+ * 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, GtkTextTag *tag)
+gtk_text_tag_table_add (GtkTextTagTable *table,
+                        GtkTextTag      *tag)
 {
   guint size;
-  
-  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));
+  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 == NULL);
+
+  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);
+    g_hash_table_insert (table->hash, tag->name, tag);
   else
     {
       table->anonymous = g_slist_prepend (table->anonymous, tag);
       table->anon_count += 1;
     }
-  
+
   tag->table = 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);
-  g_assert(size > 0);
+  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);
 }
 
+/**
+ * gtk_text_tag_table_lookup:
+ * @table: a #GtkTextTagTable 
+ * @name: name of a tag
+ * 
+ * Look up a named tag.
+ * 
+ * Return value: The tag, or %NULL if none by that name is in the table.
+ **/
 GtkTextTag*
-gtk_text_tag_table_lookup(GtkTextTagTable *table, const gchar *name)
+gtk_text_tag_table_lookup (GtkTextTagTable *table,
+                           const gchar     *name)
 {
-  g_return_val_if_fail(GTK_IS_TEXT_TAG_TABLE(table), NULL);
-  g_return_val_if_fail(name != NULL, NULL);
-  
-  return g_hash_table_lookup(table->hash, name);
+  g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), NULL);
+  g_return_val_if_fail (name != NULL, NULL);
+
+  return g_hash_table_lookup (table->hash, name);
 }
 
+/**
+ * gtk_text_tag_table_remove:
+ * @table: a #GtkTextTagTable
+ * @tag: a #GtkTextTag
+ * 
+ * Remove a tag from the table. This will remove the table's
+ * reference to the tag, so be careful - the tag will end
+ * up destroyed if you don't have a reference to it.
+ **/
 void
-gtk_text_tag_table_remove(GtkTextTagTable *table, GtkTextTag *tag)
+gtk_text_tag_table_remove (GtkTextTagTable *table,
+                           GtkTextTag      *tag)
 {
-  g_return_if_fail (GTK_IS_TEXT_TAG_TABLE(table));
+  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);  
+  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;
 
   if (tag->name)
-    g_hash_table_remove(table->hash, tag->name);
+    g_hash_table_remove (table->hash, tag->name);
   else
     {
       table->anonymous = g_slist_remove (table->anonymous, tag);
       table->anon_count -= 1;
     }
-  
-  gtk_signal_emit(GTK_OBJECT(table), signals[TAG_REMOVED], tag);
 
-  gtk_object_unref(GTK_OBJECT(tag));
+  g_signal_emit (table, signals[TAG_REMOVED], 0, tag);
+
+  g_object_unref (tag);
 }
 
 struct ForeachData
@@ -265,7 +338,7 @@ hash_foreach (gpointer key, gpointer value, gpointer data)
   struct ForeachData *fd = data;
 
   g_return_if_fail (GTK_IS_TEXT_TAG (value));
-  
+
   (* fd->func) (value, fd->data);
 }
 
@@ -275,31 +348,78 @@ list_foreach (gpointer data, gpointer user_data)
   struct ForeachData *fd = user_data;
 
   g_return_if_fail (GTK_IS_TEXT_TAG (data));
-  
+
   (* fd->func) (data, fd->data);
 }
 
+/**
+ * gtk_text_tag_table_foreach:
+ * @table: a #GtkTextTagTable
+ * @func: a function to call on each tag
+ * @data: user data
+ *
+ * Calls @func on each tag in @table, with user data @data.
+ * 
+ **/
 void
-gtk_text_tag_table_foreach(GtkTextTagTable       *table,
-                           GtkTextTagTableForeach func,
-                           gpointer               data)
+gtk_text_tag_table_foreach (GtkTextTagTable       *table,
+                            GtkTextTagTableForeach func,
+                            gpointer               data)
 {
   struct ForeachData d;
-  
-  g_return_if_fail(GTK_IS_TEXT_TAG_TABLE(table));
-  g_return_if_fail(func != NULL);
+
+  g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
+  g_return_if_fail (func != NULL);
 
   d.func = func;
   d.data = data;
-  
-  g_hash_table_foreach(table->hash, hash_foreach, &d);
+
+  g_hash_table_foreach (table->hash, hash_foreach, &d);
   g_slist_foreach (table->anonymous, list_foreach, &d);
 }
 
-guint
-gtk_text_tag_table_size(GtkTextTagTable *table)
+/**
+ * gtk_text_tag_table_get_size:
+ * @table: a #GtkTextTagTable
+ * 
+ * Returns the size of the table (number of tags)
+ * 
+ * Return value: number of tags in @table
+ **/
+gint
+gtk_text_tag_table_get_size (GtkTextTagTable *table)
 {
-  g_return_val_if_fail(GTK_IS_TEXT_TAG_TABLE(table), 0);
+  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);
+}
 
-  return g_hash_table_size(table->hash) + table->anon_count;
+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);
 }