]> Pileus Git - ~andy/gtk/blobdiff - gtk/gtkselection.c
Move main thread lock back to GDK - we need it there for locking when
[~andy/gtk] / gtk / gtkselection.c
index e3d27de7a95136b51a42c37f78e44188b5835548..2aa6c8cbdbda18554245880c0400a8ffe6c6a0cb 100644 (file)
@@ -8,12 +8,13 @@
  *
  * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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.
@@ -27,7 +28,7 @@
  * guaranteed with the way we do things, since if we are doing INCR
  * transfers, the order will depend on the timing of the requestor.
  *
- * By Owen Taylor <owt1@cornell.edu>          8/16/97
+ * By Owen Taylor <owt1@cornell.edu>         8/16/97
  */
 
 /* Terminology note: when not otherwise specified, the term "incr" below
@@ -69,7 +70,6 @@ typedef struct _GtkSelectionInfo GtkSelectionInfo;
 typedef struct _GtkIncrConversion GtkIncrConversion;
 typedef struct _GtkIncrInfo GtkIncrInfo;
 typedef struct _GtkRetrievalInfo GtkRetrievalInfo;
-typedef struct _GtkSelectionHandler GtkSelectionHandler;
 
 struct _GtkSelectionInfo
 {
@@ -80,13 +80,13 @@ struct _GtkSelectionInfo
 
 struct _GtkIncrConversion 
 {
-  GdkAtom           target;    /* Requested target */
-  GdkAtom           property;  /* Property to store in */
+  GdkAtom          target;     /* Requested target */
+  GdkAtom          property;   /* Property to store in */
   GtkSelectionData  data;      /* The data being supplied */
-  gint             offset;     /* Current offset in sent selection.
+  gint             offset;     /* Current offset in sent selection.
                                 *  -1 => All done
                                 *  -2 => Only the final (empty) portion
-                                *        left to send */
+                                *        left to send */
 };
 
 struct _GtkIncrInfo
@@ -95,7 +95,7 @@ struct _GtkIncrInfo
   GdkWindow *requestor;                /* Requestor window - we create a GdkWindow
                                   so we can receive events */
   GdkAtom    selection;                /* Selection we're sending */
-
+  
   GtkIncrConversion *conversions; /* Information about requested conversions -
                                   * With MULTIPLE requests (benighted 1980's
                                   * hardware idea), there can be more than
@@ -114,30 +114,23 @@ struct _GtkRetrievalInfo
   guint32 idle_time;           /* Number of seconds since we last heard
                                   from selection owner */
   guchar   *buffer;            /* Buffer in which to accumulate results */
-  gint     offset;             /* Current offset in buffer, -1 indicates
+  gint    offset;              /* Current offset in buffer, -1 indicates
                                   not yet started */
-};
-
-struct _GtkSelectionHandler
-{
-  GdkAtom selection;           /* selection thats handled */
-  GdkAtom target;              /* target thats handled */
-  GtkSelectionFunction function; /* callback function */
-  GtkRemoveFunction remove_func; /* called when callback is removed */
-  gpointer data;                /* callback data */
+  guint32 notify_time;         /* Timestamp from SelectionNotify */
 };
 
 /* 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,
+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);
-static GtkSelectionHandler *gtk_selection_find_handler (GtkWidget *widget,
-                                                       GdkAtom    selection,
-                                                       GdkAtom    target);
-static void gtk_selection_default_handler        (GtkWidget       *widget,
+                                                 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);
 
 /* Local Data */
@@ -147,7 +140,137 @@ static GList *current_incrs = NULL;
 static GList *current_selections = NULL;
 
 static GdkAtom gtk_selection_atoms[LAST_ATOM];
