X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cee6127eb812767eea70583451fb9e461334851f..ffaaaacbca5d66342d27251617e1bbc22748e7d9:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index 966eb2d3ca..1304b0ddf1 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -15,12 +15,23 @@ #if wxUSE_CLIPBOARD +#include "wx/dataobj.h" #include "wx/utils.h" +#include "wx/log.h" #include "glib.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 //----------------------------------------------------------------------------- @@ -91,7 +102,8 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), for (unsigned int i=0; ilength/sizeof(GdkAtom); i++) { -/* char *name = gdk_atom_name (atoms[i]); +/* + char *name = gdk_atom_name (atoms[i]); if (name) printf( "Format available: %s.\n", name ); */ if (atoms[i] == clipboard->m_targetRequested) @@ -125,7 +137,7 @@ selection_received( GtkWidget *WXUNUSED(widget), } wxDataObject *data_object = clipboard->m_receivedData; - + if (!data_object) { clipboard->m_waiting = FALSE; @@ -137,18 +149,20 @@ selection_received( GtkWidget *WXUNUSED(widget), clipboard->m_waiting = FALSE; return; } + + wxDataFormat format( selection_data->target ); /* make sure we got the data in the correct format */ - if (data_object->GetFormat().GetAtom() != selection_data->target) + 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 */ - switch (data_object->GetFormat().GetType()) + switch (format.GetType()) { case wxDF_TEXT: { @@ -169,12 +183,16 @@ selection_received( GtkWidget *WXUNUSED(widget), case wxDF_BITMAP: { - if (selection_data->type != GDK_SELECTION_TYPE_BITMAP) + if (selection_data->type != GDK_SELECTION_TYPE_STRING) { clipboard->m_waiting = FALSE; return; } + wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object; + + bitmap_object->SetData( (size_t) selection_data->length, (const void*) selection_data->data ); + break; } @@ -186,9 +204,7 @@ selection_received( GtkWidget *WXUNUSED(widget), return; } - wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object; - - private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length ); + data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data ); break; } @@ -232,10 +248,10 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) (!wxTheClipboard->m_ownsClipboard)) { /* the clipboard is no longer in our hands. we can the delete clipboard data. */ - if (wxTheClipboard->m_dataBroker) + if (wxTheClipboard->m_data) { - delete wxTheClipboard->m_dataBroker; - wxTheClipboard->m_dataBroker = (wxDataBroker*) NULL; + delete wxTheClipboard->m_data; + wxTheClipboard->m_data = (wxDataObject*) NULL; } } @@ -252,75 +268,66 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data { if (!wxTheClipboard) return; - if (!wxTheClipboard->m_dataBroker) return; + if (!wxTheClipboard->m_data) return; - wxNode *node = wxTheClipboard->m_dataBroker->m_dataObjects.First(); + wxDataObject *data = wxTheClipboard->m_data; - while (node) + wxDataFormat format( selection_data->target ); + + if (!data->IsSupportedFormat( format )) return; + + if (format.GetType() == wxDF_TEXT) { - wxDataObject *data_object = (wxDataObject *)node->Data(); - - if (data_object->GetFormat().GetAtom() != selection_data->target) - { - node = node->Next(); - continue; - } - - switch (data_object->GetFormat().GetType()) - { - case wxDF_TEXT: - { - wxTextDataObject *text_object = (wxTextDataObject*) data_object; - - wxString text = text_object->GetText(); - + wxTextDataObject *text_object = (wxTextDataObject*) data; + wxString text( text_object->GetText() ); + #if wxUSE_UNICODE - const wxWX2MBbuf s = text.mbc_str(); - int len = strlen(s); + 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(); + 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 ); + gtk_selection_data_set( + selection_data, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) (const char*) s, + len ); - break; - } - - case wxDF_BITMAP: - { - // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object; - - // how do we do that ? - - break; - } - - case wxDF_PRIVATE: - { - wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object; + return; + } + + if (format.GetType() == wxDF_BITMAP) + { + wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data; - if (private_object->GetSize() == 0) return; + if (bitmap_object->GetDataSize() == 0) return; - gtk_selection_data_set( - selection_data, - GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), - (unsigned char*) private_object->GetData(), - (int) private_object->GetSize() ); - } + gtk_selection_data_set( + selection_data, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) bitmap_object->GetPngData(), + (int) bitmap_object->GetDataSize() ); - default: - break; - } - - node = node->Next(); + return; } + + int size = data->GetDataSize( format ); + + if (size == 0) return; + + char *d = new char[size]; + + data->GetDataHere( selection_data->target, (void*) d ); + + gtk_selection_data_set( + selection_data, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) d, + size ); } //----------------------------------------------------------------------------- @@ -336,8 +343,7 @@ wxClipboard::wxClipboard() m_ownsClipboard = FALSE; m_ownsPrimarySelection = FALSE; - m_dataBroker = (wxDataBroker*) NULL; - + m_data = (wxDataObject*) NULL; m_receivedData = (wxDataObject*) NULL; /* we use m_targetsWidget to query what formats are available */ @@ -370,6 +376,8 @@ wxClipboard::wxClipboard() m_formatSupported = FALSE; m_targetRequested = 0; + + m_usePrimary = FALSE; } wxClipboard::~wxClipboard() @@ -382,11 +390,15 @@ wxClipboard::~wxClipboard() void wxClipboard::Clear() { - if (m_dataBroker) - { + if (m_data) + { +#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 */ - if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window) { m_waiting = TRUE; @@ -405,33 +417,36 @@ void wxClipboard::Clear() while (m_waiting) gtk_main_iteration(); } - if (m_dataBroker) - { - delete m_dataBroker; - m_dataBroker = (wxDataBroker*) NULL; + if (m_data) + { + delete m_data; + m_data = (wxDataObject*) NULL; } + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif } m_targetRequested = 0; - m_formatSupported = FALSE; } bool wxClipboard::Open() { - wxCHECK_MSG( !m_open, FALSE, _T("clipboard already open") ); + wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") ); m_open = TRUE; - UsePrimarySelection(FALSE); return TRUE; } bool wxClipboard::SetData( wxDataObject *data ) { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); + wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, _T("data is invalid") ); + wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); Clear(); @@ -440,100 +455,102 @@ bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data ) { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); + wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, _T("data is invalid") ); + wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); - /* if clipboard has been cleared before, create new data broker */ - if (!m_dataBroker) m_dataBroker = new wxDataBroker(); + /* we can only store one wxDataObject */ + Clear(); - /* add new data to list of offered data objects */ - m_dataBroker->Add( data ); - - /* get native format id of new data object */ - GdkAtom format = data->GetFormat().GetAtom(); - - wxCHECK_MSG( format, FALSE, _T("data has invalid format") ); - + m_data = data; + /* This should happen automatically, but to be on the safe side */ m_ownsClipboard = FALSE; m_ownsPrimarySelection = FALSE; - /* Add handlers if someone requests data */ - -#if (GTK_MINOR_VERSION > 0) - - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), + /* get formats from wxDataObjects */ + wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; + m_data->GetAllFormats( array ); + + for (size_t i = 0; i < m_data->GetFormatCount(); i++) + { + GdkAtom atom = array[i]; + wxLogDebug( wxT("Clipboard Supported atom %s"), gdk_atom_name( atom ) ); + + /* Add handlers if someone requests data. We currently always + offer data to the clipboard and the primary selection. Maybe + we should make that depend on the usePrimary flag */ + + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), GDK_SELECTION_PRIMARY, - format, + atom, 0 ); /* what is info ? */ - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), g_clipboardAtom, - format, + atom, 0 ); /* what is info ? */ + } + + delete[] array; gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_get", GTK_SIGNAL_FUNC(selection_handler), (gpointer) NULL ); -#else - - gtk_selection_add_handler( m_clipboardWidget, - g_clipboardAtom, - format, - selection_handler, - (gpointer) NULL ); - - gtk_selection_add_handler( m_clipboardWidget, - GDK_SELECTION_PRIMARY, - format, - selection_handler, - (gpointer) NULL ); +#if wxUSE_THREADS + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); #endif - -// printf( "vorher.\n" ); + /* Tell the world we offer clipboard data */ 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; -// printf( "nachher.\n" ); - - return TRUE; - if (!gtk_selection_owner_set( m_clipboardWidget, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME )) { +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif return FALSE; } m_ownsPrimarySelection = TRUE; + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif return TRUE; } void wxClipboard::Close() { - wxCHECK_RET( m_open, _T("clipboard not open") ); + wxCHECK_RET( m_open, wxT("clipboard not open") ); m_open = FALSE; } -bool wxClipboard::IsSupported( wxDataFormat format ) +bool wxClipboard::IsSupported( const wxDataFormat& format ) { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); - /* store requested format to be asked for by callbacks */ - m_targetRequested = format.GetAtom(); + m_targetRequested = format; - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); m_formatSupported = FALSE; @@ -548,7 +565,7 @@ bool wxClipboard::IsSupported( wxDataFormat format ) m_waiting = TRUE; gtk_selection_convert( m_targetsWidget, - m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, + m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, g_targetsAtom, GDK_CURRENT_TIME ); @@ -559,73 +576,62 @@ bool wxClipboard::IsSupported( wxDataFormat format ) return TRUE; } -bool wxClipboard::GetData( wxDataObject *data ) +bool wxClipboard::GetData( wxDataObject& data ) { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); + wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); - /* is data supported by clipboard ? */ + /* get formats from wxDataObjects */ + wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ]; + data.GetAllFormats( array ); - if (!IsSupported( data->GetFormat() )) return FALSE; - - /* store pointer to data object to be filled up by callbacks */ - - m_receivedData = data; + for (size_t i = 0; i < data.GetFormatCount(); i++) + { + /* is data supported by clipboard ? */ + if (!IsSupported( array[i] )) + continue; - /* store requested format to be asked for by callbacks */ + /* store pointer to data object to be filled up by callbacks */ + m_receivedData = &data; - m_targetRequested = data->GetFormat().GetAtom(); + /* store requested format to be asked for by callbacks */ + m_targetRequested = array[i]; - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); - - /* start query */ + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); - m_formatSupported = FALSE; + /* start query */ + m_formatSupported = FALSE; - /* ask for clipboard contents. this will set - m_formatSupported to TRUE if m_targetRequested - is supported. - also, we have to wait for the "answer" from the - clipboard owner which is an asynchronous process. - therefore we set m_waiting = TRUE here and wait - until the callback "targets_selection_received" - sets it to FALSE */ - - m_waiting = TRUE; - - gtk_selection_convert( m_clipboardWidget, - m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, + /* ask for clipboard contents. this will set + m_formatSupported to TRUE if m_targetRequested + is supported. + also, we have to wait for the "answer" from the + clipboard owner which is an asynchronous process. + therefore we set m_waiting = TRUE here and wait + until the callback "targets_selection_received" + sets it to FALSE */ + + m_waiting = TRUE; + + gtk_selection_convert( m_clipboardWidget, + m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, m_targetRequested, GDK_CURRENT_TIME ); - while (m_waiting) gtk_main_iteration(); - - /* this is a true error as we checked for the presence of such data before */ - - wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") ); - - return TRUE; -} + while (m_waiting) gtk_main_iteration(); -//----------------------------------------------------------------------------- -// wxClipboardModule -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule) - -bool wxClipboardModule::OnInit() -{ - wxTheClipboard = new wxClipboard(); + /* this is a true error as we checked for the presence of such data before */ + wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") ); + + /* return success */ + delete[] array; + return TRUE; + } - return TRUE; -} - -void wxClipboardModule::OnExit() -{ - if (wxTheClipboard) delete wxTheClipboard; - wxTheClipboard = (wxClipboard*) NULL; + /* return failure */ + delete[] array; + return FALSE; } #endif - // wxUSE_CLIPBOARD