diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/globals/global_defaults.h | 2 | ||||
| -rw-r--r-- | platform/iphone/globals/global_defaults.h | 2 | ||||
| -rw-r--r-- | platform/javascript/dom_keys.h | 30 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 2 |
4 files changed, 18 insertions, 18 deletions
diff --git a/platform/android/globals/global_defaults.h b/platform/android/globals/global_defaults.h index 64eb26c482..11617ddfd0 100644 --- a/platform/android/globals/global_defaults.h +++ b/platform/android/globals/global_defaults.h @@ -1,3 +1,3 @@ -void register_android_global_defaults();
\ No newline at end of file +void register_android_global_defaults(); diff --git a/platform/iphone/globals/global_defaults.h b/platform/iphone/globals/global_defaults.h index 25f1ae687e..305b600b43 100644 --- a/platform/iphone/globals/global_defaults.h +++ b/platform/iphone/globals/global_defaults.h @@ -1,3 +1,3 @@ -void register_iphone_global_defaults();
\ No newline at end of file +void register_iphone_global_defaults(); diff --git a/platform/javascript/dom_keys.h b/platform/javascript/dom_keys.h index 555c90a529..282b632e93 100644 --- a/platform/javascript/dom_keys.h +++ b/platform/javascript/dom_keys.h @@ -220,17 +220,17 @@ #define DOM_VK_WIN_OEM_CLEAR 0xFE int dom2godot_scancode(int dom_keycode) { - + if (DOM_VK_0 <= dom_keycode && dom_keycode <= DOM_VK_Z) { // ASCII intersection return dom_keycode; } - + if (DOM_VK_NUMPAD0 <= dom_keycode && dom_keycode <= DOM_VK_NUMPAD9) { // Numpad numbers return KEY_KP_0 + (dom_keycode - DOM_VK_NUMPAD0); } - + if (DOM_VK_F1 <= dom_keycode && dom_keycode <= DOM_VK_F16) { // F1-F16 return KEY_F1 + (dom_keycode - DOM_VK_F1); @@ -259,7 +259,7 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_PAUSE: return KEY_PAUSE; case DOM_VK_CAPS_LOCK: return KEY_CAPSLOCK; - + /* case DOM_VK_KANA: return KEY_UNKNOWN; case DOM_VK_HANGUL: return KEY_UNKNOWN; @@ -269,7 +269,7 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_HANJA: return KEY_UNKNOWN; case DOM_VK_KANJI: return KEY_UNKNOWN; */ - + case DOM_VK_ESCAPE: return KEY_ESCAPE; /* case DOM_VK_CONVERT: return KEY_UNKNOWN; @@ -277,8 +277,8 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_ACCEPT: return KEY_UNKNOWN; case DOM_VK_MODECHANGE: return KEY_UNKNOWN; */ - - case DOM_VK_SPACE: return KEY_SPACE; + + case DOM_VK_SPACE: return KEY_SPACE; case DOM_VK_PAGE_UP: return KEY_PAGEUP; case DOM_VK_PAGE_DOWN: return KEY_PAGEDOWN; case DOM_VK_END: return KEY_END; @@ -287,7 +287,7 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_UP: return KEY_UP; case DOM_VK_RIGHT: return KEY_RIGHT; case DOM_VK_DOWN: return KEY_DOWN; - + //case DOM_VK_SELECT: return KEY_UNKNOWN; case DOM_VK_PRINTSCREEN: // this is the usual printScreen key @@ -297,7 +297,7 @@ int dom2godot_scancode(int dom_keycode) { //case DOM_VK_EXECUTE: return KEY_UNKNOWN; case DOM_VK_INSERT: return KEY_INSERT; case DOM_VK_DELETE: return KEY_DELETE; - + case DOM_VK_META: case DOM_VK_WIN: return KEY_META; @@ -312,7 +312,7 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_SUBTRACT: return KEY_KP_SUBTRACT; case DOM_VK_DECIMAL: return KEY_KP_PERIOD; case DOM_VK_DIVIDE: return KEY_KP_DIVIDE; - + /* case DOM_VK_F17: return KEY_UNKNOWN; case DOM_VK_F18: return KEY_UNKNOWN; @@ -323,7 +323,7 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_F23: return KEY_UNKNOWN; case DOM_VK_F24: return KEY_UNKNOWN; */ - + case DOM_VK_NUM_LOCK: return KEY_NUMLOCK; case DOM_VK_SCROLL_LOCK: return KEY_SCROLLLOCK; @@ -352,11 +352,11 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_OPEN_CURLY_BRACKET: return KEY_BRACELEFT; case DOM_VK_CLOSE_CURLY_BRACKET: return KEY_BRACERIGHT; case DOM_VK_TILDE: return KEY_ASCIITILDE; - + case DOM_VK_VOLUME_MUTE: return KEY_VOLUMEMUTE; case DOM_VK_VOLUME_DOWN: return KEY_VOLUMEDOWN; case DOM_VK_VOLUME_UP: return KEY_VOLUMEUP; - + case DOM_VK_COMMA: return KEY_COMMA; case DOM_VK_PERIOD: return KEY_PERIOD; case DOM_VK_SLASH: return KEY_SLASH; @@ -365,9 +365,9 @@ int dom2godot_scancode(int dom_keycode) { case DOM_VK_BACK_SLASH: return KEY_BACKSLASH; case DOM_VK_CLOSE_BRACKET: return KEY_BRACKETRIGHT; case DOM_VK_QUOTE: return KEY_APOSTROPHE; - + // rest is OEM/unusual - + default: return KEY_UNKNOWN; }; } diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index adea26308f..810da1b3cd 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -103,7 +103,7 @@ class OS_Windows : public OS { HDC hDC; // Private GDI Device Context HINSTANCE hInstance; // Holds The Instance Of The Application HWND hWnd; - + HCURSOR hCursor; Size2 window_rect; |