#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
//-----------------------------------------------------------------------------
for (unsigned int i=0; i<selection_data->length/sizeof(GdkAtom); i++)
{
-/*
- char *name = gdk_atom_name (atoms[i]);
- if (name) printf( "Format available: %s.\n", name );
-*/
+/* char *name = gdk_atom_name (atoms[i]);
+ if (name) printf( "Format available: %s.\n", name ); */
if (atoms[i] == clipboard->m_targetRequested)
{
}
else
{
+ wxTheClipboard->m_waiting = FALSE;
return FALSE;
}
if ((!wxTheClipboard->m_ownsPrimarySelection) &&
(!wxTheClipboard->m_ownsClipboard))
{
- /* the clipboard is no longer in our hands. we can the clipboard data. */
-
+ /* the clipboard is no longer in our hands. we can the delete clipboard data. */
if (wxTheClipboard->m_dataBroker)
{
delete wxTheClipboard->m_dataBroker;
}
}
+ wxTheClipboard->m_waiting = FALSE;
return TRUE;
}
if (data_object->GetFormat().GetAtom() != selection_data->target)
{
node = node->Next();
- break;
+ continue;
}
switch (data_object->GetFormat().GetType())
wxString text = text_object->GetText();
- char *s = WXSTRINGCAST text;
+#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*) s,
+ (unsigned char*) (const char*) s,
len );
break;
m_formatSupported = FALSE;
m_targetRequested = 0;
+
+ m_usePrimary = FALSE;
}
wxClipboard::~wxClipboard()
{
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;
+
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 wxUSE_THREADS
+ /* re-enable GUI threads */
+ wxapp_install_thread_wakeup();
+#endif
}
m_targetRequested = 0;
bool wxClipboard::Open()
{
- wxCHECK_MSG( !m_open, FALSE, "clipboard already open" );
+ wxCHECK_MSG( !m_open, FALSE, _T("clipboard already open") );
m_open = TRUE;
-
+
return TRUE;
}
bool wxClipboard::SetData( wxDataObject *data )
{
- wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+ wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
- wxCHECK_MSG( data, FALSE, "data is invalid" );
+ wxCHECK_MSG( data, FALSE, _T("data is invalid") );
Clear();
bool wxClipboard::AddData( wxDataObject *data )
{
- wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+ wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
- wxCHECK_MSG( data, FALSE, "data is invalid" );
+ wxCHECK_MSG( data, FALSE, _T("data is invalid") );
/* if clipboard has been cleared before, create new data broker */
-
if (!m_dataBroker) m_dataBroker = new wxDataBroker();
/* 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, "data has invalid format" );
+ 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;
/* Add handlers if someone requests data */
-
#if (GTK_MINOR_VERSION > 0)
selection_handler,
(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;
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, "clipboard not open" );
+ wxCHECK_RET( m_open, _T("clipboard not open") );
m_open = FALSE;
}
bool wxClipboard::IsSupported( wxDataFormat format )
{
- wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+ wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
/* store requested format to be asked for by callbacks */
m_targetRequested = format.GetAtom();
- wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+ wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );
m_formatSupported = FALSE;
sets it to FALSE */
m_waiting = TRUE;
-
+
gtk_selection_convert( m_targetsWidget,
- g_clipboardAtom,
+ m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom,
g_targetsAtom,
GDK_CURRENT_TIME );
-
+
while (m_waiting) gtk_main_iteration();
if (!m_formatSupported) return FALSE;
bool wxClipboard::GetData( wxDataObject *data )
{
- wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+ wxCHECK_MSG( m_open, FALSE, _T("clipboard not open") );
/* is data supported by clipboard ? */
m_targetRequested = data->GetFormat().GetAtom();
- wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+ wxCHECK_MSG( m_targetRequested, FALSE, _T("invalid clipboard format") );
/* start query */
m_waiting = TRUE;
gtk_selection_convert( m_clipboardWidget,
- g_clipboardAtom,
+ m_usePrimary?GDK_SELECTION_PRIMARY:g_clipboardAtom,
m_targetRequested,
GDK_CURRENT_TIME );
/* this is a true error as we checked for the presence of such data before */
- wxCHECK_MSG( m_formatSupported, FALSE, "error retrieving data from clipboard" );
+ wxCHECK_MSG( m_formatSupported, FALSE, _T("error retrieving data from clipboard") );
return TRUE;
}
projects / wxWidgets.git / blobdiff