X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3133cb9f53e68e69f9b9e7c06f07ccd285aba98b..dcae64c221450a7ca9b530ecf44757543c33a754:/src/gtk/clipbrd.cpp diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp index c6edc527b1..496f09c3ee 100644 --- a/src/gtk/clipbrd.cpp +++ b/src/gtk/clipbrd.cpp @@ -7,9 +7,8 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "clipbrd.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #include "wx/clipbrd.h" @@ -37,6 +36,10 @@ GdkAtom g_clipboardAtom = 0; GdkAtom g_targetsAtom = 0; +#if defined(__WXGTK20__) && wxUSE_UNICODE +extern GdkAtom g_altTextAtom; +#endif + // 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!) @@ -71,17 +74,16 @@ struct _GtkSelectionData // "selection_received" for targets //----------------------------------------------------------------------------- +extern "C" { 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 ) { @@ -113,6 +115,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; @@ -124,17 +130,17 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), clipboard->m_waiting = FALSE; } +} //----------------------------------------------------------------------------- // "selection_received" for the actual data //----------------------------------------------------------------------------- +extern "C" { static void selection_received( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, -#if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), -#endif wxClipboard *clipboard ) { if (!wxTheClipboard) @@ -159,31 +165,36 @@ 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; return; } - /* make sure we got the data in the correct form (selection type). - if so, copy data to target object */ +#if 0 + This seems to cause problems somehow + // make sure we got the data in the correct form (selection type). + // if so, copy data to target object if (selection_data->type != GDK_SELECTION_TYPE_STRING) { clipboard->m_waiting = FALSE; return; } +#endif data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data ); wxTheClipboard->m_formatSupported = TRUE; clipboard->m_waiting = FALSE; } +} //----------------------------------------------------------------------------- // "selection_clear" //----------------------------------------------------------------------------- +extern "C" { static gint selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) { @@ -220,11 +231,13 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) wxTheClipboard->m_waiting = FALSE; return TRUE; } +} //----------------------------------------------------------------------------- // selection handler for supplying data //----------------------------------------------------------------------------- +extern "C" { static void selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, @@ -240,6 +253,16 @@ selection_handler( GtkWidget *WXUNUSED(widget), wxDataFormat format( selection_data->target ); +#ifdef __WXDEBUG__ + wxLogTrace(TRACE_CLIPBOARD, + _T("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s"), + format.GetId().c_str(), + wxString::FromAscii(gdk_atom_name(selection_data->target)).c_str(), + wxString::FromAscii(gdk_atom_name(selection_data->type)).c_str(), + wxString::FromAscii(gdk_atom_name(selection_data->selection)).c_str() + ); +#endif + if (!data->IsSupportedFormat( format )) return; int size = data->GetDataSize( format ); @@ -248,32 +271,32 @@ selection_handler( GtkWidget *WXUNUSED(widget), void *d = malloc(size); + // Text data will be in UTF8 in Unicode mode. data->GetDataHere( selection_data->target, d ); - // transform Unicode text into multibyte before putting it on clipboard -#if wxUSE_UNICODE - if ( format.GetType() == wxDF_TEXT ) + // NB: GTK+ requires special treatment of UTF8_STRING data, the text + // would show as UTF-8 data interpreted as latin1 (?) in other + // GTK+ apps if we used gtk_selection_data_set() + if (format == wxDataFormat(wxDF_UNICODETEXT)) { - 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; + gtk_selection_data_set_text( + selection_data, + (const gchar*)d, + size-1 ); + } + else + { + gtk_selection_data_set( + selection_data, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) d, + size-1 ); } -#endif // wxUSE_UNICODE - - gtk_selection_data_set( - selection_data, - GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), - (unsigned char*) d, - size ); free(d); } +} //----------------------------------------------------------------------------- // wxClipboard @@ -284,6 +307,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) wxClipboard::wxClipboard() { m_open = FALSE; + m_waiting = FALSE; m_ownsClipboard = FALSE; m_ownsPrimarySelection = FALSE; @@ -296,25 +320,19 @@ wxClipboard::wxClipboard() 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 ); + g_signal_connect (m_targetsWidget, "selection_received", + G_CALLBACK (targets_selection_received), this); /* we use m_clipboardWidget to get and to offer data */ 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 ); + g_signal_connect (m_clipboardWidget, "selection_received", + G_CALLBACK (selection_received), this); - gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), - "selection_clear_event", - GTK_SIGNAL_FUNC( selection_clear_clip ), - (gpointer) NULL ); + g_signal_connect (m_clipboardWidget, "selection_clear_event", + G_CALLBACK (selection_clear_clip), NULL); if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE ); if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE); @@ -341,8 +359,8 @@ void wxClipboard::Clear() /* disable GUI threads */ #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; @@ -404,16 +422,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; @@ -424,6 +442,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], @@ -432,10 +453,8 @@ bool wxClipboard::AddData( wxDataObject *data ) delete[] array; - gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), - "selection_get", - GTK_SIGNAL_FUNC(selection_handler), - (gpointer) NULL ); + g_signal_connect (m_clipboardWidget, "selection_get", + G_CALLBACK (selection_handler), NULL); #if wxUSE_THREADS /* disable GUI threads */ @@ -478,11 +497,9 @@ bool wxClipboard::IsSupported( const wxDataFormat& 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") ); @@ -506,9 +523,16 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) while (m_waiting) gtk_main_iteration(); - if (!m_formatSupported) return FALSE; +#if defined(__WXGTK20__) && wxUSE_UNICODE + if (!m_formatSupported && format == wxDataFormat(wxDF_UNICODETEXT)) + { + // Another try with plain STRING format + extern GdkAtom g_altTextAtom; + return IsSupported(g_altTextAtom); + } +#endif - return TRUE; + return m_formatSupported; } bool wxClipboard::GetData( wxDataObject& data )