Fix behavior for waiting on clipboard change

Author: hluk

src/gui/clipboardspy.cpp

@@ -22,7 +22,7 @@ ClipboardSpy::ClipboardSpy(ClipboardMode mode, const QByteArray &owner)
         mode == ClipboardMode::Clipboard ? ClipboardMode::Selection : ClipboardMode::Clipboard,
         false);
 
-    connect(m_clipboard.get(), &PlatformClipboard::changed, this, &ClipboardSpy::check);
+    connect(m_clipboard.get(), &PlatformClipboard::changed, this, &ClipboardSpy::emitChangeIfChanged);
     m_clipboard->startMonitoring( QStringList(mimeOwner) );
 }
 
@@ -44,18 +44,20 @@ void ClipboardSpy::wait(int ms, int checkIntervalMs)
 
     QTimer timerCheck;
     timerCheck.setInterval(checkIntervalMs);
-    connect( &timerCheck, &QTimer::timeout, this, &ClipboardSpy::check );
+    connect( &timerCheck, &QTimer::timeout, this, &ClipboardSpy::emitChangeIfChanged );
     timerCheck.start();
 
     loop.exec();
 }
 
 bool ClipboardSpy::setClipboardData(const QVariantMap &data)
 {
+    m_settingClipboard = true;
     m_oldOwnerData = currentOwnerData();
     m_clipboard->setData(m_mode, data);
     wait();
     m_oldOwnerData = data.value(mimeOwner).toByteArray();
+    m_settingClipboard = false;
     return m_oldOwnerData == currentOwnerData();
 }
 
@@ -69,11 +71,12 @@ void ClipboardSpy::stop()
     emit stopped();
 }
 
-bool ClipboardSpy::check()
+void ClipboardSpy::emitChangeIfChanged()
 {
-    if (!m_oldOwnerData.isEmpty() && m_oldOwnerData == currentOwnerData())
-        return false;
-
-    emit changed();
-    return true;
+    const auto newOwner = currentOwnerData();
+    if (m_oldOwnerData != newOwner) {
+        emit changed();
+    } else if (!m_settingClipboard && m_oldOwnerData.isEmpty() && newOwner.isEmpty()) {
+        emit changed();
+    }
 }

src/gui/clipboardspy.h

@@ -15,7 +15,7 @@ class ClipboardSpy final : public QObject
     explicit ClipboardSpy(ClipboardMode mode, const QByteArray &owner);
 
     /// Actively wait for clipboard/selection to change.
-    void wait(int ms = 2000, int checkIntervalMs = 100);
+    void wait(int ms = 2000, int checkIntervalMs = 8000);
 
     bool setClipboardData(const QVariantMap &data);
 
@@ -28,11 +28,12 @@ class ClipboardSpy final : public QObject
     void stopped();
 
 private:
-    bool check();
+    void emitChangeIfChanged();
 
     ClipboardMode m_mode;
     PlatformClipboardPtr m_clipboard;
     QByteArray m_oldOwnerData;
+    bool m_settingClipboard = false;
 };
 
 #endif // CLIPBOARDSPY_H

src/platform/x11/x11platformclipboard.cpp

@@ -316,6 +316,10 @@ void X11PlatformClipboard::updateClipboardData(X11PlatformClipboard::ClipboardDa
 
 void X11PlatformClipboard::useNewClipboardData(X11PlatformClipboard::ClipboardData *clipboardData)
 {
+    COPYQ_LOG( QStringLiteral("%1 CHANGED, owner=%2")
+            .arg(clipboardData->mode == ClipboardMode::Clipboard ? "Clipboard" : "Selection")
+            .arg(clipboardData->newOwner) );
+
     clipboardData->data = clipboardData->newData;
     clipboardData->owner = clipboardData->newOwner;
     clipboardData->timerEmitChange.stop();
@@ -331,9 +335,4 @@ void X11PlatformClipboard::checkAgainLater(bool clipboardChanged, int interval)
         m_timerCheckAgain.start(interval);
     else if (clipboardChanged)
         m_timerCheckAgain.start(maxCheckAgainIntervalMs);
-
-    if (m_clipboardData.timerEmitChange.isActive())
-        COPYQ_LOG( QStringLiteral("Clipboard CHANGED, owner: '%1'").arg(m_clipboardData.newOwner) );
-    if (m_selectionData.timerEmitChange.isActive())
-        COPYQ_LOG( QStringLiteral("Selection CHANGED, owner: '%1'").arg(m_selectionData.newOwner) );
 }