asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use "Command" instead of "Meta" for macOS (#1619)

Browse source
This commit is contained in:
Cong 2017-10-08 17:23:05 +10:00
parent 0fb22b1d24
commit dd684eaaa0
3 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/os/input_event.cpp
View file

@ -270,16 +270,16 @@ String InputEventKey::as_text() const {
return kc;
if (get_metakey()) {
kc = "Meta+" + kc;
kc = find_keycode_name(KEY_META) + ("+" + kc);
}
if (get_alt()) {
kc = "Alt+" + kc;
kc = find_keycode_name(KEY_ALT) + ("+" + kc);
}
if (get_shift()) {
kc = "Shift+" + kc;
kc = find_keycode_name(KEY_SHIFT) + ("+" + kc);
}
if (get_control()) {
kc = "Ctrl+" + kc;
kc = find_keycode_name(KEY_CONTROL) + ("+" + kc);
}
return kc;
}

43
core/os/keyboard.cpp
View file

@ -60,7 +60,11 @@ static const _KeyCodeText _keycodes[] = {
{KEY_PAGEDOWN ,"PageDown"},
{KEY_SHIFT ,"Shift"},
{KEY_CONTROL ,"Control"},
#ifdef OSX_ENABLED
{KEY_META ,"Command"},
#else
{KEY_META ,"Meta"},
#endif
{KEY_ALT ,"Alt"},
{KEY_CAPSLOCK ,"CapsLock"},
{KEY_NUMLOCK ,"NumLock"},
@ -390,14 +394,22 @@ bool keycode_has_unicode(uint32_t p_keycode) {
String keycode_get_string(uint32_t p_code) {
String codestr;
if (p_code & KEY_MASK_SHIFT)
codestr += "Shift+";
if (p_code & KEY_MASK_ALT)
codestr += "Alt+";
if (p_code & KEY_MASK_CTRL)
codestr += "Ctrl+";
if (p_code & KEY_MASK_META)
codestr += "Meta+";
if (p_code & KEY_MASK_SHIFT) {
codestr += find_keycode_name(KEY_SHIFT);
codestr += "+";
}
if (p_code & KEY_MASK_ALT) {
codestr += find_keycode_name(KEY_ALT);
codestr += "+";
}
if (p_code & KEY_MASK_CTRL) {
codestr += find_keycode_name(KEY_CONTROL);
codestr += "+";
}
if (p_code & KEY_MASK_META) {
codestr += find_keycode_name(KEY_META);
codestr += "+";
}
p_code &= KEY_CODE_MASK;
@ -433,6 +445,21 @@ int find_keycode(const String &p_code) {
return 0;
}
const char *find_keycode_name(int p_keycode) {
const _KeyCodeText *kct = &_keycodes[0];
while (kct->text) {
if (kct->code == p_keycode) {
return kct->text;
}
kct++;
}
return "";
}
struct _KeyCodeReplace {
int from;
int to;

1
core/os/keyboard.h
View file

@ -326,6 +326,7 @@ enum KeyModifierMask {
String keycode_get_string(uint32_t p_code);
bool keycode_has_unicode(uint32_t p_keycode);
int find_keycode(const String &p_code);
const char *find_keycode_name(int p_keycode);
int keycode_get_count();
int keycode_get_value_by_index(int p_index);
const char *keycode_get_name_by_index(int p_index);