Port clipboard plugin to KGuiaddons KSystemClipboard
This commit is contained in:
Méven Car
parent
bfc878faa9
commit
5d970ddd48
8 changed files with 27 additions and 843 deletions
|
|
@ -12,7 +12,7 @@ if (SAILFISHOS)
|
|||
set(KF5_MIN_VERSION "5.36.0")
|
||||
set(QT_MIN_VERSION "5.6.0")
|
||||
else()
|
||||
set(KF5_MIN_VERSION "5.71.0")
|
||||
set(KF5_MIN_VERSION "5.89.0")
|
||||
set(QT_MIN_VERSION "5.10.0")
|
||||
endif()
|
||||
set(QCA_MIN_VERSION "2.1.0")
|
||||
|
|
@ -60,7 +60,7 @@ else()
|
|||
find_package(Qca-qt5 ${QCA_MIN_VERSION} REQUIRED)
|
||||
set(Qca_LIBRARY qca-qt5)
|
||||
|
||||
set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Solid Kirigami2 People WindowSystem)
|
||||
set(KF5_REQUIRED_COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils Service Solid Kirigami2 People WindowSystem GuiAddons)
|
||||
set(KF5_OPTIONAL_COMPONENTS DocTools Wayland)
|
||||
|
||||
set_package_properties(KF5Kirigami2 PROPERTIES
|
||||
|
|
|
|||
|
|
@ -1,8 +1,3 @@
|
|||
if(UNIX AND NOT APPLE)
|
||||
find_package(QtWaylandScanner REQUIRED)
|
||||
find_package(Wayland 1.15 COMPONENTS Client)
|
||||
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS WaylandClient)
|
||||
endif()
|
||||
|
||||
set(debug_file_SRCS)
|
||||
ecm_qt_declare_logging_category(
|
||||
|
|
@ -17,20 +12,9 @@ set(kdeconnect_clipboard_SRCS
|
|||
${debug_file_SRCS}
|
||||
)
|
||||
|
||||
if(UNIX AND NOT APPLE)
|
||||
list(APPEND kdeconnect_clipboard_SRCS datacontrol.cpp)
|
||||
ecm_add_qtwayland_client_protocol(kdeconnect_clipboard_SRCS
|
||||
PROTOCOL wlr-data-control-unstable-v1.xml
|
||||
BASENAME wlr-data-control-unstable-v1
|
||||
)
|
||||
set(kdeconnect_clipboard_WL_LINK_LIBS Qt5::GuiPrivate # for native interface to get wl_seat
|
||||
Wayland::Client Qt::WaylandClient)
|
||||
endif()
|
||||
|
||||
|
||||
kdeconnect_add_plugin(kdeconnect_clipboard SOURCES ${kdeconnect_clipboard_SRCS})
|
||||
|
||||
target_link_libraries(kdeconnect_clipboard kdeconnectcore
|
||||
Qt5::Gui
|
||||
KF5::GuiAddons
|
||||
${kdeconnect_clipboard_WL_LINK_LIBS}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -5,15 +5,11 @@
|
|||
*/
|
||||
|
||||
#include "clipboardlistener.h"
|
||||
#include <QDebug>
|
||||
|
||||
#include <KSystemClipboard>
|
||||
|
||||
#include <QMimeData>
|
||||
|
||||
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
|
||||
#include "datacontrol.h"
|
||||
#endif
|
||||
|
||||
ClipboardListener::ClipboardListener()
|
||||
{}
|
||||
#include <QDateTime>
|
||||
|
||||
QString ClipboardListener::currentContent()
|
||||
{
|
||||
|
|
@ -27,17 +23,9 @@ qint64 ClipboardListener::updateTimestamp(){
|
|||
|
||||
ClipboardListener* ClipboardListener::instance()
|
||||
{
|
||||
static ClipboardListener* me = nullptr;
|
||||
static ClipboardListener *me = nullptr;
|
||||
if (!me) {
|
||||
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
|
||||
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
|
||||
me = new WaylandClipboardListener();
|
||||
} else {
|
||||
#endif
|
||||
me = new QClipboardListener();
|
||||
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
|
||||
}
|
||||
#endif
|
||||
me = new ClipboardListener();
|
||||
}
|
||||
return me;
|
||||
}
|
||||
|
|
@ -48,23 +36,23 @@ void ClipboardListener::refreshContent(const QString& content)
|
|||
m_currentContent = content;
|
||||
}
|
||||
|
||||
QClipboardListener::QClipboardListener()
|
||||
: clipboard(QGuiApplication::clipboard())
|
||||
ClipboardListener::ClipboardListener()
|
||||
: clipboard(KSystemClipboard::instance())
|
||||
{
|
||||
#ifdef Q_OS_MAC
|
||||
connect(&m_clipboardMonitorTimer, &QTimer::timeout, this, [this](){ updateClipboard(QClipboard::Clipboard); });
|
||||
m_clipboardMonitorTimer.start(1000); // Refresh 1s
|
||||
#endif
|
||||
connect(clipboard, &QClipboard::changed, this, &QClipboardListener::updateClipboard);
|
||||
connect(clipboard, &KSystemClipboard::changed, this, &ClipboardListener::updateClipboard);
|
||||
}
|
||||
|
||||
void QClipboardListener::updateClipboard(QClipboard::Mode mode)
|
||||
void ClipboardListener::updateClipboard(QClipboard::Mode mode)
|
||||
{
|
||||
if (mode != QClipboard::Clipboard) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QString content = clipboard->text();
|
||||
const QString content = clipboard->text(QClipboard::Clipboard);
|
||||
if (content == m_currentContent) {
|
||||
return;
|
||||
}
|
||||
|
|
@ -72,39 +60,10 @@ void QClipboardListener::updateClipboard(QClipboard::Mode mode)
|
|||
Q_EMIT clipboardChanged(content);
|
||||
}
|
||||
|
||||
void QClipboardListener::setText(const QString& content)
|
||||
{
|
||||
refreshContent(content);
|
||||
clipboard->setText(content);
|
||||
}
|
||||
|
||||
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
|
||||
WaylandClipboardListener::WaylandClipboardListener()
|
||||
: m_dataControl(new DataControl(this))
|
||||
{
|
||||
connect(m_dataControl, &DataControl::changed, this, &WaylandClipboardListener::refresh);
|
||||
}
|
||||
|
||||
void WaylandClipboardListener::setText(const QString& content)
|
||||
void ClipboardListener::setText(const QString& content)
|
||||
{
|
||||
refreshContent(content);
|
||||
auto mime = new QMimeData;
|
||||
mime->setText(content);
|
||||
m_dataControl->setMimeData(mime, QClipboard::Clipboard);
|
||||
clipboard->setMimeData(mime, QClipboard::Clipboard);
|
||||
}
|
||||
|
||||
void WaylandClipboardListener::refresh()
|
||||
{
|
||||
const QMimeData *mime = m_dataControl->mimeData(QClipboard::Clipboard);
|
||||
if (!mime || !mime->hasText()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const QString content = mime->text();
|
||||
if (content == m_currentContent) {
|
||||
return;
|
||||
}
|
||||
refreshContent(content);
|
||||
Q_EMIT clipboardChanged(content);
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -7,11 +7,14 @@
|
|||
#ifndef CLIPBOARDLISTENER_H
|
||||
#define CLIPBOARDLISTENER_H
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QTimer>
|
||||
#include <QObject>
|
||||
#include <QClipboard>
|
||||
#include <QGuiApplication>
|
||||
|
||||
#ifdef Q_OS_MAC
|
||||
#include <QTimer>
|
||||
#endif
|
||||
|
||||
class KSystemClipboard;
|
||||
|
||||
/**
|
||||
* Wrapper around QClipboard, which emits clipboardChanged only when it really changed
|
||||
|
|
@ -32,43 +35,21 @@ private:
|
|||
public:
|
||||
static ClipboardListener* instance();
|
||||
|
||||
virtual void setText(const QString& content) = 0;
|
||||
void setText(const QString& content);
|
||||
|
||||
QString currentContent();
|
||||
qint64 updateTimestamp();
|
||||
|
||||
Q_SIGNALS:
|
||||
void clipboardChanged(const QString& content);
|
||||
};
|
||||
|
||||
class QClipboardListener : public ClipboardListener
|
||||
{
|
||||
public:
|
||||
QClipboardListener();
|
||||
|
||||
void setText(const QString & content) override;
|
||||
|
||||
private:
|
||||
#ifdef Q_OS_MAC
|
||||
QTimer m_clipboardMonitorTimer;
|
||||
#endif
|
||||
void updateClipboard(QClipboard::Mode mode);
|
||||
QClipboard* clipboard;
|
||||
};
|
||||
|
||||
class DataControl;
|
||||
|
||||
class WaylandClipboardListener : public ClipboardListener
|
||||
{
|
||||
public:
|
||||
WaylandClipboardListener();
|
||||
|
||||
void setText(const QString & content) override;
|
||||
|
||||
private:
|
||||
void refresh();
|
||||
|
||||
DataControl *m_dataControl;
|
||||
#ifdef Q_OS_MAC
|
||||
QTimer *m_clipboardMonitorTimer;
|
||||
#endif
|
||||
KSystemClipboard *clipboard;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -40,7 +40,6 @@ void ClipboardPlugin::sendConnectPacket()
|
|||
sendPacket(np);
|
||||
}
|
||||
|
||||
|
||||
bool ClipboardPlugin::receivePacket(const NetworkPacket& np)
|
||||
{
|
||||
QString content = np.get<QString>(QStringLiteral("content"));
|
||||
|
|
|
|||
|
|
@ -1,427 +0,0 @@
|
|||
/*
|
||||
SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson@kde.org>
|
||||
|
||||
SPDX-License-Identifier: LGPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include "datacontrol.h"
|
||||
|
||||
#include <QDebug>
|
||||
#include <QFile>
|
||||
#include <QFutureWatcher>
|
||||
#include <QGuiApplication>
|
||||
#include <QPointer>
|
||||
#include <QMimeData>
|
||||
|
||||
#include <QtWaylandClient/QWaylandClientExtension>
|
||||
|
||||
#include <qpa/qplatformnativeinterface.h>
|
||||
|
||||
#include <errno.h>
|
||||
#include <poll.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "qwayland-wlr-data-control-unstable-v1.h"
|
||||
|
||||
static QString utf8Text()
|
||||
{
|
||||
return QStringLiteral("text/plain;charset=utf-8");
|
||||
}
|
||||
|
||||
class DataControlDeviceManager : public QWaylandClientExtensionTemplate<DataControlDeviceManager>, public QtWayland::zwlr_data_control_manager_v1
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DataControlDeviceManager()
|
||||
: QWaylandClientExtensionTemplate<DataControlDeviceManager>(2)
|
||||
{
|
||||
}
|
||||
|
||||
~DataControlDeviceManager() override
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
};
|
||||
|
||||
class DataControlOffer : public QMimeData, public QtWayland::zwlr_data_control_offer_v1
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DataControlOffer(struct ::zwlr_data_control_offer_v1 *id)
|
||||
: QtWayland::zwlr_data_control_offer_v1(id)
|
||||
{
|
||||
}
|
||||
|
||||
~DataControlOffer() override
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
QStringList formats() const override
|
||||
{
|
||||
return m_receivedFormats;
|
||||
}
|
||||
|
||||
bool hasFormat(const QString &mimeType) const override
|
||||
{
|
||||
if (mimeType == QStringLiteral("text/plain") && m_receivedFormats.contains(utf8Text())) {
|
||||
return true;
|
||||
}
|
||||
return m_receivedFormats.contains(mimeType);
|
||||
}
|
||||
|
||||
protected:
|
||||
void zwlr_data_control_offer_v1_offer(const QString &mime_type) override
|
||||
{
|
||||
m_receivedFormats << mime_type;
|
||||
}
|
||||
|
||||
QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
|
||||
|
||||
private:
|
||||
static bool readData(int fd, QByteArray &data);
|
||||
QStringList m_receivedFormats;
|
||||
};
|
||||
|
||||
QVariant DataControlOffer::retrieveData(const QString &mimeType, QVariant::Type type) const
|
||||
{
|
||||
Q_UNUSED(type);
|
||||
|
||||
QString mime = mimeType;
|
||||
if (!m_receivedFormats.contains(mimeType)) {
|
||||
if (mimeType == QStringLiteral("text/plain") && m_receivedFormats.contains(utf8Text())) {
|
||||
mime = utf8Text();
|
||||
} else {
|
||||
return QVariant();
|
||||
}
|
||||
}
|
||||
|
||||
int pipeFds[2];
|
||||
if (pipe(pipeFds) != 0) {
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
auto t = const_cast<DataControlOffer *>(this);
|
||||
t->receive(mime, pipeFds[1]);
|
||||
|
||||
close(pipeFds[1]);
|
||||
|
||||
/*
|
||||
* Ideally we need to introduce a non-blocking QMimeData object
|
||||
* Or a non-blocking constructor to QMimeData with the mimetypes that are relevant
|
||||
*
|
||||
* However this isn't actually any worse than X.
|
||||
*/
|
||||
|
||||
QPlatformNativeInterface *native = qApp->platformNativeInterface();
|
||||
auto display = static_cast<struct ::wl_display *>(native->nativeResourceForIntegration("wl_display"));
|
||||
wl_display_flush(display);
|
||||
|
||||
QFile readPipe;
|
||||
if (readPipe.open(pipeFds[0], QIODevice::ReadOnly)) {
|
||||
QByteArray data;
|
||||
if (readData(pipeFds[0], data)) {
|
||||
close(pipeFds[0]);
|
||||
return data;
|
||||
}
|
||||
close(pipeFds[0]);
|
||||
}
|
||||
return QVariant();
|
||||
}
|
||||
|
||||
// reads data from a file descriptor with a timeout of 1 second
|
||||
// true if data is read successfully
|
||||
bool DataControlOffer::readData(int fd, QByteArray &data)
|
||||
{
|
||||
pollfd pfds[1];
|
||||
pfds[0].fd = fd;
|
||||
pfds[0].events = POLLIN;
|
||||
|
||||
while (true) {
|
||||
const int ready = poll(pfds, 1, 1000);
|
||||
if (ready < 0) {
|
||||
if (errno != EINTR) {
|
||||
qWarning("DataControlOffer: poll() failed: %s", strerror(errno));
|
||||
return false;
|
||||
}
|
||||
} else if (ready == 0) {
|
||||
qWarning("DataControlOffer: timeout reading from pipe");
|
||||
return false;
|
||||
} else {
|
||||
char buf[4096];
|
||||
int n = read(fd, buf, sizeof buf);
|
||||
|
||||
if (n < 0) {
|
||||
qWarning("DataControlOffer: read() failed: %s", strerror(errno));
|
||||
return false;
|
||||
} else if (n == 0) {
|
||||
return true;
|
||||
} else if (n > 0) {
|
||||
data.append(buf, n);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
class DataControlSource : public QObject, public QtWayland::zwlr_data_control_source_v1
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DataControlSource(struct ::zwlr_data_control_source_v1 *id, QMimeData *mimeData);
|
||||
DataControlSource();
|
||||
~DataControlSource() override
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
QMimeData *mimeData()
|
||||
{
|
||||
return m_mimeData;
|
||||
}
|
||||
|
||||
Q_SIGNALS:
|
||||
void cancelled();
|
||||
|
||||
protected:
|
||||
void zwlr_data_control_source_v1_send(const QString &mime_type, int32_t fd) override;
|
||||
void zwlr_data_control_source_v1_cancelled() override;
|
||||
|
||||
private:
|
||||
QMimeData *m_mimeData;
|
||||
};
|
||||
|
||||
DataControlSource::DataControlSource(struct ::zwlr_data_control_source_v1 *id, QMimeData *mimeData)
|
||||
: QtWayland::zwlr_data_control_source_v1(id)
|
||||
, m_mimeData(mimeData)
|
||||
{
|
||||
for (const QString &format : mimeData->formats()) {
|
||||
offer(format);
|
||||
}
|
||||
if (mimeData->hasText()) {
|
||||
// ensure GTK applications get this mimetype to avoid them discarding the offer
|
||||
offer(QStringLiteral("text/plain;charset=utf-8"));
|
||||
}
|
||||
}
|
||||
|
||||
void DataControlSource::zwlr_data_control_source_v1_send(const QString &mime_type, int32_t fd)
|
||||
{
|
||||
QFile c;
|
||||
QString send_mime_type = mime_type;
|
||||
if (send_mime_type == QStringLiteral("text/plain;charset=utf-8")) {
|
||||
// if we get a request on the fallback mime, send the data from the original mime type
|
||||
send_mime_type = QStringLiteral("text/plain");
|
||||
}
|
||||
if (c.open(fd, QFile::WriteOnly, QFile::AutoCloseHandle)) {
|
||||
c.write(m_mimeData->data(send_mime_type));
|
||||
c.close();
|
||||
}
|
||||
}
|
||||
|
||||
void DataControlSource::zwlr_data_control_source_v1_cancelled()
|
||||
{
|
||||
Q_EMIT cancelled();
|
||||
}
|
||||
|
||||
class DataControlDevice : public QObject, public QtWayland::zwlr_data_control_device_v1
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DataControlDevice(struct ::zwlr_data_control_device_v1 *id)
|
||||
: QtWayland::zwlr_data_control_device_v1(id)
|
||||
{
|
||||
}
|
||||
|
||||
~DataControlDevice() override
|
||||
{
|
||||
destroy();
|
||||
}
|
||||
|
||||
void setSelection(std::unique_ptr<DataControlSource> selection);
|
||||
QMimeData *receivedSelection()
|
||||
{
|
||||
return m_receivedSelection.get();
|
||||
}
|
||||
QMimeData *selection()
|
||||
{
|
||||
return m_selection ? m_selection->mimeData() : nullptr;
|
||||
}
|
||||
|
||||
void setPrimarySelection(std::unique_ptr<DataControlSource> selection);
|
||||
QMimeData *receivedPrimarySelection()
|
||||
{
|
||||
return m_receivedPrimarySelection.get();
|
||||
}
|
||||
QMimeData *primarySelection()
|
||||
{
|
||||
return m_primarySelection ? m_primarySelection->mimeData() : nullptr;
|
||||
}
|
||||
|
||||
Q_SIGNALS:
|
||||
void receivedSelectionChanged();
|
||||
void selectionChanged();
|
||||
|
||||
void receivedPrimarySelectionChanged();
|
||||
void primarySelectionChanged();
|
||||
|
||||
protected:
|
||||
void zwlr_data_control_device_v1_data_offer(struct ::zwlr_data_control_offer_v1 *id) override
|
||||
{
|
||||
new DataControlOffer(id);
|
||||
// this will become memory managed when we retrieve the selection event
|
||||
// a compositor calling data_offer without doing that would be a bug
|
||||
}
|
||||
|
||||
void zwlr_data_control_device_v1_selection(struct ::zwlr_data_control_offer_v1 *id) override
|
||||
{
|
||||
if (!id) {
|
||||
m_receivedSelection.reset();
|
||||
} else {
|
||||
auto deriv = QtWayland::zwlr_data_control_offer_v1::fromObject(id);
|
||||
auto offer = dynamic_cast<DataControlOffer *>(deriv); // dynamic because of the dual inheritance
|
||||
m_receivedSelection.reset(offer);
|
||||
}
|
||||
Q_EMIT receivedSelectionChanged();
|
||||
}
|
||||
|
||||
void zwlr_data_control_device_v1_primary_selection(struct ::zwlr_data_control_offer_v1 *id) override
|
||||
{
|
||||
if (!id) {
|
||||
m_receivedPrimarySelection.reset();
|
||||
} else {
|
||||
auto deriv = QtWayland::zwlr_data_control_offer_v1::fromObject(id);
|
||||
auto offer = dynamic_cast<DataControlOffer *>(deriv); // dynamic because of the dual inheritance
|
||||
m_receivedPrimarySelection.reset(offer);
|
||||
}
|
||||
Q_EMIT receivedPrimarySelectionChanged();
|
||||
}
|
||||
|
||||
private:
|
||||
std::unique_ptr<DataControlSource> m_selection; // selection set locally
|
||||
std::unique_ptr<DataControlOffer> m_receivedSelection; // latest selection set from externally to here
|
||||
|
||||
std::unique_ptr<DataControlSource> m_primarySelection; // selection set locally
|
||||
std::unique_ptr<DataControlOffer> m_receivedPrimarySelection; // latest selection set from externally to here
|
||||
};
|
||||
|
||||
void DataControlDevice::setSelection(std::unique_ptr<DataControlSource> selection)
|
||||
{
|
||||
m_selection = std::move(selection);
|
||||
connect(m_selection.get(), &DataControlSource::cancelled, this, [this]() {
|
||||
m_selection.reset();
|
||||
Q_EMIT selectionChanged();
|
||||
});
|
||||
set_selection(m_selection->object());
|
||||
Q_EMIT selectionChanged();
|
||||
}
|
||||
|
||||
void DataControlDevice::setPrimarySelection(std::unique_ptr<DataControlSource> selection)
|
||||
{
|
||||
m_primarySelection = std::move(selection);
|
||||
connect(m_primarySelection.get(), &DataControlSource::cancelled, this, [this]() {
|
||||
m_primarySelection.reset();
|
||||
Q_EMIT primarySelectionChanged();
|
||||
});
|
||||
|
||||
if (zwlr_data_control_device_v1_get_version(object()) >= ZWLR_DATA_CONTROL_DEVICE_V1_SET_PRIMARY_SELECTION_SINCE_VERSION) {
|
||||
set_primary_selection(m_primarySelection->object());
|
||||
Q_EMIT primarySelectionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
DataControl::DataControl(QObject *parent)
|
||||
: QObject(parent)
|
||||
, m_manager(new DataControlDeviceManager)
|
||||
{
|
||||
connect(m_manager.get(), &DataControlDeviceManager::activeChanged, this, [this]() {
|
||||
if (m_manager->isActive()) {
|
||||
QPlatformNativeInterface *native = qApp->platformNativeInterface();
|
||||
if (!native) {
|
||||
return;
|
||||
}
|
||||
auto seat = static_cast<struct ::wl_seat *>(native->nativeResourceForIntegration("wl_seat"));
|
||||
if (!seat) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_device.reset(new DataControlDevice(m_manager->get_data_device(seat)));
|
||||
|
||||
connect(m_device.get(), &DataControlDevice::receivedSelectionChanged, this, [this]() {
|
||||
Q_EMIT changed(QClipboard::Clipboard);
|
||||
});
|
||||
connect(m_device.get(), &DataControlDevice::selectionChanged, this, [this]() {
|
||||
Q_EMIT changed(QClipboard::Clipboard);
|
||||
});
|
||||
|
||||
connect(m_device.get(), &DataControlDevice::receivedPrimarySelectionChanged, this, [this]() {
|
||||
Q_EMIT changed(QClipboard::Selection);
|
||||
});
|
||||
connect(m_device.get(), &DataControlDevice::primarySelectionChanged, this, [this]() {
|
||||
Q_EMIT changed(QClipboard::Selection);
|
||||
});
|
||||
|
||||
} else {
|
||||
m_device.reset();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
DataControl::~DataControl() = default;
|
||||
|
||||
void DataControl::setMimeData(QMimeData *mime, QClipboard::Mode mode)
|
||||
{
|
||||
if (!m_device) {
|
||||
return;
|
||||
}
|
||||
auto source = std::make_unique<DataControlSource>(m_manager->create_data_source(), mime);
|
||||
if (mode == QClipboard::Clipboard) {
|
||||
m_device->setSelection(std::move(source));
|
||||
} else if (mode == QClipboard::Selection) {
|
||||
m_device->setPrimarySelection(std::move(source));
|
||||
}
|
||||
}
|
||||
|
||||
void DataControl::clear(QClipboard::Mode mode)
|
||||
{
|
||||
if (!m_device) {
|
||||
return;
|
||||
}
|
||||
if (mode == QClipboard::Clipboard) {
|
||||
m_device->set_selection(nullptr);
|
||||
} else if (mode == QClipboard::Selection) {
|
||||
if (zwlr_data_control_device_v1_get_version(m_device->object()) >= ZWLR_DATA_CONTROL_DEVICE_V1_SET_PRIMARY_SELECTION_SINCE_VERSION) {
|
||||
m_device->set_primary_selection(nullptr);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const QMimeData *DataControl::mimeData(QClipboard::Mode mode) const
|
||||
{
|
||||
if (!m_device) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
// return our locally set selection if it's not cancelled to avoid copying data to ourselves
|
||||
if (mode == QClipboard::Clipboard) {
|
||||
if (m_device->selection()) {
|
||||
return m_device->selection();
|
||||
}
|
||||
// This application owns the clipboard via the regular data_device, use it so we don't block ourselves
|
||||
if (QGuiApplication::clipboard()->ownsClipboard()) {
|
||||
return QGuiApplication::clipboard()->mimeData(mode);
|
||||
}
|
||||
return m_device->receivedSelection();
|
||||
} else if (mode == QClipboard::Selection) {
|
||||
if (m_device->primarySelection()) {
|
||||
return m_device->primarySelection();
|
||||
}
|
||||
// This application owns the primary selection via the regular primary_selection_device, use it so we don't block ourselves
|
||||
if (QGuiApplication::clipboard()->ownsSelection()) {
|
||||
return QGuiApplication::clipboard()->mimeData(mode);
|
||||
}
|
||||
return m_device->receivedPrimarySelection();
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#include "datacontrol.moc"
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
/*
|
||||
SPDX-FileCopyrightText: 2020 David Edmundson <davidedmundson@kde.org>
|
||||
|
||||
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
#include <QObject>
|
||||
#include <QScopedPointer>
|
||||
#include <QClipboard>
|
||||
#include <memory>
|
||||
|
||||
class DataControlDevice;
|
||||
class DataControlDeviceManager;
|
||||
class QMimeData;
|
||||
|
||||
class DataControl : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
DataControl(QObject *parent = nullptr);
|
||||
~DataControl() override;
|
||||
|
||||
const QMimeData *mimeData(QClipboard::Mode mode) const;
|
||||
void setMimeData(QMimeData *mime, QClipboard::Mode mode);
|
||||
void clear(QClipboard::Mode mode);
|
||||
|
||||
Q_SIGNALS:
|
||||
void changed(QClipboard::Mode mode);
|
||||
|
||||
private:
|
||||
std::unique_ptr<DataControlDeviceManager> m_manager;
|
||||
std::unique_ptr<DataControlDevice> m_device;
|
||||
};
|
||||
|
|
@ -1,278 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<protocol name="wlr_data_control_unstable_v1">
|
||||
<copyright>
|
||||
Copyright © 2018 Simon Ser
|
||||
Copyright © 2019 Ivan Molodetskikh
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this
|
||||
software and its documentation for any purpose is hereby granted
|
||||
without fee, provided that the above copyright notice appear in
|
||||
all copies and that both that copyright notice and this permission
|
||||
notice appear in supporting documentation, and that the name of
|
||||
the copyright holders not be used in advertising or publicity
|
||||
pertaining to distribution of the software without specific,
|
||||
written prior permission. The copyright holders make no
|
||||
representations about the suitability of this software for any
|
||||
purpose. It is provided "as is" without express or implied
|
||||
warranty.
|
||||
|
||||
THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
|
||||
SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
||||
SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
|
||||
AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
||||
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
||||
THIS SOFTWARE.
|
||||
</copyright>
|
||||
|
||||
<description summary="control data devices">
|
||||
This protocol allows a privileged client to control data devices. In
|
||||
particular, the client will be able to manage the current selection and take
|
||||
the role of a clipboard manager.
|
||||
|
||||
Warning! The protocol described in this file is experimental and
|
||||
backward incompatible changes may be made. Backward compatible changes
|
||||
may be added together with the corresponding interface version bump.
|
||||
Backward incompatible changes are done by bumping the version number in
|
||||
the protocol and interface names and resetting the interface version.
|
||||
Once the protocol is to be declared stable, the 'z' prefix and the
|
||||
version number in the protocol and interface names are removed and the
|
||||
interface version number is reset.
|
||||
</description>
|
||||
|
||||
<interface name="zwlr_data_control_manager_v1" version="2">
|
||||
<description summary="manager to control data devices">
|
||||
This interface is a manager that allows creating per-seat data device
|
||||
controls.
|
||||
</description>
|
||||
|
||||
<request name="create_data_source">
|
||||
<description summary="create a new data source">
|
||||
Create a new data source.
|
||||
</description>
|
||||
<arg name="id" type="new_id" interface="zwlr_data_control_source_v1"
|
||||
summary="data source to create"/>
|
||||
</request>
|
||||
|
||||
<request name="get_data_device">
|
||||
<description summary="get a data device for a seat">
|
||||
Create a data device that can be used to manage a seat's selection.
|
||||
</description>
|
||||
<arg name="id" type="new_id" interface="zwlr_data_control_device_v1"/>
|
||||
<arg name="seat" type="object" interface="wl_seat"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy the manager">
|
||||
All objects created by the manager will still remain valid, until their
|
||||
appropriate destroy request has been called.
|
||||
</description>
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
<interface name="zwlr_data_control_device_v1" version="2">
|
||||
<description summary="manage a data device for a seat">
|
||||
This interface allows a client to manage a seat's selection.
|
||||
|
||||
When the seat is destroyed, this object becomes inert.
|
||||
</description>
|
||||
|
||||
<request name="set_selection">
|
||||
<description summary="copy data to the selection">
|
||||
This request asks the compositor to set the selection to the data from
|
||||
the source on behalf of the client.
|
||||
|
||||
The given source may not be used in any further set_selection or
|
||||
set_primary_selection requests. Attempting to use a previously used
|
||||
source is a protocol error.
|
||||
|
||||
To unset the selection, set the source to NULL.
|
||||
</description>
|
||||
<arg name="source" type="object" interface="zwlr_data_control_source_v1"
|
||||
allow-null="true"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy this data device">
|
||||
Destroys the data device object.
|
||||
</description>
|
||||
</request>
|
||||
|
||||
<event name="data_offer">
|
||||
<description summary="introduce a new wlr_data_control_offer">
|
||||
The data_offer event introduces a new wlr_data_control_offer object,
|
||||
which will subsequently be used in either the
|
||||
wlr_data_control_device.selection event (for the regular clipboard
|
||||
selections) or the wlr_data_control_device.primary_selection event (for
|
||||
the primary clipboard selections). Immediately following the
|
||||
wlr_data_control_device.data_offer event, the new data_offer object
|
||||
will send out wlr_data_control_offer.offer events to describe the MIME
|
||||
types it offers.
|
||||
</description>
|
||||
<arg name="id" type="new_id" interface="zwlr_data_control_offer_v1"/>
|
||||
</event>
|
||||
|
||||
<event name="selection">
|
||||
<description summary="advertise new selection">
|
||||
The selection event is sent out to notify the client of a new
|
||||
wlr_data_control_offer for the selection for this device. The
|
||||
wlr_data_control_device.data_offer and the wlr_data_control_offer.offer
|
||||
events are sent out immediately before this event to introduce the data
|
||||
offer object. The selection event is sent to a client when a new
|
||||
selection is set. The wlr_data_control_offer is valid until a new
|
||||
wlr_data_control_offer or NULL is received. The client must destroy the
|
||||
previous selection wlr_data_control_offer, if any, upon receiving this
|
||||
event.
|
||||
|
||||
The first selection event is sent upon binding the
|
||||
wlr_data_control_device object.
|
||||
</description>
|
||||
<arg name="id" type="object" interface="zwlr_data_control_offer_v1"
|
||||
allow-null="true"/>
|
||||
</event>
|
||||
|
||||
<event name="finished">
|
||||
<description summary="this data control is no longer valid">
|
||||
This data control object is no longer valid and should be destroyed by
|
||||
the client.
|
||||
</description>
|
||||
</event>
|
||||
|
||||
<!-- Version 2 additions -->
|
||||
|
||||
<event name="primary_selection" since="2">
|
||||
<description summary="advertise new primary selection">
|
||||
The primary_selection event is sent out to notify the client of a new
|
||||
wlr_data_control_offer for the primary selection for this device. The
|
||||
wlr_data_control_device.data_offer and the wlr_data_control_offer.offer
|
||||
events are sent out immediately before this event to introduce the data
|
||||
offer object. The primary_selection event is sent to a client when a
|
||||
new primary selection is set. The wlr_data_control_offer is valid until
|
||||
a new wlr_data_control_offer or NULL is received. The client must
|
||||
destroy the previous primary selection wlr_data_control_offer, if any,
|
||||
upon receiving this event.
|
||||
|
||||
If the compositor supports primary selection, the first
|
||||
primary_selection event is sent upon binding the
|
||||
wlr_data_control_device object.
|
||||
</description>
|
||||
<arg name="id" type="object" interface="zwlr_data_control_offer_v1"
|
||||
allow-null="true"/>
|
||||
</event>
|
||||
|
||||
<request name="set_primary_selection" since="2">
|
||||
<description summary="copy data to the primary selection">
|
||||
This request asks the compositor to set the primary selection to the
|
||||
data from the source on behalf of the client.
|
||||
|
||||
The given source may not be used in any further set_selection or
|
||||
set_primary_selection requests. Attempting to use a previously used
|
||||
source is a protocol error.
|
||||
|
||||
To unset the primary selection, set the source to NULL.
|
||||
|
||||
The compositor will ignore this request if it does not support primary
|
||||
selection.
|
||||
</description>
|
||||
<arg name="source" type="object" interface="zwlr_data_control_source_v1"
|
||||
allow-null="true"/>
|
||||
</request>
|
||||
|
||||
<enum name="error" since="2">
|
||||
<entry name="used_source" value="1"
|
||||
summary="source given to set_selection or set_primary_selection was already used before"/>
|
||||
</enum>
|
||||
</interface>
|
||||
|
||||
<interface name="zwlr_data_control_source_v1" version="1">
|
||||
<description summary="offer to transfer data">
|
||||
The wlr_data_control_source object is the source side of a
|
||||
wlr_data_control_offer. It is created by the source client in a data
|
||||
transfer and provides a way to describe the offered data and a way to
|
||||
respond to requests to transfer the data.
|
||||
</description>
|
||||
|
||||
<enum name="error">
|
||||
<entry name="invalid_offer" value="1"
|
||||
summary="offer sent after wlr_data_control_device.set_selection"/>
|
||||
</enum>
|
||||
|
||||
<request name="offer">
|
||||
<description summary="add an offered MIME type">
|
||||
This request adds a MIME type to the set of MIME types advertised to
|
||||
targets. Can be called several times to offer multiple types.
|
||||
|
||||
Calling this after wlr_data_control_device.set_selection is a protocol
|
||||
error.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"
|
||||
summary="MIME type offered by the data source"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy this source">
|
||||
Destroys the data source object.
|
||||
</description>
|
||||
</request>
|
||||
|
||||
<event name="send">
|
||||
<description summary="send the data">
|
||||
Request for data from the client. Send the data as the specified MIME
|
||||
type over the passed file descriptor, then close it.
|
||||
</description>
|
||||
<arg name="mime_type" type="string" summary="MIME type for the data"/>
|
||||
<arg name="fd" type="fd" summary="file descriptor for the data"/>
|
||||
</event>
|
||||
|
||||
<event name="cancelled">
|
||||
<description summary="selection was cancelled">
|
||||
This data source is no longer valid. The data source has been replaced
|
||||
by another data source.
|
||||
|
||||
The client should clean up and destroy this data source.
|
||||
</description>
|
||||
</event>
|
||||
</interface>
|
||||
|
||||
<interface name="zwlr_data_control_offer_v1" version="1">
|
||||
<description summary="offer to transfer data">
|
||||
A wlr_data_control_offer represents a piece of data offered for transfer
|
||||
by another client (the source client). The offer describes the different
|
||||
MIME types that the data can be converted to and provides the mechanism
|
||||
for transferring the data directly from the source client.
|
||||
</description>
|
||||
|
||||
<request name="receive">
|
||||
<description summary="request that the data is transferred">
|
||||
To transfer the offered data, the client issues this request and
|
||||
indicates the MIME type it wants to receive. The transfer happens
|
||||
through the passed file descriptor (typically created with the pipe
|
||||
system call). The source client writes the data in the MIME type
|
||||
representation requested and then closes the file descriptor.
|
||||
|
||||
The receiving client reads from the read end of the pipe until EOF and
|
||||
then closes its end, at which point the transfer is complete.
|
||||
|
||||
This request may happen multiple times for different MIME types.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"
|
||||
summary="MIME type desired by receiver"/>
|
||||
<arg name="fd" type="fd" summary="file descriptor for data transfer"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy this offer">
|
||||
Destroys the data offer object.
|
||||
</description>
|
||||
</request>
|
||||
|
||||
<event name="offer">
|
||||
<description summary="advertise offered MIME type">
|
||||
Sent immediately after creating the wlr_data_control_offer object.
|
||||
One event per offered MIME type.
|
||||
</description>
|
||||
<arg name="mime_type" type="string" summary="offered MIME type"/>
|
||||
</event>
|
||||
</interface>
|
||||
</protocol>
|
||||
Loading…
Reference in a new issue