]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkselection.c
Make the clipboard image API more robust (#162357, Torsten Schoenfeld):
[~andy/gtk] / gtk / gtkselection.c
index 2bfbf95ed0044b67b84ebe034df8e5598b17e3a4..1d147b9976bab77cf3236cc32fcfcd2eddc4d7a7 100644 (file)
@@ -2,27 +2,27 @@
  * 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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.
  */
 
-/* This file implements most of the work of the ICCM selection protocol.
+/* This file implements most of the work of the ICCCM selection protocol.
  * The code was written after an intensive study of the equivalent part
  * of John Ousterhout's Tk toolkit, and does many things in much the 
  * same way.
  *
- * The one thing in the ICCM that isn't fully supported here (or in Tk)
+ * The one thing in the ICCCM that isn't fully supported here (or in Tk)
  * is side effects targets. For these to be handled properly, MULTIPLE
  * targets need to be done in the order specified. This cannot be
  * guaranteed with the way we do things, since if we are doing INCR
    to the TARGETS request, though I don't really think so ... */
 
 /*
- * Modified by the GTK+ Team and others 1997-1999.  See the AUTHORS
+ * 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 <stdarg.h>
 #include <string.h>
 #include "gdk.h"
 
-#if defined (GDK_WINDOWING_X11)
-#include "x11/gdkx.h"          /* For gdk_window_lookup() */
-#elif defined (GDK_WINDOWING_WIN32)
-#include "win32/gdkwin32.h"    /* For gdk_window_lookup() */
-#elif defined (GDK_WINDOWING_NANOX)
-#include "nanox/gdkprivate-nanox.h"    /* For gdk_window_lookup() */
-#endif
-
+#include "gtkalias.h"
 #include "gtkmain.h"
 #include "gtkselection.h"
-#include "gtksignal.h"
+#include "gdk-pixbuf/gdk-pixbuf.h"
+
+#ifdef GDK_WINDOWING_X11
+#include "x11/gdkx.h"
+#endif
 
-/* #define DEBUG_SELECTION */
+#undef DEBUG_SELECTION
 
 /* Maximum size of a sent chunk, in bytes. Also the default size of
    our buffers */
-#ifdef GDK_WINDOWING_WIN32
-/* No chunks on Win32 */
-#define GTK_SELECTION_MAX_SIZE G_MAXINT
+#ifdef GDK_WINDOWING_X11
+#define GTK_SELECTION_MAX_SIZE(display)                                 \
+  MIN(262144,                                                           \
+      XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) == 0     \
+       ? XMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100         \
+       : XExtendedMaxRequestSize (GDK_DISPLAY_XDISPLAY (display)) - 100)
 #else
-#define GTK_SELECTION_MAX_SIZE 4000
+/* No chunks on Win32 */
+#define GTK_SELECTION_MAX_SIZE(display) G_MAXINT
 #endif
