Wayland: Fix setting clipboard if data control protocol is unsupported

Author: hluk

src/platform/x11/systemclipboard/waylandclipboard.cpp

@@ -623,7 +623,7 @@ WaylandClipboard *WaylandClipboard::createInstance()
 
 void WaylandClipboard::setMimeData(QMimeData *mime, QClipboard::Mode mode)
 {
-    if (!m_device) {
+    if (!waitForDevice(1000)) {
         return;
     }
     std::unique_ptr<DataControlSource> source(new DataControlSource(m_manager->create_data_source(), mime));
@@ -634,23 +634,9 @@ void WaylandClipboard::setMimeData(QMimeData *mime, QClipboard::Mode mode)
     }
 }
 
-void WaylandClipboard::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 *WaylandClipboard::mimeData(QClipboard::Mode mode) const
 {
-    if (!m_device) {
+    if (!waitForDevice(1000)) {
         return nullptr;
     }
 
@@ -669,15 +655,18 @@ const QMimeData *WaylandClipboard::mimeData(QClipboard::Mode mode) const
     return nullptr;
 }
 
-DataControlDevice *WaylandClipboard::device() const
+bool WaylandClipboard::waitForDevice(int timeoutMs) const
 {
     if (m_device)
-        return m_device.get();
+        return true;
 
-    if (m_deviceRequestedTimer.elapsed() > 5000)
-        return nullptr;
+    if (m_deviceRequestedTimer.elapsed() > timeoutMs)
+        return false;
+
+    qWarning() << "Waiting for Wayland clipboard for"
+        << timeoutMs - m_deviceRequestedTimer.elapsed() << "ms";
 
-    while (!m_device && m_deviceRequestedTimer.elapsed() < 5000) {
+    while (!m_device && m_deviceRequestedTimer.elapsed() < timeoutMs) {
         QCoreApplication::processEvents();
     }
 
@@ -686,17 +675,11 @@ DataControlDevice *WaylandClipboard::device() const
             qWarning() << "Activating Wayland clipboard took"
                 << m_deviceRequestedTimer.elapsed() << "ms";
         }
-        return m_device.get();
+        return true;
     }
 
     qCritical() << "Failed to activate Wayland clipboard";
-    return nullptr;
-}
-
-bool WaylandClipboard::isSelectionSupported() const
-{
-    return m_device && zwlr_data_control_device_v1_get_version(m_device->object())
-            >= ZWLR_DATA_CONTROL_DEVICE_V1_SET_PRIMARY_SELECTION_SINCE_VERSION;
+    return false;
 }
 
 WaylandClipboard *WaylandClipboard::instance()

src/platform/x11/systemclipboard/waylandclipboard.h

@@ -24,10 +24,8 @@ class WaylandClipboard final : public QObject
     ~WaylandClipboard();
 
     void setMimeData(QMimeData *mime, QClipboard::Mode mode);
-    void clear(QClipboard::Mode mode);
     const QMimeData *mimeData(QClipboard::Mode mode) const;
-    DataControlDevice *device() const;
-    bool isSelectionSupported() const;
+    bool waitForDevice(int timeoutMs = 5000) const;
 
 signals:
     void changed(QClipboard::Mode mode);

src/platform/x11/x11platformclipboard.cpp

@@ -65,7 +65,7 @@ X11PlatformClipboard::X11PlatformClipboard()
 
     // Create Wayland clipboard instance so it can start receiving new data.
     if ( !X11Info::isPlatformX11() ) {
-        m_selectionSupported = WaylandClipboard::instance()->isSelectionSupported();
+        WaylandClipboard::instance();
     }
 }
 
@@ -150,23 +150,22 @@ void X11PlatformClipboard::setData(ClipboardMode mode, const QVariantMap &dataMa
         // WORKAROUND: Avoid getting X11 warning "QXcbClipboard: SelectionRequest too old".
         QCoreApplication::processEvents();
         DummyClipboard::setData(mode, dataMap);
-    } else if (qobject_cast<QApplication*>(qApp) == nullptr) {
-        // WORKAROUND: QClipboard::setMimeData() with a simple windowless
-        // QGuiAplication on Wayland does not work.
+    } else {
+        DummyClipboard::setData(mode, dataMap);
         const auto data = createMimeData(dataMap);
         const auto qmode = modeToQClipboardMode(mode);
         WaylandClipboard::instance()->setMimeData(data, qmode);
-    } else {
-        DummyClipboard::setData(mode, dataMap);
     }
 }
 
 const QMimeData *X11PlatformClipboard::rawMimeData(ClipboardMode mode) const
 {
-    if ( X11Info::isPlatformX11() )
-        return DummyClipboard::rawMimeData(mode);
-
-    return WaylandClipboard::instance()->mimeData( modeToQClipboardMode(mode) );
+    if ( !X11Info::isPlatformX11() ) {
+        const auto data = WaylandClipboard::instance()->mimeData( modeToQClipboardMode(mode) );
+        if (data != nullptr)
+            return data;
+    }
+    return DummyClipboard::rawMimeData(mode);
 }
 
 void X11PlatformClipboard::onChanged(int mode)

src/platform/x11/x11platformclipboard.h

@@ -22,7 +22,7 @@ class X11PlatformClipboard final : public DummyClipboard
 
     void setData(ClipboardMode mode, const QVariantMap &dataMap) override;
 
-    bool isSelectionSupported() const override { return m_selectionSupported; }
+    bool isSelectionSupported() const override { return true; }
 
     void setClipboardOwner(const QString &owner) override { m_clipboardOwner = owner; }
 
@@ -63,7 +63,6 @@ class X11PlatformClipboard final : public DummyClipboard
     ClipboardData m_selectionData;
 
     bool m_monitoring = false;
-    bool m_selectionSupported = true;
 
     QString m_clipboardOwner;
 };