moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 22:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve Unicode support for some common characters

Browse Source
This commit is contained in:
Cameron Gutman
2021-02-07 16:00:00 -06:00
parent 5f3f2a96fd
commit 8372717a09
1 changed files with 50 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/input/clipboard.cpp
+50 -13
View File
@@ -1,5 +1,7 @@
#include "input.h" #include "input.h"
#include <QString>
#define MAP_KEY(c, sc) \ #define MAP_KEY(c, sc) \
case c: \ case c: \
event.key.keysym.scancode = sc; \ event.key.keysym.scancode = sc; \
@@ -13,27 +15,62 @@
void SdlInputHandler::sendText(const char* text) void SdlInputHandler::sendText(const char* text)
{ {
for (const char* c = text; *c != 0; c++) { QString string = QString::fromUtf8(text);
for (int i = 0; i < string.size(); i++) {
char16_t c = string[i].unicode();
SDL_Event event = {}; SDL_Event event = {};
if (*c >= 'A' && *c <= 'Z') { if (c >= 'A' && c <= 'Z') {
event.key.keysym.scancode = (SDL_Scancode)((*c - 'A') + SDL_SCANCODE_A); event.key.keysym.scancode = (SDL_Scancode)((c - 'A') + SDL_SCANCODE_A);
event.key.keysym.mod = KMOD_SHIFT; event.key.keysym.mod = KMOD_SHIFT;
} }
else if (*c >= 'a' && *c <= 'z') { else if (c >= 'a' && c <= 'z') {
event.key.keysym.scancode = (SDL_Scancode)((*c - 'a') + SDL_SCANCODE_A); event.key.keysym.scancode = (SDL_Scancode)((c - 'a') + SDL_SCANCODE_A);
} }
else if (*c >= '1' && *c <= '9') { else if (c >= '1' && c <= '9') {
event.key.keysym.scancode = (SDL_Scancode)((*c - '1') + SDL_SCANCODE_1); event.key.keysym.scancode = (SDL_Scancode)((c - '1') + SDL_SCANCODE_1);
} }
else { else {
// TODO: Smartquotes // Fixup some Unicode characters to be expressible in ASCII
switch (*c) { switch (c) {
case u'\U0000201C': // Left "
case u'\U0000201D': // Right "
c = '"';
break;
case u'\U00002018': // Left '
case u'\U00002019': // Right '
c = '\'';
break;
case u'\U00002013': // Smart -
c = '-';
break;
case u'\U00002026': // Ellipsis (...)
// Convert this character into 3 periods
string.insert(i+1, '.');
string.insert(i+1, '.');
c = '.';
break;
case u'\U000000A0': // Non-breaking space
c = ' ';
break;
default:
// Nothing
break;
}
switch (c) {
// Handle CRLF separately to avoid duplicate newlines // Handle CRLF separately to avoid duplicate newlines
case '\r': case '\r':
if (*(c + 1) == '\n') { if (string[i + 1] == '\n') {
c++; i++;
} }
event.key.keysym.scancode = SDL_SCANCODE_RETURN; event.key.keysym.scancode = SDL_SCANCODE_RETURN;
break; break;
@@ -82,8 +119,8 @@ void SdlInputHandler::sendText(const char* text)
default: default:
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION, SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"Pasting text - non-ASCII character '%c' ignored", "Pasting text - non-ASCII character value 'U+%x' ignored",
*c); c);
continue; continue;
} }
} }