Applied patch for stipppled brushes,

[wxWidgets.git] / src / gtk1 / clipbrd.cpp

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index 9dd96f96b63cf7e1a131cf24cdb8859281bd7bad..827e86ea22da383f6744af0444e3f3418814a2aa 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -15,10 +15,21 @@
 
 #if wxUSE_CLIPBOARD
 
 
 #if wxUSE_CLIPBOARD
 

+#include "wx/utils.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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // data
 //-----------------------------------------------------------------------------


@@ -60,30 +71,47 @@ 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 );
+/*        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;
 }
 


@@ -94,28 +122,50 @@ 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) return;
+    if (!data_object)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

     
     

-    if (selection_data->length <= 0) return;
+    if (selection_data->length <= 0)
+    {
+        clipboard->m_waiting = FALSE;
+        return;
+    }

   
   

-    // make sure we got the data in the correct format
-    
-    if (data_object->GetFormat().GetAtom() != selection_data->target) return;
+    /* make sure we got the data in the correct format */
+    if (data_object->GetFormat().GetAtom() != selection_data->target)
+    {
+        clipboard->m_waiting = FALSE;
+        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 form (selection type).
+       if so, copy data to target object */

     
     switch (data_object->GetFormat().GetType())
     {
         case wxDF_TEXT:
        {
     
     switch (data_object->GetFormat().GetType())
     {
         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;
            


@@ -128,16 +178,22 @@ selection_received( GtkWidget *WXUNUSED(widget),
        
        case wxDF_BITMAP:
        {
        
        case wxDF_BITMAP:
        {

-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) return;
-           
-           return;
+            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }

            
            break;
        }
        
        case wxDF_PRIVATE:
        {
            
            break;
        }
        
        case wxDF_PRIVATE:
        {

-            if (selection_data->type != GDK_SELECTION_TYPE_STRING) return;
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)
+            {
+                clipboard->m_waiting = FALSE;
+                return;
+            }

            
            wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
            
            
            wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object;
            


@@ -148,11 +204,13 @@ selection_received( GtkWidget *WXUNUSED(widget),
        
        default:
        {
        
        default:
        {

+            clipboard->m_waiting = FALSE;

            return;
        }
     }
     
     wxTheClipboard->m_formatSupported = TRUE;
            return;
        }
     }
     
     wxTheClipboard->m_formatSupported = TRUE;

+    clipboard->m_waiting = FALSE;

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -175,14 +233,14 @@ 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. */
-      
+        /* the clipboard is no longer in our hands. we can the delete clipboard data. */

         if (wxTheClipboard->m_dataBroker)
        {
            delete wxTheClipboard->m_dataBroker;
         if (wxTheClipboard->m_dataBroker)
        {
            delete wxTheClipboard->m_dataBroker;


@@ -190,6 +248,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
        }
     }
   
        }
     }
   

+    wxTheClipboard->m_waiting = FALSE;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -213,7 +272,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
        if (data_object->GetFormat().GetAtom() != selection_data->target)
        {
            node = node->Next();
        if (data_object->GetFormat().GetAtom() != selection_data->target)
        {
            node = node->Next();

-           break;
+           continue;

        }
        
        switch (data_object->GetFormat().GetType())
        }
        
        switch (data_object->GetFormat().GetType())


@@ -224,14 +283,19 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
            
                wxString text = text_object->GetText();
            
            
                wxString text = text_object->GetText();
            

-               char *s = WXSTRINGCAST text;
+#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();
                int len = (int) text.Length();

+#endif

                
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar),
                
                 gtk_selection_data_set( 
                     selection_data, 
                    GDK_SELECTION_TYPE_STRING, 
                    8*sizeof(gchar),

-                   (unsigned char*) s, 
+                   (unsigned char*) (const char*) s,

                    len ); 
                    
                break;
                    len ); 
                    
                break;


@@ -285,9 +349,26 @@ wxClipboard::wxClipboard()
   
     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 ), 
     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
                         "selection_clear_event",
                        GTK_SIGNAL_FUNC( selection_clear_clip ), 


@@ -298,6 +379,8 @@ wxClipboard::wxClipboard()
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;
   
     m_formatSupported = FALSE;
     m_targetRequested = 0;

+    
+    m_usePrimary = FALSE;

 }
 
 wxClipboard::~wxClipboard()
 }
 
 wxClipboard::~wxClipboard()


@@ -305,23 +388,36 @@ 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()
 {
     if (m_dataBroker)
     { 
 }
 
 void wxClipboard::Clear()
 {
     if (m_dataBroker)
     { 

+#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();

         }
     
         if (m_dataBroker)
         }
     
         if (m_dataBroker)


@@ -329,6 +425,11 @@ void wxClipboard::Clear()
            delete m_dataBroker;
            m_dataBroker = (wxDataBroker*) NULL;
        }
            delete m_dataBroker;
            m_dataBroker = (wxDataBroker*) NULL;
        }

+       
+#if wxUSE_THREADS
+        /* re-enable GUI threads */
+        wxapp_install_thread_wakeup();
+#endif

     }
   
     m_targetRequested = 0;
     }
   
     m_targetRequested = 0;


