X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b84311a447b8df710ac221d38e53aa11f1392d1..5de69dd366b43dc43259b34728272ae550ade92b:/src/gtk1/clipbrd.cpp diff --git a/src/gtk1/clipbrd.cpp b/src/gtk1/clipbrd.cpp index f9d56bf0f8..2d1ade92ec 100644 --- a/src/gtk1/clipbrd.cpp +++ b/src/gtk1/clipbrd.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/clipbrd.cpp +// Name: src/gtk1/clipbrd.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,25 +10,20 @@ // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/clipbrd.h" - #if wxUSE_CLIPBOARD -#include "wx/dataobj.h" -#include "wx/utils.h" -#include "wx/log.h" +#include "wx/clipbrd.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/utils.h" + #include "wx/dataobj.h" +#endif #include #include #include -//----------------------------------------------------------------------------- -// thread system -//----------------------------------------------------------------------------- - -#if wxUSE_THREADS -#endif - //----------------------------------------------------------------------------- // data //----------------------------------------------------------------------------- @@ -90,7 +85,7 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), wxLogTrace( TRACE_CLIPBOARD, _T("got unsupported clipboard target") ); - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; g_free(atom_name); return; } @@ -121,14 +116,14 @@ targets_selection_received( GtkWidget *WXUNUSED(widget), if (format == clipboard->m_targetRequested) { - clipboard->m_waiting = FALSE; - clipboard->m_formatSupported = TRUE; + clipboard->m_waiting = false; + clipboard->m_formatSupported = true; return; } } } - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; } } @@ -145,7 +140,7 @@ selection_received( GtkWidget *WXUNUSED(widget), { if (!wxTheClipboard) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -153,13 +148,13 @@ selection_received( GtkWidget *WXUNUSED(widget), if (!data_object) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } if (selection_data->length <= 0) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -168,7 +163,7 @@ selection_received( GtkWidget *WXUNUSED(widget), // make sure we got the data in the correct format if (!data_object->IsSupportedFormat( format ) ) { - clipboard->m_waiting = FALSE; + clipboard->m_waiting = false; return; } @@ -178,15 +173,15 @@ selection_received( GtkWidget *WXUNUSED(widget), // if so, copy data to target object if (selection_data->type != GDK_SELECTION_TYPE_STRING) { - clipboard->m_waiting = FALSE; + 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; + wxTheClipboard->m_formatSupported = true; + clipboard->m_waiting = false; } } @@ -202,16 +197,16 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) if (event->selection == GDK_SELECTION_PRIMARY) { - wxTheClipboard->m_ownsPrimarySelection = FALSE; + wxTheClipboard->m_ownsPrimarySelection = false; } else if (event->selection == g_clipboardAtom) { - wxTheClipboard->m_ownsClipboard = FALSE; + wxTheClipboard->m_ownsClipboard = false; } else { - wxTheClipboard->m_waiting = FALSE; + wxTheClipboard->m_waiting = false; return FALSE; } @@ -228,7 +223,7 @@ selection_clear_clip( GtkWidget *WXUNUSED(widget), GdkEventSelection *event ) } } - wxTheClipboard->m_waiting = FALSE; + wxTheClipboard->m_waiting = false; return TRUE; } } @@ -257,7 +252,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), // It shall return the time which was used to set the data. if (selection_data->target == g_timestampAtom) { - uint timestamp = GPOINTER_TO_UINT (signal_data); + guint timestamp = GPOINTER_TO_UINT (signal_data); gtk_selection_data_set(selection_data, GDK_SELECTION_TYPE_INTEGER, 32, @@ -298,7 +293,7 @@ selection_handler( GtkWidget *WXUNUSED(widget), GDK_SELECTION_TYPE_STRING, 8 * sizeof(gchar), (unsigned char*) d, - size-1 ); + size ); free(d); } @@ -312,11 +307,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) wxClipboard::wxClipboard() { - m_open = FALSE; - m_waiting = FALSE; + m_open = false; + m_waiting = false; - m_ownsClipboard = FALSE; - m_ownsPrimarySelection = FALSE; + m_ownsClipboard = false; + m_ownsPrimarySelection = false; m_data = (wxDataObject*) NULL; m_receivedData = (wxDataObject*) NULL; @@ -350,10 +345,8 @@ wxClipboard::wxClipboard() if (!g_targetsAtom) g_targetsAtom = gdk_atom_intern ("TARGETS", FALSE); if (!g_timestampAtom) g_timestampAtom = gdk_atom_intern ("TIMESTAMP", FALSE); - m_formatSupported = FALSE; + m_formatSupported = false; m_targetRequested = 0; - - m_usePrimary = FALSE; } wxClipboard::~wxClipboard() @@ -376,7 +369,7 @@ void wxClipboard::Clear() // 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; + m_waiting = true; gtk_selection_owner_set( (GtkWidget*) NULL, g_clipboardAtom, (guint32) GDK_CURRENT_TIME ); @@ -386,7 +379,7 @@ void wxClipboard::Clear() if (gdk_selection_owner_get( GDK_SELECTION_PRIMARY ) == m_clipboardWidget->window) { - m_waiting = TRUE; + m_waiting = true; gtk_selection_owner_set( (GtkWidget*) NULL, GDK_SELECTION_PRIMARY, (guint32) GDK_CURRENT_TIME ); @@ -406,23 +399,23 @@ void wxClipboard::Clear() } m_targetRequested = 0; - m_formatSupported = FALSE; + m_formatSupported = false; } bool wxClipboard::Open() { - wxCHECK_MSG( !m_open, FALSE, wxT("clipboard already open") ); + wxCHECK_MSG( !m_open, false, wxT("clipboard already open") ); - m_open = TRUE; + m_open = true; - return TRUE; + return true; } bool wxClipboard::SetData( wxDataObject *data ) { - wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); + wxCHECK_MSG( data, false, wxT("data is invalid") ); Clear(); @@ -431,9 +424,9 @@ bool wxClipboard::SetData( wxDataObject *data ) bool wxClipboard::AddData( wxDataObject *data ) { - wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); - wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); + wxCHECK_MSG( data, false, wxT("data is invalid") ); // we can only store one wxDataObject Clear(); @@ -501,7 +494,7 @@ void wxClipboard::Close() { wxCHECK_RET( m_open, wxT("clipboard not open") ); - m_open = FALSE; + m_open = false; } bool wxClipboard::IsOpened() const @@ -512,7 +505,7 @@ bool wxClipboard::IsOpened() const bool wxClipboard::IsSupported( const wxDataFormat& format ) { /* reentrance problems */ - if (m_waiting) return FALSE; + if (m_waiting) return false; /* store requested format to be asked for by callbacks */ m_targetRequested = format; @@ -521,19 +514,19 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) wxT("wxClipboard:IsSupported: requested format: %s"), format.GetId().c_str() ); - wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") ); - m_formatSupported = FALSE; + m_formatSupported = false; /* perform query. this will set m_formatSupported to - TRUE if m_targetRequested is supported. + 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 + therefore we set m_waiting = true here and wait until the callback "targets_selection_received" - sets it to FALSE */ + sets it to false */ - m_waiting = TRUE; + m_waiting = true; gtk_selection_convert( m_targetsWidget, m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY @@ -548,7 +541,7 @@ bool wxClipboard::IsSupported( const wxDataFormat& format ) bool wxClipboard::GetData( wxDataObject& data ) { - wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") ); + wxCHECK_MSG( m_open, false, wxT("clipboard not open") ); /* get formats from wxDataObjects */ wxDataFormat *array = new wxDataFormat[ data.GetFormatCount() ]; @@ -567,19 +560,19 @@ bool wxClipboard::GetData( wxDataObject& data ) /* store requested format to be asked for by callbacks */ m_targetRequested = format; - wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") ); - m_formatSupported = FALSE; + m_formatSupported = false; /* perform query. this will set m_formatSupported to - TRUE if m_targetRequested is supported. + 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 + therefore we set m_waiting = true here and wait until the callback "targets_selection_received" - sets it to FALSE */ + sets it to false */ - m_waiting = TRUE; + m_waiting = true; gtk_selection_convert( m_targetsWidget, m_usePrimary ? (GdkAtom)GDK_SELECTION_PRIMARY @@ -597,21 +590,21 @@ bool wxClipboard::GetData( wxDataObject& data ) /* store requested format to be asked for by callbacks */ m_targetRequested = format; - wxCHECK_MSG( m_targetRequested, FALSE, wxT("invalid clipboard format") ); + wxCHECK_MSG( m_targetRequested, false, wxT("invalid clipboard format") ); /* start query */ - m_formatSupported = FALSE; + m_formatSupported = false; /* ask for clipboard contents. this will set - m_formatSupported to TRUE if m_targetRequested + 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 + therefore we set m_waiting = true here and wait until the callback "targets_selection_received" - sets it to FALSE */ + sets it to false */ - m_waiting = TRUE; + m_waiting = true; wxLogTrace( TRACE_CLIPBOARD, wxT("wxClipboard::GetData: format found, start convert") ); @@ -624,12 +617,29 @@ bool wxClipboard::GetData( wxDataObject& data ) 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") ); + /* + Normally this is a true error as we checked for the presence of such + data before, but there are applications that may return an empty + string (e.g. Gnumeric-1.6.1 on Linux if an empty cell is copied) + which would produce a false error message here, so we check for the + size of the string first. In ansi, GetDataSize returns an extra + value (for the closing null?), with unicode, the exact number of + tokens is given (that is more than 1 for special characters) + (tested with Gnumeric-1.6.1 and OpenOffice.org-2.0.2) + */ +#if wxUSE_UNICODE + if ( format != wxDF_UNICODETEXT || data.GetDataSize(format) > 0 ) +#else // !UNICODE + if ( format != wxDF_TEXT || data.GetDataSize(format) > 1 ) +#endif // UNICODE / !UNICODE + { + wxCHECK_MSG( m_formatSupported, false, + wxT("error retrieving data from clipboard") ); + } /* return success */ delete[] array; - return TRUE; + return true; } wxLogTrace( TRACE_CLIPBOARD, @@ -637,9 +647,8 @@ bool wxClipboard::GetData( wxDataObject& data ) /* return failure */ delete[] array; - return FALSE; + return false; } #endif // wxUSE_CLIPBOARD -