mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-14 00:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1238 from awwdev/master

Browse Source 
rename sdl2 KeyCode to Keycode
This commit is contained in:
Jeroen van Rijn
2021-10-23 03:58:32 -07:00
committed by GitHub
parent 8113182d5c faa9df8735
commit eebf49ba72
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vendor/sdl2/sdl_keyboard.odin vendored
View File

@@ -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() ---

6
vendor/sdl2/sdl_keycode.odin vendored
View File

@@ -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',