]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/clipbrd.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
backported changes from gtk/window.cpp rev 1.678 (bug 1531348)
[wxWidgets.git] / src / gtk1 / clipbrd.cpp
diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 8390bc65f24b45b958ba6b9c7d73ef73106bdcfd..7f02601153e3320c0310d08d3aab181c846d069a 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -1,40 +1,48 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
-// Name:        clipbrd.cpp
+// Name:        src/gtk1/clipbrd.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "clipbrd.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#if wxUSE_CLIPBOARD
 
 #include "wx/clipbrd.h"
 
 
 #include "wx/clipbrd.h"
 
-#ifdef wxUSE_CLIPBOARD
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/utils.h"
+    #include "wx/dataobj.h"
+#endif
 
 
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <glib.h>
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
-wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
-
-GdkAtom  g_textAtom        = 0;
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
+GdkAtom  g_timestampAtom   = 0;
+
+// the trace mask we use with wxLogTrace() - call
+// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
+// (there will be a *lot* of them!)
+static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
 
 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------
 
 /* The contents of a selection are returned in a GtkSelectionData
 
 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------
 
 /* The contents of a selection are returned in a GtkSelectionData
-   structure. selection/target identify the request. 
+   structure. selection/target identify the request.
    type specifies the type of the return; if length < 0, and
    the data should be ignored. This structure has object semantics -
    no fields should be modified directly, they should not be created
    type specifies the type of the return; if length < 0, and
    the data should be ignored. This structure has object semantics -
    no fields should be modified directly, they should not be created
@@ -47,9 +55,9 @@ struct _GtkSelectionData
   GdkAtom selection;
   GdkAtom target;
   GdkAtom type;
   GdkAtom selection;
   GdkAtom target;
   GdkAtom type;
-  gint   format;
+  gint    format;
   guchar *data;
   guchar *data;
-  gint   length;
+  gint    length;
 };
 
 */
 };
 
 */
@@ -58,207 +66,237 @@ struct _GtkSelectionData
 // "selection_received" for targets
 //-----------------------------------------------------------------------------
 
 // "selection_received" for targets
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 static void
-targets_selection_received( GtkWidget *WXUNUSED(widget), 
-                            GtkSelectionData *selection_data, 
-                           wxClipboard *clipboard )
+targets_selection_received( GtkWidget *WXUNUSED(widget),
+                            GtkSelectionData *selection_data,
+                            guint32 WXUNUSED(time),
+                            wxClipboard *clipboard )
 {
 {
-    if (!wxTheClipboard) return;
-  
-    if (selection_data->length <= 0) return;
-  
-    // make sure we got the data in the correct form 
-    if (selection_data->type != GDK_SELECTION_TYPE_ATOM) return;
-  
-    // the atoms we received, holding a list of targets (= formats) 
-    GdkAtom *atoms = (GdkAtom *)selection_data->data;
-
-    for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
+    if ( wxTheClipboard && selection_data->length > 0 )
     {
     {
-        if (atoms[i] == clipboard->m_targetRequested)
+        // make sure we got the data in the correct form
+        GdkAtom type = selection_data->type;
+        if ( type != GDK_SELECTION_TYPE_ATOM )
         {
         {
-            clipboard->m_formatSupported = TRUE;
-            return;
+            gchar* atom_name = gdk_atom_name(type);
+            if ( strcmp(atom_name, "TARGETS") )
+            {
+                wxLogTrace( TRACE_CLIPBOARD,
+                            _T("got unsupported clipboard target") );
+
+                clipboard->m_waiting = false;
+                g_free(atom_name);
+                return;
+            }
+            g_free(atom_name);
+        }
+
+#ifdef __WXDEBUG__
+        wxDataFormat clip( selection_data->selection );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("selection received for targets, clipboard %s"),
+                    clip.GetId().c_str() );
+#endif // __WXDEBUG__
+
+        // the atoms we received, holding a list of targets (= formats)
+        GdkAtom *atoms = (GdkAtom *)selection_data->data;
+
+        for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
+        {
+            wxDataFormat format( atoms[i] );
+
+            wxLogTrace( TRACE_CLIPBOARD,
+                        wxT("selection received for targets, format %s"),
+                        format.GetId().c_str() );
+
+//            printf( "format %s requested %s\n",
+//                    gdk_atom_name( atoms[i] ),
+//                    gdk_atom_name( clipboard->m_targetRequested ) );
+
+            if (format == clipboard->m_targetRequested)
+            {
+                clipboard->m_waiting = false;
+                clipboard->m_formatSupported = true;
+                return;
+            }
         }
     }
 
         }
     }
 
-    return;
+    clipboard->m_waiting = false;
+}
 }
 
 //-----------------------------------------------------------------------------
 // "selection_received" for the actual data
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "selection_received" for the actual data
 //-----------------------------------------------------------------------------
 
