]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk/clipbrd.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
added helpext.cpp and regenerated the makefiles
[wxWidgets.git] / src / gtk / clipbrd.cpp
diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp
index 4314ac726b504ed67dc55ea4830eebd65951e2ef..1304b0ddf1d282afbbead3a9155e58501b568bbe 100644 (file)
--- a/src/gtk/clipbrd.cpp
+++ b/src/gtk/clipbrd.cpp
@@ -15,17 +15,29 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 
+#include "wx/dataobj.h"
+#include "wx/utils.h"
+#include "wx/log.h"
+
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
+//-----------------------------------------------------------------------------
+// thread system
+//-----------------------------------------------------------------------------
+
+#if wxUSE_THREADS
+extern void wxapp_install_thread_wakeup();
+extern void wxapp_uninstall_thread_wakeup();
+#endif
+
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------
 
 wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
 
 //-----------------------------------------------------------------------------
 // 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;
 
@@ -61,27 +73,48 @@ struct _GtkSelectionData
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 
 static void
 targets_selection_received( GtkWidget *WXUNUSED(widget), 
                             GtkSelectionData *selection_data, 
+#if (GTK_MINOR_VERSION > 0)
+                            guint32 WXUNUSED(time),
+#endif
                            wxClipboard *clipboard )
 {
                            wxClipboard *clipboard )
 {
-    if (!wxTheClipboard) return;
-  
-    if (selection_data->length <= 0) return;
+    if (!wxTheClipboard)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
   
   
-    // make sure we got the data in the correct form 
-    if (selection_data->type != GDK_SELECTION_TYPE_ATOM) return;
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+    
+    /* make sure we got the data in the correct form */
+    if (selection_data->type != GDK_SELECTION_TYPE_ATOM)
+    {
+        clipboard->m_waiting = FALSE;
+        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++)
     {
   
     // 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++)
     {
+/*
+        char *name = gdk_atom_name (atoms[i]);
+        if (name) printf( "Format available: %s.\n", name ); */
+      
         if (atoms[i] == clipboard->m_targetRequested)
         {
         if (atoms[i] == clipboard->m_targetRequested)
         {
+            clipboard->m_waiting = FALSE;
             clipboard->m_formatSupported = TRUE;
             return;
         }
     }
 
             clipboard->m_formatSupported = TRUE;
             return;
         }
     }
 
+    clipboard->m_waiting = FALSE;
     return;
 }
 
     return;
 }
 
@@ -92,28 +125,52 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 static void 
 selection_received( GtkWidget *WXUNUSED(widget), 
                     GtkSelectionData *selection_data, 
 static void 
 selection_received( GtkWidget *WXUNUSED(widget), 
                     GtkSelectionData *selection_data, 
+#if (GTK_MINOR_VERSION > 0)
+                    guint32 WXUNUSED(time),
+#endif
                    wxClipboard *clipboard )
 {
                    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)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
     
     
-    if (!data_object) return;
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
     
     
-    if (selection_data->length <= 0) return;
+    wxDataFormat format( selection_data->target );
   
   
-    // make sure we got the data in the correct format
-    
-    if (data_object->m_formatAtom != selection_data->target) return;
-    
-    // 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 format */
+    if (!data_object->IsSupportedFormat( format ) )
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }
+
+    /* make sure we got the data in the correct form (selection type).
+       if so, copy data to target object */
     
     
-    switch (data_object->GetFormat())
+    switch (format.GetType())
     {
         case wxDF_TEXT:
        {
     {
         case wxDF_TEXT:
        {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }
            
            wxTextDataObject *text_object = (wxTextDataObject *) data_object;
            
            
            wxTextDataObject *text_object = (wxTextDataObject *) data_object;
            
@@ -126,31 +183,41 @@ selection_received( GtkWidget *WXUNUSED(widget),
        
        case wxDF_BITMAP:
        {
        
        case wxDF_BITMAP:
        {
-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }
            
            
-           return;
+           wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+           
+           bitmap_object->SetData( (size_t) selection_data->length, (const void*) selection_data->data );
            
            break;
        }
        
        case wxDF_PRIVATE:
        {
            
            break;
        }
        
        case wxDF_PRIVATE:
        {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
-           
-           wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }
            
            
-           private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length );
+           data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
            
            break;
        }
        
        default:
        {
            
            break;
        }
        
        default:
        {
+            clipboard->m_waiting = FALSE;
            return;
        }
     }
     
     wxTheClipboard->m_formatSupported = TRUE;
            return;
        }
     }
     
     wxTheClipboard->m_formatSupported = TRUE;