-static const char *gtk_selection_handler_key = "selection_handlers";
+static const char *gtk_selection_handler_key = "gtk-selection-handlers";
+
+/****************
+ * Target Lists *
+ ****************/
+
+/*
+ * Target lists
+ */
+
+GtkTargetList *
+gtk_target_list_new (GtkTargetEntry  *targets,
+                    guint            ntargets)
+{
+  GtkTargetList *result = g_new (GtkTargetList, 1);
+  result->list = NULL;
+  result->ref_count = 1;
+
+  if (targets)
+    gtk_target_list_add_table (result, targets, ntargets);
+  
+  return result;
+}
+
+void               
+gtk_target_list_ref (GtkTargetList *list)
+{
+  list->ref_count++;
+}
+
+void               
+gtk_target_list_unref (GtkTargetList *list)
+{
+  list->ref_count--;
+  if (list->ref_count == 0)
+    {
+      GList *tmp_list = list->list;
+      while (tmp_list)
+       {
+         GtkTargetEntry *entry = tmp_list->data;
+         g_free (entry);
+
+         tmp_list = tmp_list->next;
+       }
+    }
+}
+
+void 
+gtk_target_list_add (GtkTargetList *list,
+                    GdkAtom            target,
+                    guint              flags,
+                    guint              info)
+{
+  GtkTargetPair *pair;
+
+  g_return_if_fail (list != NULL);
+  
+  pair = g_new (GtkTargetPair, 1);
+  pair->target = target;
+  pair->flags = flags;
+  pair->info = info;
+
+  list->list = g_list_append (list->list, pair);
+}
+
+void               
+gtk_target_list_add_table (GtkTargetList   *list,
+                          GtkTargetEntry  *targets,
+                          guint            ntargets)
+{
+  gint i;
+
+  for (i=ntargets-1; i >= 0; i--)
+    {
+      GtkTargetPair *pair = g_new (GtkTargetPair, 1);
+      pair->target = gdk_atom_intern (targets[i].target, FALSE);
+      pair->flags = targets[i].flags;
+      pair->info = targets[i].info;
+      
+      list->list = g_list_prepend (list->list, pair);
+    }
+}
+
+void 
+gtk_target_list_remove (GtkTargetList *list,
+                       GdkAtom            target)
+{
+  GList *tmp_list;
+
+  g_return_if_fail (list != NULL);
+
+  tmp_list = list->list;
+  while (tmp_list)
+    {
+      GtkTargetPair *pair = tmp_list->data;
+      
+      if (pair->target == target)
+       {
+         g_free (pair);
+
+         list->list = g_list_remove (list->list, tmp_list);
+         g_list_free_1 (tmp_list);
+
+         return;
+       }
+      
+      tmp_list = tmp_list->next;
+    }
+}
+
+gboolean
+gtk_target_list_find (GtkTargetList *list,
+                     GdkAtom        target,
+                     guint         *info)
+{
+  GList *tmp_list = list->list;
+  while (tmp_list)
+    {
+      GtkTargetPair *pair = tmp_list->data;
+
+      if (pair->target == target)
+       {
+         *info = pair->info;
+         return TRUE;
+       }
+      tmp_list = tmp_list->next;
+    }
+
+  return FALSE;
+}
+
 
 /*************************************************************
  * gtk_selection_owner_set:
@@ -169,7 +292,7 @@ gtk_selection_owner_set (GtkWidget *widget,
   GtkWidget *old_owner;
   GtkSelectionInfo *selection_info;
   GdkWindow *window;
-
+  
   if (widget == NULL)
     window = NULL;
   else
@@ -179,7 +302,7 @@ gtk_selection_owner_set (GtkWidget *widget,
       
       window = widget->window;
     }
-
+  
   tmp_list = current_selections;
   while (tmp_list)
     {
@@ -190,13 +313,13 @@ gtk_selection_owner_set (GtkWidget *widget,
       
       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))
     {
       old_owner = NULL;
@@ -241,7 +364,7 @@ gtk_selection_owner_set (GtkWidget *widget,
          event.window = old_owner->window;
          event.selection = selection;
          event.time = time;
-
+         
          gtk_widget_event (old_owner, (GdkEvent *) &event);
        }
       return TRUE;
@@ -251,79 +374,105 @@ gtk_selection_owner_set (GtkWidget *widget,
 }
 
 /*************************************************************
- * gtk_selection_add_handler:
- *     Add a handler for a specified selection/target pair
+ * gtk_selection_add_target
+ *     Add specified target to list of supported targets
  *
  *   arguments:
- *     widget:     The widget the handler applies to
+ *     widget:    The widget for which this target applies
  *     selection:
  *     target:
- *     format:     Format in which this handler will return data
- *     function:   Callback function (can be NULL)
- *     data:       User data for callback
+ *     info:       guint to pass to to the selection_get signal 
  *
  *   results:
  *************************************************************/
 
-void
-gtk_selection_add_handler (GtkWidget           *widget, 
-                          GdkAtom              selection,
-                          GdkAtom              target,
-                          GtkSelectionFunction function,
-                          GtkRemoveFunction    remove_func,
-                          gpointer             data)
+typedef struct _GtkSelectionTargetList GtkSelectionTargetList;
+
+struct _GtkSelectionTargetList {
+  GdkAtom selection;
+  GtkTargetList *list;
+};
+
+static GtkTargetList *
+gtk_selection_target_list_get (GtkWidget    *widget,
+                              GdkAtom       selection)
 {
-  GList *selection_handlers;
+  GtkSelectionTargetList *sellist;
   GList *tmp_list;
-  GtkSelectionHandler *handler;
+  GList *lists;
 
-  g_return_if_fail (widget != NULL);
-  if (initialize)
-    gtk_selection_init ();
+  lists = gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
   
-  selection_handlers = gtk_object_get_data (GTK_OBJECT (widget),
-                                           gtk_selection_handler_key);
-
-  /* Reuse old handler structure, if present */
-  tmp_list = selection_handlers;
+  tmp_list = lists;
   while (tmp_list)
     {
-      handler = (GtkSelectionHandler *)tmp_list->data;
-      if ((handler->selection == selection) && (handler->target == target))
-       {
-         if (handler->remove_func)
-           (*handler->remove_func)(handler->data);
-         if (function)
-           {
-             handler->function = function;
-             handler->remove_func = remove_func;
-             handler->data = data;
-           }
-         else
-           {
-             selection_handlers = g_list_remove_link (selection_handlers, 
-                                                      tmp_list);
-             g_list_free (tmp_list);
-             g_free (handler);
-           }
-         return;
-       }
+      sellist = tmp_list->data;
+      if (sellist->selection == selection)
+       return sellist->list;
       tmp_list = tmp_list->next;
     }
 
-  if (tmp_list == NULL && function)
+  sellist = g_new (GtkSelectionTargetList, 1);
+  sellist->selection = selection;
+  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);
+
+  return sellist->list;
+}
+
+static void
+gtk_selection_target_list_remove (GtkWidget    *widget)
+{
+  GtkSelectionTargetList *sellist;
+  GList *tmp_list;
+  GList *lists;
+
+  lists = gtk_object_get_data (GTK_OBJECT (widget), gtk_selection_handler_key);
+  
+  tmp_list = lists;
+  while (tmp_list)
     {
-      handler = g_new (GtkSelectionHandler, 1);
-      handler->selection = selection;
-      handler->target = target;
-      handler->function = function;
-      handler->remove_func = remove_func;
-      handler->data = data;
-      selection_handlers = g_list_append (selection_handlers, handler);
+      sellist = tmp_list->data;
+
+      gtk_target_list_unref (sellist->list);
+
+      g_free (sellist);
+      tmp_list = tmp_list->next;
     }
+
+  g_list_free (lists);
+  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key, NULL);
+}
+
+void 
+gtk_selection_add_target (GtkWidget        *widget, 
+                         GdkAtom            selection,
+                         GdkAtom            target,
+                         guint              info)
+{
+  GtkTargetList *list;
+
+  g_return_if_fail (widget != NULL);
+
+  list = gtk_selection_target_list_get (widget, selection);
+  gtk_target_list_add (list, target, 0, info);
+}
+
+void 
+gtk_selection_add_targets (GtkWidget           *widget, 
+                          GdkAtom              selection,
+                          GtkTargetEntry      *targets,
+                          guint                ntargets)
+{
+  GtkTargetList *list;
+  
+  g_return_if_fail (widget != NULL);
+  g_return_if_fail (targets != NULL);
   
-  gtk_object_set_data (GTK_OBJECT (widget), gtk_selection_handler_key,
-                      selection_handlers);
+  list = gtk_selection_target_list_get (widget, selection);
+  gtk_target_list_add_table (list, targets, ntargets);
 }
 
 /*************************************************************
@@ -343,11 +492,9 @@ gtk_selection_remove_all (GtkWidget *widget)
   GList *tmp_list;
   GList *next;
   GtkSelectionInfo *selection_info;
-  GList *selection_handlers;
-  GtkSelectionHandler *handler;
-
+  
   /* Remove pending requests/incrs for this widget */
