X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2acb9ae1c69c1e37cbe0e46933929f5b1b021ba..8aaef28406647d6aa706c34f57dd151f00b18e5b:/src/gtk/clipbrd.cpp diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp index d3cd53bc4e..1800ae2685 100644 --- a/src/gtk/clipbrd.cpp +++ b/src/gtk/clipbrd.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -15,7 +15,9 @@ #if wxUSE_CLIPBOARD +#include "wx/dataobj.h" #include "wx/utils.h" +#include "wx/log.h" #include "glib.h" #include "gdk/gdk.h" @@ -34,8 +36,6 @@ extern void wxapp_uninstall_thread_wakeup(); // data //----------------------------------------------------------------------------- -wxClipboard *wxTheClipboard = (wxClipboard*) NULL; - GdkAtom g_clipboardAtom = 0; GdkAtom g_targetsAtom = 0; @@ -57,9 +57,9 @@ struct _GtkSelectionData GdkAtom selection; GdkAtom target; GdkAtom type; - gint format; + gint format; guchar *data; - gint length; + gint length; }; */ @@ -74,7 +74,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), #if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), #endif - wxClipboard *clipboard ) + wxClipboard *clipboard ) { if (!wxTheClipboard) { @@ -94,16 +94,24 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), clipboard->m_waiting = FALSE; return; } + +/* + wxDataFormat clip( selection_data->selection ); + wxLogDebug( wxT("selection received for targets, clipboard %s"), clip.GetId().c_str() ); +*/ // the atoms we received, holding a list of targets (= formats) GdkAtom *atoms = (GdkAtom *)selection_data->data; for (unsigned int i=0; ilength/sizeof(GdkAtom); i++) { -/* char *name = gdk_atom_name (atoms[i]); - if (name) printf( "Format available: %s.\n", name ); */ - - if (atoms[i] == clipboard->m_targetRequested) + wxDataFormat format( atoms[i] ); + +/* + wxLogDebug( wxT("selection received for targets, format %s"), format.GetId().c_str() ); +*/ + + if (format == clipboard->m_targetRequested) { clipboard->m_waiting = FALSE; clipboard->m_formatSupported = TRUE; @@ -125,7 +133,7 @@ selection_received( GtkWidget *WXUNUSED(widget), #if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), #endif - wxClipboard *clipboard ) + wxClipboard *clipboard ) { if (!wxTheClipboard) { @@ -134,7 +142,7 @@ selection_received( GtkWidget *WXUNUSED(widget), } wxDataObject *data_object = clipboard->m_receivedData; - + if (!data_object) { clipboard->m_waiting = FALSE; @@ -146,9 +154,11 @@ 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; @@ -156,62 +166,13 @@ selection_received( GtkWidget *WXUNUSED(widget), /* make sure we got the data in the correct form (selection type). if so, copy data to target object */ - - switch (data_object->GetFormat().GetType()) + if (selection_data->type != GDK_SELECTION_TYPE_STRING) { - case wxDF_TEXT: - { - if (selection_data->type != GDK_SELECTION_TYPE_STRING) - { - clipboard->m_waiting = FALSE; - return; - } - - wxTextDataObject *text_object = (wxTextDataObject *) data_object; - - wxString text = (const char*) selection_data->data; - - text_object->SetText( text ); - - break; - } - - case wxDF_BITMAP: - { - if (selection_data->type != GDK_SELECTION_TYPE_STRING) - { - clipboard->m_waiting = FALSE; - return; - } - - wxBitmapDataObject *bitmap_object = (wxBitmapDataObject *) data_object; - - bitmap_object->SetPngData( (const char*) selection_data->data, (size_t) selection_data->length ); - - break; - } - - case wxDF_PRIVATE: - { - if (selection_data->type != GDK_SELECTION_TYPE_STRING) - { - clipboard->m_waiting = FALSE; - return; - } - - wxPrivateDataObject *private_object = (wxPrivateDataObject *) data_object; - - private_object->SetData( (const char*) selection_data->data, (size_t) selection_data->length ); - - break; - } - - default: - { - clipboard->m_waiting = FALSE; - return; - } + clipboard->m_waiting = FALSE; + return; } + + data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data ); wxTheClipboard->m_formatSupported = TRUE; clipboard->m_waiting = FALSE; @@ -245,11 +206,13 @@ 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) - { - delete wxTheClipboard->m_dataBroker; - wxTheClipboard->m_dataBroker = (wxDataBroker*) NULL; - } + if (wxTheClipboard->m_data) + { + wxLogDebug( wxT("wxClipboard will get cleared" ) ); + + delete wxTheClipboard->m_data; + wxTheClipboard->m_data = (wxDataObject*) NULL; + } } wxTheClipboard->m_waiting = FALSE; @@ -265,82 +228,51 @@ 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; + + /* this will fail for composite formats */ + 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 ); - - break; - } - - case wxDF_BITMAP: - { - wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object; - - if (bitmap_object->GetSize() == 0) return; - - gtk_selection_data_set( - selection_data, - GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), - (unsigned char*) bitmap_object->GetData(), - (int) bitmap_object->GetSize() ); - - break; - } - - case wxDF_PRIVATE: - { - wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object; - - if (private_object->GetSize() == 0) return; - - gtk_selection_data_set( - selection_data, - GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), - (unsigned char*) private_object->GetData(), - (int) private_object->GetSize() ); - } - - default: - break; - } - - node = node->Next(); + 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]; + + data->GetDataHere( selection_data->target, (void*) d ); + + gtk_selection_data_set( + selection_data, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) d, + size ); } //----------------------------------------------------------------------------- @@ -356,8 +288,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 */ @@ -367,9 +298,9 @@ wxClipboard::wxClipboard() gtk_signal_connect( GTK_OBJECT(m_targetsWidget), "selection_received", - GTK_SIGNAL_FUNC( targets_selection_received ), - (gpointer) this ); - + GTK_SIGNAL_FUNC( targets_selection_received ), + (gpointer) this ); + /* we use m_clipboardWidget to get and to offer data */ m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP ); @@ -377,14 +308,14 @@ wxClipboard::wxClipboard() gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_received", - GTK_SIGNAL_FUNC( selection_received ), - (gpointer) this ); + GTK_SIGNAL_FUNC( selection_received ), + (gpointer) this ); gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_clear_event", - GTK_SIGNAL_FUNC( selection_clear_clip ), - (gpointer) NULL ); - + GTK_SIGNAL_FUNC( selection_clear_clip ), + (gpointer) NULL ); + if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE ); if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE); @@ -404,8 +335,8 @@ wxClipboard::~wxClipboard() void wxClipboard::Clear() { - if (m_dataBroker) - { + if (m_data) + { #if wxUSE_THREADS /* disable GUI threads */ wxapp_uninstall_thread_wakeup(); @@ -416,27 +347,27 @@ void wxClipboard::Clear() if (gdk_selection_owner_get( g_clipboardAtom ) == m_clipboardWidget->window) { m_waiting = TRUE; - + gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, GDK_CURRENT_TIME ); - + while (m_waiting) gtk_main_iteration(); } if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window) { m_waiting = TRUE; - + gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME ); - + 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(); @@ -444,13 +375,12 @@ void wxClipboard::Clear() } 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; @@ -459,9 +389,9 @@ bool wxClipboard::Open() 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(); @@ -470,113 +400,85 @@ 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") ); - - /* This should happen automatically, but to be on the safe side */ - m_ownsClipboard = FALSE; - m_ownsPrimarySelection = FALSE; + m_data = data; + + /* get formats from wxDataObjects */ + wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; + m_data->GetAllFormats( array ); + + /* primary selection or clipboard */ + GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom; + - /* Add handlers if someone requests data */ + for (size_t i = 0; i < m_data->GetFormatCount(); i++) + { + wxLogDebug( wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() ); -#if (GTK_MINOR_VERSION > 0) + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), + clipboard, + array[i], + 0 ); /* what is info ? */ + } - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), - GDK_SELECTION_PRIMARY, - format, - 0 ); /* what is info ? */ - - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), - g_clipboardAtom, - format, - 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 ); -#endif + GTK_SIGNAL_FUNC(selection_handler), + (gpointer) NULL ); #if wxUSE_THREADS - /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); + /* disable GUI threads */ + wxapp_uninstall_thread_wakeup(); #endif /* 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; + bool res = (gtk_selection_owner_set( m_clipboardWidget, + clipboard, + GDK_CURRENT_TIME )); - 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 (m_usePrimary) + m_ownsPrimarySelection = res; + else + m_ownsClipboard = res; #if wxUSE_THREADS /* re-enable GUI threads */ wxapp_install_thread_wakeup(); #endif - - return TRUE; + + return res; } 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::IsOpened() const { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); + return m_open; +} + +bool wxClipboard::IsSupported( const wxDataFormat& format ) +{ + /* reentrance problems */ + if (m_open) return TRUE; /* 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; @@ -591,9 +493,10 @@ bool wxClipboard::IsSupported( wxDataFormat format ) m_waiting = TRUE; gtk_selection_convert( m_targetsWidget, - m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, - g_targetsAtom, - GDK_CURRENT_TIME ); + m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom, + g_targetsAtom, + GDK_CURRENT_TIME ); while (m_waiting) gtk_main_iteration(); @@ -602,73 +505,96 @@ 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++) + { + wxDataFormat format( array[i] ); - /* store requested format to be asked for by callbacks */ + wxLogDebug( wxT("wxClipboard::GetData: requested format: %s"), format.GetId().c_str() ); - m_targetRequested = data->GetFormat().GetAtom(); + /* is data supported by clipboard ? */ + + /* store requested format to be asked for by callbacks */ + m_targetRequested = format; - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); - - /* start query */ + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); - m_formatSupported = FALSE; + 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; + /* perform query. 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 */ - gtk_selection_convert( m_clipboardWidget, - m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, - m_targetRequested, - GDK_CURRENT_TIME ); - - while (m_waiting) gtk_main_iteration(); + m_waiting = TRUE; - /* this is a true error as we checked for the presence of such data before */ + gtk_selection_convert( m_targetsWidget, + m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom, + g_targetsAtom, + GDK_CURRENT_TIME ); - wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") ); + while (m_waiting) gtk_main_iteration(); + + if (!m_formatSupported) continue; + + /* store pointer to data object to be filled up by callbacks */ + m_receivedData = &data; + + /* store requested format to be asked for by callbacks */ + m_targetRequested = format; - return TRUE; -} - -//----------------------------------------------------------------------------- -// wxClipboardModule -//----------------------------------------------------------------------------- - -IMPLEMENT_DYNAMIC_CLASS(wxClipboardModule,wxModule) - -bool wxClipboardModule::OnInit() -{ - wxTheClipboard = new wxClipboard(); + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); + + /* start query */ + m_formatSupported = FALSE; - return TRUE; -} - -void wxClipboardModule::OnExit() -{ - if (wxTheClipboard) delete wxTheClipboard; - wxTheClipboard = (wxClipboard*) NULL; + /* 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; + + wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") ); + + gtk_selection_convert( m_clipboardWidget, + m_usePrimary ? (GdkAtom)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, wxT("error retrieving data from clipboard") ); + + /* return success */ + delete[] array; + return TRUE; + } + + wxLogDebug( wxT("wxClipboard::GetData: format not found") ); + + /* return failure */ + delete[] array; + return FALSE; } #endif - // wxUSE_CLIPBOARD