+    clipboard->m_waiting = FALSE;
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
@@ -173,18 +240,22 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
     }
     else
     {
     }
     else
     {
+        wxTheClipboard->m_waiting = FALSE;
         return FALSE;
     }
     
     if ((!wxTheClipboard->m_ownsPrimarySelection) &&
         (!wxTheClipboard->m_ownsClipboard))
     {
         return FALSE;
     }
     
     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)
+       {
+           delete wxTheClipboard->m_data;
+           wxTheClipboard->m_data = (wxDataObject*) NULL;
+       }
     }
   
     }
   
+    wxTheClipboard->m_waiting = FALSE;
     return TRUE;
 }
 
     return TRUE;
 }
 
@@ -197,68 +268,66 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 {
     if (!wxTheClipboard) return;
   
 {
     if (!wxTheClipboard) return;
   
-    wxNode *node = wxTheClipboard->m_dataObjects.First();
+    if (!wxTheClipboard->m_data) return;
+  
+    wxDataObject *data = wxTheClipboard->m_data;
     
     
-    while (node)
+    wxDataFormat format( selection_data->target );
+
+    if (!data->IsSupportedFormat( format )) return;
+  
+    if (format.GetType() == wxDF_TEXT)
     {
     {
-        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 ); 
+       wxTextDataObject *text_object = (wxTextDataObject*) data;
+       wxString text( text_object->GetText() );
+
+#if wxUSE_UNICODE
+       const wxWX2MBbuf s = text.mbc_str();
+       int len = strlen(s);
+#else // more efficient in non-Unicode
+       const char *s = text.c_str();
+       int len = (int) text.Length();
+#endif
+        gtk_selection_data_set( 
+            selection_data, 
+           GDK_SELECTION_TYPE_STRING, 
+           8*sizeof(gchar),
+           (unsigned char*) (const 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;
+       return;
+    }
+
+    if (format.GetType() == wxDF_BITMAP)
+    {
+       wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data;
            
            
-               if (private_object->GetDataSize() == 0) return;
+       if (bitmap_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() );
-           }
+        gtk_selection_data_set( 
+            selection_data, 
+           GDK_SELECTION_TYPE_STRING, 
+           8*sizeof(gchar), 
+           (unsigned char*) bitmap_object->GetPngData(), 
+           (int) bitmap_object->GetDataSize() );
            
            
-           default:
-             break;
-        }
-       
-       node = node->Next();
+       return;
     }
     }
+
+    int size = data->GetDataSize( format );
+    
+    if (size == 0) return;
+    
+    char *d = new char[size];
+    
+    data->GetDataHere( selection_data->target, (void*) d );
+
+    gtk_selection_data_set( 
+        selection_data, 
+       GDK_SELECTION_TYPE_STRING, 
+       8*sizeof(gchar), 
+       (unsigned char*) d,
+       size ); 
 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------
@@ -274,24 +343,41 @@ wxClipboard::wxClipboard()
     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), 
+                        "selection_received",
+                       GTK_SIGNAL_FUNC( selection_received ), 
+                       (gpointer) this );
+
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_clear_event",
                        GTK_SIGNAL_FUNC( selection_clear_clip ), 
                        (gpointer) NULL );
                      
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_clear_event",
                        GTK_SIGNAL_FUNC( selection_clear_clip ), 
                        (gpointer) NULL );
                      
     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);
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;
+    
+    m_usePrimary = FALSE;
 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()