-
+  
   tmp_list = current_incrs;
   while (tmp_list)
     {
@@ -360,7 +507,7 @@ gtk_selection_remove_all (GtkWidget *widget)
        }
       tmp_list = next;
     }
-
+  
   tmp_list = current_retrievals;
   while (tmp_list)
     {
@@ -376,7 +523,7 @@ gtk_selection_remove_all (GtkWidget *widget)
     }
   
   /* Disclaim ownership of any selections */
-
+  
   tmp_list = current_selections;
   while (tmp_list)
     {
@@ -397,26 +544,8 @@ gtk_selection_remove_all (GtkWidget *widget)
       tmp_list = next;
     }
 
-  /* Now remove all handlers */
-
-  selection_handlers = gtk_object_get_data (GTK_OBJECT (widget),
-                                           gtk_selection_handler_key);
-
-  tmp_list = selection_handlers;
-  while (tmp_list)
-    {
-      next = tmp_list->next;
-      handler = (GtkSelectionHandler *)tmp_list->data;
-
-      if (handler->remove_func)
-       (*handler->remove_func)(handler->data);
-
-      g_free (handler);
-
-      tmp_list = next;
-    }
-
-  g_list_free (selection_handlers);
+  /* Remove all selection lists */
+  gtk_selection_target_list_remove (widget);
 }
 
 /*************************************************************
@@ -425,11 +554,11 @@ gtk_selection_remove_all (GtkWidget *widget)
  *     a "selection_received" signal will be generated.
  *
  *   arguments:
- *     widget:     The widget which acts as requestor
+ *     widget:    The widget which acts as requestor
  *     selection:  Which selection to get
- *     target:     Form of information desired (e.g., STRING)
- *     time:       Time of request (usually of triggering event)
- *                 In emergency, you could use GDK_CURRENT_TIME
+ *     target:    Form of information desired (e.g., STRING)
+ *     time:      Time of request (usually of triggering event)
+ *                In emergency, you could use GDK_CURRENT_TIME
  *
  *   results:
  *     TRUE if requested succeeded. FALSE if we could not process
@@ -439,28 +568,28 @@ gtk_selection_remove_all (GtkWidget *widget)
 
 gint
 gtk_selection_convert (GtkWidget *widget, 
-                      GdkAtom    selection, 
-                      GdkAtom    target,
-                      guint32    time)
+                      GdkAtom    selection, 
+                      GdkAtom    target,
+                      guint32    time)
 {
   GtkRetrievalInfo *info;
   GList *tmp_list;
   GdkWindow *owner_window;
-
+  
   g_return_val_if_fail (widget != NULL, FALSE);
-
+  
   if (initialize)
     gtk_selection_init ();
   
   if (!GTK_WIDGET_REALIZED (widget))
     gtk_widget_realize (widget);
-
+  
   /* Check to see if there are already any retrievals in progress for
      this widget. If we changed GDK to use the selection for the 
      window property in which to store the retrieved information, then
      we could support multiple retrievals for different selections.
      This might be useful for DND. */