-static void 
-selection_received( GtkWidget *WXUNUSED(widget), 
-                    GtkSelectionData *selection_data, 
-                   wxClipboard *clipboard )
+extern "C" {
+static void
+selection_received( GtkWidget *WXUNUSED(widget),
+                    GtkSelectionData *selection_data,
+                    guint32 WXUNUSED(time),
+                    wxClipboard *clipboard )
 {
 {
-    if (!wxTheClipboard) return;
-  
+    if (!wxTheClipboard)
+    {
+        clipboard->m_waiting = false;
+        return;
+    }
+
     wxDataObject *data_object = clipboard->m_receivedData;
     wxDataObject *data_object = clipboard->m_receivedData;
-    
-    if (!data_object) return;
-    
-    if (selection_data->length <= 0) return;
-  
+
+    if (!data_object)
+    {
+        clipboard->m_waiting = false;
+        return;
+    }
+
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = false;
+        return;
+    }
+
+    wxDataFormat format( selection_data->target );
+
     // make sure we got the data in the correct format
     // make sure we got the data in the correct format
-    
-    if (data_object->m_formatAtom != selection_data->target) return;
-    
+    if (!data_object->IsSupportedFormat( format ) )
+    {
+        clipboard->m_waiting = false;
+        return;
+    }
+
+#if 0
+    This seems to cause problems somehow
     // make sure we got the data in the correct form (selection type).
     // if so, copy data to target object
     // make sure we got the data in the correct form (selection type).
     // if so, copy data to target object
-    
-    switch (data_object->GetFormat())
+    if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {
     {
-        case wxDF_TEXT:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-           
-           wxTextDataObject *text_object = (wxTextDataObject *) data_object;
-           
-           wxString text = (const char*) selection_data->data;
-           
-           text_object->SetText( text );
-           
-           break;
-       }
-       
-       case wxDF_BITMAP:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) return;
-           
-           return;
-           
-           break;
-       }
-       
-       case wxDF_PRIVATE:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-           
-           wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
-           
-           private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length );
-           
-           break;
-       }
-       
-       default:
-       {
-           return;
-       }
+        clipboard->m_waiting = false;
+        return;
     }
     }
-    
-    wxTheClipboard->m_formatSupported = TRUE;
+#endif
+
+    data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
+
+    wxTheClipboard->m_formatSupported = true;
+    clipboard->m_waiting = false;
+}
 }
 
 //-----------------------------------------------------------------------------
 // "selection_clear"
 //-----------------------------------------------------------------------------
 
 }
 
 //-----------------------------------------------------------------------------
 // "selection_clear"
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static gint
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
     if (!wxTheClipboard) return TRUE;
 static gint
 selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
 {
     if (!wxTheClipboard) return TRUE;
-    
+
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
     if (event->selection == GDK_SELECTION_PRIMARY)
     {
-        wxTheClipboard->m_ownsPrimarySelection = FALSE;
+        wxTheClipboard->m_ownsPrimarySelection = false;
     }
     else
     if (event->selection == g_clipboardAtom)
     {
     }
     else
     if (event->selection == g_clipboardAtom)
     {
-        wxTheClipboard->m_ownsClipboard = FALSE;
+        wxTheClipboard->m_ownsClipboard = false;
     }
     else
     {
     }
     else
     {
+        wxTheClipboard->m_waiting = false;
         return FALSE;
     }
         return FALSE;
     }
-    
+
     if ((!wxTheClipboard->m_ownsPrimarySelection) &&
         (!wxTheClipboard->m_ownsClipboard))
     {
     if ((!wxTheClipboard->m_ownsPrimarySelection) &&
         (!wxTheClipboard->m_ownsClipboard))
     {
-        // the clipboard is no longer in our hands. we can the
-        // clipboard data.
-    
-        wxTheClipboard->m_dataObjects.Clear();
+        /* the clipboard is no longer in our hands. we can the delete clipboard data. */
+        if (wxTheClipboard->m_data)
+        {
+            wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
+
+            delete wxTheClipboard->m_data;
+            wxTheClipboard->m_data = (wxDataObject*) NULL;
+        }
     }
     }
