Fixed wxZlibOutputStream::Sync

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index f6ad2415f2fc2f64ca943096c8e2a3d27acdc66b..d3cd53bc4e8530fea668afb86c9a885b87fa5d0b 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -21,6 +21,15 @@
 #include "gdk/gdk.h"
 #include "gtk/gtk.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
 //-----------------------------------------------------------------------------


@@ -91,10 +100,8 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
 
     for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
     {
 
     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)
         {


@@ -146,7 +153,7 @@ selection_received( GtkWidget *WXUNUSED(widget),
         clipboard->m_waiting = FALSE;
         return;
     }
         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 */
     


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

-            if (selection_data->type != GDK_SELECTION_TYPE_BITMAP)
+            if (selection_data->type != GDK_SELECTION_TYPE_STRING)

             {
                 clipboard->m_waiting = FALSE;
                 return;
             }
            
             {
                 clipboard->m_waiting = FALSE;
                 return;
             }
            

+           wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object;
+           
+           bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length );
+           

            break;
        }
        
            break;
        }
        


@@ -226,14 +237,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;


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

+    wxTheClipboard->m_waiting = FALSE;

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -260,11 +272,11 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
     while (node)
     {
         wxDataObject *data_object = (wxDataObject *)node->Data();
     while (node)
     {
         wxDataObject *data_object = (wxDataObject *)node->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())


@@ -275,14 +287,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;


@@ -290,10 +307,17 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data
            
            case wxDF_BITMAP:
            {
            
            case wxDF_BITMAP:
            {

-               // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object;
+               wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object;

            
            

-               // how do we do that ?
-               
+               if (bitmap_object->GetSize() == 0) return;
+           
+                gtk_selection_data_set( 
+                    selection_data, 
+                   GDK_SELECTION_TYPE_STRING, 
+                   8*sizeof(gchar), 
+                   (unsigned char*) bitmap_object->GetData(), 
+                   (int) bitmap_object->GetSize() );
+                   

                break;
            }
            
                break;
            }
            


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

+    
+    m_usePrimary = FALSE;

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


@@ -380,17 +406,29 @@ void wxClipboard::Clear()
 {
     if (m_dataBroker)
     { 
 {
     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)


@@ -398,6 +436,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;


@@ -407,18 +450,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();
 


@@ -427,31 +470,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)
 


@@ -484,13 +522,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;


@@ -499,29 +545,38 @@ 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") );

     
     m_formatSupported = FALSE;
   
     
     m_formatSupported = FALSE;
   


@@ -534,12 +589,12 @@ bool wxClipboard::IsSupported( wxDataFormat format )
        sets it to FALSE */
 
     m_waiting = TRUE;
        sets it to FALSE */
 
     m_waiting = TRUE;

-      
+

     gtk_selection_convert( m_targetsWidget,
     gtk_selection_convert( m_targetsWidget,

-                          g_clipboardAtom, 
+                          m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 

                           g_targetsAtom,
                           GDK_CURRENT_TIME );
                           g_targetsAtom,
                           GDK_CURRENT_TIME );

-                          
+

     while (m_waiting) gtk_main_iteration();
     
     if (!m_formatSupported) return FALSE;
     while (m_waiting) gtk_main_iteration();
     
     if (!m_formatSupported) return FALSE;


@@ -549,7 +604,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 ? */
     


@@ -563,7 +618,7 @@ 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 */
     
     
     /* start query */
     


@@ -581,7 +636,7 @@ bool wxClipboard::GetData( wxDataObject *data )
     m_waiting = TRUE;
 
     gtk_selection_convert( m_clipboardWidget,
     m_waiting = TRUE;
 
     gtk_selection_convert( m_clipboardWidget,

-                          g_clipboardAtom, 
+                          m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, 

                           m_targetRequested,
                           GDK_CURRENT_TIME );
   
                           m_targetRequested,
                           GDK_CURRENT_TIME );
   


@@ -589,7 +644,7 @@ bool wxClipboard::GetData( wxDataObject *data )
 
     /* 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;
 }