-
+  
   tmp_list = current_retrievals;
   while (tmp_list)
     {
@@ -469,50 +598,45 @@ gtk_selection_convert (GtkWidget *widget,
        return FALSE;
       tmp_list = tmp_list->next;
     }
-
+  
   info = g_new (GtkRetrievalInfo, 1);
-
+  
   info->widget = widget;
   info->selection = selection;
   info->target = target;
   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);
   
   if (owner_window != NULL)
     {
       GtkWidget *owner_widget;
-      GtkSelectionHandler *handler;
       GtkSelectionData selection_data;
-
+      
       selection_data.selection = selection;
       selection_data.target = target;
       selection_data.data = NULL;
       selection_data.length = -1;
-
+      
       gdk_window_get_user_data (owner_window, (gpointer *)&owner_widget);
-
+      
       if (owner_widget != NULL)
        {
-         handler = gtk_selection_find_handler (owner_widget, selection, target);
-         if (handler)
-           (* handler->function)(owner_widget,
-                                 &selection_data,
-                                 handler->data);
-         else                  /* try the default handler */
-           gtk_selection_default_handler (owner_widget,
-                                          &selection_data);
-
+         gtk_selection_invoke_handler (owner_widget, 
+                                       &selection_data,
+                                       time);
+         
          gtk_selection_retrieval_report (info,
                                          selection_data.type, 
                                          selection_data.format,
                                          selection_data.data,
-                                         selection_data.length);
-
+                                         selection_data.length,
+                                         time);
+         
          g_free (selection_data.data);
          
          g_free (info);
@@ -521,11 +645,11 @@ gtk_selection_convert (GtkWidget *widget,
     }
   
   /* Otherwise, we need to go through X */
-
+  
   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);
-
+  
   return TRUE;
 }
 
@@ -536,25 +660,25 @@ gtk_selection_convert (GtkWidget *widget,
  *     Null terminates the stored data.
  *   arguments:
  *     type:   the type of selection data
- *     format:  format (number of bits in a unit)
- *     data:    pointer to the data (will be copied)
- *     length:  length of the data
+ *     format: format (number of bits in a unit)
+ *     data:   pointer to the data (will be copied)
+ *     length: length of the data
  *   results:
  *************************************************************/
 
 void 
 gtk_selection_data_set (GtkSelectionData *selection_data,
-                       GdkAtom           type,
-                       gint              format,
-                       guchar           *data,
-                       gint              length)
+                       GdkAtom           type,
+                       gint              format,
+                       guchar           *data,
+                       gint              length)
 {
   if (selection_data->data)
     g_free (selection_data->data);
-
+  
   selection_data->type = type;
   selection_data->format = format;
-
+  
   if (data)
     {
       selection_data->data = g_new (guchar, length+1);
@@ -562,8 +686,15 @@ gtk_selection_data_set (GtkSelectionData *selection_data,
       selection_data->data[length] = 0;
     }
   else
-    selection_data->data = NULL;
-
+    {
+      g_return_if_fail (length <= 0);
+      
+      if (length < 0)
+       selection_data->data = NULL;
+      else
+       selection_data->data = g_strdup("");
+    }
+  
   selection_data->length = length;
 }
 
@@ -603,10 +734,10 @@ gtk_selection_clear (GtkWidget *widget,
      Tk filters based on serial #'s, which aren't retained by
      GTK. Filtering based on time's will be inherently 
      somewhat unreliable. */
-
+  
   GList *tmp_list;
   GtkSelectionInfo *selection_info;
-
+  
   tmp_list = current_selections;
   while (tmp_list)
     {
@@ -618,14 +749,21 @@ gtk_selection_clear (GtkWidget *widget,
       
       tmp_list = tmp_list->next;
     }
-    
-  if (tmp_list == NULL || selection_info->time > event->time)
-    return TRUE;
-
-  current_selections = g_list_remove_link (current_selections, tmp_list);
-  g_list_free (tmp_list);
-  g_free (selection_info);
-
+  
+  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);
+       }
+    }
+  
   return TRUE;
 }
 