-  
+
+    wxTheClipboard->m_waiting = false;
     return TRUE;
 }
     return TRUE;
 }
+}
 
 //-----------------------------------------------------------------------------
 // selection handler for supplying data
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // selection handler for supplying data
 //-----------------------------------------------------------------------------
 
+extern "C" {
 static void
 static void
-selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, gpointer WXUNUSED(data) )
+selection_handler( GtkWidget *WXUNUSED(widget),
+                   GtkSelectionData *selection_data,
+                   guint WXUNUSED(info),
+                   guint WXUNUSED(time),
+                   gpointer signal_data )
 {
     if (!wxTheClipboard) return;
 {
     if (!wxTheClipboard) return;
-  
-    wxNode *node = wxTheClipboard->m_dataObjects.First();
-    
-    while (node)
+
+    if (!wxTheClipboard->m_data) return;
+
+    wxDataObject *data = wxTheClipboard->m_data;
+
+    // ICCCM says that TIMESTAMP is a required atom.
+    // In particular, it satisfies Klipper, which polls
+    // TIMESTAMP to see if the clipboards content has changed.
+    // It shall return the time which was used to set the data.
+    if (selection_data->target == g_timestampAtom)
     {
     {
-        wxDataObject *data_object = (wxDataObject *)node->Data();
-    
-       if (data_object->m_formatAtom != selection_data->target)
-       {
-           node = node->Next();
-           break;
-       }
-       
-       switch (data_object->GetFormat())
-       {
-           case wxDF_TEXT:
-           {
-               wxTextDataObject *text_object = (wxTextDataObject*) data_object;
-           
-               wxString text = text_object->GetText();
-           
-               char *s = WXSTRINGCAST text;
-               int len = (int) text.Length();
-               
-                gtk_selection_data_set( 
-                    selection_data, 
-                   GDK_SELECTION_TYPE_STRING, 
-                   8*sizeof(gchar),
-                   (unsigned char*) s, 
-                   len ); 
-                   
-               break;
-           }
-           
-           case wxDF_BITMAP:
-           {
-               // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
-           
-               // how do we do that ?
-               
-               break;
-           }
-           
-           case wxDF_PRIVATE:
-            {
-               wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object;
-           
-               if (private_object->GetDataSize() == 0) return;
-           
-                gtk_selection_data_set( 
-                    selection_data, 
-                   GDK_SELECTION_TYPE_STRING, 
-                   8*sizeof(gchar), 
-                   (unsigned char*) private_object->GetData(), 
-                   (int) private_object->GetDataSize() );
-           }
-           
-           default:
-             break;
-        }
-       
-       node = node->Next();
+        guint timestamp = GPOINTER_TO_UINT (signal_data);
+        gtk_selection_data_set(selection_data,
+                               GDK_SELECTION_TYPE_INTEGER,
+                               32,
+                               (guchar*)&(timestamp),
+                               sizeof(timestamp));
+        wxLogTrace(TRACE_CLIPBOARD,
+                   _T("Clipboard TIMESTAMP requested, returning timestamp=%u"),
+                   timestamp);
+        return;
     }
     }
+
+    wxDataFormat format( selection_data->target );
+
+#ifdef __WXDEBUG__
+    wxLogTrace(TRACE_CLIPBOARD,
+               _T("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"),
+               format.GetId().c_str(),
+               wxString::FromAscii(gdk_atom_name(selection_data->target)).c_str(),
+               wxString::FromAscii(gdk_atom_name(selection_data->type)).c_str(),
+               wxString::FromAscii(gdk_atom_name(selection_data->selection)).c_str(),
+               GPOINTER_TO_UINT( signal_data )
+               );
+#endif
+
+    if (!data->IsSupportedFormat( format )) return;
+
+    int size = data->GetDataSize( format );
+
+    if (size == 0) return;
+
+    void *d = malloc(size);
+
+    // Text data will be in UTF8 in Unicode mode.
+    data->GetDataHere( selection_data->target, d );
+
+    gtk_selection_data_set(
+            selection_data,
+            GDK_SELECTION_TYPE_STRING,
+            8 * sizeof(gchar),
+            (unsigned char*) d,
+            size );
+
+    free(d);
+}
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
@@ -269,288 +307,333 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {
-    m_open = FALSE;
+    m_open = false;
+    m_waiting = false;
 
 
-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
+    m_ownsClipboard = false;
+    m_ownsPrimarySelection = false;
 
 
-    m_dataObjects.DeleteContents( TRUE );
-  
+    m_data = (wxDataObject*) NULL;
     m_receivedData = (wxDataObject*) NULL;
 
     m_receivedData = (wxDataObject*) NULL;
 
+    /* we use m_targetsWidget to query what formats are available */
+
+    m_targetsWidget = gtk_window_new( GTK_WINDOW_POPUP );
+    gtk_widget_realize( m_targetsWidget );
+
+    gtk_signal_connect( GTK_OBJECT(m_targetsWidget),
+                        "selection_received",
+                        GTK_SIGNAL_FUNC( targets_selection_received ),
+                        (gpointer) this );
+
+    /* we use m_clipboardWidget to get and to offer data */
+
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );
 
     m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP );
     gtk_widget_realize( m_clipboardWidget );
 
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
+                        "selection_received",
+                        GTK_SIGNAL_FUNC( selection_received ),
+                        (gpointer) this );
+
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
                         "selection_clear_event",
                         "selection_clear_event",
