]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtktextbuffer.c
Updated Bulgarian translation by Alexander Shopov <ash@contact.bg>
[~andy/gtk] / gtk / gtktextbuffer.c
index 2a66d9e32b74ac77fd83c5730cca58be59cdde97..3de0d792086ed0809c70f810f8f20d0f63b01df5 100644 (file)
@@ -1,5 +1,6 @@
 /* GTK - The GIMP Toolkit
  * gtktextbuffer.c Copyright (C) 2000 Red Hat, Inc.
+ *                 Copyright (C) 2004 Nokia Corporation
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-
+#include <config.h>
 #include <string.h>
 #include <stdarg.h>
 
 #define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
 #include "gtkclipboard.h"
+#include "gtkdnd.h"
 #include "gtkinvisible.h"
 #include "gtkmarshalers.h"
-#include "gtksignal.h"
 #include "gtktextbuffer.h"
+#include "gtktextbufferrichtext.h"
 #include "gtktextbtree.h"
 #include "gtktextiterprivate.h"
-#include <string.h>
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
+
+#define GTK_TEXT_BUFFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferPrivate))
+
+typedef struct _GtkTextBufferPrivate GtkTextBufferPrivate;
+
+struct _GtkTextBufferPrivate
+{
+  GtkTargetList  *copy_target_list;
+  GtkTargetEntry *copy_target_entries;
+  gint            n_copy_target_entries;
+
+  GtkTargetList  *paste_target_list;
+  GtkTargetEntry *paste_target_entries;
+  gint            n_paste_target_entries;
+};
+
 
 typedef struct _ClipboardRequest ClipboardRequest;
 
@@ -66,23 +87,21 @@ enum {
 };
 
 enum {
-  ARG_0,
-  LAST_ARG
-};
+  PROP_0,
 
-enum {
-  TARGET_STRING,
-  TARGET_TEXT,
-  TARGET_COMPOUND_TEXT,
-  TARGET_UTF8_STRING,
-  TARGET_TEXT_BUFFER_CONTENTS
+  /* Construct */
+  PROP_TAG_TABLE,
+
+  /* Normal */
+  PROP_TEXT,
+  PROP_HAS_SELECTION,
+  PROP_CURSOR_POSITION,
+  PROP_COPY_TARGET_LIST,
+  PROP_PASTE_TARGET_LIST
 };
 
-static void gtk_text_buffer_init       (GtkTextBuffer      *tkxt_buffer);
-static void gtk_text_buffer_class_init (GtkTextBufferClass *klass);
 static void gtk_text_buffer_finalize   (GObject            *object);
 
-
 static void gtk_text_buffer_real_insert_text           (GtkTextBuffer     *buffer,
                                                         GtkTextIter       *iter,
                                                         const gchar       *text,
@@ -105,55 +124,45 @@ static void gtk_text_buffer_real_remove_tag            (GtkTextBuffer     *buffe
                                                         const GtkTextIter *start_char,
                                                         const GtkTextIter *end_char);
 static void gtk_text_buffer_real_changed               (GtkTextBuffer     *buffer);
+static void gtk_text_buffer_real_mark_set              (GtkTextBuffer     *buffer,
+                                                        const GtkTextIter *iter,
+                                                        GtkTextMark       *mark);
 
 static GtkTextBTree* get_btree (GtkTextBuffer *buffer);
 static void          free_log_attr_cache (GtkTextLogAttrCache *cache);
 
-static void remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer);
 static void remove_all_selection_clipboards       (GtkTextBuffer *buffer);
 static void update_selection_clipboards           (GtkTextBuffer *buffer);
 
-static GObjectClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = { 0 };
+static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
 
