summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorajreckof <tbonhoure@ymail.Com>2022-08-07 00:30:56 +0100
committerajreckof <tbonhoure@ymail.Com>2023-01-15 18:49:20 +0100
commit4309dffc6ab413eadc76ff246adeaa542b4c63b2 (patch)
treec3b353775bd8355101f4e80f2e3418074b0cf983 /core
parenta51ca2beafc5d74d3e62cb56fbba76ceb39160a3 (diff)
add CMD_OR_CTRL as a Key and not just a key modifier
Diffstat (limited to 'core')
-rw-r--r--core/os/keyboard.cpp3
-rw-r--r--core/os/keyboard.h5
2 files changed, 8 insertions, 0 deletions
diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp
index e0231b818f..5183b77cb1 100644
--- a/core/os/keyboard.cpp
+++ b/core/os/keyboard.cpp
@@ -63,12 +63,15 @@ static const _KeyCodeText _keycodes[] = {
{Key::CTRL ,"Ctrl"},
#if defined(MACOS_ENABLED)
{Key::META ,"Command"},
+ {Key::CMD_OR_CTRL ,"Command"},
{Key::ALT ,"Option"},
#elif defined(WINDOWS_ENABLED)
{Key::META ,"Windows"},
+ {Key::CMD_OR_CTRL ,"Ctrl"},
{Key::ALT ,"Alt"},
#else
{Key::META ,"Meta"},
+ {Key::CMD_OR_CTRL ,"Ctrl"},
{Key::ALT ,"Alt"},
#endif
{Key::CAPSLOCK ,"CapsLock"},
diff --git a/core/os/keyboard.h b/core/os/keyboard.h
index 389baee915..c78fa2a631 100644
--- a/core/os/keyboard.h
+++ b/core/os/keyboard.h
@@ -65,6 +65,11 @@ enum class Key {
SHIFT = SPECIAL | 0x15,
CTRL = SPECIAL | 0x16,
META = SPECIAL | 0x17,
+#if defined(MACOS_ENABLED)
+ CMD_OR_CTRL = META,
+#else
+ CMD_OR_CTRL = CTRL,
+#endif
ALT = SPECIAL | 0x18,
CAPSLOCK = SPECIAL | 0x19,
NUMLOCK = SPECIAL | 0x1A,