@@ -338,18 +439,18 @@ void wxClipboard::Clear()
 
 bool wxClipboard::Open()
 {
 
 bool wxClipboard::Open()
 {

-    wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
+    wxCHECK_MSG( !m_open, FALSE, _T("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( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

   
   

-    wxCHECK_MSG( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( data, FALSE, _T("data is invalid") );

   
     Clear();
 
   
     Clear();
 


@@ -358,31 +459,26 @@ bool wxClipboard::SetData( wxDataObject *data )
 
 bool wxClipboard::AddData( wxDataObject *data )
 {
 
 bool wxClipboard::AddData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

   
   

-    wxCHECK_MSG( data, FALSE, "data is invalid" );
+    wxCHECK_MSG( data, FALSE, _T("data is invalid") );

     
     /* if clipboard has been cleared before, create new data broker */
     
     /* if clipboard has been cleared before, create new data broker */

-  

     if (!m_dataBroker) m_dataBroker = new wxDataBroker();
   
     /* add new data to list of offered data objects */
     if (!m_dataBroker) m_dataBroker = new wxDataBroker();
   
     /* add new data to list of offered data objects */

-  

     m_dataBroker->Add( data );
     
     /* get native format id of new data object */
     m_dataBroker->Add( data );
     
     /* get native format id of new data object */

-    

     GdkAtom format = data->GetFormat().GetAtom();
        
     GdkAtom format = data->GetFormat().GetAtom();
        

-    wxCHECK_MSG( format, FALSE, "data has invalid format" );
+    wxCHECK_MSG( format, FALSE, _T("data has invalid format") );

     
     /* This should happen automatically, but to be on the safe side */
     
     /* This should happen automatically, but to be on the safe side */

-      

     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
     
     /* Add handlers if someone requests data */
     m_ownsClipboard = FALSE;
     m_ownsPrimarySelection = FALSE;
     
     /* Add handlers if someone requests data */

-  

 
 #if (GTK_MINOR_VERSION > 0)
 
 
 #if (GTK_MINOR_VERSION > 0)
 


@@ -415,13 +511,21 @@ bool wxClipboard::AddData( wxDataObject *data )
                               selection_handler,
                               (gpointer) NULL );
 #endif
                               selection_handler,
                               (gpointer) NULL );
 #endif

-                              
+
+#if wxUSE_THREADS
+        /* disable GUI threads */
+        wxapp_uninstall_thread_wakeup();
+#endif
+    

     /* Tell the world we offer clipboard data */
     /* 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;


@@ -430,51 +534,58 @@ bool wxClipboard::AddData( wxDataObject *data )
                                   GDK_SELECTION_PRIMARY,
                                  GDK_CURRENT_TIME ))
     {  
                                   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, _T("clipboard not open") );

     
     m_open = FALSE;
 }
 
 bool wxClipboard::IsSupported( wxDataFormat format )
 {
     
     m_open = FALSE;
 }
 
 bool wxClipboard::IsSupported( wxDataFormat format )
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

     
     /* store requested format to be asked for by callbacks */
     
     m_targetRequested = format.GetAtom();
   
     
     /* store requested format to be asked for by callbacks */
     
     m_targetRequested = format.GetAtom();
   

-    wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+    wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );

     
     

-    /* 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 
     m_formatSupported = FALSE;
   
     /* perform query. this will set m_formatSupported to 

-     * TRUE if m_targetRequested is supported */
-    
-    gtk_selection_convert( m_clipboardWidget,
-                          g_clipboardAtom, 
+       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;
     
     return TRUE;
     if (!m_formatSupported) return FALSE;
     
     return TRUE;


@@ -482,7 +593,7 @@ bool wxClipboard::IsSupported( wxDataFormat format )
     
 bool wxClipboard::GetData( wxDataObject *data )
 {
     
 bool wxClipboard::GetData( wxDataObject *data )
 {

-    wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+    wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );

     
     /* is data supported by clipboard ? */
     
     
     /* is data supported by clipboard ? */
     


@@ -496,31 +607,33 @@ bool wxClipboard::GetData( wxDataObject *data )
     
     m_targetRequested = data->GetFormat().GetAtom();
   
     
     m_targetRequested = data->GetFormat().GetAtom();
   

-    wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+    wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );

     
     /* start query */
     
     m_formatSupported = FALSE;
   
     
     /* start query */
     
     m_formatSupported = FALSE;
   

-    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), 
-                        "selection_received",
-                       GTK_SIGNAL_FUNC( selection_received ), 
-                       (gpointer) this );
+    /* 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 */

 
 

-    /* ask for clipboard contents */
+    m_waiting = TRUE;

 
     gtk_selection_convert( m_clipboardWidget,
 
     gtk_selection_convert( m_clipboardWidget,

-                          g_clipboardAtom, 
+                          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 );
+    while (m_waiting) gtk_main_iteration();

 
     /* this is a true error as we checked for the presence of such data before */
 
 
     /* this is a true error as we checked for the presence of such data before */
 

-    wxCHECK_MSG( m_formatSupported, FALSE, "error retrieving data from clipboard" );
+    wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") );

   
     return TRUE;
 }
   
     return TRUE;
 }