-GType
-gtk_text_buffer_get_type (void)
-{
-  static GType our_type = 0;
+static void gtk_text_buffer_free_target_lists     (GtkTextBuffer *buffer);
 
-  if (our_type == 0)
-    {
-      static const GTypeInfo our_info =
-      {
-        sizeof (GtkTextBufferClass),
-        (GBaseInitFunc) NULL,
-        (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gtk_text_buffer_class_init,
-        NULL,           /* class_finalize */
-        NULL,           /* class_data */
-        sizeof (GtkTextBuffer),
-        0,              /* n_preallocs */
-        (GInstanceInitFunc) gtk_text_buffer_init
-      };
+static guint signals[LAST_SIGNAL] = { 0 };
 
-      our_type = g_type_register_static (G_TYPE_OBJECT,
-                                         "GtkTextBuffer",
-                                         &our_info,
-                                         0);
-    }
+static void gtk_text_buffer_set_property (GObject         *object,
+                                         guint            prop_id,
+                                         const GValue    *value,
+                                         GParamSpec      *pspec);
+static void gtk_text_buffer_get_property (GObject         *object,
+                                         guint            prop_id,
+                                         GValue          *value,
+                                         GParamSpec      *pspec);
+static void gtk_text_buffer_notify       (GObject         *object,
+                                          GParamSpec      *pspec);
 
-  return our_type;
-}
+G_DEFINE_TYPE (GtkTextBuffer, gtk_text_buffer, G_TYPE_OBJECT)
 
 static void
 gtk_text_buffer_class_init (GtkTextBufferClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  parent_class = g_type_class_peek_parent (klass);
-
   object_class->finalize = gtk_text_buffer_finalize;
-
+  object_class->set_property = gtk_text_buffer_set_property;
+  object_class->get_property = gtk_text_buffer_get_property;
+  object_class->notify       = gtk_text_buffer_notify;
   klass->insert_text = gtk_text_buffer_real_insert_text;
   klass->insert_pixbuf = gtk_text_buffer_real_insert_pixbuf;
   klass->insert_child_anchor = gtk_text_buffer_real_insert_anchor;
@@ -161,150 +170,375 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
   klass->apply_tag = gtk_text_buffer_real_apply_tag;
   klass->remove_tag = gtk_text_buffer_real_remove_tag;
   klass->changed = gtk_text_buffer_real_changed;
+  klass->mark_set = gtk_text_buffer_real_mark_set;
+
+  /* Construct */
+  g_object_class_install_property (object_class,
+                                   PROP_TAG_TABLE,
+                                   g_param_spec_object ("tag-table",
+                                                        P_("Tag Table"),
+                                                        P_("Text Tag Table"),
+                                                        GTK_TYPE_TEXT_TAG_TABLE,
+                                                        GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+  /* Normal properties*/
+  
+  /**
+   * GtkTextBuffer:text:
+   *
+   * The text content of the buffer. Without child widgets and images,
+   * see gtk_text_buffer_get_text () for more information.
+   *
+   * Since: 2.8
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_TEXT,
+                                   g_param_spec_string ("text",
+                                                        P_("Text"),
+                                                        P_("Current text of the buffer"),
+                                                       "",
+                                                        GTK_PARAM_READWRITE));
+
+  /**
+   * GtkTextBuffer:has-selection:
+   *
+   * Whether the buffer has some text currently selected.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_HAS_SELECTION,
+                                   g_param_spec_boolean ("has-selection",
+                                                         P_("Has selection"),
+                                                         P_("Whether the buffer has some text currently selected"),
+                                                         FALSE,
+                                                         GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:cursor-position:
+   *
+   * The position of the insert mark (as offset from the beginning of the buffer). 
+   * It is useful for getting notified when the cursor moves.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_CURSOR_POSITION,
+                                   g_param_spec_int ("cursor-position",
+                                                     P_("Cursor position"),
+                                                     P_("The position of the insert mark (as offset from the beginning of the buffer)"),
+                                                    0, G_MAXINT, 0,
+                                                     GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:copy-target-list:
+   *
+   * The list of targets this buffer supports for clipboard copying
+   * and as DND source.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_COPY_TARGET_LIST,
+                                   g_param_spec_boxed ("copy-target-list",
+                                                       P_("Copy target list"),
+                                                       P_("The list of targets this buffer supports for clipboard copying and DND source"),
+                                                       GTK_TYPE_TARGET_LIST,
+                                                       GTK_PARAM_READABLE));
+
+  /**
+   * GtkTextBuffer:paste-target-list:
+   *
+   * The list of targets this buffer supports for clipboard pasting
+   * and as DND destination.
+   *
+   * Since: 2.10
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_PASTE_TARGET_LIST,
+                                   g_param_spec_boxed ("paste-target-list",
+                                                       P_("Paste target list"),
+                                                       P_("The list of targets this buffer supports for clipboard pasting and DND destination"),
+                                                       GTK_TYPE_TARGET_LIST,
+                                                       GTK_PARAM_READABLE));
 
   signals[INSERT_TEXT] =
-    g_signal_new ("insert_text",
+    g_signal_new (I_("insert_text"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
                   NULL, NULL,
                   _gtk_marshal_VOID__BOXED_STRING_INT,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
-                  GTK_TYPE_INT);
+                  G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
+                  G_TYPE_INT);
 
   signals[INSERT_PIXBUF] =
-    g_signal_new ("insert_pixbuf",
+    g_signal_new (I_("insert_pixbuf"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
                   NULL, NULL,
                   _gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GDK_TYPE_PIXBUF);
 
   signals[INSERT_CHILD_ANCHOR] =
-    g_signal_new ("insert_child_anchor",
+    g_signal_new (I_("insert_child_anchor"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
                   NULL, NULL,
                   _gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GTK_TYPE_TEXT_CHILD_ANCHOR);
   
+  /**
+   * GtkTextBuffer::delete_range:
+   * @buffer: the object which received the signal.
+   * @start: the start of the range to be deleted
+   * @end: the end of the range to be deleted
+   *
+   * The ::delete_range signal is emitted to delete a range from 
+   * a #GtkTextBuffer. Note that your handler must not invalidate the
+   * @start and @end iters (or has to revalidate them), if it runs before the 
+   * default handler. There is no need to keep the iters valid in handlers
+   * which run after the default handler (see g_signal_connect_after()), but
+   * those don't have access to the deleted text.
+   */
   signals[DELETE_RANGE] =
-    g_signal_new ("delete_range",
+    g_signal_new (I_("delete_range"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
                   NULL, NULL,
                   _gtk_marshal_VOID__BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
                   GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE);
 
   signals[CHANGED] =
-    g_signal_new ("changed",
+    g_signal_new (I_("changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, changed),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   0);
 
   signals[MODIFIED_CHANGED] =
-    g_signal_new ("modified_changed",
+    g_signal_new (I_("modified_changed"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   0);
 
   signals[MARK_SET] =
-    g_signal_new ("mark_set",
+    g_signal_new (I_("mark_set"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
                   NULL, NULL,
                   _gtk_marshal_VOID__BOXED_OBJECT,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   2,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_MARK);
 
   signals[MARK_DELETED] =
-    g_signal_new ("mark_deleted",
+    g_signal_new (I_("mark_deleted"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
                   NULL, NULL,
                   _gtk_marshal_VOID__OBJECT,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   1,
                   GTK_TYPE_TEXT_MARK);
   
   signals[APPLY_TAG] =
-    g_signal_new ("apply_tag",
+    g_signal_new (I_("apply_tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
                   NULL, NULL,
                   _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_ITER);
 
   signals[REMOVE_TAG] =
-    g_signal_new ("remove_tag",
+    g_signal_new (I_("remove_tag"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,
                   G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
                   NULL, NULL,
                   _gtk_marshal_VOID__OBJECT_BOXED_BOXED,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   3,
                   GTK_TYPE_TEXT_TAG,
                   GTK_TYPE_TEXT_ITER,
                   GTK_TYPE_TEXT_ITER);
 
   signals[BEGIN_USER_ACTION] =
-    g_signal_new ("begin_user_action",
+    g_signal_new (I_("begin_user_action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
+                  G_TYPE_NONE,
                   0);
 
   signals[END_USER_ACTION] =
-    g_signal_new ("end_user_action",
+    g_signal_new (I_("end_user_action"),
                   G_OBJECT_CLASS_TYPE (object_class),
                   G_SIGNAL_RUN_LAST,                   
                   G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
                   NULL, NULL,
                   _gtk_marshal_VOID__VOID,
-                  GTK_TYPE_NONE,
-                  0);  
+                  G_TYPE_NONE,
+                  0);
+
+  g_type_class_add_private (object_class, sizeof (GtkTextBufferPrivate));
 }
 
 static void
 gtk_text_buffer_init (GtkTextBuffer *buffer)
 {
   buffer->clipboard_contents_buffers = NULL;
+  buffer->tag_table = NULL;
+
+  /* allow copying of arbiatray stuff in the internal rich text format */
+  gtk_text_buffer_register_serialize_tagset (buffer, NULL);
+}
+
+static void
+set_table (GtkTextBuffer *buffer, GtkTextTagTable *table)
+{
+  g_return_if_fail (buffer->tag_table == NULL);
+
+  if (table)
+    {
+      buffer->tag_table = table;
+      g_object_ref (buffer->tag_table);
+      _gtk_text_tag_table_add_buffer (table, buffer);
+    }
+}
+
+static GtkTextTagTable*
+get_table (GtkTextBuffer *buffer)
+{
+  if (buffer->tag_table == NULL)
+    {
+      buffer->tag_table = gtk_text_tag_table_new ();
+      _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
+    }
+
+  return buffer->tag_table;
+}
+
+static void
+gtk_text_buffer_set_property (GObject         *object,
+                              guint            prop_id,
+                              const GValue    *value,
+                              GParamSpec      *pspec)
+{
+  GtkTextBuffer *text_buffer;
+
+  text_buffer = GTK_TEXT_BUFFER (object);
+
+  switch (prop_id)
+    {
+    case PROP_TAG_TABLE:
+      set_table (text_buffer, g_value_get_object (value));
+      break;
+
+    case PROP_TEXT:
+      gtk_text_buffer_set_text (text_buffer,
+                               g_value_get_string (value), -1);
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gtk_text_buffer_get_property (GObject         *object,
+                              guint            prop_id,
+                              GValue          *value,
+                              GParamSpec      *pspec)
+{
+  GtkTextBuffer *text_buffer;
+  GtkTextIter iter;
+
+  text_buffer = GTK_TEXT_BUFFER (object);
+
+  switch (prop_id)
+    {
+    case PROP_TAG_TABLE:
+      g_value_set_object (value, get_table (text_buffer));
+      break;
+
+    case PROP_TEXT:
+      {
+        GtkTextIter start, end;
+
+        gtk_text_buffer_get_start_iter (text_buffer, &start);
+        gtk_text_buffer_get_end_iter (text_buffer, &end);
+
+        g_value_take_string (value,
+                            gtk_text_buffer_get_text (text_buffer,
+                                                      &start, &end, FALSE));
+        break;
+      }
+
+    case PROP_HAS_SELECTION:
+      g_value_set_boolean (value, text_buffer->has_selection);
+      break;
+
+    case PROP_CURSOR_POSITION:
+      gtk_text_buffer_get_iter_at_mark (text_buffer, &iter, 
+                                       gtk_text_buffer_get_insert (text_buffer));
+      g_value_set_int (value, gtk_text_iter_get_offset (&iter));
+      break;
+
+    case PROP_COPY_TARGET_LIST:
+      g_value_set_boxed (value, gtk_text_buffer_get_copy_target_list (text_buffer));
+      break;
+
+    case PROP_PASTE_TARGET_LIST:
+      g_value_set_boxed (value, gtk_text_buffer_get_paste_target_list (text_buffer));
+      break;
+
+    default:
+      break;
+    }
+}
+
+static void
+gtk_text_buffer_notify (GObject    *object,
+                        GParamSpec *pspec)
+{
+  if (!strcmp (pspec->name, "copy-target-list") ||
+      !strcmp (pspec->name, "paste-target-list"))
+    {
+      gtk_text_buffer_free_target_lists (GTK_TEXT_BUFFER (object));
+    }
 }
 
 /**
@@ -320,17 +554,8 @@ gtk_text_buffer_new (GtkTextTagTable *table)
 {
   GtkTextBuffer *text_buffer;
 
-  text_buffer = GTK_TEXT_BUFFER (g_object_new (gtk_text_buffer_get_type (), NULL));
-
-  if (table)
-    {
-      text_buffer->tag_table = table;
-
-      g_object_ref (G_OBJECT (text_buffer->tag_table));
+  text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag-table", table, NULL);
 
-      _gtk_text_tag_table_add_buffer (table, text_buffer);
-    }
-  
   return text_buffer;
 }
 
@@ -338,16 +563,18 @@ static void
 gtk_text_buffer_finalize (GObject *object)
 {
   GtkTextBuffer *buffer;
+  GtkTextBufferPrivate *priv;
 
   buffer = GTK_TEXT_BUFFER (object);
 
-  remove_all_clipboard_contents_buffers (buffer);
   remove_all_selection_clipboards (buffer);
 
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
   if (buffer->tag_table)
     {
       _gtk_text_tag_table_remove_buffer (buffer->tag_table, buffer);
-      g_object_unref (G_OBJECT (buffer->tag_table));
+      g_object_unref (buffer->tag_table);
       buffer->tag_table = NULL;
     }
 
@@ -361,20 +588,10 @@ gtk_text_buffer_finalize (GObject *object)
     free_log_attr_cache (buffer->log_attr_cache);
 
   buffer->log_attr_cache = NULL;
-  
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
 
-static GtkTextTagTable*
-get_table (GtkTextBuffer *buffer)
-{
-  if (buffer->tag_table == NULL)
-    {
-      buffer->tag_table = gtk_text_tag_table_new ();
-      _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
-    }
+  gtk_text_buffer_free_target_lists (buffer);
 
-  return buffer->tag_table;
+  G_OBJECT_CLASS (gtk_text_buffer_parent_class)->finalize (object);
 }
 
 static GtkTextBTree*
@@ -440,8 +657,12 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
       gtk_text_buffer_get_iter_at_offset (buffer, &start, 0);
       gtk_text_buffer_insert (buffer, &start, text, len);
     }
+  
+  g_object_notify (G_OBJECT (buffer), "text");
 }
 
+
 /*
  * Insertion
  */
@@ -457,7 +678,8 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
   
   _gtk_text_btree_insert (iter, text, len);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
@@ -477,7 +699,7 @@ gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
   
   if (len > 0)
     {
-      g_signal_emit (G_OBJECT (buffer), signals[INSERT_TEXT], 0,
+      g_signal_emit (buffer, signals[INSERT_TEXT], 0,
                      iter, text, len);
     }
 }
@@ -546,7 +768,7 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
  * @len: length of text in bytes, or -1
  * @default_editable: default editability of buffer
  *
- * Like gtk_text_buffer_insert (), but the insertion will not occur if
+ * Like gtk_text_buffer_insert(), but the insertion will not occur if
  * @iter is at a non-editable location in the buffer.  Usually you
  * want to prevent insertions at ineditable locations if the insertion
  * results from a user action (is interactive).
@@ -659,7 +881,7 @@ save_range (GtkTextIter *range_start,
   r = g_new (Range, 1);
 
   r->buffer = gtk_text_iter_get_buffer (range_start);
-  g_object_ref (G_OBJECT (r->buffer));
+  g_object_ref (r->buffer);
   
   r->start_mark = 
     gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
@@ -715,7 +937,7 @@ restore_range (Range *r)
   if (gtk_text_iter_compare (r->range_end, r->whole_end) > 0)
     *r->range_end = *r->whole_end;
   
-  g_object_unref (G_OBJECT (r->buffer));
+  g_object_unref (r->buffer);
   g_free (r); 
 }
 
@@ -729,7 +951,6 @@ insert_range_untagged (GtkTextBuffer     *buffer,
   GtkTextIter range_start;
   GtkTextIter range_end;
   GtkTextIter start, end;
-  GtkTextBuffer *src_buffer;
   Range *r;
   
   if (gtk_text_iter_equal (orig_start, orig_end))
@@ -738,8 +959,6 @@ insert_range_untagged (GtkTextBuffer     *buffer,
   start = *orig_start;
   end = *orig_end;
   
-  src_buffer = gtk_text_iter_get_buffer (&start);
-  
   range_start = start;
   range_end = start;
   
@@ -845,13 +1064,10 @@ insert_range_not_inside_self (GtkTextBuffer     *buffer,
   GtkTextIter end = *orig_end;
   GtkTextIter range_start;
   GtkTextIter range_end;
-  GtkTextBuffer *src_buffer;
   
   if (gtk_text_iter_equal (orig_start, orig_end))
     return;
   
-  src_buffer = gtk_text_iter_get_buffer (orig_start);
-  
   gtk_text_iter_order (&start, &end);
 
   range_start = start;
@@ -1172,6 +1388,8 @@ gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
                                    GtkTextIter   *start,
                                    GtkTextIter   *end)
 {
+  gboolean has_selection;
+
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
   g_return_if_fail (start != NULL);
   g_return_if_fail (end != NULL);
@@ -1181,7 +1399,15 @@ gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
   /* may have deleted the selection... */
   update_selection_clipboards (buffer);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  has_selection = gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL);
+  if (has_selection != buffer->has_selection)
+    {
+      buffer->has_selection = has_selection;
+      g_object_notify (G_OBJECT (buffer), "has-selection");
+    }
+
+  g_signal_emit (buffer, signals[CHANGED], 0);
+  g_object_notify (G_OBJECT (buffer), "cursor-position");
 }
 
 static void
@@ -1198,7 +1424,7 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
 
   gtk_text_iter_order (start, end);
 
-  g_signal_emit (G_OBJECT (buffer),
+  g_signal_emit (buffer,
                  signals[DELETE_RANGE],
                  0,
                  start, end);
@@ -1277,7 +1503,8 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
                                             start_iter, TRUE);
   end_mark = gtk_text_buffer_create_mark (buffer, NULL,
                                           end_iter, FALSE);
-  iter = *start_iter;
+
+  gtk_text_buffer_get_iter_at_mark (buffer, &iter, start_mark);
 
   current_state = gtk_text_iter_editable (&iter, default_editable);
 
@@ -1382,7 +1609,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
  *
  * Returns the text in the range [@start,@end). Excludes undisplayed
  * text (text marked with tags that set the invisibility attribute) if
- * @include_hidden_chars is FALSE. Does not include characters
+ * @include_hidden_chars is %FALSE. Does not include characters
  * representing embedded images, so byte and character indexes into
  * the returned string do <emphasis>not</emphasis> correspond to byte
  * and character indexes into the buffer. Contrast with
@@ -1417,7 +1644,7 @@ gtk_text_buffer_get_text (GtkTextBuffer      *buffer,
  *
  * Returns the text in the range [@start,@end). Excludes undisplayed
  * text (text marked with tags that set the invisibility attribute) if
- * @include_hidden_chars is FALSE. The returned string includes a
+ * @include_hidden_chars is %FALSE. The returned string includes a
  * 0xFFFC character whenever the buffer contains
  * embedded images, so byte and character indexes into
  * the returned string <emphasis>do</emphasis> correspond to byte
@@ -1457,7 +1684,7 @@ gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer     *buffer,
 { 
   _gtk_text_btree_insert_pixbuf (iter, pixbuf);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
 }
 
 /**
@@ -1486,7 +1713,7 @@ gtk_text_buffer_insert_pixbuf         (GtkTextBuffer      *buffer,
   g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
   g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  g_signal_emit (G_OBJECT (buffer), signals[INSERT_PIXBUF], 0,
+  g_signal_emit (buffer, signals[INSERT_PIXBUF], 0,
                  iter, pixbuf);
 }
 
@@ -1502,7 +1729,7 @@ gtk_text_buffer_real_insert_anchor (GtkTextBuffer      *buffer,
 {
   _gtk_text_btree_insert_child_anchor (iter, anchor);
 
-  g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+  g_signal_emit (buffer, signals[CHANGED], 0);
 }
 
 /**
@@ -1534,7 +1761,7 @@ gtk_text_buffer_insert_child_anchor (GtkTextBuffer      *buffer,
   g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
   g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
   
-  g_signal_emit (G_OBJECT (buffer), signals[INSERT_CHILD_ANCHOR], 0,
+  g_signal_emit (buffer, signals[INSERT_CHILD_ANCHOR], 0,
                  iter, anchor);
 }
 
@@ -1566,7 +1793,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
 
   gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
 
-  g_object_unref (G_OBJECT (anchor));
+  g_object_unref (anchor);
 
   return anchor;
 }
@@ -1591,15 +1818,15 @@ gtk_text_buffer_mark_set (GtkTextBuffer     *buffer,
    * default behavior.
    */
 
-  g_object_ref (G_OBJECT (mark));
+  g_object_ref (mark);
 
-  g_signal_emit (G_OBJECT (buffer),
+  g_signal_emit (buffer,
                  signals[MARK_SET],
                  0,
                  location,
                  mark);
 
-  g_object_unref (G_OBJECT (mark));
+  g_object_unref (mark);
 }
 
 /**
@@ -1636,12 +1863,6 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
                                    iter,
                                    should_exist);
   
-  if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
-      _gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
-    {
-      update_selection_clipboards (buffer);
-    }
-
   _gtk_text_btree_get_iter_at_mark (get_btree (buffer),
                                    &location,
                                    mark);
@@ -1756,7 +1977,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
   g_return_if_fail (!gtk_text_mark_get_deleted (mark));
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  g_object_ref (G_OBJECT (mark));
+  g_object_ref (mark);
 
   _gtk_text_btree_remove_mark (get_btree (buffer), mark);
 
@@ -1764,11 +1985,11 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
    * removing the mark, rather than removing the mark in a default
    * handler.
    */
-  g_signal_emit (G_OBJECT (buffer), signals[MARK_DELETED],
+  g_signal_emit (buffer, signals[MARK_DELETED],
                  0,
                  mark);
 
-  g_object_unref (G_OBJECT (mark));
+  g_object_unref (mark);
 }
 
 /**
@@ -1942,17 +2163,44 @@ void
 gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
                               const GtkTextIter *where)
 {
-  GtkTextIter real;
+  gtk_text_buffer_select_range (buffer, where, where);
+}
+
+
+/**
+ * gtk_text_buffer_select_range:
+ * @buffer: a #GtkTextBuffer
+ * @ins: where to put the "insert" mark
+ * @bound: where to put the "selection_bound" mark
+ *
+ * This function moves the "insert" and "selection_bound" marks
+ * simultaneously.  If you move them in two steps
+ * with gtk_text_buffer_move_mark(), you will temporarily select a
+ * region in between their old and new locations, which can be pretty
+ * inefficient since the temporarily-selected region will force stuff
+ * to be recalculated. This function moves them as a unit, which can
+ * be optimized.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_text_buffer_select_range (GtkTextBuffer     *buffer,
+                             const GtkTextIter *ins,
+                              const GtkTextIter *bound)
+{
+  GtkTextIter real_ins;
+  GtkTextIter real_bound;
 
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
 
-  real = *where;
+  real_ins = *ins;
+  real_bound = *bound;
 
-  _gtk_text_btree_place_cursor (get_btree (buffer), &real);
-  gtk_text_buffer_mark_set (buffer, &real,
+  _gtk_text_btree_select_range (get_btree (buffer), &real_ins, &real_bound);
+  gtk_text_buffer_mark_set (buffer, &real_ins,
                             gtk_text_buffer_get_mark (buffer,
                                                       "insert"));
-  gtk_text_buffer_mark_set (buffer, &real,
+  gtk_text_buffer_mark_set (buffer, &real_bound,
                             gtk_text_buffer_get_mark (buffer,
                                                       "selection_bound"));
 }
@@ -2047,6 +2295,36 @@ gtk_text_buffer_real_changed (GtkTextBuffer *buffer)
   gtk_text_buffer_set_modified (buffer, TRUE);
 }
 
+static void
+gtk_text_buffer_real_mark_set (GtkTextBuffer *buffer,
+                               const GtkTextIter *iter,
+                               GtkTextMark *mark)
+{
+  GtkTextMark *insert;
+  
+  insert = gtk_text_buffer_get_insert (buffer);
+
+  if (mark == insert || mark == gtk_text_buffer_get_selection_bound (buffer))
+    {
+      gboolean has_selection;
+
+      update_selection_clipboards (buffer);
+    
+      has_selection = gtk_text_buffer_get_selection_bounds (buffer,
+                                                            NULL,
+                                                            NULL);
+
+      if (has_selection != buffer->has_selection)
+        {
+          buffer->has_selection = has_selection;
+          g_object_notify (G_OBJECT (buffer), "has-selection");
+        }
+    }
+    
+    if (mark == insert)
+      g_object_notify (G_OBJECT (buffer), "cursor-position");
+}
+
 static void
 gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
                           GtkTextTag *tag,
@@ -2062,11 +2340,11 @@ gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
   gtk_text_iter_order (&start_tmp, &end_tmp);
 
   if (apply)
-    g_signal_emit (G_OBJECT (buffer), signals[APPLY_TAG],
+    g_signal_emit (buffer, signals[APPLY_TAG],
                    0,
                    tag, &start_tmp, &end_tmp);
   else
-    g_signal_emit (G_OBJECT (buffer), signals[REMOVE_TAG],
+    g_signal_emit (buffer, signals[REMOVE_TAG],
                    0,
                    tag, &start_tmp, &end_tmp);
 }
@@ -2241,7 +2519,7 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
   GtkTextIter first, second, tmp;
   GSList *tags;
   GSList *tmp_list;
-  GSList *prev;
+  GSList *prev, *next;
   GtkTextTag *tag;
   
   g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
@@ -2296,14 +2574,15 @@ gtk_text_buffer_remove_all_tags (GtkTextBuffer     *buffer,
       if (tag == tmp_list->data)
         {
           /* duplicate */
+          next = tmp_list->next;
           if (prev)
-            prev->next = tmp_list->next;
+            prev->next = next;
 
           tmp_list->next = NULL;
 
           g_slist_free (tmp_list);
 
-          tmp_list = prev->next;
+          tmp_list = next;
           /* prev is unchanged */
         }
       else
@@ -2412,11 +2691,12 @@ gtk_text_buffer_get_iter_at_line    (GtkTextBuffer      *buffer,
  * gtk_text_buffer_get_iter_at_offset:
  * @buffer: a #GtkTextBuffer 
  * @iter: iterator to initialize
- * @char_offset: char offset from start of buffer, counting from 0
+ * @char_offset: char offset from start of buffer, counting from 0, or -1
  *
  * Initializes @iter to a position @char_offset chars from the start
- * of the entire buffer.
- * 
+ * of the entire buffer. If @char_offset is -1 or greater than the number
+ * of characters in the buffer, @iter is initialized to the end iterator,
+ * the iterator one past the last valid character in the buffer.
  **/
 void
 gtk_text_buffer_get_iter_at_offset         (GtkTextBuffer      *buffer,
@@ -2437,7 +2717,6 @@ gtk_text_buffer_get_iter_at_offset         (GtkTextBuffer      *buffer,
  * Initialized @iter with the first position in the text buffer. This
  * is the same as using gtk_text_buffer_get_iter_at_offset() to get
  * the iter at character offset 0.
- * 
  **/
 void
 gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer,
@@ -2545,10 +2824,28 @@ gtk_text_buffer_set_modified (GtkTextBuffer      *buffer,
   else
     {
       buffer->modified = fixed_setting;
-      g_signal_emit (G_OBJECT (buffer), signals[MODIFIED_CHANGED], 0);
+      g_signal_emit (buffer, signals[MODIFIED_CHANGED], 0);
     }
 }
 
+/**
+ * gtk_text_buffer_get_has_selection:
+ * @buffer: a #GtkTextBuffer 
+ * 
+ * Indicates whether the buffer has some text currently selected.
+ * 
+ * Return value: %TRUE if the there is text selected
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_text_buffer_get_has_selection (GtkTextBuffer *buffer)
+{
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
+  return buffer->has_selection;
+}
+
 
 /*
  * Assorted other stuff
@@ -2626,22 +2923,36 @@ clipboard_get_selection_cb (GtkClipboard     *clipboard,
 
   if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
-      if (selection_data->target ==
-          gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+      if (info == GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
         {
           /* Provide the address of the buffer; this will only be
            * used within-process
            */
           gtk_selection_data_set (selection_data,
-                                  gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+                                  selection_data->target,
                                   8, /* bytes */
                                   (void*)&buffer,
                                   sizeof (buffer));
         }
+      else if (info == GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT)
+        {
+          guint8 *str;
+          gsize   len;
+
+          str = gtk_text_buffer_serialize (buffer, buffer,
+                                           selection_data->target,
+                                           &start, &end, &len);
+
+          gtk_selection_data_set (selection_data,
+                                  selection_data->target,
+                                  8, /* bytes */
+                                  str, len);
+          g_free (str);
+        }
       else
         {
           gchar *str;
-          
+
           str = gtk_text_iter_get_visible_text (&start, &end);
           gtk_selection_data_set_text (selection_data, str, -1);
           g_free (str);
@@ -2649,85 +2960,26 @@ clipboard_get_selection_cb (GtkClipboard     *clipboard,
     }
 }
 
-typedef struct
-{
-  GtkClipboard *clipboard;
-  GtkTextBuffer *buffer;
-} ContentsBuffer;
-
-static void
-remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer)
-{
-  GSList *tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      ContentsBuffer *contents_buffer = tmp_list->data;
-
-      g_object_unref (contents_buffer->buffer);
-      g_free (contents_buffer);
-         
-      tmp_list = tmp_list->next;
-    }
-
-  g_slist_free (buffer->clipboard_contents_buffers);
-  buffer->clipboard_contents_buffers = NULL;
-}
-
-static void
-remove_clipboard_contents_buffer (GtkTextBuffer *buffer,
-                                 GtkClipboard  *clipboard)
-{
-  GSList *tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      ContentsBuffer *contents_buffer = tmp_list->data;
-      
-      if (contents_buffer->clipboard == clipboard)
-       {
-         buffer->clipboard_contents_buffers = g_slist_remove (buffer->clipboard_contents_buffers, contents_buffer);
-         
-         g_object_unref (contents_buffer->buffer);
-         g_free (contents_buffer);
-         
-         return;
-       }
-
-      tmp_list = tmp_list->next;
-    }
-}
-
 static GtkTextBuffer *
-get_clipboard_contents_buffer (GtkTextBuffer *buffer,
-                              GtkClipboard  *clipboard,
-                              gboolean       create)
+create_clipboard_contents_buffer (GtkTextBuffer *buffer)
 {
-  ContentsBuffer *contents_buffer;
-  GSList *tmp_list;
+  GtkTextBuffer *contents;
 
-  tmp_list = buffer->clipboard_contents_buffers;
-  while (tmp_list)
-    {
-      contents_buffer = tmp_list->data;
-      if (contents_buffer->clipboard == clipboard)
-       return contents_buffer->buffer;
-    }
-  
-  if (create)
-    {
-      contents_buffer = g_new (ContentsBuffer, 1);
-      contents_buffer->clipboard = clipboard;
-      contents_buffer->buffer = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
+  contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
 
-      g_object_set_data (G_OBJECT (contents_buffer->buffer), "gtk-text-buffer-clipboard",
-                        GUINT_TO_POINTER (1));
+  g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard-source"),
+                     buffer);
+  g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard"),
+                     GINT_TO_POINTER (1));
 
-      buffer->clipboard_contents_buffers = g_slist_prepend (buffer->clipboard_contents_buffers, contents_buffer);
+  /*  Ref the source buffer as long as the clipboard contents buffer
+   *  exists, because it's needed for serializing the contents buffer.
+   *  See http://bugzilla.gnome.org/show_bug.cgi?id=339195
+   */
+  g_object_ref (buffer);
+  g_object_weak_ref (G_OBJECT (contents), (GWeakNotify) g_object_unref, buffer);
 
-      
-      return contents_buffer->buffer;
-    }
-  else
-    return NULL;
+  return contents;
 }
 
 /* Provide cut/copied data */
@@ -2737,33 +2989,50 @@ clipboard_get_contents_cb (GtkClipboard     *clipboard,
                            guint             info,
                            gpointer          data)
 {
-  GtkTextBuffer *buffer;
-  GtkTextBuffer *contents;
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  buffer = GTK_TEXT_BUFFER (data);
-  contents = get_clipboard_contents_buffer (buffer, clipboard, FALSE);
-  
   g_assert (contents); /* This should never be called unless we own the clipboard */
 
-  if (selection_data->target ==
-      gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+  if (info == GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS)
     {
       /* Provide the address of the clipboard buffer; this will only
        * be used within-process. OK to supply a NULL value for contents.
        */
       gtk_selection_data_set (selection_data,
-                              gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+                              selection_data->target,
                               8, /* bytes */
                               (void*)&contents,
                               sizeof (contents));
     }
+  else if (info == GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT)
+    {
+      GtkTextBuffer *clipboard_source_buffer;
+      GtkTextIter start, end;
+      guint8 *str;
+      gsize   len;
+
+      clipboard_source_buffer = g_object_get_data (G_OBJECT (contents),
+                                                   "gtk-text-buffer-clipboard-source");
+
+      gtk_text_buffer_get_bounds (contents, &start, &end);
+
+      str = gtk_text_buffer_serialize (clipboard_source_buffer, contents,
+                                       selection_data->target,
+                                       &start, &end, &len);
+
+      gtk_selection_data_set (selection_data,
+                             selection_data->target,
+                             8, /* bytes */
+                             str, len);
+      g_free (str);
+    }
   else
     {
       gchar *str;
       GtkTextIter start, end;
-      
+
       gtk_text_buffer_get_bounds (contents, &start, &end);
-      
+
       str = gtk_text_iter_get_visible_text (&start, &end);
       gtk_selection_data_set_text (selection_data, str, -1);
       g_free (str);
@@ -2774,9 +3043,9 @@ static void
 clipboard_clear_contents_cb (GtkClipboard *clipboard,
                              gpointer      data)
 {
-  GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+  GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
 
-  remove_clipboard_contents_buffer (buffer, clipboard);
+  g_object_unref (contents);
 }
 
 static void
@@ -2850,6 +3119,13 @@ post_paste_cleanup (ClipboardRequest *request_data)
     }
 }
 
+static void
+free_clipboard_request (ClipboardRequest *request_data)
+{
+  g_object_unref (request_data->buffer);
+  g_free (request_data);
+}
+
 /* Called when we request a paste and receive the text data
  */
 static void
@@ -2863,21 +3139,26 @@ clipboard_text_received (GtkClipboard *clipboard,
   if (str)
     {
       GtkTextIter insert_point;
+      
+      if (request_data->interactive) 
+       gtk_text_buffer_begin_user_action (buffer);
 
       pre_paste_prep (request_data, &insert_point);
       
-      if (request_data->interactive)
-        gtk_text_buffer_insert_interactive (buffer, &insert_point,
-                                            str, -1, request_data->default_editable);
+      if (request_data->interactive) 
+       gtk_text_buffer_insert_interactive (buffer, &insert_point,
+                                           str, -1, request_data->default_editable);
       else
         gtk_text_buffer_insert (buffer, &insert_point,
                                 str, -1);
 
       post_paste_cleanup (request_data);
+      
+      if (request_data->interactive) 
+       gtk_text_buffer_end_user_action (buffer);
     }
 
-  g_object_unref (G_OBJECT (buffer));
-  g_free (request_data);
+  free_clipboard_request (request_data);
 }
 
 static GtkTextBuffer*
@@ -2894,7 +3175,11 @@ selection_data_get_buffer (GtkSelectionData *selection_data,
   if (owner == NULL)
     return NULL;
   
-  if (selection_data->type != gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+  if (gdk_window_get_window_type (owner) == GDK_WINDOW_FOREIGN)
+    return NULL;
+  if (selection_data->type !=
+      gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
     return NULL;
 
   if (selection_data->length != sizeof (src_buffer))
@@ -2941,6 +3226,62 @@ restore_iter (const GtkTextIter *iter,
 }
 #endif
 
+static void
+clipboard_rich_text_received (GtkClipboard *clipboard,
+                              GdkAtom       format,
+                              const guint8 *text,
+                              gsize         length,
+                              gpointer      data)
+{
+  ClipboardRequest *request_data = data;
+  GtkTextIter insert_point;
+  gboolean retval = TRUE;
+  GError *error = NULL;
+  GtkTextBufferPrivate *priv;
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
+
+  if (text != NULL && length > 0)
+    {
+      pre_paste_prep (request_data, &insert_point);
+
+      if (request_data->interactive)
+        gtk_text_buffer_begin_user_action (request_data->buffer);
+
+      if (!request_data->interactive ||
+          gtk_text_iter_can_insert (&insert_point,
+                                    request_data->default_editable))
+        {
+          retval = gtk_text_buffer_deserialize (request_data->buffer,
+                                                request_data->buffer,
+                                                format,
+                                                &insert_point,
+                                                text, length,
+                                                &error);
+        }
+
+      if (!retval)
+        {
+          g_warning ("error pasting: %s\n", error->message);
+          g_clear_error (&error);
+        }
+
+      if (request_data->interactive)
+        gtk_text_buffer_end_user_action (request_data->buffer);
+
+      if (retval)
+        {
+          post_paste_cleanup (request_data);
+          return;
+        }
+    }
+
+  /* Request the text selection instead */
+  gtk_clipboard_request_text (clipboard,
+                              clipboard_text_received,
+                              data);
+}
+
 static void
 paste_from_buffer (ClipboardRequest    *request_data,
                    GtkTextBuffer       *src_buffer,
@@ -2948,18 +3289,22 @@ paste_from_buffer (ClipboardRequest    *request_data,
                    const GtkTextIter   *end)
 {
   GtkTextIter insert_point;
+  GtkTextBuffer *buffer = request_data->buffer;
   
   /* We're about to emit a bunch of signals, so be safe */
-  g_object_ref (G_OBJECT (src_buffer));
+  g_object_ref (src_buffer);
   
   pre_paste_prep (request_data, &insert_point);
   
+  if (request_data->interactive) 
+    gtk_text_buffer_begin_user_action (buffer);
+
   if (!gtk_text_iter_equal (start, end))
     {
       if (!request_data->interactive ||
           (gtk_text_iter_can_insert (&insert_point,
                                      request_data->default_editable)))
-        gtk_text_buffer_real_insert_range (request_data->buffer,
+        gtk_text_buffer_real_insert_range (buffer,
                                            &insert_point,
                                            start,
                                            end,
@@ -2968,8 +3313,12 @@ paste_from_buffer (ClipboardRequest    *request_data,
 
   post_paste_cleanup (request_data);
       
-  g_object_unref (G_OBJECT (src_buffer));
-  g_free (request_data);
+  if (request_data->interactive) 
+    gtk_text_buffer_end_user_action (buffer);
+
+  g_object_unref (src_buffer);
+
+  free_clipboard_request (request_data);
 }
 
 static void
@@ -2979,7 +3328,8 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
 {
   ClipboardRequest *request_data = data;
   GtkTextBuffer *src_buffer;
-  
+  GtkTextBufferPrivate *priv;
+
   src_buffer = selection_data_get_buffer (selection_data, request_data); 
 
   if (src_buffer)
@@ -2989,7 +3339,7 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
       if (g_object_get_data (G_OBJECT (src_buffer), "gtk-text-buffer-clipboard"))
        {
          gtk_text_buffer_get_bounds (src_buffer, &start, &end);
-      
+
          paste_from_buffer (request_data, src_buffer,
                             &start, &end);
        }
@@ -3002,21 +3352,27 @@ clipboard_clipboard_buffer_received (GtkClipboard     *clipboard,
     }
   else
     {
-      /* Request the text selection instead */
-      gtk_clipboard_request_text (clipboard,
-                                  clipboard_text_received,
-                                  data);
+      priv = GTK_TEXT_BUFFER_GET_PRIVATE (request_data->buffer);
+
+      if (gtk_clipboard_wait_is_rich_text_available (clipboard,
+                                                     request_data->buffer))
+        {
+          /* Request rich text */
+          gtk_clipboard_request_rich_text (clipboard,
+                                           request_data->buffer,
+                                           clipboard_rich_text_received,
+                                           data);
+        }
+      else
+        {
+          /* Request the text selection instead */
+          gtk_clipboard_request_text (clipboard,
+                                      clipboard_text_received,
+                                      data);
+        }
     }
 }
 
-static const GtkTargetEntry targets[] = {
-  { "STRING", 0, TARGET_STRING },
-  { "TEXT",   0, TARGET_TEXT },
-  { "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
-  { "UTF8_STRING", 0, TARGET_UTF8_STRING },
-  { "GTK_TEXT_BUFFER_CONTENTS", 0, TARGET_TEXT_BUFFER_CONTENTS }
-};
-
 typedef struct
 {
   GtkClipboard *clipboard;
@@ -3026,7 +3382,13 @@ typedef struct
 static void
 update_selection_clipboards (GtkTextBuffer *buffer)
 {
-  GSList *tmp_list = buffer->selection_clipboards;
+  GtkTextBufferPrivate *priv;
+  GSList               *tmp_list = buffer->selection_clipboards;
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
   while (tmp_list)
     {
       GtkTextIter start;
@@ -3048,7 +3410,9 @@ update_selection_clipboards (GtkTextBuffer *buffer)
          /* Even if we already have the selection, we need to update our
           * timestamp.
           */
-         if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
+         if (!gtk_clipboard_set_with_owner (clipboard,
+                                             priv->copy_target_entries,
+                                             priv->n_copy_target_entries,
                                             clipboard_get_selection_cb,
                                             clipboard_clear_selection_cb,
                                             G_OBJECT (buffer)))
@@ -3190,8 +3554,7 @@ gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
                                  "gtk_paste_point_override",
                                  override_location, FALSE);
 
-  data->buffer = buffer;
-  g_object_ref (G_OBJECT (buffer));
+  data->buffer = g_object_ref (buffer);
   data->interactive = TRUE;
   data->default_editable = default_editable;
 
@@ -3210,7 +3573,7 @@ gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
     data->replace_selection = TRUE;
 
   gtk_clipboard_request_contents (clipboard,
-                                 gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+                                 gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
                                  clipboard_clipboard_buffer_received, data);
 }
 
@@ -3254,6 +3617,105 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
     }
 }
 
+/**
+ * gtk_text_buffer_backspace:
+ * @buffer: a #GtkTextBuffer
+ * @iter: a position in @buffer
+ * @interactive: whether the deletion is caused by user interaction
+ * @default_editable: whether the buffer is editable by default
+ * 
+ * Performs the appropriate action as if the user hit the delete
+ * key with the cursor at the position specified by @iter. In the
+ * normal case a single character will be deleted, but when
+ * combining accents are involved, more than one character can
+ * be deleted, and when precomposed character and accent combinations
+ * are involved, less than one character will be deleted.
+ * 
+ * Because the buffer is modified, all outstanding iterators become 
+ * invalid after calling this function; however, the @iter will be
+ * re-initialized to point to the location where text was deleted. 
+ *
+ * Return value: %TRUE if the buffer was modified
+
+ * Since: 2.6
+ **/
+gboolean
+gtk_text_buffer_backspace (GtkTextBuffer *buffer,
+                          GtkTextIter   *iter,
+                          gboolean       interactive,
+                          gboolean       default_editable)
+{
+  gchar *cluster_text;
+  GtkTextIter start;
+  GtkTextIter end;
+  gboolean retval = FALSE;
+  const PangoLogAttr *attrs;
+  int offset;
+  gboolean backspace_deletes_character;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+  g_return_val_if_fail (iter != NULL, FALSE);
+
+  start = *iter;
+  end = *iter;
+
+  attrs = _gtk_text_buffer_get_line_log_attrs (buffer, &start, NULL);
+
+  /* For no good reason, attrs is NULL for the empty last line in
+   * a buffer. Special case that here. (#156164)
+   */
+  if (attrs)
+    {
+      offset = gtk_text_iter_get_line_offset (&start);
+      backspace_deletes_character = attrs[offset].backspace_deletes_character;
+    }
+  else
+    backspace_deletes_character = FALSE;
+
+  gtk_text_iter_backward_cursor_position (&start);
+
+  if (gtk_text_iter_equal (&start, &end))
+    return FALSE;
+    
+  cluster_text = gtk_text_iter_get_text (&start, &end);
+
+  if (interactive)
+    gtk_text_buffer_begin_user_action (buffer);
+  
+  if (gtk_text_buffer_delete_interactive (buffer, &start, &end,
+                                         default_editable))
+    {
+      if (backspace_deletes_character)
+       {
+         gchar *normalized_text = g_utf8_normalize (cluster_text,
+                                                    strlen (cluster_text),
+                                                    G_NORMALIZE_NFD);
+         glong len = g_utf8_strlen (normalized_text, -1);
+         
+         if (len > 1)
+           gtk_text_buffer_insert_interactive (buffer,
+                                               &start,
+                                               normalized_text,
+                                               g_utf8_offset_to_pointer (normalized_text, len - 1) - normalized_text,
+                                               default_editable);
+         
+         g_free (normalized_text);
+       }
+
+      retval = TRUE;
+    }
+  
+  if (interactive)
+    gtk_text_buffer_end_user_action (buffer);
+  
+  g_free (cluster_text);
+
+  /* Revalidate the users iter */
+  *iter = start;
+
+  return retval;
+}
+
 static void
 cut_or_copy (GtkTextBuffer *buffer,
             GtkClipboard  *clipboard,
@@ -3261,6 +3723,8 @@ cut_or_copy (GtkTextBuffer *buffer,
              gboolean       interactive,
              gboolean       default_editable)
 {
+  GtkTextBufferPrivate *priv;
+
   /* We prefer to cut the selected region between selection_bound and
    * insertion point. If that region is empty, then we cut the region
    * between the "anchor" and the insertion point (this is for
@@ -3270,7 +3734,11 @@ cut_or_copy (GtkTextBuffer *buffer,
    */
   GtkTextIter start;
   GtkTextIter end;
-  
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  gtk_text_buffer_get_copy_target_list (buffer);
+
   if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
     {
       /* Let's try the anchor thing */
@@ -3290,18 +3758,23 @@ cut_or_copy (GtkTextBuffer *buffer,
       GtkTextIter ins;
       GtkTextBuffer *contents;
 
-      remove_clipboard_contents_buffer (buffer, clipboard);
-      contents = get_clipboard_contents_buffer (buffer, clipboard, TRUE);
+      contents = create_clipboard_contents_buffer (buffer);
 
       gtk_text_buffer_get_iter_at_offset (contents, &ins, 0);
       
       gtk_text_buffer_insert_range (contents, &ins, &start, &end);
                                     
-      if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
-                                         clipboard_get_contents_cb,
-                                         clipboard_clear_contents_cb,
-                                         G_OBJECT (buffer)))
-        clipboard_clear_contents_cb (clipboard, buffer);      
+      if (!gtk_clipboard_set_with_data (clipboard,
+                                        priv->copy_target_entries,
+                                        priv->n_copy_target_entries,
+                                       clipboard_get_contents_cb,
+                                       clipboard_clear_contents_cb,
+                                       contents))
+       g_object_unref (contents);
+      else
+       gtk_clipboard_set_can_store (clipboard,
+                                     priv->copy_target_entries + 1,
+                                     priv->n_copy_target_entries - 1);
 
       if (delete_region_after)
         {
@@ -3408,7 +3881,7 @@ gtk_text_buffer_begin_user_action (GtkTextBuffer *buffer)
   if (buffer->user_action_count == 1)
     {
       /* Outermost nested user action begin emits the signal */
-      g_signal_emit (G_OBJECT (buffer), signals[BEGIN_USER_ACTION], 0);
+      g_signal_emit (buffer, signals[BEGIN_USER_ACTION], 0);
     }
 }
 
@@ -3430,10 +3903,130 @@ gtk_text_buffer_end_user_action (GtkTextBuffer *buffer)
   if (buffer->user_action_count == 0)
     {
       /* Ended the outermost-nested user action end, so emit the signal */
-      g_signal_emit (G_OBJECT (buffer), signals[END_USER_ACTION], 0);
+      g_signal_emit (buffer, signals[END_USER_ACTION], 0);
     }
 }
 
+static void
+gtk_text_buffer_free_target_lists (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (priv->copy_target_list)
+    {
+      gtk_target_list_unref (priv->copy_target_list);
+      priv->copy_target_list = NULL;
+
+      gtk_target_table_free (priv->copy_target_entries,
+                             priv->n_copy_target_entries);
+      priv->copy_target_entries = NULL;
+      priv->n_copy_target_entries = 0;
+    }
+
+  if (priv->paste_target_list)
+    {
+      gtk_target_list_unref (priv->paste_target_list);
+      priv->paste_target_list = NULL;
+
+      gtk_target_table_free (priv->paste_target_entries,
+                             priv->n_paste_target_entries);
+      priv->paste_target_entries = NULL;
+      priv->n_paste_target_entries = 0;
+    }
+}
+
+static GtkTargetList *
+gtk_text_buffer_get_target_list (GtkTextBuffer   *buffer,
+                                 gboolean         deserializable,
+                                 GtkTargetEntry **entries,
+                                 gint            *n_entries)
+{
+  GtkTargetList *target_list;
+
+  target_list = gtk_target_list_new (NULL, 0);
+
+  gtk_target_list_add (target_list,
+                       gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
+                       GTK_TARGET_SAME_APP,
+                       GTK_TEXT_BUFFER_TARGET_INFO_BUFFER_CONTENTS);
+
+  gtk_target_list_add_rich_text_targets (target_list,
+                                         GTK_TEXT_BUFFER_TARGET_INFO_RICH_TEXT,
+                                         deserializable,
+                                         buffer);
+
+  gtk_target_list_add_text_targets (target_list,
+                                    GTK_TEXT_BUFFER_TARGET_INFO_TEXT);
+
+  *entries = gtk_target_table_new_from_list (target_list, n_entries);
+
+  return target_list;
+}
+
+/**
+ * gtk_text_buffer_get_copy_target_list:
+ * @buffer: a #GtkTextBuffer
+ *
+ * This function returns the list of targets this text buffer can
+ * provide for copying and as DND source. The targets in the list are
+ * added with %info values from the #GtkTextBufferTargetInfo enum,
+ * using gtk_target_list_add_rich_text_targets() and
+ * gtk_target_list_add_text_targets()
+ *
+ * Return value: the #GtkTargetList
+ *
+ * Since: 2.10
+ **/
+GtkTargetList *
+gtk_text_buffer_get_copy_target_list (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (! priv->copy_target_list)
+    priv->copy_target_list =
+      gtk_text_buffer_get_target_list (buffer, FALSE,
+                                       &priv->copy_target_entries,
+                                       &priv->n_copy_target_entries);
+
+  return priv->copy_target_list;
+}
+
+/**
+ * gtk_text_buffer_get_paste_target_list:
+ * @buffer: a #GtkTextBuffer
+ *
+ * This function returns the list of targets this text buffer supports
+ * for pasting and as DND destination. The targets in the list are
+ * added with %info values from the #GtkTextBufferTargetInfo enum,
+ * using gtk_target_list_add_rich_text_targets() and
+ * gtk_target_list_add_text_targets()
+ *
+ * Return value: the #GtkTargetList
+ *
+ * Since: 2.10
+ **/
+GtkTargetList *
+gtk_text_buffer_get_paste_target_list (GtkTextBuffer *buffer)
+{
+  GtkTextBufferPrivate *priv;
+
+  g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+  priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+
+  if (! priv->paste_target_list)
+    priv->paste_target_list =
+      gtk_text_buffer_get_target_list (buffer, TRUE,
+                                       &priv->paste_target_entries,
+                                       &priv->n_paste_target_entries);
+
+  return priv->paste_target_list;
+}
+
 /*
  * Logical attribute cache
  */
@@ -3613,3 +4206,6 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
 {
   _gtk_text_btree_spew (get_btree (buffer));
 }
+
+#define __GTK_TEXT_BUFFER_C__
+#include "gtkaliasdef.c"