From e919f10a6b7a07ce7d32f855d8219f34bb914621 Mon Sep 17 00:00:00 2001 From: Michael Ragazzon Date: Mon, 19 Jul 2021 13:52:48 +0200 Subject: [PATCH] Don't submit key down as text when ctrl-key is down on X11 and macOS. Fixes shortcut keys (eg. cut/copy/select all), see #210. --- Samples/shell/src/macosx/InputMacOSX.cpp | 2 +- Samples/shell/src/x11/InputX11.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/shell/src/macosx/InputMacOSX.cpp b/Samples/shell/src/macosx/InputMacOSX.cpp index fc68bfbc4..9ba62c28c 100644 --- a/Samples/shell/src/macosx/InputMacOSX.cpp +++ b/Samples/shell/src/macosx/InputMacOSX.cpp @@ -130,7 +130,7 @@ OSStatus InputMacOSX::EventHandler(EventHandlerCallRef next_handler, EventRef ev context->ProcessKeyDown(key_identifier, key_modifier_state); Rml::Character character = GetCharacterCode(key_identifier, key_modifier_state); - if (character != Rml::Character::Null) + if (character != Rml::Character::Null && !(key_modifier_state & Rml::Input::KM_CTRL)) context->ProcessTextInput(character); } } diff --git a/Samples/shell/src/x11/InputX11.cpp b/Samples/shell/src/x11/InputX11.cpp index 7b3a3a143..85275eddf 100644 --- a/Samples/shell/src/x11/InputX11.cpp +++ b/Samples/shell/src/x11/InputX11.cpp @@ -183,7 +183,7 @@ void InputX11::ProcessXEvent(Display* display, const XEvent& event) context->ProcessKeyDown(key_identifier, key_modifier_state); Rml::Character character = GetCharacterCode(key_identifier, key_modifier_state); - if (character != Rml::Character::Null) + if (character != Rml::Character::Null && !(key_modifier_state & Rml::Input::KM_CTRL)) context->ProcessTextInput(character); } }