devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Support controll remove/add events for SDL2 frontend

Browse source 
Former-commit-id: b0e97f9c9b3f0b32140f1425159088270be6a433
Former-commit-id: b158c5c4ac491561f33f71d2bcd5cf069d55b343
This commit is contained in:
Michel Heily 2020-05-23 11:45:25 +03:00
parent 91515b6b10
commit c131e73ce1
1 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
platform/rustboyadvance-sdl2/src/main.rs
View file

@ -162,7 +162,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
.filter(|&id| controller_subsystem.is_game_controller(id)) .filter(|&id| controller_subsystem.is_game_controller(id))
.collect::<Vec<u32>>(); .collect::<Vec<u32>>();
let _active_controller = match available_controllers.first() { let mut active_controller = match available_controllers.first() {
Some(&id) => { Some(&id) => {
let controller = controller_subsystem.open(id)?; let controller = controller_subsystem.open(id)?;
info!("Found game controller: {}", controller.name()); info!("Found game controller: {}", controller.name());
@ -295,6 +295,27 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
Event::ControllerAxisMotion { axis, value, .. } => { Event::ControllerAxisMotion { axis, value, .. } => {
input.borrow_mut().on_axis_motion(axis, value); input.borrow_mut().on_axis_motion(axis, value);
} }
Event::ControllerDeviceRemoved { which, .. } => {
let removed = if let Some(active_controller) = &active_controller {
active_controller.instance_id() == (which as i32)
} else {
false
};
if removed {
let name = active_controller
.and_then(|controller| Some(controller.name()))
.unwrap();
info!("Removing game controller: {}", name);
active_controller = None;
}
}
Event::ControllerDeviceAdded { which, .. } => {
if active_controller.is_none() {
let controller = controller_subsystem.open(which)?;
info!("Adding game controller: {}", controller.name());
active_controller = Some(controller);
}
}
Event::Quit { .. } => break 'running, Event::Quit { .. } => break 'running,
Event::DropFile { filename, .. } => { Event::DropFile { filename, .. } => {
// load the new rom // load the new rom