diff options
| author | Jeroen van Rijn <Kelimion@users.noreply.github.com> | 2021-10-23 03:58:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 03:58:32 -0700 |
| commit | eebf49ba721959f39e2a8cd71e409bd5eda4c213 (patch) | |
| tree | 24c4e1ec3240c490168fd8b0d5fe2c5f1646f39e | |
| parent | 8113182d5cd378173e3bb1ac226f85dd7f598c1d (diff) | |
| parent | faa9df87359e9fb24423e8d14f3f1f4e36a946f4 (diff) | |
Merge pull request #1238 from awwdev/master
rename sdl2 KeyCode to Keycode
| -rw-r--r-- | vendor/sdl2/sdl_keyboard.odin | 10 | ||||
| -rw-r--r-- | vendor/sdl2/sdl_keycode.odin | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vendor/sdl2/sdl_keyboard.odin b/vendor/sdl2/sdl_keyboard.odin index 507b549cb..86112863a 100644 --- a/vendor/sdl2/sdl_keyboard.odin +++ b/vendor/sdl2/sdl_keyboard.odin @@ -9,7 +9,7 @@ when ODIN_OS == "freebsd" { foreign import lib "system:SDL2" } Keysym :: struct { scancode: Scancode, /**< SDL physical key code - see ::SDL_Scancode for details */ - sym: KeyCode, /**< SDL virtual key code - see ::SDL_KeyCode for details */ + sym: Keycode, /**< SDL virtual key code - see ::SDL_Keycode for details */ mod: Keymod, /**< current key modifiers */ unused: u32, } @@ -19,12 +19,12 @@ Keysym :: struct { foreign lib { GetKeyboardFocus :: proc() -> ^Window --- GetKeyboardState :: proc(numkeys: ^c.int) -> [^]u8 --- - GetKeyFromScancode :: proc(scancode: Scancode) -> KeyCode --- - GetScancodeFromKey :: proc(key: KeyCode) -> Scancode --- + GetKeyFromScancode :: proc(scancode: Scancode) -> Keycode --- + GetScancodeFromKey :: proc(key: Keycode) -> Scancode --- GetScancodeName :: proc(scancode: Scancode) -> cstring --- GetScancodeFromName :: proc(name: cstring) -> Scancode --- - GetKeyName :: proc(key: KeyCode) -> cstring --- - GetKeyFromName :: proc(name: cstring) -> KeyCode --- + GetKeyName :: proc(key: Keycode) -> cstring --- + GetKeyFromName :: proc(name: cstring) -> Keycode --- StartTextInput :: proc() --- IsTextInputActive :: proc() -> bool --- StopTextInput :: proc() --- diff --git a/vendor/sdl2/sdl_keycode.odin b/vendor/sdl2/sdl_keycode.odin index 2b79d0e47..73637f072 100644 --- a/vendor/sdl2/sdl_keycode.odin +++ b/vendor/sdl2/sdl_keycode.odin @@ -2,11 +2,11 @@ package sdl2 SCANCODE_MASK :: 1<<30 -SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> KeyCode { - return KeyCode(i32(X) | SCANCODE_MASK) +SCANCODE_TO_KEYCODE :: #force_inline proc "c" (X: Scancode) -> Keycode { + return Keycode(i32(X) | SCANCODE_MASK) } -KeyCode :: enum i32 { +Keycode :: enum i32 { UNKNOWN = 0, RETURN = '\r', |