Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add GameControllerType functionality and bump to SDL 2.30.5 #1420

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
+218 −98
Open

Add GameControllerType functionality and bump to SDL 2.30.5 #1420

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
903b9f3
Update SDL to 2.30.2
naumazeredo Apr 20, 2024
cf98f19
Remove unneeded clones in sdl2-sys/build.rs
naumazeredo Apr 20, 2024
d33c01a
Add GameControllerType
naumazeredo Apr 20, 2024
9d233cb
Reorder GameControllerType list
naumazeredo Apr 23, 2024
b2ec9f9
Merge remote-tracking branch 'upstream/master'
naumazeredo Jul 6, 2024
f97f4fe
Bump SDL version
naumazeredo Jul 6, 2024
53efd51
Fix tests
naumazeredo Jul 6, 2024
911a6db
Run cargo fmt
naumazeredo Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reorder GameControllerType list
@naumazeredo
naumazeredo committed Apr 23, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 9d233cb297a4f1b86a05581ec559b2c93a9f0082
18 changes: 9 additions & 9 deletions src/sdl2/controller.rs
View file
Original file line number Diff line number Diff line change
@@ -209,16 +209,16 @@ impl GameControllerSubsystem {
#[repr(i32)]
pub enum GameControllerType {
Unknown = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_UNKNOWN as i32,
Virtual = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL as i32,
Xbox360 = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOX360 as i32,
Xboxone = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE as i32,
XboxOne = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE as i32,
PS3 = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS3 as i32,
PS4 = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS4 as i32,
NintendoSwitchPro = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO as i32,
Virtual = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL as i32,
PS5 = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS5 as i32,
AmazonLuna = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_AMAZON_LUNA as i32,
GoogleStadia = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_GOOGLE_STADIA as i32,
NvidiaShield = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NVIDIA_SHIELD as i32,
NintendoSwitchPro = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO as i32,
NintendoSwitchJoyconLeft = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT as i32,
NintendoSwitchJoyconRight = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT as i32,
NintendoSwitchJoyconPair = sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR as i32,
@@ -228,16 +228,16 @@ impl GameControllerType {
pub fn from_ll(bitflags: sys::SDL_GameControllerType) -> GameControllerType {
match bitflags {
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_UNKNOWN => GameControllerType::Unknown,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL => GameControllerType::Virtual,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOX360 => GameControllerType::Xbox360,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE => GameControllerType::Xboxone,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE => GameControllerType::XboxOne,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS3 => GameControllerType::PS3,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS4 => GameControllerType::PS4,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO => GameControllerType::NintendoSwitchPro,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL => GameControllerType::Virtual,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS5 => GameControllerType::PS5,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_AMAZON_LUNA => GameControllerType::AmazonLuna,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_GOOGLE_STADIA => GameControllerType::GoogleStadia,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NVIDIA_SHIELD => GameControllerType::NvidiaShield,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO => GameControllerType::NintendoSwitchPro,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT => GameControllerType::NintendoSwitchJoyconLeft,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT => GameControllerType::NintendoSwitchJoyconRight,
sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR => GameControllerType::NintendoSwitchJoyconPair,
@@ -249,16 +249,16 @@ impl GameControllerType {
pub fn to_ll(self) -> sys::SDL_GameControllerType {
match self {
GameControllerType::Unknown => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_UNKNOWN,
GameControllerType::Virtual => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL,
GameControllerType::Xbox360 => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOX360,
GameControllerType::Xboxone => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE,
GameControllerType::XboxOne => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_XBOXONE,
GameControllerType::PS3 => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS3,
GameControllerType::PS4 => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS4,
GameControllerType::NintendoSwitchPro => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO,
GameControllerType::Virtual => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_VIRTUAL,
GameControllerType::PS5 => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_PS5,
GameControllerType::AmazonLuna => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_AMAZON_LUNA,
GameControllerType::GoogleStadia => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_GOOGLE_STADIA,
GameControllerType::NvidiaShield => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NVIDIA_SHIELD,
GameControllerType::NintendoSwitchPro => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_PRO,
GameControllerType::NintendoSwitchJoyconLeft => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_LEFT,
GameControllerType::NintendoSwitchJoyconRight => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_RIGHT,
GameControllerType::NintendoSwitchJoyconPair => sys::SDL_GameControllerType::SDL_CONTROLLER_TYPE_NINTENDO_SWITCH_JOYCON_PAIR,