X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/270c23f7bdcfa775dea3287dc60c2f706908caab..6f28211af2258ce0c052e5b5c1d862e7bbc8de27:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index eb5efb10a0..6faf83eaad 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -1,16 +1,19 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: gtk/clipbrd.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// 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 @@ -19,17 +22,15 @@ #include "wx/utils.h" #include "wx/log.h" -#include "glib.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include +#include //----------------------------------------------------------------------------- // thread system //----------------------------------------------------------------------------- #if wxUSE_THREADS -extern void wxapp_install_thread_wakeup(); -extern void wxapp_uninstall_thread_wakeup(); #endif //----------------------------------------------------------------------------- @@ -39,6 +40,15 @@ extern void wxapp_uninstall_thread_wakeup(); 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!) +static const wxChar *TRACE_CLIPBOARD = _T("clipboard"); + //----------------------------------------------------------------------------- // reminder //----------------------------------------------------------------------------- @@ -57,9 +67,9 @@ struct _GtkSelectionData GdkAtom selection; GdkAtom target; GdkAtom type; - gint format; + gint format; guchar *data; - gint length; + gint length; }; */ @@ -71,39 +81,31 @@ 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 */ - - // 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! + // make sure we got the data in the correct form 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; } - //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 ); - 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; @@ -112,9 +114,13 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), { 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() ); + +// printf( "format %s requested %s\n", +// gdk_atom_name( atoms[i] ), +// gdk_atom_name( clipboard->m_targetRequested ) ); if (format == clipboard->m_targetRequested) { @@ -135,9 +141,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) @@ -162,20 +166,23 @@ 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 ); @@ -213,7 +220,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; @@ -229,7 +236,11 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) //----------------------------------------------------------------------------- static void -selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data, gpointer WXUNUSED(data) ) +selection_handler( GtkWidget *WXUNUSED(widget), + GtkSelectionData *selection_data, + guint WXUNUSED(info), + guint WXUNUSED(time), + gpointer WXUNUSED(data) ) { if (!wxTheClipboard) return; @@ -241,36 +252,14 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data 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, @@ -278,6 +267,8 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data 8*sizeof(gchar), (unsigned char*) d, size ); + + free(d); } //----------------------------------------------------------------------------- @@ -289,6 +280,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) wxClipboard::wxClipboard() { m_open = FALSE; + m_waiting = FALSE; m_ownsClipboard = FALSE; m_ownsPrimarySelection = FALSE; @@ -344,11 +336,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; @@ -377,7 +368,6 @@ void wxClipboard::Clear() #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif } @@ -411,24 +401,29 @@ 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; 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() ); +// printf( "added %s\n", +// gdk_atom_name( array[i].GetFormatId() ) ); + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), clipboard, array[i], @@ -444,7 +439,6 @@ bool wxClipboard::AddData( wxDataObject *data ) #if wxUSE_THREADS /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); #endif /* Tell the world we offer clipboard data */ @@ -459,7 +453,6 @@ bool wxClipboard::AddData( wxDataObject *data ) #if wxUSE_THREADS /* re-enable GUI threads */ - wxapp_install_thread_wakeup(); #endif return res; @@ -480,11 +473,17 @@ bool wxClipboard::IsOpened() const 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; +#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; @@ -507,6 +506,15 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) while (m_waiting) gtk_main_iteration(); +#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 + if (!m_formatSupported) return FALSE; return TRUE; @@ -524,7 +532,9 @@ bool wxClipboard::GetData( wxDataObject& data ) { 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 ? */ @@ -577,7 +587,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 @@ -595,7 +606,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;