]> git.saurik.com Git - wxWidgets.git/blobdiff - src/gtk1/clipbrd.cpp
Compile fix for wxDataFormat cast,
[wxWidgets.git] / src / gtk1 / clipbrd.cpp
index b9f24728221167d079f6ca724b21fc4f74f5611a..023cdad83c1c47a67c6fc5bf905b7b5236782ef6 100644 (file)
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:           wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -59,9 +59,9 @@ struct _GtkSelectionData
   GdkAtom selection;
   GdkAtom target;
   GdkAtom type;
-  gint   format;
+  gint          format;
   guchar *data;
-  gint   length;
+  gint          length;
 };
 
 */
@@ -76,7 +76,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 #if (GTK_MINOR_VERSION > 0)
                             guint32 WXUNUSED(time),
 #endif
-                           wxClipboard *clipboard )
+                            wxClipboard *clipboard )
 {
     if (!wxTheClipboard)
     {
@@ -102,11 +102,9 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
     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 ); */
+        wxDataFormat format( atoms[i] );
       
-        if (atoms[i] == clipboard->m_targetRequested)
+        if (format == clipboard->m_targetRequested)
         {
             clipboard->m_waiting = FALSE;
             clipboard->m_formatSupported = TRUE;
@@ -128,7 +126,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
 #if (GTK_MINOR_VERSION > 0)
                     guint32 WXUNUSED(time),
 #endif
-                   wxClipboard *clipboard )
+                    wxClipboard *clipboard )
 {
     if (!wxTheClipboard)
     {
@@ -161,60 +159,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
 
     /* make sure we got the data in the correct form (selection type).
        if so, copy data to target object */
-    
-    switch (format.GetType())
+    if (selection_data->type != GDK_SELECTION_TYPE_STRING)
     {
-        case wxDF_TEXT:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
-            {
-                clipboard->m_waiting = FALSE;
-                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_STRING)
-            {
-                clipboard->m_waiting = FALSE;
-                return;
-            }
-           
-           wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
-           
-           bitmap_object->SetData( (size_t) selection_data->length, (const void*) selection_data->data );
-           
-           break;
-       }
-       
-       case wxDF_PRIVATE:
-       {
-            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
-            {
-                clipboard->m_waiting = FALSE;
-                return;
-            }
-           
-           data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
-           
-           break;
-       }
-       
-       default:
-       {
-            clipboard->m_waiting = FALSE;
-           return;
-       }
+        clipboard->m_waiting = FALSE;
+        return;
     }
+            
+    data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
     
     wxTheClipboard->m_formatSupported = TRUE;
     clipboard->m_waiting = FALSE;
@@ -249,10 +200,10 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
     {
         /* 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;
-       }
+        {
+            delete wxTheClipboard->m_data;
+            wxTheClipboard->m_data = (wxDataObject*) NULL;
+        }
     }
   
     wxTheClipboard->m_waiting = FALSE;
@@ -276,42 +227,27 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 
     if (!data->IsSupportedFormat( format )) return;
   
+    /* this will fail for composite formats */
     if (format.GetType() == wxDF_TEXT)
     {
-       wxTextDataObject *text_object = (wxTextDataObject*) data;
-       wxString text( text_object->GetText() );
+        wxTextDataObject *text_object = (wxTextDataObject*) data;
+        wxString text( text_object->GetText() );
 
 #if wxUSE_UNICODE
-       const wxWX2MBbuf s = text.mbc_str();
-       int len = strlen(s);
+        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();
+        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,
+            GDK_SELECTION_TYPE_STRING, 
+            8*sizeof(gchar),
+            (unsigned char*) (const char*) s,
             len ); 
-                   
-       return;
-    }
-
-    if (format.GetType() == wxDF_BITMAP)
-    {
-       wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data;
-           
-       if (bitmap_object->GetDataSize() == 0) return;
-           
-        gtk_selection_data_set( 
-            selection_data, 
-           GDK_SELECTION_TYPE_STRING, 
-           8*sizeof(gchar), 
-           (unsigned char*) bitmap_object->GetPngData(), 
-           (int) bitmap_object->GetDataSize() );
-           
-       return;
+                    
+        return;
     }
 
     int size = data->GetDataSize( format );
@@ -324,10 +260,10 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
 
     gtk_selection_data_set( 
         selection_data, 
-       GDK_SELECTION_TYPE_STRING, 
-       8*sizeof(gchar), 
-       (unsigned char*) d,
-       size ); 
+        GDK_SELECTION_TYPE_STRING, 
+        8*sizeof(gchar), 
+        (unsigned char*) d,
+        size ); 
 }
 
 //-----------------------------------------------------------------------------
