X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/72a7edf007f57bc9dacea77c408adb86a57d41f7..7d0bf46a34e2422c441ccccd9dffb799999bb6a8:/src/gtk1/clipbrd.cpp?ds=inline diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index 32d0991d3e..8ba52502f1 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -7,10 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "clipbrd.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/clipbrd.h" #if wxUSE_CLIPBOARD @@ -28,8 +31,6 @@ //----------------------------------------------------------------------------- #if wxUSE_THREADS -extern void wxapp_install_thread_wakeup(); -extern void wxapp_uninstall_thread_wakeup(); #endif //----------------------------------------------------------------------------- @@ -42,7 +43,7 @@ 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 char *TRACE_CLIPBOARD = _T("clipboard"); +static const wxChar *TRACE_CLIPBOARD = _T("clipboard"); //----------------------------------------------------------------------------- // reminder @@ -76,14 +77,12 @@ struct _GtkSelectionData static void targets_selection_received( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, -#if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), -#endif wxClipboard *clipboard ) { if ( wxTheClipboard && selection_data->length > 0 ) { - /* make sure we got the data in the correct form */ + // make sure we got the data in the correct form GdkAtom type = selection_data->type; if ( type != GDK_SELECTION_TYPE_ATOM ) { @@ -115,6 +114,10 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), wxT("selection received for targets, format %s"), format.GetId().c_str() ); +// printf( "format %s requested %s\n", +// gdk_atom_name( atoms[i] ), +// gdk_atom_name( clipboard->m_targetRequested ) ); + if (format == clipboard->m_targetRequested) { clipboard->m_waiting = FALSE; @@ -134,9 +137,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), static void selection_received( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, -#if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), -#endif wxClipboard *clipboard ) { if (!wxTheClipboard) @@ -161,7 +162,7 @@ selection_received( GtkWidget *WXUNUSED(widget), wxDataFormat format( selection_data->target ); - /* make sure we got the data in the correct format */ + // make sure we got the data in the correct format if (!data_object->IsSupportedFormat( format ) ) { clipboard->m_waiting = FALSE; @@ -212,7 +213,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) { - wxLogDebug( wxT("wxClipboard will get cleared" ) ); + wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" )); delete wxTheClipboard->m_data; wxTheClipboard->m_data = (wxDataObject*) NULL; @@ -244,36 +245,14 @@ selection_handler( GtkWidget *WXUNUSED(widget), 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; - char *d = new char[size]; + void *d = malloc(size); - data->GetDataHere( selection_data->target, (void*) d ); + // Text data will be in UTF8 in Unicode mode. + data->GetDataHere( selection_data->target, d ); gtk_selection_data_set( selection_data, @@ -281,6 +260,8 @@ selection_handler( GtkWidget *WXUNUSED(widget), 8*sizeof(gchar), (unsigned char*) d, size ); + + free(d); } //----------------------------------------------------------------------------- @@ -292,6 +273,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) wxClipboard::wxClipboard() { m_open = FALSE; + m_waiting = FALSE; m_ownsClipboard = FALSE; m_ownsPrimarySelection = FALSE; @@ -347,11 +329,10 @@ void wxClipboard::Clear() { #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) { m_waiting = TRUE; @@ -380,7 +361,6 @@ void wxClipboard::Clear() #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif } @@ -414,16 +394,16 @@ bool wxClipboard::AddData( wxDataObject *data ) wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); - /* we can only store one wxDataObject */ + // we can only store one wxDataObject Clear(); m_data = data; - /* get formats from wxDataObjects */ + // get formats from wxDataObjects wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; m_data->GetAllFormats( array ); - /* primary selection or clipboard */ + // primary selection or clipboard GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY : g_clipboardAtom; @@ -434,6 +414,9 @@ bool wxClipboard::AddData( wxDataObject *data ) wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() ); +// printf( "added %s\n", +// gdk_atom_name( array[i].GetFormatId() ) ); + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), clipboard, array[i], @@ -449,7 +432,6 @@ bool wxClipboard::AddData( wxDataObject *data ) #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif /* Tell the world we offer clipboard data */ @@ -464,7 +446,6 @@ bool wxClipboard::AddData( wxDataObject *data ) #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif return res; @@ -590,7 +571,8 @@ bool wxClipboard::GetData( wxDataObject& data ) 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 @@ -608,7 +590,8 @@ bool wxClipboard::GetData( wxDataObject& data ) return TRUE; } - wxLogDebug( wxT("wxClipboard::GetData: format not found") ); + wxLogTrace( TRACE_CLIPBOARD, + wxT("wxClipboard::GetData: format not found") ); /* return failure */ delete[] array;