#include "wx/clipbrd.h"
-#ifdef wxUSE_CLIPBOARD
+#if wxUSE_CLIPBOARD
#include "glib.h"
#include "gdk/gdk.h"
wxClipboard *wxTheClipboard = (wxClipboard*) NULL;
-GdkAtom g_textAtom = 0;
GdkAtom g_clipboardAtom = 0;
GdkAtom g_targetsAtom = 0;
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 );
+
if (atoms[i] == clipboard->m_targetRequested)
{
clipboard->m_formatSupported = TRUE;
// make sure we got the data in the correct format
- if (data_object->m_formatAtom != selection_data->target) return;
+ if (data_object->GetFormat().GetAtom() != selection_data->target) return;
// make sure we got the data in the correct form (selection type).
// if so, copy data to target object
- switch (data_object->GetFormat())
+ switch (data_object->GetFormat().GetType())
{
case wxDF_TEXT:
{
if ((!wxTheClipboard->m_ownsPrimarySelection) &&
(!wxTheClipboard->m_ownsClipboard))
{
- // the clipboard is no longer in our hands. we can the
- // clipboard data.
-
- wxTheClipboard->m_dataObjects.Clear();
+ /* the clipboard is no longer in our hands. we can the clipboard data. */
+
+ if (wxTheClipboard->m_dataBroker)
+ {
+ delete wxTheClipboard->m_dataBroker;
+ wxTheClipboard->m_dataBroker = (wxDataBroker*) NULL;
+ }
}
return TRUE;
{
if (!wxTheClipboard) return;
- wxNode *node = wxTheClipboard->m_dataObjects.First();
+ if (!wxTheClipboard->m_dataBroker) return;
+
+ wxNode *node = wxTheClipboard->m_dataBroker->m_dataObjects.First();
while (node)
{
wxDataObject *data_object = (wxDataObject *)node->Data();
- if (data_object->m_formatAtom != selection_data->target)
+ if (data_object->GetFormat().GetAtom() != selection_data->target)
{
node = node->Next();
break;
}
- switch (data_object->GetFormat())
+ switch (data_object->GetFormat().GetType())
{
case wxDF_TEXT:
{
{
wxPrivateDataObject *private_object = (wxPrivateDataObject*) data_object;
- if (private_object->GetDataSize() == 0) return;
+ 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->GetDataSize() );
+ (int) private_object->GetSize() );
}
default:
m_ownsClipboard = FALSE;
m_ownsPrimarySelection = FALSE;
- m_dataObjects.DeleteContents( TRUE );
+ m_dataBroker = (wxDataBroker*) NULL;
m_receivedData = (wxDataObject*) NULL;
(gpointer) NULL );
if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE );
- if (!g_textAtom) g_textAtom = gdk_atom_intern( "TEXT", FALSE );
if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE);
m_formatSupported = FALSE;
void wxClipboard::Clear()
{
- if (m_dataObjects.GetCount())
+ if (m_dataBroker)
{
/* 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 */
gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME );
}
- m_dataObjects.Clear();
+ if (m_dataBroker)
+ {
+ delete m_dataBroker;
+ m_dataBroker = (wxDataBroker*) NULL;
+ }
}
m_targetRequested = 0;
bool wxClipboard::SetData( wxDataObject *data )
{
+ wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+
wxCHECK_MSG( data, FALSE, "data is invalid" );
- wxNode *node = m_dataObjects.First();
-
- while (node)
- {
- wxDataObject *d = (wxDataObject*)node->Data();
-
- if (d->GetFormat() == data->GetFormat())
- {
- m_dataObjects.DeleteNode( node );
-
- break;
- }
-
- node = node->Next();
- }
+ Clear();
+
+ return AddData( data );
+}
+
+bool wxClipboard::AddData( wxDataObject *data )
+{
+ wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+
+ wxCHECK_MSG( data, FALSE, "data is invalid" );
- m_dataObjects.Append( data );
+ /* if clipboard has been cleared before, create new data broker */
- wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+ if (!m_dataBroker) m_dataBroker = new wxDataBroker();
- if (data->GetFormat() == wxDF_PRIVATE)
- {
- wxPrivateDataObject* pd = (wxPrivateDataObject*) data;
-
- wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
+ /* 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();
- data->m_formatAtom = GetTargetAtom( data->GetFormat(), pd->GetId() );
- }
- else
- {
- data->m_formatAtom = GetTargetAtom( data->GetFormat() );
- }
+ wxCHECK_MSG( format, FALSE, "data has invalid format" );
- // This should happen automatically
+ /* This should happen automatically, but to be on the safe side */
m_ownsClipboard = FALSE;
m_ownsPrimarySelection = FALSE;
- // Add handlers if someone requests data
+ /* Add handlers if someone requests data */
+
+#if (GTK_MINOR_VERSION > 0)
+
+ 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 ? */
+
+ 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,
- data->m_formatAtom,
+ format,
selection_handler,
- NULL );
+ (gpointer) NULL );
gtk_selection_add_handler( m_clipboardWidget,
GDK_SELECTION_PRIMARY,
- data->m_formatAtom,
+ format,
selection_handler,
- NULL );
+ (gpointer) NULL );
+#endif
- // Tell the world we offer clipboard data
+ /* Tell the world we offer clipboard data */
if (!gtk_selection_owner_set( m_clipboardWidget,
g_clipboardAtom,
if (!gtk_selection_owner_set( m_clipboardWidget,
GDK_SELECTION_PRIMARY,
GDK_CURRENT_TIME ))
- {
+ {
return FALSE;
}
m_ownsPrimarySelection = TRUE;
-
+
return TRUE;
}
m_open = FALSE;
}
-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString &id )
+bool wxClipboard::IsSupported( wxDataFormat format )
{
- m_targetRequested = GetTargetAtom( format, id );
+ wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
+
+ /* store requested format to be asked for by callbacks */
+
+ m_targetRequested = format.GetAtom();
- if (m_targetRequested == 0) return FALSE;
+ wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
- // add handler for target (= format) query
+ /* add handler for target (= format) query */
gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
"selection_received",
m_formatSupported = FALSE;
- // perform query. this will set m_formatSupported to
- // TRUE if m_targetRequested is supported
+ /* perform query. this will set m_formatSupported to
+ * TRUE if m_targetRequested is supported */
gtk_selection_convert( m_clipboardWidget,
g_clipboardAtom,
(gpointer) this );
if (!m_formatSupported) return FALSE;
-
+
return TRUE;
-}
-
+}
+
bool wxClipboard::GetData( wxDataObject *data )
{
wxCHECK_MSG( m_open, FALSE, "clipboard not open" );
- m_receivedData = data;
+ /* is data supported by clipboard ? */
- wxCHECK_MSG( m_receivedData, FALSE, "invalid data object" );
+ if (!IsSupported( data->GetFormat() )) return FALSE;
- if (m_receivedData->GetFormat() == wxDF_PRIVATE)
- {
- wxPrivateDataObject* pd = (wxPrivateDataObject*) m_receivedData;
-
- wxCHECK_MSG( !pd->GetId().IsEmpty(), FALSE, "private clipboard format requires ID string" );
-
- m_targetRequested = GetTargetAtom( m_receivedData->GetFormat(), pd->GetId() );
- }
- else
- {
- m_targetRequested = GetTargetAtom( m_receivedData->GetFormat() );
- }
+ /* store pointer to data object to be filled up by callbacks */
- data->m_formatAtom = m_targetRequested;
-
- wxCHECK_MSG( m_targetRequested, FALSE, "unsupported clipboard format" );
+ m_receivedData = data;
+
+ /* store requested format to be asked for by callbacks */
+
+ m_targetRequested = data->GetFormat().GetAtom();
+ wxCHECK_MSG( m_targetRequested, FALSE, "invalid clipboard format" );
+
+ /* start query */
+
m_formatSupported = FALSE;
gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
GTK_SIGNAL_FUNC( selection_received ),
(gpointer) this );
+ /* ask for clipboard contents */
+
gtk_selection_convert( m_clipboardWidget,
g_clipboardAtom,
m_targetRequested,
GTK_SIGNAL_FUNC( selection_received ),
(gpointer) this );
+ /* 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" );
return TRUE;
}
-GdkAtom wxClipboard::GetTargetAtom( wxDataFormat format, const wxString &id )
-{
- // What is X representation of that format?
-
- switch (format)
- {
- case wxDF_TEXT:
- {
- return GDK_TARGET_STRING;
- // g_textAtom
- }
-
- case wxDF_BITMAP:
- {
- return GDK_TARGET_BITMAP;
- break;
- }
-
- case wxDF_PRIVATE:
- {
- // we create our own X representation
-
- return gdk_atom_intern( WXSTRINGCAST( id ), FALSE );
- }
-
- default:
- {
- return (GdkAtom) 0;
- }
- }
-
- return (GdkAtom) 0;
-}
-
//-----------------------------------------------------------------------------
// wxClipboardModule
//-----------------------------------------------------------------------------
projects / wxWidgets.git / blobdiff