-                       GTK_SIGNAL_FUNC( selection_clear_clip ), 
-                       (gpointer) NULL );
-                     
+                        GTK_SIGNAL_FUNC( selection_clear_clip ),
+                        (gpointer) NULL );
+
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
-    if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
-  
-    m_formatSupported = FALSE;
+    if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
+
+    m_formatSupported = false;
     m_targetRequested = 0;
     m_targetRequested = 0;
+
+    m_usePrimary = false;
 }
 
 wxClipboard::~wxClipboard()
 {
 }
 
 wxClipboard::~wxClipboard()
 {
-    Clear();  
-  
+    Clear();
+
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
+    if (m_targetsWidget) gtk_widget_destroy( m_targetsWidget );
 }
 
 void wxClipboard::Clear()
 {
 }
 
 void wxClipboard::Clear()
 {
-    if (m_dataObjects.GetCount())
-    { 
-        /*  As we have data we also own the clipboard. Once we no longer own
-            it, clear_selection is called which will set m_data to zero */
-     
+    if (m_data)
+    {
+#if wxUSE_THREADS
+        /* disable GUI threads */
+#endif
+
+        //  As we have data we also own the clipboard. Once we no longer own
+        //  it, clear_selection is called which will set m_data to zero
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
-            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
+            m_waiting = true;
+
+            gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom,
+                                     (guint32) GDK_CURRENT_TIME );
+
+            while (m_waiting) gtk_main_iteration();
         }
         }
-    
+
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
         if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window)
         {
-            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
+            m_waiting = true;
+
+            gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY,
+                                     (guint32) GDK_CURRENT_TIME );
+
+            while (m_waiting) gtk_main_iteration();
+        }
+
+        if (m_data)
+        {
+            delete m_data;
+            m_data = (wxDataObject*) NULL;
         }
         }
-    
-        m_dataObjects.Clear();
+
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+#endif
     }
     }
-  
+
     m_targetRequested = 0;
     m_targetRequested = 0;
-  
-    m_formatSupported = FALSE;
+    m_formatSupported = false;
 }
 
 bool wxClipboard::Open()
 {
 }
 
 bool wxClipboard::Open()
 {
-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
-  
-    m_open = TRUE;
-  
-    return TRUE;
+    wxCHECK_MSG( !m_open, false, wxT("clipboard already open") );
+
+    m_open = true;
+
+    return true;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, "data is invalid" );
-  
-    wxNode *node = m_dataObjects.First();
-    
-    while (node)
-    {
-        wxDataObject *d = (wxDataObject*)node->Data();
-       
-       if (d->GetFormat() == data->GetFormat())
-       {
-           m_dataObjects.DeleteNode( node );
-           
-           break;
-       }
-       
-        node = node->Next();
-    }
-    
-    m_dataObjects.Append( data );
-  
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
-  
-    if (data->GetFormat() == wxDF_PRIVATE)
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
+
+    Clear();
+
+    return AddData( data );
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+
+    wxCHECK_MSG( data, false, wxT("data is invalid") );
+
+    // we can only store one wxDataObject
+    Clear();
+
+    m_data = data;
+
+    // get formats from wxDataObjects
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+
+    // primary selection or clipboard
+    GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                     : g_clipboardAtom;
+
+    // by default provide TIMESTAMP as a target
+    gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
+                              clipboard,
+                              g_timestampAtom,
+                              0 );
+
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
     {
-        wxPrivateDataObject* pd = (wxPrivateDataObject*) data;
-       
-        wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
-       
-        data->m_formatAtom = GetTargetAtom( data->GetFormat(), pd->GetId() );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );
+
+//        printf( "added %s\n",
+//                    gdk_atom_name( array[i].GetFormatId() ) );
+
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
+                                  clipboard,
+                                  array[i],
+                                  0 );  /* what is info ? */
     }
     }