@@ -353,9 +289,9 @@ wxClipboard::wxClipboard()
 
     gtk_signal_connect( GTK_OBJECT(m_targetsWidget), 
                         "selection_received",
-                       GTK_SIGNAL_FUNC( targets_selection_received ), 
-                       (gpointer) this );
-                       
+                        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 );
@@ -363,14 +299,14 @@ wxClipboard::wxClipboard()
 
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_received",
-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
+                        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 );
-                     
+                        GTK_SIGNAL_FUNC( selection_clear_clip ), 
+                        (gpointer) NULL );
+                      
     if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
     if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
   
@@ -402,27 +338,27 @@ void wxClipboard::Clear()
         if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window)
         {
             m_waiting = TRUE;
-           
+            
             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)
         {
             m_waiting = TRUE;
-           
+            
             gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
-           
+            
             while (m_waiting) gtk_main_iteration();
         }
     
         if (m_data)
         { 
-           delete m_data;
-           m_data = (wxDataObject*) NULL;
-       }
-       
+            delete m_data;
+            m_data = (wxDataObject*) NULL;
+        }
+        
 #if wxUSE_THREADS
         /* re-enable GUI threads */
         wxapp_install_thread_wakeup();
@@ -475,29 +411,29 @@ bool wxClipboard::AddData( wxDataObject *data )
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
         GdkAtom atom = array[i];
-       wxLogDebug( wxT("Clipboard Supported atom %s"), gdk_atom_name( atom ) );
+        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 */
-          
+           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 ? */
-                            
+                              atom, 
+                              0 );  /* what is info ? */
+                             
         gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), 
                               g_clipboardAtom,
-                             atom, 
-                             0 );  /* what is info ? */
+                              atom, 
+                              0 );  /* what is info ? */
     }
 
     delete[] array;
-                            
+                             
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_get",
-                       GTK_SIGNAL_FUNC(selection_handler), 
-                       (gpointer) NULL );
+                        GTK_SIGNAL_FUNC(selection_handler), 
+                        (gpointer) NULL );
 
 #if wxUSE_THREADS
         /* disable GUI threads */
@@ -507,7 +443,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* Tell the world we offer clipboard data */
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   g_clipboardAtom,
-                                 GDK_CURRENT_TIME ))
+                                  GDK_CURRENT_TIME ))
     {
 #if wxUSE_THREADS
         /* re-enable GUI threads */
@@ -519,7 +455,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     
     if (!gtk_selection_owner_set( m_clipboardWidget, 
                                   GDK_SELECTION_PRIMARY,
-                                 GDK_CURRENT_TIME ))
+                                  GDK_CURRENT_TIME ))
     {  
 #if wxUSE_THREADS
         /* re-enable GUI threads */
@@ -533,7 +469,7 @@ bool wxClipboard::AddData( wxDataObject *data )
     /* re-enable GUI threads */
     wxapp_install_thread_wakeup();
 #endif
-       
+        
     return TRUE;
 }
 
@@ -551,8 +487,10 @@ bool wxClipboard::IsOpened() const
 
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
-    /* store requested format to be asked for by callbacks */
+    /* reentrance problems */
+    if (m_open) return TRUE;
     
+    /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
   
     wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
@@ -570,9 +508,10 @@ bool wxClipboard::IsSupported( const wxDataFormat& format )
     m_waiting = TRUE;
 
     gtk_selection_convert( m_targetsWidget,
-                          m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
-                          g_targetsAtom,
-                          GDK_CURRENT_TIME );
+                           m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                        : g_clipboardAtom, 
+                           g_targetsAtom,
+                           GDK_CURRENT_TIME );
 
     while (m_waiting) gtk_main_iteration();
     
@@ -591,15 +530,19 @@ bool wxClipboard::GetData( wxDataObject& data )
     
     for (size_t i = 0; i < data.GetFormatCount(); i++)
     {
+        wxDataFormat format( array[i] );
+    
+        wxLogDebug( wxT("wxClipboard::GetData: request format %s"), format.GetId().c_str() );
+    
         /* is data supported by clipboard ? */
-        if (!IsSupported( array[i] ))
-          continue;
+        if (!IsSupported( format ))
+           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 = array[i];
+        m_targetRequested = format;
   
         wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
     
@@ -617,17 +560,20 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         m_waiting = TRUE;
 
+        wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
+    
         gtk_selection_convert( m_clipboardWidget,
-                          m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, 
-                          m_targetRequested,
-                          GDK_CURRENT_TIME );
+                               m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
+                                            : g_clipboardAtom, 
+                               m_targetRequested,
+                               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 */
+        
+        /* return success */
         delete[] array;
         return TRUE;
     }