@@ -644,53 +782,54 @@ gtk_selection_request (GtkWidget *widget,
                       GdkEventSelection *event)
 {
   GtkIncrInfo *info;
-  GtkSelectionHandler *handler;
   GList *tmp_list;
   guchar *mult_atoms;
   int i;
-
+  
+  if (initialize)
+    gtk_selection_init ();
+  
   /* Check if we own selection */
-
+  
   tmp_list = current_selections;
   while (tmp_list)
     {
       GtkSelectionInfo *selection_info = (GtkSelectionInfo *)tmp_list->data;
-
+      
       if ((selection_info->selection == event->selection) &&
          (selection_info->widget == widget))
        break;
-
+      
       tmp_list = tmp_list->next;
     }
-
+  
   if (tmp_list == NULL)
     return FALSE;
   
   info = g_new(GtkIncrInfo, 1);
-
+  
   info->widget = widget;
   info->selection = event->selection;
   info->num_incrs = 0;
-
+  
   /* Create GdkWindow structure for the requestor */
-
+  
   info->requestor = gdk_window_lookup (event->requestor);
   if (!info->requestor)
     info->requestor = gdk_window_foreign_new (event->requestor);
   
   /* Determine conversions we need to perform */
-
+  
   if (event->target == gtk_selection_atoms[MULTIPLE])
     {
       GdkAtom  type;
       gint     format;
       gint     length;
-
+      
       mult_atoms = NULL;
-      if (!gdk_property_get (info->requestor, event->property, GDK_SELECTION_TYPE_ATOM,
+      if (!gdk_property_get (info->requestor, event->property, 0, /* AnyPropertyType */
                             0, GTK_SELECTION_MAX_SIZE, FALSE,
-                            &type, &format, &length, &mult_atoms) ||
-         type != GDK_SELECTION_TYPE_ATOM || format != 8*sizeof(GdkAtom))
+                            &type, &format, &length, &mult_atoms))
        {
          gdk_selection_send_notify (event->requestor, event->selection,
                                     event->target, GDK_NONE, event->time);
@@ -698,10 +837,10 @@ gtk_selection_request (GtkWidget *widget,
          g_free (info);
          return TRUE;
        }
-
+      
       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];
@@ -716,44 +855,39 @@ gtk_selection_request (GtkWidget *widget,
       info->conversions[0].property = event->property;
       mult_atoms = (guchar *)info->conversions;
     }
-
+  
   /* Loop through conversions and determine which of these are big
      enough to require doing them via INCR */
   for (i=0; i<info->num_conversions; i++)
     {
       GtkSelectionData data;
       gint items;
-
+      
       data.selection = event->selection;
       data.target = info->conversions[i].target;
       data.data = NULL;
       data.length = -1;
-
+      
 #ifdef DEBUG_SELECTION
-      g_print("Selection %ld, target %ld (%s) requested by 0x%x (property = %ld)\n",
-             event->selection, info->conversions[i].target,
-             gdk_atom_name(info->conversions[i].target),
-             event->requestor, event->property);
+      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);
 #endif
-  
-      handler = gtk_selection_find_handler (widget, event->selection,
-                                           info->conversions[i].target);
-      if (handler)
-       (* handler->function)(widget, &data, handler->data);
-      else
-       gtk_selection_default_handler (widget, &data);
-
+      
+      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);
-
+      
       if (data.length > GTK_SELECTION_MAX_SIZE)
        {
          /* Sending via INCR */
@@ -772,37 +906,37 @@ gtk_selection_request (GtkWidget *widget,
       else
        {
          info->conversions[i].offset = -1;
-
+         
          gdk_property_change (info->requestor, 
                               info->conversions[i].property,
                               data.type,
                               data.format,
                               GDK_PROP_MODE_REPLACE,
                               data.data, items);
-
+         
          g_free (data.data);
        }
     }
-
+  
   /* If we have some INCR's, we need to send the rest of the data in
      a callback */
-
+  
   if (info->num_incrs > 0)
     {
       /* FIXME: this could be dangerous if window doesn't still
         exist */
-
+      
 #ifdef DEBUG_SELECTION
-      g_print("Starting INCR...\n");
+      g_message ("Starting INCR...");
 #endif
-
+      
       gdk_window_set_events (info->requestor,
                             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);
     }
-
+  
   /* If it was a MULTIPLE request, set the property to indicate which
      conversions succeeded */
   if (event->target == gtk_selection_atoms[MULTIPLE])
@@ -810,19 +944,19 @@ gtk_selection_request (GtkWidget *widget,
       gdk_property_change (info->requestor, event->property,
                           GDK_SELECTION_TYPE_ATOM, 8*sizeof(GdkAtom), 
                           GDK_PROP_MODE_REPLACE,
-                          mult_atoms, info->num_conversions);
+                          mult_atoms, 2*info->num_conversions);
       g_free (mult_atoms);
     }
-
+  
   gdk_selection_send_notify (event->requestor, event->selection, event->target,
                             event->property, event->time);
-
+  
   if (info->num_incrs == 0)
     {
       g_free (info->conversions);
       g_free (info);
     }
-
+  
   return TRUE;
 }
 