+
+    delete[] array;
+
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
+                        "selection_get",
+                        GTK_SIGNAL_FUNC(selection_handler),
+                        GUINT_TO_POINTER( gdk_event_get_time(gtk_get_current_event()) ) );
+
+#if wxUSE_THREADS
+    /* disable GUI threads */
+#endif
+
+    /* Tell the world we offer clipboard data */
+    bool res = (gtk_selection_owner_set( m_clipboardWidget,
+                                         clipboard,
+                                         (guint32) GDK_CURRENT_TIME ));
+
+    if (m_usePrimary)
+        m_ownsPrimarySelection = res;
     else
     else
-    {
-        data->m_formatAtom = GetTargetAtom( data->GetFormat() );
-    }
-    
-    // This should happen automatically
-      
-    m_ownsClipboard = FALSE;
-    m_ownsPrimarySelection = FALSE;
-    
-    // Add handlers if someone requests data
-  
-    gtk_selection_add_handler( m_clipboardWidget, 
-                               g_clipboardAtom,
-                              data->m_formatAtom,
-                              selection_handler,
-                              NULL );
-                              
-    gtk_selection_add_handler( m_clipboardWidget, 
-                               GDK_SELECTION_PRIMARY,
-                              data->m_formatAtom,
-                              selection_handler,
-                              NULL );
-                              
-    // Tell the world we offer clipboard data
-  
-    if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                  g_clipboardAtom,
-                                 GDK_CURRENT_TIME ))
-    {
-        return FALSE;
-    }
-    m_ownsClipboard = TRUE;
-    
-    if (!gtk_selection_owner_set( m_clipboardWidget, 
-                                  GDK_SELECTION_PRIMARY,
-                                 GDK_CURRENT_TIME ))
-    {
-        return FALSE;
-    }
-    m_ownsPrimarySelection = TRUE;
-                            
-    return TRUE;
+        m_ownsClipboard = res;
+
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+#endif
+
+    return res;
 }
 
 void wxClipboard::Close()
 {
 }
 
 void wxClipboard::Close()
 {
-    wxCHECK_RET( m_open, "clipboard not open" );
-    
-    m_open = FALSE;
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
+
+    m_open = false;
 }
 
 }
 
-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString &id )
+bool wxClipboard::IsOpened() const
 {
 {
-    m_targetRequested = GetTargetAtom( format, id );
-  
-    if (m_targetRequested == 0) return FALSE;
-    
-    // add handler for target (= format) query
-
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
-  
-    m_formatSupported = FALSE;
-  
-    // perform query. this will set m_formatSupported to 
-    // TRUE if m_targetRequested is supported
-    
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
-                          g_targetsAtom,
-                          GDK_CURRENT_TIME );
-
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( targets_selection_received ),
-                                  (gpointer) this );
-  
-    if (!m_formatSupported) return FALSE;
-  
-    return TRUE;
+    return m_open;
 }
 
 }
 
