// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "clipbrd.h"
-#endif
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
#include "wx/clipbrd.h"
#include "wx/utils.h"
#include "wx/log.h"
-#include "glib.h"
-#include "gdk/gdk.h"
-#include "gtk/gtk.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
//-----------------------------------------------------------------------------
GdkAtom g_clipboardAtom = 0;
GdkAtom g_targetsAtom = 0;
+GdkAtom g_timestampAtom = 0;
// the trace mask we use with wxLogTrace() - call
// wxLog::AddTraceMask(TRACE_CLIPBOARD) to enable the trace messages from here
// (there will be a *lot* of them!)
-static const char *TRACE_CLIPBOARD = _T("clipboard");
+static const wxChar *TRACE_CLIPBOARD = _T("clipboard");
//-----------------------------------------------------------------------------
// reminder
// "selection_received" for targets
//-----------------------------------------------------------------------------
+extern "C" {
static void
targets_selection_received( GtkWidget *WXUNUSED(widget),
GtkSelectionData *selection_data,
-#if (GTK_MINOR_VERSION > 0)
guint32 WXUNUSED(time),
-#endif
wxClipboard *clipboard )
{
if ( wxTheClipboard && selection_data->length > 0 )
{
- /* make sure we got the data in the correct form */
+ // make sure we got the data in the correct form
GdkAtom type = selection_data->type;
if ( type != GDK_SELECTION_TYPE_ATOM )
{
- if ( strcmp(gdk_atom_name(type), "TARGETS") )
+ gchar* atom_name = gdk_atom_name(type);
+ if ( strcmp(atom_name, "TARGETS") )
{
wxLogTrace( TRACE_CLIPBOARD,
_T("got unsupported clipboard target") );
clipboard->m_waiting = FALSE;
+ g_free(atom_name);
return;
}
+ g_free(atom_name);
}
#ifdef __WXDEBUG__
wxT("selection received for targets, format %s"),
format.GetId().c_str() );
+// printf( "format %s requested %s\n",
+// gdk_atom_name( atoms[i] ),
+// gdk_atom_name( clipboard->m_targetRequested ) );
+
if (format == clipboard->m_targetRequested)
{
clipboard->m_waiting = FALSE;
clipboard->m_waiting = FALSE;
}
+}
//-----------------------------------------------------------------------------
// "selection_received" for the actual data
//-----------------------------------------------------------------------------
+extern "C" {
static void
selection_received( GtkWidget *WXUNUSED(widget),
GtkSelectionData *selection_data,
-#if (GTK_MINOR_VERSION > 0)
guint32 WXUNUSED(time),
-#endif
wxClipboard *clipboard )
{
if (!wxTheClipboard)
wxDataFormat format( selection_data->target );
- /* make sure we got the data in the correct format */
+ // make sure we got the data in the correct format
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 */
+#if 0
+ This seems to cause problems somehow
+ // make sure we got the data in the correct form (selection type).
+ // if so, copy data to target object
if (selection_data->type != GDK_SELECTION_TYPE_STRING)
{
clipboard->m_waiting = FALSE;
return;
}
+#endif
data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data );
wxTheClipboard->m_formatSupported = TRUE;
clipboard->m_waiting = FALSE;
}
+}
//-----------------------------------------------------------------------------
// "selection_clear"
//-----------------------------------------------------------------------------
+extern "C" {
static gint
selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event )
{
/* the clipboard is no longer in our hands. we can the delete clipboard data. */
if (wxTheClipboard->m_data)
{
- wxLogDebug( wxT("wxClipboard will get cleared" ) );
+ wxLogTrace(TRACE_CLIPBOARD, wxT("wxClipboard will get cleared" ));
delete wxTheClipboard->m_data;
wxTheClipboard->m_data = (wxDataObject*) NULL;
wxTheClipboard->m_waiting = FALSE;
return TRUE;
}
+}
//-----------------------------------------------------------------------------
// selection handler for supplying data
//-----------------------------------------------------------------------------
+extern "C" {
static void
selection_handler( GtkWidget *WXUNUSED(widget),
GtkSelectionData *selection_data,
guint WXUNUSED(info),
guint WXUNUSED(time),
- gpointer WXUNUSED(data) )
+ gpointer signal_data )
{
if (!wxTheClipboard) return;
wxDataObject *data = wxTheClipboard->m_data;
- wxDataFormat format( selection_data->target );
+ // ICCCM says that TIMESTAMP is a required atom.
+ // In particular, it satisfies Klipper, which polls
+ // TIMESTAMP to see if the clipboards content has changed.
+ // It shall return the time which was used to set the data.
+ if (selection_data->target == g_timestampAtom)
+ {
+ guint timestamp = GPOINTER_TO_UINT (signal_data);
+ gtk_selection_data_set(selection_data,
+ GDK_SELECTION_TYPE_INTEGER,
+ 32,
+ (guchar*)&(timestamp),
+ sizeof(timestamp));
+ wxLogTrace(TRACE_CLIPBOARD,
+ _T("Clipboard TIMESTAMP requested, returning timestamp=%u"),
+ timestamp);
+ return;
+ }
- if (!data->IsSupportedFormat( format )) return;
+ wxDataFormat format( selection_data->target );
- /* this will fail for composite formats */
- if (format.GetType() == wxDF_TEXT)
- {
- wxTextDataObject *text_object = (wxTextDataObject*) data;
- wxString text( text_object->GetText() );
-
-#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();
+#ifdef __WXDEBUG__
+ wxLogTrace(TRACE_CLIPBOARD,
+ _T("clipboard data in format %s, GtkSelectionData is target=%s type=%s selection=%s timestamp=%u"),
+ format.GetId().c_str(),
+ wxString::FromAscii(gdk_atom_name(selection_data->target)).c_str(),
+ wxString::FromAscii(gdk_atom_name(selection_data->type)).c_str(),
+ wxString::FromAscii(gdk_atom_name(selection_data->selection)).c_str(),
+ GPOINTER_TO_UINT( signal_data )
+ );
#endif
- gtk_selection_data_set(
- selection_data,
- GDK_SELECTION_TYPE_STRING,
- 8*sizeof(gchar),
- (unsigned char*) (const char*) s,
- len );
- return;
- }
+ if (!data->IsSupportedFormat( format )) return;
int size = data->GetDataSize( format );
if (size == 0) return;
- char *d = new char[size];
+ void *d = malloc(size);
- data->GetDataHere( selection_data->target, (void*) d );
+ // Text data will be in UTF8 in Unicode mode.
+ data->GetDataHere( selection_data->target, d );
gtk_selection_data_set(
- selection_data,
- GDK_SELECTION_TYPE_STRING,
- 8*sizeof(gchar),
- (unsigned char*) d,
- size );
+ selection_data,
+ GDK_SELECTION_TYPE_STRING,
+ 8 * sizeof(gchar),
+ (unsigned char*) d,
+ size );
+
+ free(d);
+}
}
//-----------------------------------------------------------------------------
wxClipboard::wxClipboard()
{
m_open = FALSE;
+ m_waiting = FALSE;
m_ownsClipboard = FALSE;
m_ownsPrimarySelection = FALSE;
if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
+ if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE);
m_formatSupported = FALSE;
m_targetRequested = 0;
{
#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 */
+ // 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;
#if wxUSE_THREADS
/* re-enable GUI threads */
- wxapp_install_thread_wakeup();
#endif
}
wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
- /* we can only store one wxDataObject */
+ // we can only store one wxDataObject
Clear();
m_data = data;
- /* get formats from wxDataObjects */
+ // get formats from wxDataObjects
wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ];
m_data->GetAllFormats( array );
- /* primary selection or clipboard */
+ // primary selection or clipboard
GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
: g_clipboardAtom;
+ // by default provide TIMESTAMP as a target
+ gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
+ clipboard,
+ g_timestampAtom,
+ 0 );
for (size_t i = 0; i < m_data->GetFormatCount(); i++)
{
wxT("wxClipboard now supports atom %s"),
array[i].GetId().c_str() );
+// printf( "added %s\n",
+// gdk_atom_name( array[i].GetFormatId() ) );
+
gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget),
clipboard,
array[i],
gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
"selection_get",
GTK_SIGNAL_FUNC(selection_handler),
- (gpointer) NULL );
+ GUINT_TO_POINTER( gdk_event_get_time(gtk_get_current_event()) ) );
#if wxUSE_THREADS
/* disable GUI threads */
- wxapp_uninstall_thread_wakeup();
#endif
/* Tell the world we offer clipboard data */
#if wxUSE_THREADS
/* re-enable GUI threads */
- wxapp_install_thread_wakeup();
#endif
return res;
while (m_waiting) gtk_main_iteration();
- if (!m_formatSupported) return FALSE;
-
- return TRUE;
+ return m_formatSupported;
}
bool wxClipboard::GetData( wxDataObject& data )
m_waiting = TRUE;
- wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") );
+ wxLogTrace( TRACE_CLIPBOARD,
+ wxT("wxClipboard::GetData: format found, start convert") );
gtk_selection_convert( m_clipboardWidget,
m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY
return TRUE;
}
- wxLogDebug( wxT("wxClipboard::GetData: format not found") );
+ wxLogTrace( TRACE_CLIPBOARD,
+ wxT("wxClipboard::GetData: format not found") );
/* return failure */
delete[] array;
projects / wxWidgets.git / blobdiff