зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1581638 - Provide logging to Linux/Gtk clipboard code, r=jhorak
Differential Revision: https://phabricator.services.mozilla.com/D46266 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Martin Stransky
Родитель
f1f19846f0
Коммит
59589dad99
|
|
@ -44,6 +44,7 @@ LazyLogModule gWidgetFocusLog("WidgetFocus");
|
|||
LazyLogModule gWidgetDragLog("WidgetDrag");
|
||||
LazyLogModule gWidgetDrawLog("WidgetDraw");
|
||||
LazyLogModule gWidgetWaylandLog("WidgetWayland");
|
||||
LazyLogModule gClipboardLog("WidgetClipboard");
|
||||
|
||||
static GPollFunc sPollFunc;
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,15 @@ GdkAtom GetSelectionAtom(int32_t aWhichClipboard) {
|
|||
return GDK_SELECTION_PRIMARY;
|
||||
}
|
||||
|
||||
int GetGeckoClipboardType(GtkClipboard* aGtkClipboard) {
|
||||
if (aGtkClipboard == gtk_clipboard_get(GDK_SELECTION_PRIMARY))
|
||||
return nsClipboard::kSelectionClipboard;
|
||||
else if (aGtkClipboard == gtk_clipboard_get(GDK_SELECTION_CLIPBOARD))
|
||||
return nsClipboard::kGlobalClipboard;
|
||||
else
|
||||
return -1; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
|
||||
}
|
||||
|
||||
nsClipboard::nsClipboard() {}
|
||||
|
||||
nsClipboard::~nsClipboard() {
|
||||
|
|
@ -104,6 +113,8 @@ nsresult nsClipboard::Init(void) {
|
|||
}
|
||||
|
||||
nsresult nsClipboard::Store(void) {
|
||||
LOGCLIP(("nsClipboard::Store\n"));
|
||||
|
||||
if (mGlobalTransferable) {
|
||||
GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
|
||||
gtk_clipboard_store(clipboard);
|
||||
|
|
@ -131,6 +142,9 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
LOGCLIP(("nsClipboard::SetData (%s)\n",
|
||||
aWhichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
// Clear out the clipboard in order to set the new data
|
||||
EmptyClipboard(aWhichClipboard);
|
||||
|
||||
|
|
@ -141,6 +155,7 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
nsTArray<nsCString> flavors;
|
||||
nsresult rv = aTransferable->FlavorsTransferableCanExport(flavors);
|
||||
if (NS_FAILED(rv)) {
|
||||
LOGCLIP((" FlavorsTransferableCanExport failed!\n"));
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -151,6 +166,7 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
|
||||
// Special case text/unicode since we can handle all of the string types.
|
||||
if (flavorStr.EqualsLiteral(kUnicodeMime)) {
|
||||
LOGCLIP((" text targets\n"));
|
||||
gtk_target_list_add_text_targets(list, 0);
|
||||
continue;
|
||||
}
|
||||
|
|
@ -159,6 +175,7 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
// Don't bother adding image targets twice
|
||||
if (!imagesAdded) {
|
||||
// accept any writable image type
|
||||
LOGCLIP((" image targets\n"));
|
||||
gtk_target_list_add_image_targets(list, 0, TRUE);
|
||||
imagesAdded = true;
|
||||
}
|
||||
|
|
@ -178,10 +195,13 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
GtkTargetEntry* gtkTargets =
|
||||
gtk_target_table_new_from_list(list, &numTargets);
|
||||
|
||||
LOGCLIP((" gtk_target_table_new_from_list() = %p\n", (void*)gtkTargets));
|
||||
|
||||
// Set getcallback and request to store data after an application exit
|
||||
if (gtkTargets &&
|
||||
gtk_clipboard_set_with_data(gtkClipboard, gtkTargets, numTargets,
|
||||
clipboard_get_cb, clipboard_clear_cb, this)) {
|
||||
LOGCLIP((" gtk_clipboard_set_with_data() is ok\n"));
|
||||
// We managed to set-up the clipboard so update internal state
|
||||
// We have to set it now because gtk_clipboard_set_with_data() calls
|
||||
// clipboard_clear_cb() which reset our internal state
|
||||
|
|
@ -196,6 +216,7 @@ nsClipboard::SetData(nsITransferable* aTransferable, nsIClipboardOwner* aOwner,
|
|||
|
||||
rv = NS_OK;
|
||||
} else {
|
||||
LOGCLIP((" gtk_clipboard_set_with_data() failed!\n"));
|
||||
rv = NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
|
|
@ -209,6 +230,8 @@ void nsClipboard::SetTransferableData(nsITransferable* aTransferable,
|
|||
nsCString& aFlavor,
|
||||
const char* aClipboardData,
|
||||
uint32_t aClipboardDataLength) {
|
||||
LOGCLIP(("nsClipboard::SetTransferableData MIME %s\n", aFlavor.get()));
|
||||
|
||||
nsCOMPtr<nsISupports> wrapper;
|
||||
nsPrimitiveHelpers::CreatePrimitiveForData(
|
||||
aFlavor, aClipboardData, aClipboardDataLength, getter_AddRefs(wrapper));
|
||||
|
|
@ -219,10 +242,14 @@ NS_IMETHODIMP
|
|||
nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
||||
if (!aTransferable) return NS_ERROR_FAILURE;
|
||||
|
||||
LOGCLIP(("nsClipboard::GetData (%s)\n",
|
||||
aWhichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
// Get a list of flavors this transferable can import
|
||||
nsTArray<nsCString> flavors;
|
||||
nsresult rv = aTransferable->FlavorsTransferableCanImport(flavors);
|
||||
if (NS_FAILED(rv)) {
|
||||
LOGCLIP((" FlavorsTransferableCanImport falied!\n"));
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
|
@ -241,13 +268,17 @@ nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
|||
uint32_t clipboardDataLength;
|
||||
const char* clipboardData = mContext->GetClipboardData(
|
||||
flavorStr.get(), aWhichClipboard, &clipboardDataLength);
|
||||
if (!clipboardData) continue;
|
||||
if (!clipboardData) {
|
||||
LOGCLIP((" %s type is missing\n", flavorStr.get()));
|
||||
continue;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIInputStream> byteStream;
|
||||
NS_NewByteInputStream(getter_AddRefs(byteStream),
|
||||
MakeSpan(clipboardData, clipboardDataLength),
|
||||
NS_ASSIGNMENT_COPY);
|
||||
aTransferable->SetTransferData(flavorStr.get(), byteStream);
|
||||
LOGCLIP((" got %s MIME data\n", flavorStr.get()));
|
||||
|
||||
mContext->ReleaseClipboardData(clipboardData);
|
||||
return NS_OK;
|
||||
|
|
@ -258,6 +289,7 @@ nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
|||
if (flavorStr.EqualsLiteral(kUnicodeMime)) {
|
||||
const char* clipboardData = mContext->GetClipboardText(aWhichClipboard);
|
||||
if (!clipboardData) {
|
||||
LOGCLIP((" failed to get unicode data\n"));
|
||||
// If the type was text/unicode and we couldn't get
|
||||
// text off the clipboard, run the next loop
|
||||
// iteration.
|
||||
|
|
@ -272,6 +304,8 @@ nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
|||
unicodeDataLength);
|
||||
free((void*)unicodeData);
|
||||
|
||||
LOGCLIP((" got unicode data, length %d\n", ucs2string.Length()));
|
||||
|
||||
mContext->ReleaseClipboardData(clipboardData);
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -280,7 +314,15 @@ nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
|||
const char* clipboardData = mContext->GetClipboardData(
|
||||
flavorStr.get(), aWhichClipboard, &clipboardDataLength);
|
||||
|
||||
#ifdef MOZ_LOGGING
|
||||
if (!clipboardData) {
|
||||
LOGCLIP((" %s type is missing\n", flavorStr.get()));
|
||||
}
|
||||
#endif
|
||||
|
||||
if (clipboardData) {
|
||||
LOGCLIP((" got %s mime type data.\n", flavorStr.get()));
|
||||
|
||||
// Special case text/html since we can convert into UCS2
|
||||
if (flavorStr.EqualsLiteral(kHTMLMime)) {
|
||||
char16_t* htmlBody = nullptr;
|
||||
|
|
@ -308,11 +350,15 @@ nsClipboard::GetData(nsITransferable* aTransferable, int32_t aWhichClipboard) {
|
|||
}
|
||||
}
|
||||
|
||||
LOGCLIP((" failed to get clipboard content.\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsClipboard::EmptyClipboard(int32_t aWhichClipboard) {
|
||||
LOGCLIP(("nsClipboard::EmptyClipboard (%s)\n",
|
||||
aWhichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
if (aWhichClipboard == kSelectionClipboard) {
|
||||
if (mSelectionOwner) {
|
||||
mSelectionOwner->LosingOwnership(mSelectionTransferable);
|
||||
|
|
@ -337,11 +383,17 @@ nsClipboard::HasDataMatchingFlavors(const nsTArray<nsCString>& aFlavorList,
|
|||
return NS_ERROR_NULL_POINTER;
|
||||
}
|
||||
|
||||
LOGCLIP(("nsClipboard::HasDataMatchingFlavors (%s)\n",
|
||||
aWhichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
*_retval = false;
|
||||
|
||||
int targetNums;
|
||||
GdkAtom* targets = mContext->GetTargets(aWhichClipboard, &targetNums);
|
||||
if (!targets) return NS_OK;
|
||||
if (!targets) {
|
||||
LOGCLIP((" no targes at clipboard (null)\n"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
// Walk through the provided types and try to match it to a
|
||||
// provided type.
|
||||
|
|
@ -350,6 +402,7 @@ nsClipboard::HasDataMatchingFlavors(const nsTArray<nsCString>& aFlavorList,
|
|||
if (flavor.EqualsLiteral(kUnicodeMime) &&
|
||||
gtk_targets_include_text(targets, targetNums)) {
|
||||
*_retval = true;
|
||||
LOGCLIP((" has kUnicodeMime\n"));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -359,12 +412,14 @@ nsClipboard::HasDataMatchingFlavors(const nsTArray<nsCString>& aFlavorList,
|
|||
|
||||
if (flavor.Equals(atom_name)) {
|
||||
*_retval = true;
|
||||
LOGCLIP((" has %s\n", atom_name));
|
||||
}
|
||||
// X clipboard supports image/jpeg, but we want to emulate support
|
||||
// for image/jpg as well
|
||||
else if (flavor.EqualsLiteral(kJPGImageMime) &&
|
||||
!strcmp(atom_name, kJPEGImageMime)) {
|
||||
*_retval = true;
|
||||
LOGCLIP((" has image/jpg\n"));
|
||||
}
|
||||
|
||||
g_free(atom_name);
|
||||
|
|
@ -373,6 +428,12 @@ nsClipboard::HasDataMatchingFlavors(const nsTArray<nsCString>& aFlavorList,
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef MOZ_LOGGING
|
||||
if (!(*_retval)) {
|
||||
LOGCLIP((" no targes at clipboard (bad match)\n"));
|
||||
}
|
||||
#endif
|
||||
|
||||
g_free(targets);
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
@ -418,13 +479,14 @@ void nsClipboard::SelectionGetEvent(GtkClipboard* aClipboard,
|
|||
else
|
||||
return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
|
||||
|
||||
LOGCLIP(("nsClipboard::SelectionGetEvent (%s)\n",
|
||||
whichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
nsCOMPtr<nsITransferable> trans = GetTransferable(whichClipboard);
|
||||
if (!trans) {
|
||||
// We have nothing to serve
|
||||
#ifdef DEBUG_CLIPBOARD
|
||||
printf("nsClipboard::SelectionGetEvent() - %s clipboard is empty!\n",
|
||||
whichClipboard == kSelectionClipboard ? "Selection" : "Global");
|
||||
#endif
|
||||
LOGCLIP(("nsClipboard::SelectionGetEvent() - %s clipboard is empty!\n",
|
||||
whichClipboard == kSelectionClipboard ? "Primary" : "Clipboard"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -541,15 +603,13 @@ void nsClipboard::SelectionGetEvent(GtkClipboard* aClipboard,
|
|||
}
|
||||
|
||||
void nsClipboard::SelectionClearEvent(GtkClipboard* aGtkClipboard) {
|
||||
int32_t whichClipboard;
|
||||
int32_t whichClipboard = GetGeckoClipboardType(aGtkClipboard);
|
||||
if (whichClipboard < 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// which clipboard?
|
||||
if (aGtkClipboard == gtk_clipboard_get(GDK_SELECTION_PRIMARY))
|
||||
whichClipboard = kSelectionClipboard;
|
||||
else if (aGtkClipboard == gtk_clipboard_get(GDK_SELECTION_CLIPBOARD))
|
||||
whichClipboard = kGlobalClipboard;
|
||||
else
|
||||
return; // THAT AIN'T NO CLIPBOARD I EVER HEARD OF
|
||||
LOGCLIP(("nsClipboard::SelectionClearEvent (%s)\n",
|
||||
whichClipboard == kSelectionClipboard ? "primary" : "clipboard"));
|
||||
|
||||
EmptyClipboard(whichClipboard);
|
||||
}
|
||||
|
|
@ -557,11 +617,13 @@ void nsClipboard::SelectionClearEvent(GtkClipboard* aGtkClipboard) {
|
|||
void clipboard_get_cb(GtkClipboard* aGtkClipboard,
|
||||
GtkSelectionData* aSelectionData, guint info,
|
||||
gpointer user_data) {
|
||||
LOGCLIP(("clipboard_get_cb() callback\n"));
|
||||
nsClipboard* aClipboard = static_cast<nsClipboard*>(user_data);
|
||||
aClipboard->SelectionGetEvent(aGtkClipboard, aSelectionData);
|
||||
}
|
||||
|
||||
void clipboard_clear_cb(GtkClipboard* aGtkClipboard, gpointer user_data) {
|
||||
LOGCLIP(("clipboard_clear_cb() callback\n"));
|
||||
nsClipboard* aClipboard = static_cast<nsClipboard*>(user_data);
|
||||
aClipboard->SelectionClearEvent(aGtkClipboard);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,6 +13,17 @@
|
|||
#include "nsIBinaryOutputStream.h"
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
#undef LOG
|
||||
#ifdef MOZ_LOGGING
|
||||
# include "mozilla/Logging.h"
|
||||
# include "nsTArray.h"
|
||||
# include "Units.h"
|
||||
extern mozilla::LazyLogModule gClipboardLog;
|
||||
# define LOGCLIP(args) MOZ_LOG(gClipboardLog, mozilla::LogLevel::Debug, args)
|
||||
#else
|
||||
# define LOGCLIP(args)
|
||||
#endif /* MOZ_LOGGING */
|
||||
|
||||
class nsRetrievalContext {
|
||||
public:
|
||||
// Get actual clipboard content (GetClipboardData/GetClipboardText)
|
||||
|
|
@ -76,5 +87,6 @@ class nsClipboard : public nsIClipboard, public nsIObserver {
|
|||
extern const int kClipboardTimeout;
|
||||
|
||||
GdkAtom GetSelectionAtom(int32_t aWhichClipboard);
|
||||
int GetGeckoClipboardType(GtkClipboard* aGtkClipboard);
|
||||
|
||||
#endif /* __nsClipboard_h_ */
|
||||
|
|
|
|||
|
|
@ -475,6 +475,7 @@ void nsRetrievalContextWayland::ClearDragAndDropDataOffer(void) {
|
|||
static void data_device_data_offer(void* data,
|
||||
struct wl_data_device* data_device,
|
||||
struct wl_data_offer* offer) {
|
||||
LOGCLIP(("data_device_data_offer() callback\n"));
|
||||
nsRetrievalContextWayland* context =
|
||||
static_cast<nsRetrievalContextWayland*>(data);
|
||||
context->RegisterNewDataOffer(offer);
|
||||
|
|
@ -484,6 +485,7 @@ static void data_device_data_offer(void* data,
|
|||
static void data_device_selection(void* data,
|
||||
struct wl_data_device* wl_data_device,
|
||||
struct wl_data_offer* offer) {
|
||||
LOGCLIP(("data_device_selection() callback\n"));
|
||||
nsRetrievalContextWayland* context =
|
||||
static_cast<nsRetrievalContextWayland*>(data);
|
||||
context->SetClipboardDataOffer(offer);
|
||||
|
|
@ -541,7 +543,6 @@ static void data_device_motion(void* data, struct wl_data_device* data_device,
|
|||
static void data_device_drop(void* data, struct wl_data_device* data_device) {
|
||||
nsRetrievalContextWayland* context =
|
||||
static_cast<nsRetrievalContextWayland*>(data);
|
||||
|
||||
nsWaylandDragContext* dropContext = context->GetDragContext();
|
||||
|
||||
uint32_t time;
|
||||
|
|
@ -581,6 +582,7 @@ static void primary_selection_data_offer(
|
|||
void* data,
|
||||
struct gtk_primary_selection_device* gtk_primary_selection_device,
|
||||
struct gtk_primary_selection_offer* gtk_primary_offer) {
|
||||
LOGCLIP(("primary_selection_data_offer() callback\n"));
|
||||
// create and add listener
|
||||
nsRetrievalContextWayland* context =
|
||||
static_cast<nsRetrievalContextWayland*>(data);
|
||||
|
|
@ -591,6 +593,7 @@ static void primary_selection_selection(
|
|||
void* data,
|
||||
struct gtk_primary_selection_device* gtk_primary_selection_device,
|
||||
struct gtk_primary_selection_offer* gtk_primary_offer) {
|
||||
LOGCLIP(("primary_selection_selection() callback\n"));
|
||||
nsRetrievalContextWayland* context =
|
||||
static_cast<nsRetrievalContextWayland*>(data);
|
||||
context->SetPrimaryDataOffer(gtk_primary_offer);
|
||||
|
|
@ -690,6 +693,7 @@ struct FastTrackClipboard {
|
|||
|
||||
static void wayland_clipboard_contents_received(
|
||||
GtkClipboard* clipboard, GtkSelectionData* selection_data, gpointer data) {
|
||||
LOGCLIP(("wayland_clipboard_contents_received() callback\n"));
|
||||
FastTrackClipboard* fastTrack = static_cast<FastTrackClipboard*>(data);
|
||||
fastTrack->mRetrievalContex->TransferFastTrackClipboard(
|
||||
fastTrack->mClipboardRequestNumber, selection_data);
|
||||
|
|
@ -718,6 +722,8 @@ const char* nsRetrievalContextWayland::GetClipboardData(
|
|||
NS_ASSERTION(mClipboardData == nullptr && mClipboardDataLength == 0,
|
||||
"Looks like we're leaking clipboard data here!");
|
||||
|
||||
LOGCLIP(("nsRetrievalContextWayland::GetClipboardData\n"));
|
||||
|
||||
/* If actual clipboard data is owned by us we don't need to go
|
||||
* through Wayland but we ask Gtk+ to directly call data
|
||||
* getter callback nsClipboard::SelectionGetEvent().
|
||||
|
|
@ -751,6 +757,8 @@ const char* nsRetrievalContextWayland::GetClipboardData(
|
|||
|
||||
const char* nsRetrievalContextWayland::GetClipboardText(
|
||||
int32_t aWhichClipboard) {
|
||||
LOGCLIP(("nsRetrievalContextWayland::GetClipboardText\n"));
|
||||
|
||||
GdkAtom selection = GetSelectionAtom(aWhichClipboard);
|
||||
DataOffer* dataOffer =
|
||||
(selection == GDK_SELECTION_PRIMARY) ? mPrimaryOffer : mClipboardOffer;
|
||||
|
|
@ -767,6 +775,8 @@ const char* nsRetrievalContextWayland::GetClipboardText(
|
|||
|
||||
void nsRetrievalContextWayland::ReleaseClipboardData(
|
||||
const char* aClipboardData) {
|
||||
LOGCLIP(("nsRetrievalContextWayland::ReleaseClipboardData\n"));
|
||||
|
||||
NS_ASSERTION(aClipboardData == mClipboardData,
|
||||
"Releasing unknown clipboard data!");
|
||||
g_free((void*)aClipboardData);
|
||||
|
|
|
|||
|
|
@ -193,6 +193,8 @@ bool nsRetrievalContextX11::WaitForX11Content() {
|
|||
void nsRetrievalContextX11::Complete(ClipboardDataType aDataType,
|
||||
const void* aData,
|
||||
int aDataRequestNumber) {
|
||||
LOGCLIP(("nsRetrievalContextX11::Complete\n"));
|
||||
|
||||
if (mClipboardRequestNumber != aDataRequestNumber) {
|
||||
NS_WARNING(
|
||||
"nsRetrievalContextX11::Complete() got obsoleted clipboard data.");
|
||||
|
|
@ -251,6 +253,11 @@ void nsRetrievalContextX11::Complete(ClipboardDataType aDataType,
|
|||
static void clipboard_contents_received(GtkClipboard* clipboard,
|
||||
GtkSelectionData* selection_data,
|
||||
gpointer data) {
|
||||
int whichClipboard = GetGeckoClipboardType(clipboard);
|
||||
LOGCLIP(("clipboard_contents_received (%s) callback\n",
|
||||
whichClipboard == nsClipboard::kSelectionClipboard ? "primary"
|
||||
: "clipboard"));
|
||||
|
||||
ClipboardRequestHandler* handler =
|
||||
static_cast<ClipboardRequestHandler*>(data);
|
||||
handler->Complete(selection_data);
|
||||
|
|
@ -259,6 +266,11 @@ static void clipboard_contents_received(GtkClipboard* clipboard,
|
|||
|
||||
static void clipboard_text_received(GtkClipboard* clipboard, const gchar* text,
|
||||
gpointer data) {
|
||||
int whichClipboard = GetGeckoClipboardType(clipboard);
|
||||
LOGCLIP(("clipboard_text_received (%s) callback\n",
|
||||
whichClipboard == nsClipboard::kSelectionClipboard ? "primary"
|
||||
: "clipboard"));
|
||||
|
||||
ClipboardRequestHandler* handler =
|
||||
static_cast<ClipboardRequestHandler*>(data);
|
||||
handler->Complete(text);
|
||||
|
|
@ -268,6 +280,8 @@ static void clipboard_text_received(GtkClipboard* clipboard, const gchar* text,
|
|||
bool nsRetrievalContextX11::WaitForClipboardData(ClipboardDataType aDataType,
|
||||
GtkClipboard* clipboard,
|
||||
const char* aMimeType) {
|
||||
LOGCLIP(("nsRetrievalContextX11::WaitForClipboardData\n"));
|
||||
|
||||
mState = INITIAL;
|
||||
NS_ASSERTION(!mClipboardData, "Leaking clipboard content!");
|
||||
|
||||
|
|
@ -299,10 +313,17 @@ bool nsRetrievalContextX11::WaitForClipboardData(ClipboardDataType aDataType,
|
|||
|
||||
GdkAtom* nsRetrievalContextX11::GetTargets(int32_t aWhichClipboard,
|
||||
int* aTargetNums) {
|
||||
LOGCLIP(("nsRetrievalContextX11::GetTargets(%s)\n",
|
||||
aWhichClipboard == nsClipboard::kSelectionClipboard ? "primary"
|
||||
: "clipboard"));
|
||||
|
||||
GtkClipboard* clipboard =
|
||||
gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
|
||||
|
||||
if (!WaitForClipboardData(CLIPBOARD_TARGETS, clipboard)) return nullptr;
|
||||
if (!WaitForClipboardData(CLIPBOARD_TARGETS, clipboard)) {
|
||||
LOGCLIP((" WaitForClipboardData() failed!\n"));
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
*aTargetNums = mClipboardDataLength;
|
||||
GdkAtom* targets = static_cast<GdkAtom*>(mClipboardData);
|
||||
|
|
@ -311,12 +332,17 @@ GdkAtom* nsRetrievalContextX11::GetTargets(int32_t aWhichClipboard,
|
|||
mClipboardData = nullptr;
|
||||
mClipboardDataLength = 0;
|
||||
|
||||
LOGCLIP((" returned %d targets\n", *aTargetNums));
|
||||
return targets;
|
||||
}
|
||||
|
||||
const char* nsRetrievalContextX11::GetClipboardData(const char* aMimeType,
|
||||
int32_t aWhichClipboard,
|
||||
uint32_t* aContentLength) {
|
||||
LOGCLIP(("nsRetrievalContextX11::GetClipboardData(%s)\n",
|
||||
aWhichClipboard == nsClipboard::kSelectionClipboard ? "primary"
|
||||
: "clipboard"));
|
||||
|
||||
GtkClipboard* clipboard;
|
||||
clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
|
||||
|
||||
|
|
@ -328,6 +354,10 @@ const char* nsRetrievalContextX11::GetClipboardData(const char* aMimeType,
|
|||
}
|
||||
|
||||
const char* nsRetrievalContextX11::GetClipboardText(int32_t aWhichClipboard) {
|
||||
LOGCLIP(("nsRetrievalContextX11::GetClipboardText(%s)\n",
|
||||
aWhichClipboard == nsClipboard::kSelectionClipboard ? "primary"
|
||||
: "clipboard"));
|
||||
|
||||
GtkClipboard* clipboard;
|
||||
clipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard));
|
||||
|
||||
|
|
@ -337,6 +367,7 @@ const char* nsRetrievalContextX11::GetClipboardText(int32_t aWhichClipboard) {
|
|||
}
|
||||
|
||||
void nsRetrievalContextX11::ReleaseClipboardData(const char* aClipboardData) {
|
||||
LOGCLIP(("nsRetrievalContextX11::ReleaseClipboardData\n"));
|
||||
NS_ASSERTION(aClipboardData == mClipboardData,
|
||||
"Releasing unknown clipboard data!");
|
||||
free((void*)aClipboardData);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче