From a04527882248a43f9ecdc1cd2886659f8a97f526 Mon Sep 17 00:00:00 2001
From: Weixuan Xiao <veyx.shaw@gmail.com>
Date: Thu, 28 Apr 2022 12:40:53 +0000
Subject: [PATCH] Fix and improve unicode input on macOS and Windows

Unicode text input from remote devices gives random texts because the plugin mistook the text encoding. Insert a Unicode 16 bits character each time instead of a UTF-8 character.

The API accepts the `UniChar` Unicode characters:

```c
void CGEventKeyboardSetUnicodeString(CGEventRef event, UniCharCount stringLength, const UniChar *unicodeString);
```

from https://developer.apple.com/documentation/coregraphics/1456028-cgeventkeyboardsetunicodestring.
---
 plugins/mousepad/macosremoteinput.mm    | 10 ++++------
 plugins/mousepad/windowsremoteinput.cpp |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/plugins/mousepad/macosremoteinput.mm b/plugins/mousepad/macosremoteinput.mm
index 79dcb8129..e93e03b43 100644
--- a/plugins/mousepad/macosremoteinput.mm
+++ b/plugins/mousepad/macosremoteinput.mm
@@ -178,16 +178,14 @@ bool MacOSRemoteInput::handlePacket(const NetworkPacket& np)
                 CFRelease(specialKeyDownEvent);
                 CFRelease(specialKeyUpEvent);
             } else {
-                for (int i=0;i<key.length();i++) {
-                    QByteArray utf8 = QString(key.at(i)).toUtf8();
-                    NSData *data = utf8.toNSData();     // Will be autoreleased
-                    const UniChar* const unicharData = (const UniChar*)data.bytes;
+                for (int i = 0; i < key.length(); i++) {
+                    const UniChar unicharData = (const UniChar)key.at(i).unicode();
 
                     CGEventRef event = CGEventCreateKeyboardEvent(NULL, 0, true);
 
-                    CGEventKeyboardSetUnicodeString(event, utf8.length(), unicharData);
+                    CGEventKeyboardSetUnicodeString(event, 1, &unicharData);
                     CGEventPost(kCGSessionEventTap, event);
-                    
+
                     CFRelease(event);
                 }
 
diff --git a/plugins/mousepad/windowsremoteinput.cpp b/plugins/mousepad/windowsremoteinput.cpp
index 3087fa37d..f49a91e8d 100644
--- a/plugins/mousepad/windowsremoteinput.cpp
+++ b/plugins/mousepad/windowsremoteinput.cpp
@@ -159,7 +159,7 @@ bool WindowsRemoteInput::handlePacket(const NetworkPacket& np)
             } else {
 
                 for (int i=0;i<key.length();i++) {
-                    wchar_t inputChar = *QString(key.at(i)).utf16();
+                    wchar_t inputChar = (wchar_t)key.at(i).unicode();
                     short inputVk = VkKeyScanExW(inputChar, GetKeyboardLayout(0));
 
                     if(inputVk != -1) {