godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

Use Key enum instead of plain integers

Browse Source
This commit is contained in:
Aaron Franke
2021-06-20 13:12:33 -04:00
parent 18bd0fee5a
commit fa3a32a2d6
43 changed files with 173 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
platform/linuxbsd/key_mapping_x11.cpp
View File

@@ -34,7 +34,7 @@
struct _XTranslatePair {
KeySym keysym;
unsigned int keycode;
Key keycode;
};
static _XTranslatePair _xkeysym_to_keycode[] = {
@@ -176,7 +176,7 @@ static _XTranslatePair _xkeysym_to_keycode[] = {
{ XF86XK_LaunchC, KEY_LAUNCHE },
{ XF86XK_LaunchD, KEY_LAUNCHF },
{ 0, 0 }
{ 0, KEY_NONE }
};
struct _TranslatePair {
@@ -309,11 +309,11 @@ unsigned int KeyMappingX11::get_scancode(unsigned int p_code) {
return keycode;
}
unsigned int KeyMappingX11::get_keycode(KeySym p_keysym) {
Key KeyMappingX11::get_keycode(KeySym p_keysym) {
// kinda bruteforce.. could optimize.
if (p_keysym < 0x100) { // Latin 1, maps 1-1
return p_keysym;
return (Key)p_keysym;
}
// look for special key
@@ -323,14 +323,14 @@ unsigned int KeyMappingX11::get_keycode(KeySym p_keysym) {
}
}
return 0;
return KEY_NONE;
}
KeySym KeyMappingX11::get_keysym(unsigned int p_code) {
KeySym KeyMappingX11::get_keysym(Key p_code) {
// kinda bruteforce.. could optimize.
if (p_code < 0x100) { // Latin 1, maps 1-1
return p_code;
return (KeySym)p_code;
}
// look for special key
@@ -340,7 +340,7 @@ KeySym KeyMappingX11::get_keysym(unsigned int p_code) {
}
}
return 0;
return (KeySym)KEY_NONE;
}
/***** UNICODE CONVERSION ******/