added missing WXDLLEXPORT

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

diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp
index dc4bbe9c9043661ffa6cedb84e192fb95177b002..c6edc527b1d980eff1b786ecec9ab9c15fb36e7a 100644 (file)
--- a/src/gtk1/clipbrd.cpp
+++ b/src/gtk1/clipbrd.cpp
@@ -1,10 +1,10 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        clipbrd.cpp
+// Name:        gtk/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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -19,17 +19,15 @@
 #include "wx/utils.h"
 #include "wx/log.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
 
 //-----------------------------------------------------------------------------
 // thread system
 //-----------------------------------------------------------------------------
 
 #if wxUSE_THREADS

-extern void wxapp_install_thread_wakeup();
-extern void wxapp_uninstall_thread_wakeup();

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -39,6 +37,11 @@ extern void wxapp_uninstall_thread_wakeup();
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 0;
 
 GdkAtom  g_clipboardAtom   = 0;
 GdkAtom  g_targetsAtom     = 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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // reminder
 //-----------------------------------------------------------------------------


@@ -57,9 +60,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;

 };
 
 */
 };
 
 */


@@ -79,31 +82,25 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
     if ( wxTheClipboard && selection_data->length > 0 )
     {
         /* make sure we got the data in the correct form */
     if ( wxTheClipboard && selection_data->length > 0 )
     {
         /* make sure we got the data in the correct form */

-
-        // VZ: I don't know what does this mean (and GTK+ authors apparently
-        //     don't know either, Owen Taylor writes that "Motif seems to ask
-        //     for TARGETS atom sometimes" (??)), but it seems that xterm
-        //     (which is not a Motif app AFAIK) does this too, so it's
-        //     absolutely essential to support this, otherwise we can't paste
-        //     text from xterm!

         GdkAtom type = selection_data->type;
         if ( type != GDK_SELECTION_TYPE_ATOM )
         {
         GdkAtom type = selection_data->type;
         if ( type != GDK_SELECTION_TYPE_ATOM )
         {

-            if ( strcmp(gdk_atom_name(type), "TARGETS") != 0 )
+            if ( strcmp(gdk_atom_name(type), "TARGETS") )

             {
             {

-                // don't know what this is
+                wxLogTrace( TRACE_CLIPBOARD,
+                            _T("got unsupported clipboard target") );
+

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

-            //else: don't know what this is, but it seems to work in the same
-            //      way as GDK_SELECTION_TYPE_ATOM does

         }
         }

-        //else: the data is the list of formats supported by the selection

 
 

-        /*
+#ifdef __WXDEBUG__

         wxDataFormat clip( selection_data->selection );
         wxDataFormat clip( selection_data->selection );

-        wxLogDebug( wxT("selection received for targets, clipboard %s"), clip.GetId().c_str() );
-        */
+        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;
 
         // the atoms we received, holding a list of targets (= formats)
         GdkAtom *atoms = (GdkAtom *)selection_data->data;


@@ -112,9 +109,9 @@ targets_selection_received( GtkWidget *WXUNUSED(widget),
         {
             wxDataFormat format( atoms[i] );
 
         {
             wxDataFormat format( atoms[i] );
 

-            /*
-            wxLogDebug( wxT("selection received for targets, format %s"), format.GetId().c_str() );
-            */
+            wxLogTrace( TRACE_CLIPBOARD,
+                        wxT("selection received for targets, format %s"),
+                        format.GetId().c_str() );

 
             if (format == clipboard->m_targetRequested)
             {
 
             if (format == clipboard->m_targetRequested)
             {


@@ -213,7 +210,7 @@ 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)
         {
         /* the clipboard is no longer in our hands. we can the delete clipboard data. */
         if (wxTheClipboard->m_data)
         {

-            wxLogDebug( wxT("wxClipboard will get cleared" ) );
+            wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));

 
             delete wxTheClipboard->m_data;
             wxTheClipboard->m_data = (wxDataObject*) NULL;
 
             delete wxTheClipboard->m_data;
             wxTheClipboard->m_data = (wxDataObject*) NULL;


@@ -245,36 +242,28 @@ selection_handler( GtkWidget *WXUNUSED(widget),
 
     if (!data->IsSupportedFormat( format )) return;
 
 
     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() );
-
-#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 );
-
-        return;
-    }
-

     int size = data->GetDataSize( format );
 
     if (size == 0) return;
 
     int size = data->GetDataSize( format );
 
     if (size == 0) return;
 

-    char *d = new char[size];
+    void *d = malloc(size);

 
 

-    data->GetDataHere( selection_data->target, (void*) d );
+    data->GetDataHere( selection_data->target, d );
+
+    // transform Unicode text into multibyte before putting it on clipboard
+#if wxUSE_UNICODE
+    if ( format.GetType() == wxDF_TEXT )
+    {
+        const wchar_t *wstr = (const wchar_t *)d;
+        size_t len = wxConvCurrent->WC2MB(NULL, wstr, 0);
+        char *str = malloc(len + 1);
+        wxConvCurrent->WC2MB(str, wstr, len);
+        str[len] = '\0';
+
+        free(d);
+        d = str;
+    }
+#endif // wxUSE_UNICODE

 
     gtk_selection_data_set(
         selection_data,
 
     gtk_selection_data_set(
         selection_data,


@@ -282,6 +271,8 @@ selection_handler( GtkWidget *WXUNUSED(widget),
         8*sizeof(gchar),
         (unsigned char*) d,
         size );
         8*sizeof(gchar),
         (unsigned char*) d,
         size );

+
+    free(d);

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


@@ -348,7 +339,6 @@ void wxClipboard::Clear()
     {
 #if wxUSE_THREADS
         /* disable GUI threads */
     {
 #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
 #endif
 
         /*  As we have data we also own the clipboard. Once we no longer own


@@ -381,7 +371,6 @@ void wxClipboard::Clear()
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */
 
 #if wxUSE_THREADS
         /* re-enable GUI threads */

-        wxapp_install_thread_wakeup();

 #endif
     }
 
 #endif
     }
 


@@ -431,7 +420,9 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {
 
     for (size_t i = 0; i < m_data->GetFormatCount(); i++)
     {

-        wxLogDebug( wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard now supports atom %s"),
+                    array[i].GetId().c_str() );

 
         gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
                                   clipboard,
 
         gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
                                   clipboard,


@@ -448,7 +439,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 #if wxUSE_THREADS
     /* disable GUI threads */
 
 #if wxUSE_THREADS
     /* disable GUI threads */

-    wxapp_uninstall_thread_wakeup();

 #endif
 
     /* Tell the world we offer clipboard data */
 #endif
 
     /* Tell the world we offer clipboard data */


@@ -463,7 +453,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */
 
 #if wxUSE_THREADS
     /* re-enable GUI threads */

-    wxapp_install_thread_wakeup();

 #endif
 
     return res;
 #endif
 
     return res;


@@ -484,11 +473,17 @@ bool wxClipboard::IsOpened() const
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */
 bool wxClipboard::IsSupported( const wxDataFormat& format )
 {
     /* reentrance problems */

-    if (m_open) return TRUE;
+    if (m_waiting) return FALSE;

 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 
 
     /* store requested format to be asked for by callbacks */
     m_targetRequested = format;
 

+#if 0
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard:IsSupported: requested format: %s"),
+                format.GetId().c_str() );
+#endif
+

     wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
 
     m_formatSupported = FALSE;
     wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") );
 
     m_formatSupported = FALSE;


@@ -528,7 +523,9 @@ bool wxClipboard::GetData( wxDataObject& data )
     {
         wxDataFormat format( array[i] );
 
     {
         wxDataFormat format( array[i] );
 

-        wxLogDebug( wxT("wxClipboard::GetData: requested format: %s"), format.GetId().c_str() );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard::GetData: requested format: %s"),
+                    format.GetId().c_str() );

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


@@ -581,7 +578,8 @@ bool wxClipboard::GetData( wxDataObject& data )
 
         m_waiting = TRUE;
 
 
         m_waiting = TRUE;
 

-        wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
+        wxLogTrace( TRACE_CLIPBOARD,
+                    wxT("wxClipboard::GetData: format found, start convert") );

 
         gtk_selection_convert( m_clipboardWidget,
                                m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
 
         gtk_selection_convert( m_clipboardWidget,
                                m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY


@@ -599,7 +597,8 @@ bool wxClipboard::GetData( wxDataObject& data )
         return TRUE;
     }
 
         return TRUE;
     }
 

-    wxLogDebug( wxT("wxClipboard::GetData: format not found") );
+    wxLogTrace( TRACE_CLIPBOARD,
+                wxT("wxClipboard::GetData: format not found") );

 
     /* return failure */
     delete[] array;
 
     /* return failure */
     delete[] array;