From 2fa77032062023cd582ae8c810b3cee74cc394a0 Mon Sep 17 00:00:00 2001 From: aryanrawlani28 Date: Wed, 26 Aug 2020 01:31:01 +0530 Subject: [PATCH] GLK: Use U32Strings properly for clipboards. --- engines/glk/selection.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/engines/glk/selection.cpp b/engines/glk/selection.cpp index f5ef012fd26..63d900b5025 100644 --- a/engines/glk/selection.cpp +++ b/engines/glk/selection.cpp @@ -33,19 +33,14 @@ void Clipboard::clipboardStore(const Common::U32String &text) { } void Clipboard::clipboardSend(ClipSource source) { - // Convert unicode string to standard string, since that's all ScummVM supports - Common::String text; - for (uint idx = 0; idx < _text.size(); ++idx) - text += (_text[idx] <= 0x7f) ? (char)_text[idx] : '?'; - - g_system->setTextInClipboard(text); + g_system->setTextInClipboard(_text); } void Clipboard::clipboardReceive(ClipSource source) { Windows &windows = *g_vm->_windows; if (g_system->hasTextInClipboard()) { - Common::String text = g_system->getTextFromClipboard(); + Common::U32String text = g_system->getTextFromClipboard(); for (uint idx = 0; idx < text.size(); ++idx) { uint c = text[idx]; if (c != '\r' && c != '\n' && c != '\b' && c != '\t')