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.
mikke89 · Jul 19, 2021 · e919f10 · e919f10
1 parent b1f331b
commit e919f10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 			}
 		}