X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e5d6aa2208e2cede142bd2cf703a75cbdff5df92..8aaef28406647d6aa706c34f57dd151f00b18e5b:/src/gtk/clipbrd.cpp diff --git a/src/gtk/clipbrd.cpp b/src/gtk/clipbrd.cpp index dc455e90c5..1800ae2685 100644 --- a/src/gtk/clipbrd.cpp +++ b/src/gtk/clipbrd.cpp @@ -4,7 +4,7 @@ // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -36,8 +36,6 @@ extern void wxapp_uninstall_thread_wakeup(); // data //----------------------------------------------------------------------------- -wxClipboard *wxTheClipboard = (wxClipboard*) NULL; - GdkAtom g_clipboardAtom = 0; GdkAtom g_targetsAtom = 0; @@ -59,9 +57,9 @@ struct _GtkSelectionData GdkAtom selection; GdkAtom target; GdkAtom type; - gint format; + gint format; guchar *data; - gint length; + gint length; }; */ @@ -76,7 +74,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), #if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), #endif - wxClipboard *clipboard ) + wxClipboard *clipboard ) { if (!wxTheClipboard) { @@ -96,6 +94,11 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), clipboard->m_waiting = FALSE; return; } + +/* + wxDataFormat clip( selection_data->selection ); + wxLogDebug( wxT("selection received for targets, clipboard %s"), clip.GetId().c_str() ); +*/ // the atoms we received, holding a list of targets (= formats) GdkAtom *atoms = (GdkAtom *)selection_data->data; @@ -103,7 +106,11 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), for (unsigned int i=0; ilength/sizeof(GdkAtom); i++) { wxDataFormat format( atoms[i] ); - + +/* + wxLogDebug( wxT("selection received for targets, format %s"), format.GetId().c_str() ); +*/ + if (format == clipboard->m_targetRequested) { clipboard->m_waiting = FALSE; @@ -126,7 +133,7 @@ selection_received( GtkWidget *WXUNUSED(widget), #if (GTK_MINOR_VERSION > 0) guint32 WXUNUSED(time), #endif - wxClipboard *clipboard ) + wxClipboard *clipboard ) { if (!wxTheClipboard) { @@ -164,7 +171,7 @@ selection_received( GtkWidget *WXUNUSED(widget), clipboard->m_waiting = FALSE; return; } - + data_object->SetData( format, (size_t) selection_data->length, (const char*) selection_data->data ); wxTheClipboard->m_formatSupported = TRUE; @@ -200,10 +207,12 @@ 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) - { - delete wxTheClipboard->m_data; - wxTheClipboard->m_data = (wxDataObject*) NULL; - } + { + wxLogDebug( wxT("wxClipboard will get cleared" ) ); + + delete wxTheClipboard->m_data; + wxTheClipboard->m_data = (wxDataObject*) NULL; + } } wxTheClipboard->m_waiting = FALSE; @@ -230,24 +239,24 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data /* this will fail for composite formats */ if (format.GetType() == wxDF_TEXT) { - wxTextDataObject *text_object = (wxTextDataObject*) data; - 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, + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) (const char*) s, len ); - - return; + + return; } int size = data->GetDataSize( format ); @@ -260,10 +269,10 @@ selection_handler( GtkWidget *WXUNUSED(widget), GtkSelectionData *selection_data gtk_selection_data_set( selection_data, - GDK_SELECTION_TYPE_STRING, - 8*sizeof(gchar), - (unsigned char*) d, - size ); + GDK_SELECTION_TYPE_STRING, + 8*sizeof(gchar), + (unsigned char*) d, + size ); } //----------------------------------------------------------------------------- @@ -289,9 +298,9 @@ wxClipboard::wxClipboard() gtk_signal_connect( GTK_OBJECT(m_targetsWidget), "selection_received", - GTK_SIGNAL_FUNC( targets_selection_received ), - (gpointer) this ); - + GTK_SIGNAL_FUNC( targets_selection_received ), + (gpointer) this ); + /* we use m_clipboardWidget to get and to offer data */ m_clipboardWidget = gtk_window_new( GTK_WINDOW_POPUP ); @@ -299,14 +308,14 @@ wxClipboard::wxClipboard() gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_received", - GTK_SIGNAL_FUNC( selection_received ), - (gpointer) this ); + GTK_SIGNAL_FUNC( selection_received ), + (gpointer) this ); gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_clear_event", - GTK_SIGNAL_FUNC( selection_clear_clip ), - (gpointer) NULL ); - + GTK_SIGNAL_FUNC( selection_clear_clip ), + (gpointer) NULL ); + if (!g_clipboardAtom) g_clipboardAtom = gdk_atom_intern( "CLIPBOARD", FALSE ); if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE); @@ -338,27 +347,27 @@ void wxClipboard::Clear() 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_data) { - delete m_data; - m_data = (wxDataObject*) NULL; - } - + delete m_data; + m_data = (wxDataObject*) NULL; + } + #if wxUSE_THREADS /* re-enable GUI threads */ wxapp_install_thread_wakeup(); @@ -400,77 +409,53 @@ bool wxClipboard::AddData( wxDataObject *data ) m_data = data; - /* This should happen automatically, but to be on the safe side */ - m_ownsClipboard = FALSE; - m_ownsPrimarySelection = FALSE; - /* get formats from wxDataObjects */ wxDataFormat *array = new wxDataFormat[ m_data->GetFormatCount() ]; m_data->GetAllFormats( array ); + + /* primary selection or clipboard */ + GdkAtom clipboard = m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom; + for (size_t i = 0; i < m_data->GetFormatCount(); i++) { - GdkAtom atom = array[i]; - wxLogDebug( wxT("Clipboard Supported atom %s"), gdk_atom_name( atom ) ); - - /* Add handlers if someone requests data. We currently always - offer data to the clipboard and the primary selection. Maybe - we should make that depend on the usePrimary flag */ - - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), - GDK_SELECTION_PRIMARY, - atom, - 0 ); /* what is info ? */ - - gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), - g_clipboardAtom, - atom, - 0 ); /* what is info ? */ + wxLogDebug( wxT("wxClipboard now supports atom %s"), array[i].GetId().c_str() ); + + gtk_selection_add_target( GTK_WIDGET(m_clipboardWidget), + clipboard, + array[i], + 0 ); /* what is info ? */ } delete[] array; - + gtk_signal_connect( GTK_OBJECT(m_clipboardWidget), "selection_get", - GTK_SIGNAL_FUNC(selection_handler), - (gpointer) NULL ); + GTK_SIGNAL_FUNC(selection_handler), + (gpointer) NULL ); #if wxUSE_THREADS - /* disable GUI threads */ - wxapp_uninstall_thread_wakeup(); + /* 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; + bool res = (gtk_selection_owner_set( m_clipboardWidget, + clipboard, + GDK_CURRENT_TIME )); - 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 (m_usePrimary) + m_ownsPrimarySelection = res; + else + m_ownsClipboard = res; #if wxUSE_THREADS /* re-enable GUI threads */ wxapp_install_thread_wakeup(); #endif - - return TRUE; + + return res; } void wxClipboard::Close() @@ -508,9 +493,10 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) m_waiting = TRUE; gtk_selection_convert( m_targetsWidget, - m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, - g_targetsAtom, - GDK_CURRENT_TIME ); + m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom, + g_targetsAtom, + GDK_CURRENT_TIME ); while (m_waiting) gtk_main_iteration(); @@ -531,11 +517,36 @@ bool wxClipboard::GetData( wxDataObject& data ) { wxDataFormat format( array[i] ); - wxLogDebug( wxT("wxClipboard::GetData: request format %s"), format.GetId().c_str() ); + wxLogDebug( wxT("wxClipboard::GetData: requested format: %s"), format.GetId().c_str() ); /* is data supported by clipboard ? */ - if (!IsSupported( format )) - continue; + + /* store requested format to be asked for by callbacks */ + m_targetRequested = format; + + wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); + + m_formatSupported = FALSE; + + /* perform query. this will set m_formatSupported to + TRUE if m_targetRequested is supported. + also, we have to wait for the "answer" from the + clipboard owner which is an asynchronous process. + therefore we set m_waiting = TRUE here and wait + until the callback "targets_selection_received" + sets it to FALSE */ + + m_waiting = TRUE; + + gtk_selection_convert( m_targetsWidget, + m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom, + g_targetsAtom, + GDK_CURRENT_TIME ); + + while (m_waiting) gtk_main_iteration(); + + if (!m_formatSupported) continue; /* store pointer to data object to be filled up by callbacks */ m_receivedData = &data; @@ -562,20 +573,23 @@ bool wxClipboard::GetData( wxDataObject& data ) wxLogDebug( wxT("wxClipboard::GetData: format found, start convert") ); gtk_selection_convert( m_clipboardWidget, - m_usePrimary ? GDK_SELECTION_PRIMARY : g_clipboardAtom, - m_targetRequested, - GDK_CURRENT_TIME ); + m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY + : g_clipboardAtom, + m_targetRequested, + GDK_CURRENT_TIME ); while (m_waiting) gtk_main_iteration(); /* this is a true error as we checked for the presence of such data before */ wxCHECK_MSG( m_formatSupported, FALSE, wxT("error retrieving data from clipboard") ); - - /* return success */ + + /* return success */ delete[] array; return TRUE; } + wxLogDebug( wxT("wxClipboard::GetData: format not found") ); + /* return failure */ delete[] array; return FALSE;