From c56712776a2bd6b10ba24b8042830bce68b7a6b8 Mon Sep 17 00:00:00 2001
From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Date: Fri, 26 Mar 2021 13:14:04 +0200
Subject: [PATCH] Fix management of keymap files

This is a regression that was introduced with the port to the new
approach.
---
 src/wayland/keyboard_interface.cpp | 58 +++++++++++++++++-------------
 src/wayland/keyboard_interface_p.h |  6 ++--
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/wayland/keyboard_interface.cpp b/src/wayland/keyboard_interface.cpp
index 5af47f2af2..e398875af6 100644
--- a/src/wayland/keyboard_interface.cpp
+++ b/src/wayland/keyboard_interface.cpp
@@ -36,7 +36,7 @@ void KeyboardInterfacePrivate::keyboard_bind_resource(Resource *resource)
         send_repeat_info(resource->handle, keyRepeat.charactersPerSecond, keyRepeat.delay);
     }
     if (!keymap.isNull()) {
-        send_keymap(resource->handle, keymap_format::keymap_format_xkb_v1, keymap->handle(), keymap->size());
+        sendKeymap(resource);
     }
 
     if (focusedClient && focusedClient->client() == resource->client()) {
@@ -78,37 +78,45 @@ void KeyboardInterfacePrivate::sendEnter(SurfaceInterface *surface, quint32 seri
     }
 }
 
+void KeyboardInterfacePrivate::sendKeymap(Resource *resource)
+{
+    QScopedPointer<QTemporaryFile> tmp(new QTemporaryFile());
+    if (!tmp->open()) {
+        qCWarning(KWAYLAND_SERVER) << "Failed to create keymap file:" << tmp->errorString();
+        return;
+    }
+
+    unlink(tmp->fileName().toUtf8().constData());
+    if (!tmp->resize(keymap.size())) {
+        qCWarning(KWAYLAND_SERVER) << "Failed to resize keymap file:" << tmp->errorString();
+        return;
+    }
+
+    uchar *address = tmp->map(0, keymap.size());
+    if (!address) {
+        qCWarning(KWAYLAND_SERVER) << "Failed to map keymap file:" << tmp->errorString();
+        return;
+    }
+
+    if (qstrncpy(reinterpret_cast<char *>(address), keymap.constData(), keymap.size() + 1) == nullptr) {
+        return;
+    }
+    tmp->unmap(address);
+
+    send_keymap(resource->handle, keymap_format::keymap_format_xkb_v1, tmp->handle(), tmp->size());
+}
+
 void KeyboardInterface::setKeymap(const QByteArray &content)
 {
     if (content.isNull()) {
         return;
     }
-    QScopedPointer<QTemporaryFile> tmp{new QTemporaryFile(this)};
-    if (!tmp->open()) {
-        return;
-    }
-    unlink(tmp->fileName().toUtf8().constData());
-    if (!tmp->resize(content.size())) {
-        return;
-    }
-    uchar *address = tmp->map(0, content.size());
-    if (!address) {
-        return;
-    }
-    if (qstrncpy(reinterpret_cast<char*>(address), content.constData(), content.size() + 1) == nullptr) {
-        return;
-    }
-    tmp->unmap(address);
 
-    d->sendKeymap(tmp->handle(), content.size());
-    d->keymap.swap(tmp);
-}
+    d->keymap = content;
 
-void KeyboardInterfacePrivate::sendKeymap(int fd, quint32 size)
-{
-    const QList<Resource *> keyboards = resourceMap().values();
-    for (Resource *keyboardResource : keyboards) {
-        send_keymap(keyboardResource->handle, keymap_format::keymap_format_xkb_v1, fd, size);
+    const auto keyboardResources = d->resourceMap();
+    for (KeyboardInterfacePrivate::Resource *resource : keyboardResources) {
+        d->sendKeymap(resource);
     }
 }
 
diff --git a/src/wayland/keyboard_interface_p.h b/src/wayland/keyboard_interface_p.h
index 9ec1ed3d55..4c387dc755 100644
--- a/src/wayland/keyboard_interface_p.h
+++ b/src/wayland/keyboard_interface_p.h
@@ -12,8 +12,6 @@
 #include <QPointer>
 #include <QHash>
 
-class QTemporaryFile;
-
 namespace KWaylandServer
 {
 
@@ -25,7 +23,7 @@ public:
     KeyboardInterfacePrivate(SeatInterface *s);
 
 
-    void sendKeymap(int fd, quint32 size);
+    void sendKeymap(Resource *resource);
     void sendModifiers();
     void sendModifiers(quint32 depressed, quint32 latched, quint32 locked, quint32 group, quint32 serial);
 
@@ -38,7 +36,7 @@ public:
     SeatInterface *seat;
     SurfaceInterface *focusedSurface = nullptr;
     QMetaObject::Connection destroyConnection;
-    QScopedPointer<QTemporaryFile> keymap;
+    QByteArray keymap;
 
     struct {
         qint32 charactersPerSecond = 0;