@@ -299,104 +385,134 @@ wxClipboard::~wxClipboard()
     Clear();  
   
     if (m_clipboardWidget) gtk_widget_destroy( m_clipboardWidget );
     Clear();  
   
     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())
-    { 
+    if (m_data)
+    {
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#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 */
         /*  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)
         {
+            m_waiting = TRUE;
+           
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME );
             gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, 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)
         {
+            m_waiting = TRUE;
+           
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
+           
+            while (m_waiting) gtk_main_iteration();
         }
     
         }
     
-        m_dataObjects.Clear();
+        if (m_data)
+        { 
+           delete m_data;
+           m_data = (wxDataObject*) NULL;
+       }
+       
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
     }
   
     m_targetRequested = 0;
     }
   
     m_targetRequested = 0;
-  
     m_formatSupported = FALSE;
 }
 
 bool wxClipboard::Open()
 {
     m_formatSupported = FALSE;
 }
 
 bool wxClipboard::Open()
 {
-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
+    wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") );
   
     m_open = TRUE;
   
     m_open = TRUE;
-  
+    
     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
     return TRUE;
 }
 
 bool wxClipboard::SetData( wxDataObject *data )
 {
-    wxCHECK_MSG( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
   
-    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( data, FALSE, wxT("data is invalid") );
   
   
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    Clear();
+
+    return AddData( data );
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
   
   
-    if (data->GetFormat() == wxDF_PRIVATE)
-    {
-        wxPrivateDataObject* pd = (wxPrivateDataObject*) data;
-       
-        wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
-       
-        data->m_formatAtom = GetTargetAtom( data->GetFormat(), pd->GetId() );
-    }
-    else
-    {
-        data->m_formatAtom = GetTargetAtom( data->GetFormat() );
-    }
+    wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
     
     
-    // This should happen automatically
-      
+    /* we can only store one wxDataObject */
+    Clear();
+  
+    m_data = data;
+
+    /* This should happen automatically, but to be on the safe side */
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
     
     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
-  
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
+    m_data->GetAllFormats( array );
+    
+    for (size_t i = 0; i < m_data->GetFormatCount(); i++)
+    {
+        GdkAtom atom = array[i];
+       wxLogDebug( wxT("Clipboard Supported atom %s"), gdk_atom_name( atom ) );
+
+        /* Add handlers if someone requests data. We currently always
+          offer data to the clipboard and the primary selection. Maybe
+          we should make that depend on the usePrimary flag */
+          
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
+                              GDK_SELECTION_PRIMARY,
+                             atom, 
+                             0 );  /* what is info ? */
+                            
+        gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
+                              g_clipboardAtom,
+                             atom, 
+                             0 );  /* what is info ? */
+    }
+
+    delete[] array;
+                            
+    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
+                        "selection_get",
+                       GTK_SIGNAL_FUNC(selection_handler), 
+                       (gpointer) NULL );
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+    
+    /* Tell the world we offer clipboard data */
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
                                  GDK_CURRENT_TIME ))
     {
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
                                  GDK_CURRENT_TIME ))
     {
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
         return FALSE;
     }
     m_ownsClipboard = TRUE;
         return FALSE;
     }
     m_ownsClipboard = TRUE;
@@ -404,153 +520,118 @@ bool wxClipboard::SetData( wxDataObject *data )
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
                                  GDK_CURRENT_TIME ))
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
                                  GDK_CURRENT_TIME ))
-    {
+    {  
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif
         return FALSE;
     }
     m_ownsPrimarySelection = TRUE;
         return FALSE;
     }
     m_ownsPrimarySelection = TRUE;