-bool wxClipboard::GetData( wxDataObject *data )
+bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
 {
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
-    
-    m_receivedData = data;
-    
-    wxCHECK_MSG( m_receivedData, FALSE, "invalid data object" );
-    
-    if (m_receivedData->GetFormat() == wxDF_PRIVATE)
-    {
-        wxPrivateDataObject* pd = (wxPrivateDataObject*) m_receivedData;
-       
-        wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
-       
-        m_targetRequested = GetTargetAtom( m_receivedData->GetFormat(), pd->GetId() );
-    }
-    else
-    {
-        m_targetRequested = GetTargetAtom( m_receivedData->GetFormat() );
-    }
-    
-    data->m_formatAtom = m_targetRequested;
-  
-    wxCHECK_MSG( m_targetRequested, FALSE, "unsupported clipboard format" );
-  
-    m_formatSupported = FALSE;
-  
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
-
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
-                          m_targetRequested,
-                          GDK_CURRENT_TIME );
-  
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( selection_received ),
-                                  (gpointer) this );
-
-    wxCHECK_MSG( m_formatSupported, FALSE, "error retrieving data from clipboard" );
-  
-    return TRUE;
+    /* reentrance problems */
+    if (m_waiting) return false;
+
+    /* store requested format to be asked for by callbacks */
+    m_targetRequested = format;
+
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard:IsSupported: requested format: %s"),
+                format.GetId().c_str() );
+
+    wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
+
+    m_formatSupported = false;
+
+    /* perform query. this will set m_formatSupported to
+       true if m_targetRequested is supported.
+       also, we have to wait for the "answer" from the
+       clipboard owner which is an asynchronous process.
+       therefore we set m_waiting = true here and wait
+       until the callback "targets_selection_received"
+       sets it to false */
+
+    m_waiting = true;
+
+    gtk_selection_convert( m_targetsWidget,
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom,
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );
+
+    while (m_waiting) gtk_main_iteration();
+
+    return m_formatSupported;
 }
 
 }
 
-GdkAtom wxClipboard::GetTargetAtom( wxDataFormat format, const wxString &id )
+bool wxClipboard::GetData( wxDataObject& data )
 {
 {
-    // What is X representation of that format?
-  
-    switch (format)
+    wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
+
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
+    data.GetAllFormats( array );
+
+    for (size_t i = 0; i < data.GetFormatCount(); i++)
     {
     {
-        case wxDF_TEXT:
-        {
-            return GDK_TARGET_STRING;
-                               // g_textAtom
-        }
-      
-        case wxDF_BITMAP:
-        {
-            return GDK_TARGET_BITMAP;
-            break;
-        }
-      
-        case wxDF_PRIVATE:
-        {
-            // we create our own X representation
-    
-            return gdk_atom_intern( WXSTRINGCAST( id ), FALSE );
-        }
-       
-       default:
-       {
-           return (GdkAtom) 0;
-       }
-    }
-       
-    return (GdkAtom) 0;
-}
+        wxDataFormat format( array[i] );
 
 
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard::GetData: requested format: %s"),
+                    format.GetId().c_str() );
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
+        /* is data supported by clipboard ? */
 
 
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
-  
-    return TRUE;
-}
+        /* store requested format to be asked for by callbacks */
+        m_targetRequested = format;
 
 
-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
+
+        m_formatSupported = false;
+
+       /* perform query. this will set m_formatSupported to
+          true if m_targetRequested is supported.
+          also, we have to wait for the "answer" from the
+          clipboard owner which is an asynchronous process.
+          therefore we set m_waiting = true here and wait
+          until the callback "targets_selection_received"
+          sets it to false */
+
+        m_waiting = true;
+
+        gtk_selection_convert( m_targetsWidget,
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom,
+                           g_targetsAtom,
+                           (guint32) GDK_CURRENT_TIME );
+
+        while (m_waiting) gtk_main_iteration();
+
+        if (!m_formatSupported) continue;
+
+        /* store pointer to data object to be filled up by callbacks */
+        m_receivedData = &data;
+
+        /* store requested format to be asked for by callbacks */
+        m_targetRequested = format;
+
+        wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") );
+
+        /* start query */
+        m_formatSupported = false;
+
+        /* ask for clipboard contents.  this will set
+           m_formatSupported to true if m_targetRequested
+           is supported.
+           also, we have to wait for the "answer" from the
+           clipboard owner which is an asynchronous process.
+           therefore we set m_waiting = true here and wait
+           until the callback "targets_selection_received"
+           sets it to false */
+
+        m_waiting = true;
+
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard::GetData: format found, start convert") );
+
+        gtk_selection_convert( m_clipboardWidget,
+                               m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                            : g_clipboardAtom,
+                               m_targetRequested,
+                               (guint32) GDK_CURRENT_TIME );
+
+        while (m_waiting) gtk_main_iteration();
+
+        /* this is a true error as we checked for the presence of such data before */
+        wxCHECK_MSG( m_formatSupported, false, wxT("error retrieving data from clipboard") );
+
+        /* return success */
+        delete[] array;
+        return true;
+    }
+
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard::GetData: format not found") );
+
+    /* return failure */
+    delete[] array;
+    return false;
 }
 
 #endif
 }
 
 #endif
-
   // wxUSE_CLIPBOARD
   // wxUSE_CLIPBOARD
-
wxWidgets (Impactor)