@@ -835,30 +969,30 @@ gtk_selection_request (GtkWidget *widget,
  *     more data.
  *
  *   arguments:
- *     window:  the requestor window
- *     event:   the property event structure
+ *     window: the requestor window
+ *     event:  the property event structure
  *
  *   results:
  *************************************************************/
 
 gint
-gtk_selection_incr_event (GdkWindow        *window,
+gtk_selection_incr_event (GdkWindow       *window,
                          GdkEventProperty *event)
 {
   GList *tmp_list;
   GtkIncrInfo *info;
   gint num_bytes;
   guchar *buffer;
-
+  
   int i;
   
   if (event->state != GDK_PROPERTY_DELETE)
     return FALSE;
-
+  
 #ifdef DEBUG_SELECTION
-  g_print("PropertyDelete, property %ld\n", event->atom);
+  g_message ("PropertyDelete, property %ld", event->atom);
 #endif
-
+  
   /* Now find the appropriate ongoing INCR */
   tmp_list = current_incrs;
   while (tmp_list)
@@ -869,10 +1003,10 @@ gtk_selection_incr_event (GdkWindow        *window,
       
       tmp_list = tmp_list->next;
     }
-
+  
   if (tmp_list == NULL)
     return FALSE;
-
+  
   /* Find out which target this is for */
   for (i=0; i<info->num_conversions; i++)
     {
@@ -893,7 +1027,7 @@ gtk_selection_incr_event (GdkWindow        *window,
                info->conversions[i].offset;
              buffer = info->conversions[i].data.data + 
                info->conversions[i].offset;
-
+             
              if (num_bytes > GTK_SELECTION_MAX_SIZE)
                {
                  num_bytes = GTK_SELECTION_MAX_SIZE;
@@ -903,9 +1037,9 @@ gtk_selection_incr_event (GdkWindow        *window,
                info->conversions[i].offset = -2;
            }
 #ifdef DEBUG_SELECTION
-         g_print("INCR: put %d bytes (offset = %d) into window 0x%lx , property %ld\n",
-                 num_bytes, info->conversions[i].offset, 
-                 GDK_WINDOW_XWINDOW(info->requestor), event->atom);
+         g_message ("INCR: put %d bytes (offset = %d) into window 0x%lx , property %ld",
+                    num_bytes, info->conversions[i].offset, 
+                    GDK_WINDOW_XWINDOW(info->requestor), event->atom);
 #endif
          gdk_property_change (info->requestor, event->atom,
                               info->conversions[i].data.type,
@@ -914,7 +1048,7 @@ gtk_selection_incr_event (GdkWindow        *window,
                               buffer, 
                               (num_bytes + info->conversions[i].data.format/8 - 1) / 
                               (info->conversions[i].data.format/8));
-
+         
          if (info->conversions[i].offset == -2)
            {
              g_free (info->conversions[i].data.data);
@@ -929,9 +1063,9 @@ gtk_selection_incr_event (GdkWindow        *window,
        }
       break;
     }
-
+  
   /* Check if we're finished with all the targets */
-
+  
   if (info->num_incrs == 0)
     {
       current_incrs = g_list_remove_link (current_incrs, tmp_list);
@@ -947,7 +1081,7 @@ gtk_selection_incr_event (GdkWindow        *window,
  *     Timeout callback for the sending portion of the INCR
  *     protocol
  *   arguments:
- *     info:    Information about this incr
+ *     info:   Information about this incr
  *   results:
  *************************************************************/
 
@@ -955,10 +1089,13 @@ static gint
 gtk_selection_incr_timeout (GtkIncrInfo *info)
 {
   GList *tmp_list;
+  gboolean retval;
+
+  GDK_THREADS_ENTER ();
   
   /* Determine if retrieval has finished by checking if it still in
      list of pending retrievals */
-
+  
   tmp_list = current_incrs;
   while (tmp_list)
     {
@@ -979,17 +1116,21 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
       g_free (info->conversions);
       /* FIXME: we should check if requestor window is still in use,
         and if not, remove it? */
-        
+      
       g_free (info);
       
-      return FALSE;            /* remove timeout */
+      retval =  FALSE;         /* remove timeout */
     }
   else
     {
       info->idle_time++;
       
-      return TRUE;             /* timeout will happen again */
+      retval = TRUE;           /* timeout will happen again */
     }
+  
+  GDK_THREADS_LEAVE ();
+
+  return retval;
 }
 
 /*************************************************************
@@ -998,15 +1139,15 @@ gtk_selection_incr_timeout (GtkIncrInfo *info)
  *     where a retrieval is currently in process. The selection
  *     owner has responded to our conversion request.
  *   arguments:
- *     widget:          Widget getting signal
- *     event:           Selection event structure
- *     info:            Information about this retrieval
+ *     widget:         Widget getting signal
+ *     event:          Selection event structure
+ *     info:           Information about this retrieval
  *   results:
  *     was event handled?
  *************************************************************/
 
 gint
-gtk_selection_notify (GtkWidget        *widget,
+gtk_selection_notify (GtkWidget               *widget,
                      GdkEventSelection *event)
 {
   GList *tmp_list;
@@ -1014,11 +1155,11 @@ gtk_selection_notify (GtkWidget        *widget,
   guchar  *buffer;
   gint length;
   GdkAtom type;
-  gint    format;
+  gint   format;
   
 #ifdef DEBUG_SELECTION
-  g_print("Initial receipt of selection %ld, target %ld (property = %ld)\n",
-         event->selection, event->target, event->property);
+  g_message ("Initial receipt of selection %ld, target %ld (property = %ld)",
+            event->selection, event->target, event->property);
 #endif
   
   tmp_list = current_retrievals;
@@ -1029,29 +1170,30 @@ gtk_selection_notify (GtkWidget        *widget,
        break;
       tmp_list = tmp_list->next;
     }
-
+  
   if (!tmp_list)               /* no retrieval in progress */
     return FALSE;
-
+  
   if (event->property == GDK_NONE)
     {
       current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
       g_list_free (tmp_list);
       /* structure will be freed in timeout */
       gtk_selection_retrieval_report (info,
-                                     GDK_NONE, 0, NULL, -1);
-
+                                     GDK_NONE, 0, NULL, -1, event->time);
+      
       return TRUE;
     }
   
   length = gdk_selection_property_get (widget->window, &buffer, 
                                       &type, &format);
-
+  
   if (type == gtk_selection_atoms[INCR])
     {
       /* The remainder of the selection will come through PropertyNotify
         events */
 
+      info->notify_time = event->time;
       info->idle_time = 0;
       info->offset = 0;                /* Mark as OK to proceed */
       gdk_window_set_events (widget->window,
@@ -1063,17 +1205,17 @@ gtk_selection_notify (GtkWidget        *widget,
       /* We don't delete the info structure - that will happen in timeout */
       current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
       g_list_free (tmp_list);
-
+      
       info->offset = length;
       gtk_selection_retrieval_report (info,
                                      type, format, 
-                                     buffer, length);
+                                     buffer, length, event->time);
     }
-
+  
   gdk_property_delete (widget->window, event->property);
-
+  
   g_free (buffer);
-
+  
   return TRUE;
 }
 
@@ -1083,15 +1225,15 @@ gtk_selection_notify (GtkWidget        *widget,
  *     where a retrieval is currently in process. The selection
  *     owner has added more data.
  *   arguments:
- *     widget:          Widget getting signal
- *     event:           Property event structure
- *     info:            Information about this retrieval
+ *     widget:         Widget getting signal
+ *     event:          Property event structure
+ *     info:           Information about this retrieval
  *   results:
  *     was event handled?
  *************************************************************/
 
 gint
-gtk_selection_property_notify (GtkWidget        *widget,
+gtk_selection_property_notify (GtkWidget       *widget,
                               GdkEventProperty *event)
 {
   GList *tmp_list;
@@ -1099,15 +1241,15 @@ gtk_selection_property_notify (GtkWidget        *widget,
   guchar *new_buffer;
   int length;
   GdkAtom type;
-  gint    format;
-
+  gint   format;
+  
   if ((event->state != GDK_PROPERTY_NEW_VALUE) ||  /* property was deleted */
       (event->atom != gdk_selection_property)) /* not the right property */
     return FALSE;
-
+  
 #ifdef DEBUG_SELECTION
-  g_print("PropertyNewValue, property %ld\n",
-         event->atom);
+  g_message ("PropertyNewValue, property %ld",
+            event->atom);
 #endif
   
   tmp_list = current_retrievals;
@@ -1118,25 +1260,25 @@ gtk_selection_property_notify (GtkWidget        *widget,
        break;
       tmp_list = tmp_list->next;
     }
-
+  
   if (!tmp_list)               /* No retrieval in progress */
     return FALSE;
-
+  
   if (info->offset < 0)                /* We haven't got the SelectionNotify
                                   for this retrieval yet */
     return FALSE;
-
+  
   info->idle_time = 0;
   
   length = gdk_selection_property_get (widget->window, &new_buffer, 
                                       &type, &format);
   gdk_property_delete (widget->window, event->atom);
-
+  
   /* We could do a lot better efficiency-wise by paying attention to
      what length was sent in the initial INCR transaction, instead of
      doing memory allocation at every step. But its only guaranteed to
      be a _lower bound_ (pretty useless!) */
-
+  
   if (length == 0 || type == GDK_NONE)         /* final zero length portion */
     {
       /* Info structure will be freed in timeout */
@@ -1145,25 +1287,26 @@ gtk_selection_property_notify (GtkWidget        *widget,
       gtk_selection_retrieval_report (info,
                                      type, format, 
                                      (type == GDK_NONE) ?  NULL : info->buffer,
-                                     (type == GDK_NONE) ?  -1 : info->offset);
+                                     (type == GDK_NONE) ?  -1 : info->offset,
+                                     info->notify_time);
     }
   else                         /* append on newly arrived data */
     {
       if (!info->buffer)
        {
 #ifdef DEBUG_SELECTION
-         g_print("Start - Adding %d bytes at offset 0\n",
-                 length);
+         g_message ("Start - Adding %d bytes at offset 0",
+                    length);
 #endif
          info->buffer = new_buffer;
          info->offset = length;
        }
       else
        {
-
+         
 #ifdef DEBUG_SELECTION
-         g_print("Appending %d bytes at offset %d\n",
-                 length,info->offset);
+         g_message ("Appending %d bytes at offset %d",
+                    length,info->offset);
 #endif
          /* We copy length+1 bytes to preserve guaranteed null termination */
          info->buffer = g_realloc (info->buffer, info->offset+length+1);
@@ -1172,7 +1315,7 @@ gtk_selection_property_notify (GtkWidget        *widget,
          g_free (new_buffer);
        }
     }
-
+  
   return TRUE;
 }
 
@@ -1188,10 +1331,13 @@ static gint
 gtk_selection_retrieval_timeout (GtkRetrievalInfo *info)
 {
   GList *tmp_list;
+  gboolean retval;
+
+  GDK_THREADS_ENTER ();
   
   /* Determine if retrieval has finished by checking if it still in
      list of pending retrievals */
-
+  
   tmp_list = current_retrievals;
   while (tmp_list)
     {
@@ -1207,86 +1353,96 @@ gtk_selection_retrieval_timeout (GtkRetrievalInfo *info)
        {
          current_retrievals = g_list_remove_link (current_retrievals, tmp_list);
          g_list_free (tmp_list);
-         gtk_selection_retrieval_report (info, GDK_NONE, 0, NULL, -1);
+         gtk_selection_retrieval_report (info, GDK_NONE, 0, NULL, -1, GDK_CURRENT_TIME);
        }
       
       g_free (info->buffer);
       g_free (info);
       
-      return FALSE;            /* remove timeout */
+      retval =  FALSE;         /* remove timeout */
     }
   else
     {
       info->idle_time++;
       
-      return TRUE;             /* timeout will happen again */
+      retval =  TRUE;          /* timeout will happen again */
     }
 
+  GDK_THREADS_LEAVE ();
+
+  return retval;
 }
 
 /*************************************************************
  * gtk_selection_retrieval_report:
  *     Emits a "selection_received" signal.
  *   arguments:
- *     info:      information about the retrieval that completed
- *     buffer:    buffer containing data (NULL => errror)
+ *     info:     information about the retrieval that completed
+ *     buffer:   buffer containing data (NULL => errror)
+ *     time:      timestamp for data in buffer
  *   results:
  *************************************************************/
 
 static void
 gtk_selection_retrieval_report (GtkRetrievalInfo *info,
                                GdkAtom type, gint format, 
-                               guchar *buffer, gint length)
+                               guchar *buffer, gint length,
+                               guint32 time)
 {
   GtkSelectionData data;
-
+  
   data.selection = info->selection;
   data.target = info->target;
   data.type = type;
   data.format = format;
-
+  
   data.length = length;
   data.data = buffer;
-
+  
   gtk_signal_emit_by_name (GTK_OBJECT(info->widget),
-                          "selection_received", &data);
+                          "selection_received", 
+                          &data, time);
 }
 
 /*************************************************************
- * gtk_selection_find_handler:
- *     Find handler for specified widget/selection/target
+ * gtk_selection_invoke_handler:
+ *     Finds and invokes handler for specified
+ *     widget/selection/target combination, calls 
+ *     gtk_selection_default_handler if none exists.
+ *
  *   arguments:
- *     widget:
- *     selection:
- *     target:
+ *     widget:     selection owner
+ *     data:       selection data [INOUT]
+ *     time:        time from requeset
+ *     
  *   results:
+ *     Number of bytes written to buffer, -1 if error
  *************************************************************/
 
-static GtkSelectionHandler *
-gtk_selection_find_handler (GtkWidget *widget,
-                           GdkAtom    selection,
-                           GdkAtom    target)
+static void
+gtk_selection_invoke_handler (GtkWidget               *widget,
+                             GtkSelectionData *data,
+                             guint             time)
 {
-  GList *tmp_list;
-  GtkSelectionHandler *handler;
-
-  g_return_val_if_fail (widget != NULL, FALSE);
+  GtkTargetList *target_list;
+  guint info;
   
-  tmp_list = gtk_object_get_data (GTK_OBJECT (widget),
-                                 gtk_selection_handler_key);
 
-  while (tmp_list)
+  g_return_if_fail (widget != NULL);
+
+  target_list = gtk_selection_target_list_get (widget, data->selection);
+  if (target_list && 
+      gtk_target_list_find (target_list, data->target, &info))
     {
-      handler = (GtkSelectionHandler *)tmp_list->data;
-      if ((handler->selection == selection) && (handler->target == target))
-       return handler;
-      tmp_list = tmp_list->next;
+      gtk_signal_emit_by_name (GTK_OBJECT (widget), 
+                              "selection_get",
+                              data,
+                              info, time);
     }
-
-  return NULL;
+  else
+    gtk_selection_default_handler (widget, data);
 }
 
-
 /*************************************************************
  * gtk_selection_default_handler:
  *     Handles some default targets that exist for any widget
@@ -1295,20 +1451,13 @@ gtk_selection_find_handler (GtkWidget *widget,
  *     require 1000 selection targets!
  *
  *   arguments:
- *     widget:      selection owner
- *     selection:   selection requested
- *     target:      target requested
- *     buffer:      buffer to write results into
- *     length:      size of buffer
- *     type:        type atom
- *     format:      length of type's units in bits
- *     
- *   results:
- *     Number of bytes written to buffer, -1 if error
+ *     widget:     selection owner
+ *     data:       selection data [INOUT]
+ *
  *************************************************************/
 
 static void
-gtk_selection_default_handler (GtkWidget        *widget,
+gtk_selection_default_handler (GtkWidget       *widget,
                               GtkSelectionData *data)
 {
   if (data->target == gtk_selection_atoms[TIMESTAMP])
@@ -1331,10 +1480,10 @@ gtk_selection_default_handler (GtkWidget        *widget,
                                      sizeof (guint32));
              return;
            }
-             
+         
          tmp_list = tmp_list->next;
        }
-
+      
       data->length = -1;
     }
   else if (data->target == gtk_selection_atoms[TARGETS])
@@ -1343,41 +1492,36 @@ gtk_selection_default_handler (GtkWidget        *widget,
       GdkAtom *p;
       gint count;
       GList *tmp_list;
-      GtkSelectionHandler *handler;
-
+      GtkTargetList *target_list;
+      GtkTargetPair *pair;
+      
       count = 3;
-      tmp_list = gtk_object_get_data (GTK_OBJECT(widget),
-                                     gtk_selection_handler_key);
+      target_list = gtk_selection_target_list_get (widget,
+                                                  data->selection);
+      tmp_list = target_list->list;
       while (tmp_list)
        {
-         handler = (GtkSelectionHandler *)tmp_list->data;
-
-         if (handler->selection == data->selection)
-           count++;
-         
+         count++;
          tmp_list = tmp_list->next;
        }
-
+      
       data->type = GDK_SELECTION_TYPE_ATOM;
       data->format = 8*sizeof (GdkAtom);
       data->length = count*sizeof (GdkAtom);
-
+      
       p = g_new (GdkAtom, count);
       data->data = (guchar *)p;
-
+      
       *p++ = gtk_selection_atoms[TIMESTAMP];
       *p++ = gtk_selection_atoms[TARGETS];
       *p++ = gtk_selection_atoms[MULTIPLE];
-
-      tmp_list = gtk_object_get_data (GTK_OBJECT(widget),
-                                     gtk_selection_handler_key);
+      
+      tmp_list = target_list->list;
       while (tmp_list)
        {
-         handler = (GtkSelectionHandler *)tmp_list->data;
-
-         if (handler->selection == data->selection)
-           *p++ = handler->target;
-
+         pair = (GtkTargetPair *)tmp_list->data;
+         *p++ = pair->target;
+         
          tmp_list = tmp_list->next;
        }
     }
@@ -1386,3 +1530,25 @@ gtk_selection_default_handler (GtkWidget        *widget,
       data->length = -1;
     }
 }
+
+
+GtkSelectioData*
+gtk_selection_data_copy (GtkSelectionData *data)
+{
+  GtkSelectionData *new_data;
+  
+  g_return_val_if_fail (data != NULL, NULL);
+  
+  new_data = g_new (GtkSelectionData, 1);
+  *new_data = *data;
+  
+  return new_data;
+}
+
+void
+gtk_selection_data_free (GtkSelectionData *data)
+{
+  g_return_if_fail (data != NULL);
+  
+  g_free (data);
+}