X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7e2c43b8551c394d790e416ae52a4476c759683e..a3e7d24d21f5371c88caffe4a85c8e4a5362db3f:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index f4ed88753f..9a9e38ee22 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -21,6 +21,15 @@ #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 +100,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 +135,7 @@ selection_received( GtkWidget *WXUNUSED(widget), } wxDataObject *data_object = clipboard->m_receivedData; - + if (!data_object) { clipboard->m_waiting = FALSE; @@ -139,12 +149,12 @@ selection_received( GtkWidget *WXUNUSED(widget), } /* make sure we got the data in the correct format */ - if (data_object->GetFormat().GetAtom() != selection_data->target) + if (data_object->GetFormat() != selection_data->target) { clipboard->m_waiting = FALSE; return; } - + /* make sure we got the data in the correct form (selection type). if so, copy data to target object */ @@ -169,12 +179,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->SetPngData( (const void*) selection_data->data, (size_t) selection_data->length ); + break; } @@ -232,10 +246,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 +266,64 @@ 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) + if (!data->IsSupportedFormat( selection_data->target )) return; + + if (data->GetFormat().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 (data->GetFormat().GetType() == wxDF_BITMAP) + { + wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data; - if (private_object->GetSize() == 0) return; + if (bitmap_object->GetDataSize(wxDF_BITMAP) == 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->GetData(), + (int) bitmap_object->GetDataSize(wxDF_BITMAP) ); - default: - break; - } - - node = node->Next(); + return; } + + int size = data->GetDataSize( selection_data->target ); + + 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 +339,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 */ @@ -384,11 +386,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; @@ -407,21 +413,25 @@ 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; @@ -430,9 +440,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(); @@ -441,20 +451,19 @@ 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 ); - + m_data = data; + /* get native format id of new data object */ - GdkAtom format = data->GetFormat().GetAtom(); + GdkAtom format = data->GetFormat(); - wxCHECK_MSG( format, FALSE, _T("data has invalid format") ); + wxCHECK_MSG( format, FALSE, wxT("data has invalid format") ); /* This should happen automatically, but to be on the safe side */ m_ownsClipboard = FALSE; @@ -494,11 +503,20 @@ bool wxClipboard::AddData( wxDataObject *data ) (gpointer) NULL ); #endif +#if wxUSE_THREADS + /* 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; @@ -507,29 +525,36 @@ bool wxClipboard::AddData( wxDataObject *data ) 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 ) { - 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; @@ -544,7 +569,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 ); @@ -557,7 +582,7 @@ bool wxClipboard::IsSupported( wxDataFormat format ) 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 ? */ @@ -569,9 +594,9 @@ bool wxClipboard::GetData( wxDataObject *data ) /* store requested format to be asked for by callbacks */ - m_targetRequested = data->GetFormat().GetAtom(); + m_targetRequested = data->GetFormat(); - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); /* start query */ @@ -589,7 +614,7 @@ bool wxClipboard::GetData( wxDataObject *data ) m_waiting = TRUE; gtk_selection_convert( m_clipboardWidget, - m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, + m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, m_targetRequested, GDK_CURRENT_TIME ); @@ -597,7 +622,7 @@ bool wxClipboard::GetData( wxDataObject *data ) /* 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") ); + wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") ); return TRUE; }