X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db2d879ad4bdd492daee48bf2829760b92d8e50e..d1b15f03b8e614c83541ca3487f847f61122b514:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index a4bf7b6a6f..d981a17e76 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,7 @@ 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) @@ -144,7 +153,7 @@ selection_received( GtkWidget *WXUNUSED(widget), 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 +178,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 char*) selection_data->data, (size_t) selection_data->length ); + break; } @@ -259,7 +272,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data while (node) { wxDataObject *data_object = (wxDataObject *)node->Data(); - + if (data_object->GetFormat().GetAtom() != selection_data->target) { node = node->Next(); @@ -294,10 +307,17 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data case wxDF_BITMAP: { - // wxBitmapDataObject *private_object = (wxBitmapDataObject*) data_object; + wxBitmapDataObject *bitmap_object = (wxBitmapDataObject*) data_object; - // how do we do that ? - + 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; } @@ -370,6 +390,8 @@ wxClipboard::wxClipboard() m_formatSupported = FALSE; m_targetRequested = 0; + + m_usePrimary = FALSE; } wxClipboard::~wxClipboard() @@ -384,9 +406,13 @@ void wxClipboard::Clear() { if (m_dataBroker) { +#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; @@ -410,6 +436,11 @@ void wxClipboard::Clear() delete m_dataBroker; m_dataBroker = (wxDataBroker*) NULL; } + +#if wxUSE_THREADS + /* re-enable GUI threads */ + wxapp_install_thread_wakeup(); +#endif } m_targetRequested = 0; @@ -419,18 +450,18 @@ void wxClipboard::Clear() bool wxClipboard::Open() { - wxCHECK_MSG( !m_open, FALSE, _T("clipboard already open") ); + wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") ); m_open = TRUE; - + 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(); @@ -439,9 +470,9 @@ 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(); @@ -452,7 +483,7 @@ bool wxClipboard::AddData( wxDataObject *data ) /* get native format id of new data object */ GdkAtom format = data->GetFormat().GetAtom(); - 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; @@ -492,47 +523,60 @@ bool wxClipboard::AddData( wxDataObject *data ) (gpointer) NULL ); #endif -// printf( "vorher.\n" ); +#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; -// 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 ) { - wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") ); + wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); /* store requested format to be asked for by callbacks */ m_targetRequested = format.GetAtom(); - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); m_formatSupported = FALSE; @@ -547,7 +591,7 @@ bool wxClipboard::IsSupported( wxDataFormat format ) m_waiting = TRUE; gtk_selection_convert( m_targetsWidget, - g_clipboardAtom, + m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, g_targetsAtom, GDK_CURRENT_TIME ); @@ -560,7 +604,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 ? */ @@ -574,7 +618,7 @@ bool wxClipboard::GetData( wxDataObject *data ) m_targetRequested = data->GetFormat().GetAtom(); - wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); /* start query */ @@ -592,7 +636,7 @@ bool wxClipboard::GetData( wxDataObject *data ) m_waiting = TRUE; gtk_selection_convert( m_clipboardWidget, - g_clipboardAtom, + m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom, m_targetRequested, GDK_CURRENT_TIME ); @@ -600,7 +644,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; }