File 0006-Klipper-Handle-incoming-UTF-8-mime-types.p... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0006-Klipper-Handle-incoming-UTF-8-mime-types.patch of Package plasma5-workspace (Revision 3bfff5ce322917efe1e307fd120c7d1c)

Currently displaying revision 3bfff5ce322917efe1e307fd120c7d1c , Show latest

From 75fbdaab0d128ed5afb339e923d83722205af2d3 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
Date: Sat, 18 Sep 2021 00:16:12 +0100
Subject: [PATCH 06/11] [Klipper] Handle incoming UTF-8 mime types

QMimeData abstracts most mime type handling, but not text/plain vs
text/plain;charset=utf-8.

This is currently being done in QWayland inside qwaylanddataoffer. Given
this code is effectively a clone, we need to have the same check here.

Interestingly mimeData->text() worked before but not hasText(), which is
why it was unnoticed in the test pasteClient tool.

This fixes klipper and GTK apps.

BUG: 424694

(cherry picked from commit 2297983230521ee5f2a79054e66c50e84300c9ac)
---
 klipper/systemclipboard/waylandclipboard.cpp | 26 +++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/klipper/systemclipboard/waylandclipboard.cpp b/klipper/systemclipboard/waylandclipboard.cpp
index 5d3f8edff..0ae999009 100644
--- a/klipper/systemclipboard/waylandclipboard.cpp
+++ b/klipper/systemclipboard/waylandclipboard.cpp
@@ -23,6 +23,11 @@
 
 #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
@@ -57,9 +62,12 @@ public:
         return m_receivedFormats;
     }
 
-    bool hasFormat(const QString &format) const override
+    bool hasFormat(const QString &mimeType) const override
     {
-        return m_receivedFormats.contains(format);
+        if (mimeType == QStringLiteral("text/plain") && m_receivedFormats.contains(utf8Text())) {
+            return true;
+        }
+        return m_receivedFormats.contains(mimeType);
     }
 
 protected:
@@ -77,18 +85,24 @@ private:
 
 QVariant DataControlOffer::retrieveData(const QString &mimeType, QVariant::Type type) const
 {
-    if (!hasFormat(mimeType)) {
-        return QVariant();
-    }
     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(mimeType, pipeFds[1]);
+    t->receive(mime, pipeFds[1]);
 
     close(pipeFds[1]);
 
-- 
2.33.0

Places

File 0006-Klipper-Handle-incoming-UTF-8-mime-types.patch of Package plasma5-workspace (Revision 3bfff5ce322917efe1e307fd120c7d1c)

Places