-                            
+    
+#if wxUSE_THREADS
+    /* re-enable GUI threads */
+    wxapp_install_thread_wakeup();
+#endif
+       
     return TRUE;
 }
 
 void wxClipboard::Close()
 {
     return TRUE;
 }
 
 void wxClipboard::Close()
 {
-    wxCHECK_RET( m_open, "clipboard not open" );
+    wxCHECK_RET( m_open, wxT("clipboard not open") );
     
     m_open = FALSE;
 }
 
     
     m_open = FALSE;
 }
 
-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString &id )
+bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
 {
-    m_targetRequested = GetTargetAtom( format, id );
-  
-    if (m_targetRequested == 0) return FALSE;
+    /* store requested format to be asked for by callbacks */
     
     
-    // add handler for target (= format) query
-
-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
+    m_targetRequested = format;
   
   
+    wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    
     m_formatSupported = FALSE;
   
     m_formatSupported = FALSE;
   
-    // perform query. this will set m_formatSupported to 
-    // TRUE if m_targetRequested is supported
-    
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
+    /* perform query. this will set m_formatSupported to 
+       TRUE if m_targetRequested is supported.
+       alsom 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 ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
                           g_targetsAtom,
                           GDK_CURRENT_TIME );
 
                           g_targetsAtom,
                           GDK_CURRENT_TIME );
 
-    gtk_signal_disconnect_by_func( GTK_OBJECT(m_clipboardWidget), 
-                                  GTK_SIGNAL_FUNC( targets_selection_received ),
-                                  (gpointer) this );
-  
+    while (m_waiting) gtk_main_iteration();
+    
     if (!m_formatSupported) return FALSE;
     if (!m_formatSupported) return FALSE;
-  
+    
     return TRUE;
     return TRUE;
-}
-
-bool wxClipboard::GetData( wxDataObject *data )
-{
-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+}    
     
     
-    m_receivedData = data;
+bool wxClipboard::GetData( wxDataObject& data )
+{
+    wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
     
     
-    wxCHECK_MSG( m_receivedData, FALSE, "invalid data object" );
+    /* get formats from wxDataObjects */
+    wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ];
+    data.GetAllFormats( array );
     
     
-    if (m_receivedData->GetFormat() == wxDF_PRIVATE)
+    for (size_t i = 0; i < data.GetFormatCount(); i++)
     {
     {
-        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() );
-    }
+        /* is data supported by clipboard ? */
+        if (!IsSupported( array[i] ))
+          continue;
     
     
-    data->m_formatAtom = m_targetRequested;
-  
-    wxCHECK_MSG( m_targetRequested, FALSE, "unsupported clipboard format" );
+        /* 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 = array[i];
   
   
-    m_formatSupported = FALSE;
+        wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
+    
+        /* start query */
+        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, 
+        /* 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;
+
+        gtk_selection_convert( m_clipboardWidget,
+                          m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
                           m_targetRequested,
                           GDK_CURRENT_TIME );
   
                           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;
-}
+        while (m_waiting) gtk_main_iteration();
 
 
-GdkAtom wxClipboard::GetTargetAtom( wxDataFormat format, const wxString &id )
-{
-    // What is X representation of that format?
-  
-    switch (format)
-    {
-        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 );
-        }
+        /* 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") );
        
        
-       default:
-       {
-           return (GdkAtom) 0;
-       }
+       /* return success */
+        delete[] array;
+        return TRUE;
     }
     }
-       
-    return (GdkAtom) 0;
-}
-
-//-----------------------------------------------------------------------------
-// wxClipboardModule
-//-----------------------------------------------------------------------------
-
-IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule)
-
-bool wxClipboardModule::OnInit()
-{
-    wxTheClipboard = new wxClipboard();
   
   
-    return TRUE;
-}
-
-void wxClipboardModule::OnExit()
-{
-    if (wxTheClipboard) delete wxTheClipboard;
-    wxTheClipboard = (wxClipboard*) NULL;
+    /* return failure */
+    delete[] array;
+    return FALSE;
 }
 
 #endif
 }
 
 #endif
-
   // wxUSE_CLIPBOARD
 
   // wxUSE_CLIPBOARD
 
wxWidgets (Impactor)