pbwraith/gopher64-netplay
Archived
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

match controllers on android (#959)

Browse Source 
* match controllers on android

* more

* more
This commit is contained in:
Logan McNaughton 2026-05-27 12:03:36 +02:00 committed by GitHub
parent f80f0f5f02
commit 69e3ebcc26
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/android.rs
View File

@ -132,7 +132,6 @@ bind_java_type! {
fn get_vendor_id() -> jint,
fn get_product_id() -> jint,
fn get_name() -> JString,
fn get_descriptor() -> JString,
},
}
@ -395,10 +394,10 @@ fn list_controllers_on_jvm(env: &mut Env<'_>) -> jni::errors::Result<Vec<Control
} else {
"Unknown controller".to_string()
};
let descriptor = if let Ok(descriptor) = device.get_descriptor(env)
&& let Ok(descriptor) = descriptor.try_to_string(env)
let descriptor = if let Ok(product_id) = device.get_product_id(env)
&& let Ok(vendor_id) = device.get_vendor_id(env)
{
descriptor
format!("{}:{}:{}", name, vendor_id, product_id)
} else {
String::new()
};

31
src/ui/input.rs
View File

@ -1177,10 +1177,33 @@ pub fn init(ui: &mut ui::Ui) {
let mut joystick_id = sdl3_sys::everything::SDL_JoystickID(0);
for joystick in get_joysticks().iter() {
let path = unsafe { sdl3_sys::joystick::SDL_GetJoystickPathForID(*joystick) };
if !path.is_null()
&& unsafe { std::ffi::CStr::from_ptr(path).to_str().unwrap() }
== controller_assignment
let path = if cfg!(target_os = "android") {
let name = if let name =
unsafe { sdl3_sys::joystick::SDL_GetJoystickNameForID(*joystick) }
&& !name.is_null()
{
unsafe { std::ffi::CStr::from_ptr(name).to_str().unwrap() }.to_string()
} else {
"Unknown controller".to_string()
};
let vendor_id =
unsafe { sdl3_sys::joystick::SDL_GetJoystickVendorForID(*joystick) };
let product_id =
unsafe { sdl3_sys::joystick::SDL_GetJoystickProductForID(*joystick) };
Some(format!("{}:{}:{}", name, vendor_id, product_id))
} else {
let path = unsafe { sdl3_sys::joystick::SDL_GetJoystickPathForID(*joystick) };
if !path.is_null() {
Some(
unsafe { std::ffi::CStr::from_ptr(path).to_str().unwrap() }.to_string(),
)
} else {
None
}
};
if let Some(path) = path
&& path == *controller_assignment
&& unsafe { sdl3_sys::joystick::SDL_GetJoystickFromID(*joystick) }.is_null()
&& unsafe { sdl3_sys::gamepad::SDL_GetGamepadFromID(*joystick) }.is_null()
{