+
+#define IDLE_ABORT_TIME 30
+
 enum {
   INCR,
   MULTIPLE,
@@ -92,9 +97,10 @@ typedef struct _GtkRetrievalInfo GtkRetrievalInfo;
 
 struct _GtkSelectionInfo
 {
-  GdkAtom    selection;
-  GtkWidget *widget;           /* widget that owns selection */
-  guint32    time;             /* time used to acquire selection */
+  GdkAtom       selection;
+  GtkWidget    *widget;        /* widget that owns selection */
+  guint32       time;          /* time used to acquire selection */
+  GdkDisplay   *display;       /* needed in gtk_selection_remove_all */    
 };
 
 struct _GtkIncrConversion 
@@ -110,7 +116,6 @@ struct _GtkIncrConversion
 
 struct _GtkIncrInfo
 {
-  GtkWidget *widget;           /* Selection owner */
   GdkWindow *requestor;                /* Requestor window - we create a GdkWindow
                                   so we can receive events */
   GdkAtom    selection;                /* Selection we're sending */
@@ -139,18 +144,21 @@ struct _GtkRetrievalInfo
 };
 
 /* Local Functions */
-static void gtk_selection_init                  (void);
-static gint gtk_selection_incr_timeout          (GtkIncrInfo *info);
-static gint gtk_selection_retrieval_timeout     (GtkRetrievalInfo *info);
-static void gtk_selection_retrieval_report      (GtkRetrievalInfo *info,
-                                                 GdkAtom type, gint format, 
-                                                 guchar *buffer, gint length,
-                                                 guint32 time);
-static void gtk_selection_invoke_handler        (GtkWidget        *widget,
-                                                 GtkSelectionData *data,
-                                                 guint             time);
-static void gtk_selection_default_handler       (GtkWidget       *widget,
-                                                 GtkSelectionData *data);
+static void gtk_selection_init              (void);
+static gint gtk_selection_incr_timeout      (GtkIncrInfo      *info);
+static gint gtk_selection_retrieval_timeout (GtkRetrievalInfo *info);
+static void gtk_selection_retrieval_report  (GtkRetrievalInfo *info,
+                                            GdkAtom           type,
+                                            gint              format,
+                                            guchar           *buffer,
+                                            gint              length,
+                                            guint32           time);
+static void gtk_selection_invoke_handler    (GtkWidget        *widget,
+                                            GtkSelectionData *data,
+                                            guint             time);
+static void gtk_selection_default_handler   (GtkWidget        *widget,
+                                            GtkSelectionData *data);
+static int  gtk_selection_bytes_per_item    (gint              format);
 
 /* Local Data */
 static gint initialize = TRUE;
@@ -159,7 +167,7 @@ static GList *current_incrs = NULL;
 static GList *current_selections = NULL;
 
 static GdkAtom gtk_selection_atoms[LAST_ATOM];
-static const char *gtk_selection_handler_key = "gtk-selection-handlers";
+static const char gtk_selection_handler_key[] = "gtk-selection-handlers";
 
 /****************
  * Target Lists *
@@ -216,9 +224,9 @@ gtk_target_list_unref (GtkTargetList *list)
 
 void 
 gtk_target_list_add (GtkTargetList *list,
-                    GdkAtom            target,
-                    guint              flags,
-                    guint              info)
+                    GdkAtom        target,
+                    guint          flags,
+                    guint          info)
 {
   GtkTargetPair *pair;
 
@@ -232,6 +240,130 @@ gtk_target_list_add (GtkTargetList *list,
   list->list = g_list_append (list->list, pair);
 }
 
+static GdkAtom utf8_atom;
+static GdkAtom text_atom;
+static GdkAtom ctext_atom;
+static GdkAtom text_plain_atom;
+static GdkAtom text_plain_utf8_atom;
+static GdkAtom text_plain_locale_atom;
+static GdkAtom text_uri_list_atom;
+
+static void 
+init_atoms (void)
+{
+  gchar *tmp;
+  const gchar *charset;
+
+  if (!utf8_atom)
+    {
+      utf8_atom = gdk_atom_intern ("UTF8_STRING", FALSE);
+      text_atom = gdk_atom_intern ("TEXT", FALSE);
+      ctext_atom = gdk_atom_intern ("COMPOUND_TEXT", FALSE);
+      text_plain_atom = gdk_atom_intern ("text/plain", FALSE);
+      text_plain_utf8_atom = gdk_atom_intern ("text/plain;charset=utf-8", FALSE);
+      g_get_charset (&charset);
+      tmp = g_strdup_printf ("text/plain;charset=%s", charset);
+      text_plain_locale_atom = gdk_atom_intern (tmp, FALSE);
+      g_free (tmp);
+
+      text_uri_list_atom = gdk_atom_intern ("text/uri-list", FALSE);
+    }
+}
+
+/**
+ * gtk_target_list_add_text_targets:
+ * @list: a #GtkTargetList
+ * @info: an ID that will be passed back to the application
+ * 
+ * Adds the text targets supported by #GtkSelection to
+ * the target list. All targets are added with the same @info.
+ * 
+ * Since: 2.6
+ **/
+void 
+gtk_target_list_add_text_targets (GtkTargetList *list,
+                                 guint          info)
+{
+  g_return_if_fail (list != NULL);
+  
+  init_atoms ();
+
+  /* Keep in sync with gtk_selection_data_targets_include_text()
+   */
+  gtk_target_list_add (list, utf8_atom, 0, info);  
+  gtk_target_list_add (list, ctext_atom, 0, info);  
+  gtk_target_list_add (list, text_atom, 0, info);  
+  gtk_target_list_add (list, GDK_TARGET_STRING, 0, info);  
+  gtk_target_list_add (list, text_plain_utf8_atom, 0, info);  
+  gtk_target_list_add (list, text_plain_locale_atom, 0, info);  
+  gtk_target_list_add (list, text_plain_atom, 0, info);  
+}
+
+/**
+ * gtk_target_list_add_image_targets:
+ * @list: a #GtkTargetList
+ * @info: an ID that will be passed back to the application
+ * @writable: whether to add only targets for which GTK+ knows
+ *   how to convert a pixbuf into the format
+ * 
+ * Adds the image targets supported by #GtkSelection to
+ * the target list. All targets are added with the same @info.
+ * 
+ * Since: 2.6
+ **/
+void 
+gtk_target_list_add_image_targets (GtkTargetList *list,
+                                  guint          info,
+                                  gboolean       writable)
+{
+  GSList *formats, *f;
+  gchar **mimes, **m;
+  GdkAtom atom;
+
+  g_return_if_fail (list != NULL);
+
+  formats = gdk_pixbuf_get_formats ();
+
+  for (f = formats; f; f = f->next)
+    {
+      GdkPixbufFormat *fmt = f->data;
+
+      if (writable && !gdk_pixbuf_format_is_writable (fmt))
+       continue;
+      
+      mimes = gdk_pixbuf_format_get_mime_types (fmt);
+      for (m = mimes; *m; m++)
+       {
+         atom = gdk_atom_intern (*m, FALSE);
+         gtk_target_list_add (list, atom, 0, info);  
+       }
+      g_strfreev (mimes);
+    }
+
+  g_slist_free (formats);
+}
+
+/**
+ * gtk_target_list_add_uri_targets:
+ * @list: a #GtkTargetList
+ * @info: an ID that will be passed back to the application
+ * 
+ * Adds the URI targets supported by #GtkSelection to
+ * the target list. All targets are added with the same @info.
+ * 
+ * Since: 2.6
+ **/
+void 
+gtk_target_list_add_uri_targets (GtkTargetList *list,
+                                guint          info)
+{
+  g_return_if_fail (list != NULL);
+  
+  init_atoms ();
+
+  gtk_target_list_add (list, text_uri_list_atom, 0, info);  
+}
+
 void               
 gtk_target_list_add_table (GtkTargetList        *list,
                           const GtkTargetEntry *targets,
@@ -298,56 +430,54 @@ gtk_target_list_find (GtkTargetList *list,
   return FALSE;
 }
 
-
-/*************************************************************
- * gtk_selection_owner_set:
- *     Claim ownership of a selection.
- *   arguments:
- *     widget:         new selection owner
- *     selection:      which selection
- *     time:           time (use GDK_CURRENT_TIME only if necessary)
+/**
+ * gtk_selection_owner_set_for_display:
+ * @display: the #Gdkdisplay where the selection is set 
+ * @widget: new selection owner (a #GdkWidget), or %NULL.
+ * @selection: an interned atom representing the selection to claim.
+ * @time_: timestamp with which to claim the selection
  *
- *   results:
- *************************************************************/
-
-gint
-gtk_selection_owner_set (GtkWidget *widget,
-                        GdkAtom    selection,
-                        guint32    time)
+ * Claim ownership of a given selection for a particular widget, or,
+ * if @widget is %NULL, release ownership of the selection.
+ *
+ * Return value: TRUE if the operation succeeded 
+ * 
+ * Since: 2.2
+ */
+gboolean
+gtk_selection_owner_set_for_display (GdkDisplay   *display,
+                                    GtkWidget    *widget,
+                                    GdkAtom       selection,
+                                    guint32       time)
 {
   GList *tmp_list;
   GtkWidget *old_owner;
   GtkSelectionInfo *selection_info = NULL;
   GdkWindow *window;
+
+  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);
+  g_return_val_if_fail (selection != GDK_NONE, FALSE);
+  g_return_val_if_fail (widget == NULL || GTK_WIDGET_REALIZED (widget), FALSE);
+  g_return_val_if_fail (widget == NULL || gtk_widget_get_display (widget) == display, FALSE);
   
   if (widget == NULL)
     window = NULL;
   else
-    {
-      if (!GTK_WIDGET_REALIZED (widget))
-       gtk_widget_realize (widget);
-      
-      window = widget->window;
-    }
-  
+    window = widget->window;
+
   tmp_list = current_selections;
   while (tmp_list)
     {
-      selection_info = (GtkSelectionInfo *)tmp_list->data;
-      
-      if (selection_info->selection == selection)
-       break;
+      if (((GtkSelectionInfo *)tmp_list->data)->selection == selection)
+       {
+         selection_info = tmp_list->data;
+         break;
+       }
       
       tmp_list = tmp_list->next;
     }
   
-  if (tmp_list == NULL)
-    selection_info = NULL;
-  else
-    if (selection_info->widget == widget)
-      return TRUE;
-  
-  if (gdk_selection_owner_set (window, selection, time, TRUE))
+  if (gdk_selection_owner_set_for_display (display, window, selection, time, TRUE))
     {
       old_owner = NULL;
       
@@ -370,29 +500,32 @@ gtk_selection_owner_set (GtkWidget *widget,
              selection_info->selection = selection;
              selection_info->widget = widget;
              selection_info->time = time;
-             current_selections = g_list_append (current_selections, 
-                                                 selection_info);
+             selection_info->display = display;
+             current_selections = g_list_prepend (current_selections,
+                                                  selection_info);
            }
          else
            {
              old_owner = selection_info->widget;
              selection_info->widget = widget;
              selection_info->time = time;
+             selection_info->display = display;
            }
        }
       /* If another widget in the application lost the selection,
-       *  send it a GDK_SELECTION_CLEAR event, unless we're setting
-       *  the owner to None, in which case an event will be sent */
-      if (old_owner && (widget != NULL))
+       *  send it a GDK_SELECTION_CLEAR event.
+       */
+      if (old_owner && old_owner != widget)
        {
-         GdkEventSelection event;
+         GdkEvent *event = gdk_event_new (GDK_SELECTION_CLEAR);
          
-         event.type = GDK_SELECTION_CLEAR;
-         event.window = old_owner->window;
-         event.selection = selection;
-         event.time = time;
+         event->selection.window = g_object_ref (old_owner->window);
+         event->selection.selection = selection;
+         event->selection.time = time;
          
-         gtk_widget_event (old_owner, (GdkEvent *) &event);
+         gtk_widget_event (old_owner, event);
+
+         gdk_event_free (event);
        }
       return TRUE;
     }
@@ -400,6 +533,41 @@ gtk_selection_owner_set (GtkWidget *widget,
     return FALSE;
 }
 
+/**
+ * gtk_selection_owner_set:
+ * @widget:  a #GtkWidget, or %NULL.
+ * @selection:  an interned atom representing the selection to claim
+ * @time_: timestamp with which to claim the selection
+ * 
+ * Claims ownership of a given selection for a particular widget,
+ * or, if @widget is %NULL, release ownership of the selection.
+ * 
+ * Return value: %TRUE if the operation succeeded
+ **/
+gboolean
+gtk_selection_owner_set (GtkWidget *widget,
+                        GdkAtom    selection,
+                        guint32    time)
+{
+  GdkDisplay *display;
+  
+  g_return_val_if_fail (widget == NULL || GTK_WIDGET_REALIZED (widget), FALSE);
+  g_return_val_if_fail (selection != GDK_NONE, FALSE);
+
+  if (widget)
+    display = gtk_widget_get_display (widget);
+  else
+    {
+      GTK_NOTE (MULTIHEAD,
+               g_warning ("gtk_selection_owner_set (NULL,...) is not multihead safe"));
+                
+      display = gdk_display_get_default ();
+    }
+  
+  return gtk_selection_owner_set_for_display (display, widget,
+                                             selection, time);
+}
+
 /*************************************************************
  * gtk_selection_add_target
  *     Add specified target to list of supported targets
@@ -428,7 +596,7 @@ gtk_selection_target_list_get (GtkWidget    *widget,
   GList *tmp_list;
   GList *lists;
 
-  lists = gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
+  lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key);
   
   tmp_list = lists;
   while (tmp_list)
@@ -444,7 +612,7 @@ gtk_selection_target_list_get (GtkWidget    *widget,
   sellist->list = gtk_target_list_new (NULL, 0);
 
   lists = g_list_prepend (lists, sellist);
-  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, lists);
+  g_object_set_data (G_OBJECT (widget), gtk_selection_handler_key, lists);
 
   return sellist->list;
 }
@@ -456,7 +624,7 @@ gtk_selection_target_list_remove (GtkWidget    *widget)
   GList *tmp_list;
   GList *lists;
 
-  lists = gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
+  lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key);
   
   tmp_list = lists;
   while (tmp_list)
@@ -470,7 +638,47 @@ gtk_selection_target_list_remove (GtkWidget    *widget)
     }
 
   g_list_free (lists);
-  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
+  g_object_set_data (G_OBJECT (widget), gtk_selection_handler_key, NULL);
+}
+
+/**
+ * gtk_selection_clear_targets:
+ * @widget:    a #GtkWidget
+ * @selection: an atom representing a selection
+ *
+ * Remove all targets registered for the given selection for the
+ * widget.
+ **/
+void 
+gtk_selection_clear_targets (GtkWidget *widget,
+                            GdkAtom    selection)
+{
+  GtkSelectionTargetList *sellist;
+  GList *tmp_list;
+  GList *lists;
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (selection != GDK_NONE);
+
+  lists = g_object_get_data (G_OBJECT (widget), gtk_selection_handler_key);
+  
+  tmp_list = lists;
+  while (tmp_list)
+    {
+      sellist = tmp_list->data;
+      if (sellist->selection == selection)
+       {
+         lists = g_list_delete_link (lists, tmp_list);
+         gtk_target_list_unref (sellist->list);
+         g_free (sellist);
+
+         break;
+       }
+      
+      tmp_list = tmp_list->next;
+    }
+  
+  g_object_set_data (G_OBJECT (widget), gtk_selection_handler_key, lists);
 }
 
 void 
@@ -481,7 +689,8 @@ gtk_selection_add_target (GtkWidget     *widget,
 {
   GtkTargetList *list;
 
-  g_return_if_fail (widget != NULL);
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (selection != GDK_NONE);
 
   list = gtk_selection_target_list_get (widget, selection);
   gtk_target_list_add (list, target, 0, info);
@@ -494,14 +703,16 @@ gtk_selection_add_targets (GtkWidget            *widget,
                           guint                 ntargets)
 {
   GtkTargetList *list;
-  
-  g_return_if_fail (widget != NULL);
+
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (selection != GDK_NONE);
   g_return_if_fail (targets != NULL);
   
   list = gtk_selection_target_list_get (widget, selection);
   gtk_target_list_add_table (list, targets, ntargets);
 }
 
+
 /*************************************************************
  * gtk_selection_remove_all:
  *     Removes all handlers and unsets ownership of all 
@@ -522,19 +733,6 @@ gtk_selection_remove_all (GtkWidget *widget)
   
   /* Remove pending requests/incrs for this widget */
   
-  tmp_list = current_incrs;
-  while (tmp_list)
-    {
-      next = tmp_list->next;
-      if (((GtkIncrInfo *)tmp_list->data)->widget == widget)
-       {
-         current_incrs = g_list_remove_link (current_incrs, tmp_list);
-         /* structure will be freed in timeout */
-         g_list_free (tmp_list);
-       }
-      tmp_list = next;
-    }
-  
   tmp_list = current_retrievals;
   while (tmp_list)
     {
@@ -559,10 +757,11 @@ gtk_selection_remove_all (GtkWidget *widget)
       
       if (selection_info->widget == widget)
        {       
-         gdk_selection_owner_set (NULL, 
-                                  selection_info->selection,
-                                  GDK_CURRENT_TIME, FALSE);
-         current_selections = g_list_remove_link (current_selections, 
+         gdk_selection_owner_set_for_display (selection_info->display,
+                                              NULL, 
+                                              selection_info->selection,
+                                              GDK_CURRENT_TIME, FALSE);
+         current_selections = g_list_remove_link (current_selections,
                                                   tmp_list);
          g_list_free (tmp_list);
          g_free (selection_info);
@@ -593,7 +792,7 @@ gtk_selection_remove_all (GtkWidget *widget)
  *     this widget). 
  *************************************************************/
 
-gint
+gboolean
 gtk_selection_convert (GtkWidget *widget, 
                       GdkAtom    selection, 
                       GdkAtom    target,
@@ -602,8 +801,10 @@ gtk_selection_convert (GtkWidget *widget,
   GtkRetrievalInfo *info;
   GList *tmp_list;
   GdkWindow *owner_window;
+  GdkDisplay *display;
   
-  g_return_val_if_fail (widget != NULL, FALSE);
+  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
+  g_return_val_if_fail (selection != GDK_NONE, FALSE);
   
   if (initialize)
     gtk_selection_init ();
@@ -631,13 +832,15 @@ gtk_selection_convert (GtkWidget *widget,
   info->widget = widget;
   info->selection = selection;
   info->target = target;
+  info->idle_time = 0;
   info->buffer = NULL;
   info->offset = -1;
   
   /* Check if this process has current owner. If so, call handler
      procedure directly to avoid deadlocks with INCR. */
-  
-  owner_window = gdk_selection_owner_get (selection);
+
+  display = gtk_widget_get_display (widget);
+  owner_window = gdk_selection_owner_get_for_display (display, selection);
   
   if (owner_window != NULL)
     {
@@ -648,6 +851,7 @@ gtk_selection_convert (GtkWidget *widget,
       selection_data.target = target;
       selection_data.data = NULL;
       selection_data.length = -1;
+      selection_data.display = display;
       
       gdk_window_get_user_data (owner_window, (gpointer *)&owner_widget);
       
@@ -675,7 +879,7 @@ gtk_selection_convert (GtkWidget *widget,
   
   current_retrievals = g_list_append (current_retrievals, info);
   gdk_selection_convert (widget->window, selection, target, time);
-  gtk_timeout_add (1000, (GtkFunction) gtk_selection_retrieval_timeout, info);
+  g_timeout_add (1000, (GSourceFunc) gtk_selection_retrieval_timeout, info);
   
   return TRUE;
 }
@@ -725,6 +929,633 @@ gtk_selection_data_set (GtkSelectionData *selection_data,
   selection_data->length = length;
 }
 
+static gboolean
+selection_set_string (GtkSelectionData *selection_data,
+                     const gchar      *str,
+                     gint              len)
+{
+  gchar *tmp = g_strndup (str, len);
+  gchar *latin1 = gdk_utf8_to_string_target (tmp);
+  g_free (tmp);
+  
+  if (latin1)
+    {
+      gtk_selection_data_set (selection_data,
+                             GDK_SELECTION_TYPE_STRING,
+                             8, latin1, strlen (latin1));
+      g_free (latin1);
+      
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+static gboolean
+selection_set_compound_text (GtkSelectionData *selection_data,
+                            const gchar      *str,
+                            gint              len)
+{
+  gchar *tmp;
+  guchar *text;
+  GdkAtom encoding;
+  gint format;
+  gint new_length;
+  gboolean result = FALSE;
+  
+  tmp = g_strndup (str, len);
+  if (gdk_utf8_to_compound_text_for_display (selection_data->display, tmp,
+                                            &encoding, &format, &text, &new_length))
+    {
+      gtk_selection_data_set (selection_data, encoding, format, text, new_length);
+      gdk_free_compound_text (text);
+      
+      result = TRUE;
+    }
+
+  g_free (tmp);
+
+  return result;
+}
+
+/* Normalize \r and \n into \r\n
+ */
+static gchar *
+normalize_to_crlf (const gchar *str, 
+                  gint         len)
+{
+  GString *result = g_string_sized_new (len);
+  const gchar *p = str;
+
+  while (1)
+    {
+      if (*p == '\n')
+       g_string_append_c (result, '\r');
+
+      if (*p == '\r')
+       {
+         g_string_append_c (result, *p);
+         p++;
+         if (*p != '\n')
+           g_string_append_c (result, '\n');
+       }
+
+      if (*p == '\0')
+       break;
+
+      g_string_append_c (result, *p);
+      p++;
+    }
+
+  return g_string_free (result, FALSE);  
+}
+
+/* Normalize \r and \r\n into \n
+ */
+static gchar *
+normalize_to_lf (gchar *str, 
+                gint   len)
+{
+  GString *result = g_string_sized_new (len);
+  const gchar *p = str;
+
+  while (1)
+    {
+      if (*p == '\r')
+       {
+         p++;
+         if (*p != '\n')
+           g_string_append_c (result, '\n');
+       }
+
+      if (*p == '\0')
+       break;
+
+      g_string_append_c (result, *p);
+      p++;
+    }
+
+  return g_string_free (result, FALSE);  
+}
+
+static gboolean
+selection_set_text_plain (GtkSelectionData *selection_data,
+                         const gchar      *str,
+                         gint              len)
+{
+  const gchar *charset = NULL;
+  gchar *result;
+  GError *error = NULL;
+
+  result = normalize_to_crlf (str, len);
+  if (selection_data->target == text_plain_atom)
+    charset = "ASCII";
+  else if (selection_data->target == text_plain_locale_atom)
+    g_get_charset (&charset);
+
+  if (charset)
+    {
+      gchar *tmp = result;
+      result = g_convert_with_fallback (tmp, -1, 
+                                       charset, "UTF-8", 
+                                       NULL, NULL, NULL, &error);
+      g_free (tmp);
+    }
+
+  if (!result)
+    {
+      g_warning ("Error converting from UTF-8 to %s: %s",
+                charset, error->message);
+      g_error_free (error);
+      
+      return FALSE;
+    }
+  
+  gtk_selection_data_set (selection_data,
+                         selection_data->target, 
+                         8, result, strlen (result));
+  g_free (result);
+  
+  return TRUE;
+}
+
+static gchar *
+selection_get_text_plain (GtkSelectionData *selection_data)
+{
+  const gchar *charset = NULL;
+  gchar *str, *result;
+  gsize len;
+  GError *error = NULL;
+
+  str = g_strdup (selection_data->data);
+  len = selection_data->length;
+  
+  if (selection_data->type == text_plain_atom)
+    charset = "ISO-8859-1";
+  else if (selection_data->type == text_plain_locale_atom)
+    g_get_charset (&charset);
+
+  if (charset)
+    {
+      gchar *tmp = str;
+      str = g_convert_with_fallback (tmp, len, 
+                                    charset, "UTF-8", 
+                                    NULL, NULL, &len, &error);
+      g_free (tmp);
+
+      if (!str)
+       {
+         g_warning ("Error converting from %s to UTF-8: %s",
+                     charset, error->message);
+         g_error_free (error);
+
+         return NULL;
+       }
+    }
+  else if (!g_utf8_validate (str, -1, NULL))
+    {
+      g_warning ("Error converting from text/plain;charset=utf-8 to UTF-8");
+      g_free (str);
+
+      return NULL;
+    }
+
+  result = normalize_to_lf (str, len);
+  g_free (str);
+
+  return result;
+}
+
+/**
+ * gtk_selection_data_set_text:
+ * @selection_data: a #GtkSelectionData
+ * @str: a UTF-8 string
+ * @len: the length of @str, or -1 if @str is nul-terminated.
+ * 
+ * Sets the contents of the selection from a UTF-8 encoded string.
+ * The string is converted to the form determined by
+ * @selection_data->target.
+ * 
+ * Return value: %TRUE if the selection was successfully set,
+ *   otherwise %FALSE.
+ **/
+gboolean
+gtk_selection_data_set_text (GtkSelectionData     *selection_data,
+                            const gchar          *str,
+                            gint                  len)
+{
+  if (len < 0)
+    len = strlen (str);
+  
+  init_atoms ();
+
+  if (selection_data->target == utf8_atom)
+    {
+      gtk_selection_data_set (selection_data,
+                             utf8_atom,
+                             8, (guchar *)str, len);
+      return TRUE;
+    }
+  else if (selection_data->target == GDK_TARGET_STRING)
+    {
+      return selection_set_string (selection_data, str, len);
+    }
+  else if (selection_data->target == ctext_atom ||
+          selection_data->target == text_atom)
+    {
+      if (selection_set_compound_text (selection_data, str, len))
+       return TRUE;
+      else if (selection_data->target == text_atom)
+       return selection_set_string (selection_data, str, len);
+    }
+  else if (selection_data->target == text_plain_atom ||
+          selection_data->target == text_plain_utf8_atom ||
+          selection_data->target == text_plain_locale_atom)
+    {
+      return selection_set_text_plain (selection_data, str, len);
+    }
+
+  return FALSE;
+}
+
+/**
+ * gtk_selection_data_get_text:
+ * @selection_data: a #GtkSelectionData
+ * 
+ * Gets the contents of the selection data as a UTF-8 string.
+ * 
+ * Return value: if the selection data contained a recognized
+ *   text type and it could be converted to UTF-8, a newly allocated
+ *   string containing the converted text, otherwise %NULL.
+ *   If the result is non-%NULL it must be freed with g_free().
+ **/
+guchar *
+gtk_selection_data_get_text (GtkSelectionData *selection_data)
+{
+  guchar *result = NULL;
+
+  init_atoms ();
+  
+  if (selection_data->length >= 0 &&
+      (selection_data->type == GDK_TARGET_STRING ||
+       selection_data->type == ctext_atom ||
+       selection_data->type == utf8_atom))
+    {
+      gchar **list;
+      gint i;
+      gint count = gdk_text_property_to_utf8_list_for_display (selection_data->display,
+                                                              selection_data->type,
+                                                              selection_data->format, 
+                                                              selection_data->data,
+                                                              selection_data->length,
+                                                              &list);
+      if (count > 0)
+       result = list[0];
+
+      for (i = 1; i < count; i++)
+       g_free (list[i]);
+      g_free (list);
+    }
+  else if (selection_data->length >= 0 &&
+          (selection_data->type == text_plain_atom ||
+           selection_data->type == text_plain_utf8_atom ||
+           selection_data->type == text_plain_locale_atom))
+    {
+      result = selection_get_text_plain (selection_data);
+    }
+
+  return result;
+}
+
+/**
+ * gtk_selection_data_set_pixbuf:
+ * @selection_data: a #GtkSelectionData
+ * @pixbuf: a #GdkPixbuf
+ * 
+ * Sets the contents of the selection from a #GdkPixbuf
+ * The pixbuf is converted to the form determined by
+ * @selection_data->target.
+ * 
+ * Return value: %TRUE if the selection was successfully set,
+ *   otherwise %FALSE.
+ *
+ * Since: 2.6
+ **/
+gboolean
+gtk_selection_data_set_pixbuf (GtkSelectionData *selection_data,
+                              GdkPixbuf        *pixbuf)
+{
+  GSList *formats, *f;
+  gchar **mimes, **m;
+  GdkAtom atom;
+  gboolean result;
+  gchar *str, *type;
+  gsize len;
+
+  formats = gdk_pixbuf_get_formats ();
+
+  for (f = formats; f; f = f->next)
+    {
+      GdkPixbufFormat *fmt = f->data;
+
+      mimes = gdk_pixbuf_format_get_mime_types (fmt);
+      for (m = mimes; *m; m++)
+       {
+         atom = gdk_atom_intern (*m, FALSE);
+         if (selection_data->target == atom)
+           {
+             str = NULL;
+             type = gdk_pixbuf_format_get_name (fmt),
+             result = gdk_pixbuf_save_to_buffer (pixbuf, &str, &len,
+                                                 type, NULL, NULL);
+             if (result) 
+               gtk_selection_data_set (selection_data,
+                                       atom, 8, (guchar *)str, len);
+             g_free (type);
+             g_free (str);
+             g_strfreev (mimes);
+             g_slist_free (formats);
+             
+             return result;
+           }
+       }
+
+      g_strfreev (mimes);
+    }
+
+  g_slist_free (formats);
+  return FALSE;
+}
+
+/**
+ * gtk_selection_data_get_pixbuf:
+ * @selection_data: a #GtkSelectionData
+ * 
+ * Gets the contents of the selection data as a #GdkPixbuf.
+ * 
+ * Return value: if the selection data contained a recognized
+ *   image type and it could be converted to a #GdkPixbuf, a 
+ *   newly allocated pixbuf is returned, otherwise %NULL.
+ *   If the result is non-%NULL it must be freed with g_object_unref().
+ *
+ * Since: 2.6
+ **/
+GdkPixbuf *
+gtk_selection_data_get_pixbuf (GtkSelectionData *selection_data)
+{
+  GdkPixbufLoader *loader;
+  GdkPixbuf *result = NULL;
+
+  if (selection_data->length > 0)
+    {
+      loader = gdk_pixbuf_loader_new ();
+      
+      if (gdk_pixbuf_loader_write (loader, 
+                                  selection_data->data,
+                                  selection_data->length,
+                                  NULL))
+       result = gdk_pixbuf_loader_get_pixbuf (loader);
+      
+      if (result)
+       g_object_ref (result);
+      
+      gdk_pixbuf_loader_close (loader, NULL);
+      g_object_unref (loader);
+    }
+
+  return result;
+}
+
+/**
+ * gtk_selection_data_set_uris:
+ * @selection_data: a #GtkSelectionData
+ * @uris: a %NULL-terminated array of strings hilding URIs
+ * 
+ * Sets the contents of the selection from a list of URIs.
+ * The string is converted to the form determined by
+ * @selection_data->target.
+ * 
+ * Return value: %TRUE if the selection was successfully set,
+ *   otherwise %FALSE.
+ *
+ * Since: 2.6
+ **/
+gboolean
+gtk_selection_data_set_uris (GtkSelectionData  *selection_data,
+                            gchar            **uris)
+{
+  init_atoms ();
+
+  if (selection_data->target == text_uri_list_atom)
+    {
+      GString *list;
+      gint i;
+      gchar *result;
+      gsize length;
+      
+      list = g_string_new (NULL);
+      for (i = 0; uris[i]; i++)
+       {
+         g_string_append (list, uris[i]);
+         g_string_append (list, "\r\n");
+       }
+
+      result = g_convert (list->str, list->len,
+                         "ASCII", "UTF-8", 
+                         NULL, &length, NULL);
+      g_string_free (list, TRUE);
+      
+      if (result)
+       {
+         gtk_selection_data_set (selection_data,
+                                 text_uri_list_atom,
+                                 8, (guchar *)result, length);
+         
+         return TRUE;
+       }
+    }
+
+  return FALSE;
+}
+
+/**
+ * gtk_selection_data_get_uris:
+ * @selection_data: a #GtkSelectionData
+ * 
+ * Gets the contents of the selection data as array of URIs.
+ * 
+ * Return value: if the selection data contains a list of
+ *   URIs, a newly allocated %NULL-terminated string array
+ *   containing the URIs, otherwise %NULL. If the result is 
+ *   non-%NULL it must be freed with g_strfreev().
+ *
+ * Since: 2.6
+ **/
+gchar **
+gtk_selection_data_get_uris (GtkSelectionData *selection_data)
+{
+  gchar **result = NULL;
+
+  init_atoms ();
+  
+  if (selection_data->length >= 0 &&
+      selection_data->type == text_uri_list_atom)
+    {
+      gchar **list;
+      gint i;
+      gint count = gdk_text_property_to_utf8_list_for_display (selection_data->display,
+                                                              utf8_atom,
+                                                              selection_data->format, 
+                                                              selection_data->data,
+                                                              selection_data->length,
+                                                              &list);
+      if (count > 0)
+       result = g_uri_list_extract_uris (list[0]);
+      
+      for (i = 1; i < count; i++)
+       g_free (list[i]);
+      g_free (list);
+    }
+
+  return result;
+}
+
+
+/**
+ * gtk_selection_data_get_targets:
+ * @selection_data: a #GtkSelectionData object
+ * @targets: location to store an array of targets. The result
+ *           stored here must be freed with g_free().
+ * @n_atoms: location to store number of items in @targets.
+ * 
+ * Gets the contents of @selection_data as an array of targets.
+ * This can be used to interpret the results of getting
+ * the standard TARGETS target that is always supplied for
+ * any selection.
+ * 
+ * Return value: %TRUE if @selection_data contains a valid
+ *    array of targets, otherwise %FALSE.
+ **/
+gboolean
+gtk_selection_data_get_targets (GtkSelectionData  *selection_data,
+                               GdkAtom          **targets,
+                               gint              *n_atoms)
+{
+  if (selection_data->length >= 0 &&
+      selection_data->format == 32 &&
+      selection_data->type == GDK_SELECTION_TYPE_ATOM)
+    {
+      if (targets)
+       *targets = g_memdup (selection_data->data, selection_data->length);
+      if (n_atoms)
+       *n_atoms = selection_data->length / sizeof (GdkAtom);
+
+      return TRUE;
+    }
+  else
+    {
+      if (targets)
+       *targets = NULL;
+      if (n_atoms)
+       *n_atoms = -1;
+
+      return FALSE;
+    }
+}
+
+/**
+ * gtk_selection_data_targets_include_text:
+ * @selection_data: a #GtkSelectionData object
+ * 
+ * Given a #GtkSelectionData object holding a list of targets,
+ * determines if any of the targets in @targets can be used to
+ * provide text.
+ * 
+ * Return value: %TRUE if @selection_data holds a list of targets,
+ *   and a suitable target for text is included, otherwise %FALSE.
+ **/
+gboolean
+gtk_selection_data_targets_include_text (GtkSelectionData *selection_data)
+{
+  GdkAtom *targets;
+  gint n_targets;
+  gint i;
+  gboolean result = FALSE;
+
+  init_atoms ();
+
+  if (gtk_selection_data_get_targets (selection_data, &targets, &n_targets))
+    {
+      for (i=0; i < n_targets; i++)
+       {
+         if (targets[i] == utf8_atom ||
+             targets[i] == text_atom ||
+             targets[i] == GDK_TARGET_STRING ||
+             targets[i] == ctext_atom ||
+             targets[i] == text_plain_atom ||
+             targets[i] == text_plain_utf8_atom ||
+             targets[i] == text_plain_locale_atom)
+           {
+             result = TRUE;
+             break;
+           }
+       }
+
+      g_free (targets);
+    }
+
+  return result;
+}
+
+/**
+ * gtk_selection_data_targets_include_image:
+ * @selection_data: a #GtkSelectionData object
+ * @writable: whether to accept only targets for which GTK+ knows
+ *   how to convert a pixbuf into the format
+ * 
+ * Given a #GtkSelectionData object holding a list of targets,
+ * determines if any of the targets in @targets can be used to
+ * provide a #GdkPixbuf.
+ * 
+ * Return value: %TRUE if @selection_data holds a list of targets,
+ *   and a suitable target for images is included, otherwise %FALSE.
+ *
+ * Since: 2.6
+ **/
+gboolean 
+gtk_selection_data_targets_include_image (GtkSelectionData *selection_data,
+                                         gboolean          writable)
+{
+  GdkAtom *targets;
+  gint n_targets;
+  gint i;
+  gboolean result = FALSE;
+  GtkTargetList *list;
+  GList *l;
+
+  init_atoms ();
+
+  if (gtk_selection_data_get_targets (selection_data, &targets, &n_targets))
+    {
+      list = gtk_target_list_new (NULL, 0);
+      gtk_target_list_add_image_targets (list, 0, writable);
+      for (i=0; i < n_targets && !result; i++)
+       {
+         for (l = list->list; l && !result; l = l->next)
+           {
+             GtkTargetPair *pair = (GtkTargetPair *)l->data;
+             if (pair->target == targets[i])
+               result = TRUE;
+           }
+       }
+      gtk_target_list_unref (list);
+      g_free (targets);
+    }
+
+  return result;
+}
+         
 /*************************************************************
  * gtk_selection_init:
  *     Initialize local variables
@@ -740,28 +1571,34 @@ gtk_selection_init (void)
   gtk_selection_atoms[MULTIPLE] = gdk_atom_intern ("MULTIPLE", FALSE);
   gtk_selection_atoms[TIMESTAMP] = gdk_atom_intern ("TIMESTAMP", FALSE);
   gtk_selection_atoms[TARGETS] = gdk_atom_intern ("TARGETS", FALSE);
+
+  initialize = FALSE;
 }
 
-/*************************************************************
+/**
  * gtk_selection_clear:
- *     Handler for "selection_clear_event"
- *   arguments:
- *     widget:
- *     event:
- *   results:
- *************************************************************/
-
-gint
-gtk_selection_clear (GtkWidget *widget,
+ * @widget: a #GtkWidget
+ * @event: the event
+ * 
+ * The default handler for the GtkWidget::selection_clear_event
+ * signal. 
+ * 
+ * Return value: %TRUE if the event was handled, otherwise false
+ * 
+ * Since: 2.2
+ *
+ * Deprecated: Instead of calling this function, chain up from
+ * your selection_clear_event handler. Calling this function
+ * from any other context is illegal. 
+ **/
+gboolean
+gtk_selection_clear (GtkWidget         *widget,
                     GdkEventSelection *event)
 {
-  /* FIXME: there can be a problem if we change the selection
-     via gtk_selection_owner_set after another client claims 
-     the selection, but before we get the notification event.
-     Tk filters based on serial #'s, which aren't retained by
-     GTK. Filtering based on time's will be inherently 
-     somewhat unreliable. */
-  
+  /* Note that we filter clear events in gdkselection-x11.c, so
+   * that we only will get here if the clear event actually
+   * represents a change that we didn't do ourself.
+   */
   GList *tmp_list;
   GtkSelectionInfo *selection_info = NULL;
   
@@ -779,16 +1616,9 @@ gtk_selection_clear (GtkWidget *widget,
   
   if (tmp_list)
     {
-      if (selection_info->time > event->time)
-       return FALSE;           /* return FALSE to indicate that
-                                * the selection was out of date,
-                                * and this clear should be ignored */
-      else
-       {
-         current_selections = g_list_remove_link (current_selections, tmp_list);
-         g_list_free (tmp_list);
-         g_free (selection_info);
-       }
+      current_selections = g_list_remove_link (current_selections, tmp_list);
+      g_list_free (tmp_list);
+      g_free (selection_info);
     }
   
   return TRUE;
@@ -796,7 +1626,7 @@ gtk_selection_clear (GtkWidget *widget,
 
 
 /*************************************************************
- * gtk_selection_request:
+ * _gtk_selection_request:
  *     Handler for "selection_request_event" 
  *   arguments:
  *     widget:
@@ -804,18 +1634,21 @@ gtk_selection_clear (GtkWidget *widget,
  *   results:
  *************************************************************/
 
-gint
-gtk_selection_request (GtkWidget *widget,
-                      GdkEventSelection *event)
+gboolean
+_gtk_selection_request (GtkWidget *widget,
+                       GdkEventSelection *event)
 {
+  GdkDisplay *display = gtk_widget_get_display (widget);
   GtkIncrInfo *info;
   GList *tmp_list;
-  guchar *mult_atoms;
   int i;
-  
+  gulong selection_max_size;
+
   if (initialize)
     gtk_selection_init ();
   
+  selection_max_size = GTK_SELECTION_MAX_SIZE (display);
+
   /* Check if we own selection */
   
   tmp_list = current_selections;
@@ -833,48 +1666,79 @@ gtk_selection_request (GtkWidget *widget,
   if (tmp_list == NULL)
     return FALSE;
   
-  info = g_new(GtkIncrInfo, 1);
+  info = g_new (GtkIncrInfo, 1);
+
+  g_object_ref (widget);
   
-  info->widget = widget;
   info->selection = event->selection;
   info->num_incrs = 0;
   
   /* Create GdkWindow structure for the requestor */
   
-  info->requestor = gdk_window_lookup (event->requestor);
+  info->requestor = gdk_window_lookup_for_display (display,
+                                                  event->requestor);
   if (!info->requestor)
-    info->requestor = gdk_window_foreign_new (event->requestor);
+    info->requestor = gdk_window_foreign_new_for_display (display,
+                                                         event->requestor);
   
   /* Determine conversions we need to perform */
   
   if (event->target == gtk_selection_atoms[MULTIPLE])
     {
       GdkAtom  type;
+      guchar  *mult_atoms;
       gint     format;
       gint     length;
       
       mult_atoms = NULL;
       
-      gdk_error_trap_push();
-      if (!gdk_property_get (info->requestor, event->property, 0, /* AnyPropertyType */
-                            0, GTK_SELECTION_MAX_SIZE, FALSE,
+      gdk_error_trap_push ();
+      if (!gdk_property_get (info->requestor, event->property, GDK_NONE, /* AnyPropertyType */
+                            0, selection_max_size, FALSE,
                             &type, &format, &length, &mult_atoms))
        {
-         gdk_selection_send_notify (event->requestor, event->selection,
-                                    event->target, GDK_NONE, event->time);
+         gdk_selection_send_notify_for_display (display,
+                                                event->requestor, 
+                                                event->selection,
+                                                event->target, 
+                                                GDK_NONE, 
+                                                event->time);
          g_free (mult_atoms);
          g_free (info);
          return TRUE;
        }
-      gdk_error_trap_pop();
-      
-      info->num_conversions = length / (2*sizeof (GdkAtom));
-      info->conversions = g_new (GtkIncrConversion, info->num_conversions);
-      
-      for (i=0; i<info->num_conversions; i++)
+      gdk_error_trap_pop ();
+
+      /* This is annoying; the ICCCM doesn't specify the property type
+       * used for the property contents, so the autoconversion for
+       * ATOM / ATOM_PAIR in GDK doesn't work properly.
+       */
+#ifdef GDK_WINDOWING_X11
+      if (type != GDK_SELECTION_TYPE_ATOM &&
+         type != gdk_atom_intern ("ATOM_PAIR", FALSE))
        {
-         info->conversions[i].target = ((GdkAtom *)mult_atoms)[2*i];
-         info->conversions[i].property = ((GdkAtom *)mult_atoms)[2*i+1];
+         info->num_conversions = length / (2*sizeof (glong));
+         info->conversions = g_new (GtkIncrConversion, info->num_conversions);
+         
+         for (i=0; i<info->num_conversions; i++)
+           {
+             info->conversions[i].target = gdk_x11_xatom_to_atom_for_display (display,
+                                                                              ((glong *)mult_atoms)[2*i]);
+             info->conversions[i].property = gdk_x11_xatom_to_atom_for_display (display,
+                                                                                ((glong *)mult_atoms)[2*i + 1]);
+           }
+       }
+      else
+#endif
+       {
+         info->num_conversions = length / (2*sizeof (GdkAtom));
+         info->conversions = g_new (GtkIncrConversion, info->num_conversions);
+         
+         for (i=0; i<info->num_conversions; i++)
+           {
+             info->conversions[i].target = ((GdkAtom *)mult_atoms)[2*i];
+             info->conversions[i].property = ((GdkAtom *)mult_atoms)[2*i+1];
+           }
        }
     }
   else                         /* only a single conversion */
@@ -883,7 +1747,6 @@ gtk_selection_request (GtkWidget *widget,
       info->num_conversions = 1;
       info->conversions[0].target = event->target;
       info->conversions[0].property = event->property;
-      mult_atoms = (guchar *)info->conversions;
     }
   
   /* Loop through conversions and determine which of these are big
@@ -891,36 +1754,41 @@ gtk_selection_request (GtkWidget *widget,
   for (i=0; i<info->num_conversions; i++)
     {
       GtkSelectionData data;
-      gint items;
+      glong items;
       
       data.selection = event->selection;
       data.target = info->conversions[i].target;
       data.data = NULL;
       data.length = -1;
+      data.display = gtk_widget_get_display (widget);
       
 #ifdef DEBUG_SELECTION
       g_message ("Selection %ld, target %ld (%s) requested by 0x%x (property = %ld)",
-                event->selection, info->conversions[i].target,
-                gdk_atom_name(info->conversions[i].target),
-                event->requestor, event->property);
+                event->selection, 
+                info->conversions[i].target,
+                gdk_atom_name (info->conversions[i].target),
+                event->requestor, info->conversions[i].property);
 #endif
       
       gtk_selection_invoke_handler (widget, &data, event->time);
       
       if (data.length < 0)
        {
-         ((GdkAtom *)mult_atoms)[2*i+1] = GDK_NONE;
          info->conversions[i].property = GDK_NONE;
          continue;
        }
       
       g_return_val_if_fail ((data.format >= 8) && (data.format % 8 == 0), FALSE);
       
-      items = (data.length + data.format/8 - 1) / (data.format/8);
+      items = data.length / gtk_selection_bytes_per_item (data.format);
       
-      if (data.length > GTK_SELECTION_MAX_SIZE)
+      if (data.length > selection_max_size)
        {
          /* Sending via INCR */
+#ifdef DEBUG_SELECTION
+         g_message ("Target larger (%d) than max. request size (%ld), sending incrementally\n",
+                    data.length, selection_max_size);
+#endif
          
          info->conversions[i].offset = 0;
          info->conversions[i].data = data;
@@ -929,7 +1797,7 @@ gtk_selection_request (GtkWidget *widget,
          gdk_property_change (info->requestor, 
                               info->conversions[i].property,
                               gtk_selection_atoms[INCR],
-                              8*sizeof (GdkAtom),
+                              32,
                               GDK_PROP_MODE_REPLACE,
                               (guchar *)&items, 1);
        }
@@ -964,17 +1832,24 @@ gtk_selection_request (GtkWidget *widget,
                             gdk_window_get_events (info->requestor) |
                             GDK_PROPERTY_CHANGE_MASK);
       current_incrs = g_list_append (current_incrs, info);
-      gtk_timeout_add (1000, (GtkFunction)gtk_selection_incr_timeout, info);
+      g_timeout_add (1000, (GSourceFunc) gtk_selection_incr_timeout, info);
     }
   
   /* If it was a MULTIPLE request, set the property to indicate which
      conversions succeeded */
   if (event->target == gtk_selection_atoms[MULTIPLE])
     {
+      GdkAtom *mult_atoms = g_new (GdkAtom, 2 * info->num_conversions);
+      for (i = 0; i < info->num_conversions; i++)
+       {
+         mult_atoms[2*i] = info->conversions[i].target;
+         mult_atoms[2*i+1] = info->conversions[i].property;
+       }
+      
       gdk_property_change (info->requestor, event->property,
-                          GDK_SELECTION_TYPE_ATOM, 8*sizeof(GdkAtom)
+                          gdk_atom_intern ("ATOM_PAIR", FALSE), 32
                           GDK_PROP_MODE_REPLACE,
-                          mult_atoms, 2*info->num_conversions);
+                          (guchar *)mult_atoms, 2*info->num_conversions);
       g_free (mult_atoms);
     }
 
@@ -982,26 +1857,36 @@ gtk_selection_request (GtkWidget *widget,
       info->conversions[0].property == GDK_NONE)
     {
       /* Reject the entire conversion */
-      gdk_selection_send_notify (event->requestor, event->selection, 
-                                event->target, GDK_NONE, event->time);
+      gdk_selection_send_notify_for_display (gtk_widget_get_display (widget),
+                                            event->requestor, 
+                                            event->selection, 
+                                            event->target, 
+                                            GDK_NONE, 
+                                            event->time);
     }
   else
     {
-      gdk_selection_send_notify (event->requestor, event->selection, 
-                                event->target, event->property, event->time);
+      gdk_selection_send_notify_for_display (gtk_widget_get_display (widget),
+                                            event->requestor, 
+                                            event->selection,
+                                            event->target,
+                                            event->property, 
+                                            event->time);
     }
-  
+
   if (info->num_incrs == 0)
     {
       g_free (info->conversions);
       g_free (info);
     }
+
+  g_object_unref (widget);
   
   return TRUE;
 }
 
 /*************************************************************
- * gtk_selection_incr_event:
+ * _gtk_selection_incr_event:
  *     Called whenever an PropertyNotify event occurs for an 
  *     GdkWindow with user_data == NULL. These will be notifications
  *     that a window we are sending the selection to via the
@@ -1015,14 +1900,15 @@ gtk_selection_request (GtkWidget *widget,
  *   results:
  *************************************************************/
 
-gint
-gtk_selection_incr_event (GdkWindow       *window,
-                         GdkEventProperty *event)
+gboolean
+_gtk_selection_incr_event (GdkWindow      *window,
+                          GdkEventProperty *event)
 {
   GList *tmp_list;
   GtkIncrInfo *info = NULL;
   gint num_bytes;
   guchar *buffer;
+  gulong selection_max_size;
   
   int i;
   
@@ -1032,7 +1918,9 @@ gtk_selection_incr_event (GdkWindow          *window,
 #ifdef DEBUG_SELECTION
   g_message ("PropertyDelete, property %ld", event->atom);
 #endif
-  
+
+  selection_max_size = GTK_SELECTION_MAX_SIZE (gdk_drawable_get_display (window));  
+
   /* Now find the appropriate ongoing INCR */
   tmp_list = current_incrs;
   while (tmp_list)
@@ -1053,6 +1941,8 @@ gtk_selection_incr_event (GdkWindow          *window,
       if (info->conversions[i].property == event->atom &&
          info->conversions[i].offset != -1)
        {
+         int bytes_per_item;
+         
          info->idle_time = 0;
          
          if (info->conversions[i].offset == -2) /* only the last 0-length
@@ -1068,10 +1958,10 @@ gtk_selection_incr_event (GdkWindow        *window,
              buffer = info->conversions[i].data.data + 
                info->conversions[i].offset;
              
-             if (num_bytes > GTK_SELECTION_MAX_SIZE)
+             if (num_bytes > selection_max_size)
                {
-                 num_bytes = GTK_SELECTION_MAX_SIZE;
-                 info->conversions[i].offset += GTK_SELECTION_MAX_SIZE;
+                 num_bytes = selection_max_size;
+                 info->conversions[i].offset += selection_max_size;
                }
              else
                info->conversions[i].offset = -2;
@@ -1081,13 +1971,14 @@ gtk_selection_incr_event (GdkWindow        *window,
                     num_bytes, info->conversions[i].offset, 
                     GDK_WINDOW_XWINDOW(info->requestor), event->atom);
 #endif
+
+         bytes_per_item = gtk_selection_bytes_per_item (info->conversions[i].data.format);
          gdk_property_change (info->requestor, event->atom,
                               info->conversions[i].data.type,
                               info->conversions[i].data.format,
                               GDK_PROP_MODE_REPLACE,
-                              buffer, 
-                              (num_bytes + info->conversions[i].data.format/8 - 1) / 
-                              (info->conversions[i].data.format/8));
+                              buffer,
+                              num_bytes / bytes_per_item);
          
          if (info->conversions[i].offset == -2)
            {
@@ -1101,7 +1992,6 @@ gtk_selection_incr_event (GdkWindow          *window,
              info->conversions[i].offset = -1;
            }
        }
-      break;
     }
   
   /* Check if we're finished with all the targets */
@@ -1145,9 +2035,9 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
     }
   
   /* If retrieval is finished */
-  if (!tmp_list || info->idle_time >= 5)
+  if (!tmp_list || info->idle_time >= IDLE_ABORT_TIME)
     {
-      if (tmp_list && info->idle_time >= 5)
+      if (tmp_list && info->idle_time >= IDLE_ABORT_TIME)
        {
          current_incrs = g_list_remove_link (current_incrs, tmp_list);
          g_list_free (tmp_list);
@@ -1174,7 +2064,7 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
 }
 
 /*************************************************************
- * gtk_selection_notify:
+ * _gtk_selection_notify:
  *     Handler for "selection_notify_event" signals on windows
  *     where a retrieval is currently in process. The selection
  *     owner has responded to our conversion request.
@@ -1186,9 +2076,9 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
  *     was event handled?
  *************************************************************/
 
-gint
-gtk_selection_notify (GtkWidget               *widget,
-                     GdkEventSelection *event)
+gboolean
+_gtk_selection_notify (GtkWidget              *widget,
+                      GdkEventSelection *event)
 {
   GList *tmp_list;
   GtkRetrievalInfo *info = NULL;
@@ -1217,7 +2107,9 @@ gtk_selection_notify (GtkWidget          *widget,
   if (event->property != GDK_NONE)
     length = gdk_selection_property_get (widget->window, &buffer, 
                                         &type, &format);
-
+  else
+    length = 0; /* silence gcc */
+  
   if (event->property == GDK_NONE || buffer == NULL)
     {
       current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
@@ -1261,7 +2153,7 @@ gtk_selection_notify (GtkWidget          *widget,
 }
 
 /*************************************************************
- * gtk_selection_property_notify:
+ * _gtk_selection_property_notify:
  *     Handler for "property_notify_event" signals on windows
  *     where a retrieval is currently in process. The selection
  *     owner has added more data.
@@ -1273,9 +2165,9 @@ gtk_selection_notify (GtkWidget          *widget,
  *     was event handled?
  *************************************************************/
 
-gint
-gtk_selection_property_notify (GtkWidget       *widget,
-                              GdkEventProperty *event)
+gboolean
+_gtk_selection_property_notify (GtkWidget      *widget,
+                               GdkEventProperty *event)
 {
   GList *tmp_list;
   GtkRetrievalInfo *info = NULL;
@@ -1287,8 +2179,10 @@ gtk_selection_property_notify (GtkWidget *widget,
   g_return_val_if_fail (widget != NULL, FALSE);
   g_return_val_if_fail (event != NULL, FALSE);
 
+#if defined(GDK_WINDOWING_WIN32) || defined(GDK_WINDOWING_X11)
   if ((event->state != GDK_PROPERTY_NEW_VALUE) ||  /* property was deleted */
-      (event->atom != gdk_selection_property)) /* not the right property */
+      (event->atom != gdk_atom_intern ("GDK_SELECTION", FALSE))) /* not the right property */
+#endif
     return FALSE;
   
 #ifdef DEBUG_SELECTION
@@ -1391,9 +2285,9 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info)
     }
   
   /* If retrieval is finished */
-  if (!tmp_list || info->idle_time >= 5)
+  if (!tmp_list || info->idle_time >= IDLE_ABORT_TIME)
     {
-      if (tmp_list && info->idle_time >= 5)
+      if (tmp_list && info->idle_time >= IDLE_ABORT_TIME)
        {
          current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
          g_list_free (tmp_list);
@@ -1442,10 +2336,11 @@ gtk_selection_retrieval_report (GtkRetrievalInfo *info,
   
   data.length = length;
   data.data = buffer;
+  data.display = gtk_widget_get_display (info->widget);
   
-  gtk_signal_emit_by_name (GTK_OBJECT(info->widget),
-                          "selection_received", 
-                          &data, time);
+  g_signal_emit_by_name (info->widget,
+                        "selection_received", 
+                        &data, time);
 }
 
 /*************************************************************
@@ -1478,10 +2373,10 @@ gtk_selection_invoke_handler (GtkWidget        *widget,
   if (target_list && 
       gtk_target_list_find (target_list, data->target, &info))
     {
-      gtk_signal_emit_by_name (GTK_OBJECT (widget), 
-                              "selection_get",
-                              data,
-                              info, time);
+      g_signal_emit_by_name (widget,
+                            "selection_get",
+                            data,
+                            info, time);
     }
   else
     gtk_selection_default_handler (widget, data);
@@ -1517,11 +2412,13 @@ gtk_selection_default_handler (GtkWidget        *widget,
          if ((selection_info->widget == widget) &&
              (selection_info->selection == data->selection))
            {
+             gulong time = selection_info->time;
+
              gtk_selection_data_set (data,
                                      GDK_SELECTION_TYPE_INTEGER,
-                                     sizeof (guint32)*8,
-                                     (guchar *)&selection_info->time,
-                                     sizeof (guint32));
+                                     32,
+                                     (guchar *)&time,
+                                     sizeof (time));
              return;
            }
          
@@ -1544,11 +2441,14 @@ gtk_selection_default_handler (GtkWidget        *widget,
       count = g_list_length (target_list->list) + 3;
       
       data->type = GDK_SELECTION_TYPE_ATOM;
-      data->format = 8*sizeof (GdkAtom);
+      data->format = 32;
       data->length = count * sizeof (GdkAtom);
-      
-      p = g_new (GdkAtom, count);
+
+      /* selection data is always terminated by a trailing \0
+       */
+      p = g_malloc (data->length + 1);
       data->data = (guchar *)p;
+      data->data[data->length] = '\0';
       
       *p++ = gtk_selection_atoms[TIMESTAMP];
       *p++ = gtk_selection_atoms[TARGETS];
@@ -1570,15 +2470,21 @@ gtk_selection_default_handler (GtkWidget        *widget,
 }
 
 
-GtkSelectioData*
-gtk_selection_data_copy (GtkSelectionData *data)
+GtkSelectionData*
+gtk_selection_data_copy (GtkSelectionData *selection_data)
 {
   GtkSelectionData *new_data;
   
-  g_return_val_if_fail (data != NULL, NULL);
+  g_return_val_if_fail (selection_data != NULL, NULL);
   
   new_data = g_new (GtkSelectionData, 1);
-  *new_data = *data;
+  *new_data = *selection_data;
+
+  if (selection_data->data)
+    {
+      new_data->data = g_malloc (selection_data->length + 1);
+      memcpy (new_data->data, selection_data->data, selection_data->length + 1);
+    }
   
   return new_data;
 }
@@ -1588,5 +2494,41 @@ gtk_selection_data_free (GtkSelectionData *data)
 {
   g_return_if_fail (data != NULL);
   
+  if (data->data)
+    g_free (data->data);
+  
   g_free (data);
 }
+
+GType
+gtk_selection_data_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static ("GtkSelectionData",
+                                            (GBoxedCopyFunc) gtk_selection_data_copy,
+                                            (GBoxedFreeFunc) gtk_selection_data_free);
+
+  return our_type;
+}
+
+static int 
+gtk_selection_bytes_per_item (gint format)
+{
+  switch (format)
+    {
+    case 8:
+      return sizeof (char);
+      break;
+    case 16:
+      return sizeof (short);
+      break;
+    case 32:
+      return sizeof (long);
+      break;
+    default:
+      g_assert_not_reached();
+    }
+  return 0;
+}