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

Use positional keyboard mapping instead of symbolic in the SDL2 frontend

Browse source 
Former-commit-id: 778b79f4afd5d290399e518f9b1a45470c5ad3a9
Former-commit-id: 58b2e0dd75acbe01fe0f4e73c0fa73af8caa88c2
This commit is contained in:
Tibor Nagy 2020-05-03 22:03:57 +02:00 committed by MishMish
parent 27a7cb14cf
commit b2928de614
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
platform/rustboyadvance-sdl2/src/input.rs
View file

@ -1,4 +1,4 @@
use sdl2::keyboard::Keycode; use sdl2::keyboard::Scancode;
use rustboyadvance_core::keypad as gba_keypad; use rustboyadvance_core::keypad as gba_keypad;
use rustboyadvance_core::InputInterface; use rustboyadvance_core::InputInterface;
@ -17,30 +17,30 @@ impl InputInterface for Sdl2Input {
} }
impl Sdl2Input { impl Sdl2Input {
pub fn on_keyboard_key_down(&mut self, keycode: Keycode) { pub fn on_keyboard_key_down(&mut self, scancode: Scancode) {
if let Some(key) = keycode_to_keypad(keycode) { if let Some(key) = scancode_to_keypad(scancode) {
self.keyinput.set_bit(key as usize, false); self.keyinput.set_bit(key as usize, false);
} }
} }
pub fn on_keyboard_key_up(&mut self, keycode: Keycode) { pub fn on_keyboard_key_up(&mut self, scancode: Scancode) {
if let Some(key) = keycode_to_keypad(keycode) { if let Some(key) = scancode_to_keypad(scancode) {
self.keyinput.set_bit(key as usize, true); self.keyinput.set_bit(key as usize, true);
} }
} }
} }
fn keycode_to_keypad(keycode: Keycode) -> Option<gba_keypad::Keys> { fn scancode_to_keypad(scancode: Scancode) -> Option<gba_keypad::Keys> {
match keycode { match scancode {
Keycode::Up => Some(gba_keypad::Keys::Up), Scancode::Up => Some(gba_keypad::Keys::Up),
Keycode::Down => Some(gba_keypad::Keys::Down), Scancode::Down => Some(gba_keypad::Keys::Down),
Keycode::Left => Some(gba_keypad::Keys::Left), Scancode::Left => Some(gba_keypad::Keys::Left),
Keycode::Right => Some(gba_keypad::Keys::Right), Scancode::Right => Some(gba_keypad::Keys::Right),
Keycode::Z => Some(gba_keypad::Keys::ButtonB), Scancode::Z => Some(gba_keypad::Keys::ButtonB),
Keycode::X => Some(gba_keypad::Keys::ButtonA), Scancode::X => Some(gba_keypad::Keys::ButtonA),
Keycode::Return => Some(gba_keypad::Keys::Start), Scancode::Return => Some(gba_keypad::Keys::Start),
Keycode::Backspace => Some(gba_keypad::Keys::Select), Scancode::Backspace => Some(gba_keypad::Keys::Select),
Keycode::A => Some(gba_keypad::Keys::ButtonL), Scancode::A => Some(gba_keypad::Keys::ButtonL),
Keycode::S => Some(gba_keypad::Keys::ButtonR), Scancode::S => Some(gba_keypad::Keys::ButtonR),
_ => None, _ => None,
} }
} }

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

@ -1,7 +1,7 @@
use sdl2; use sdl2;
use sdl2::event::Event; use sdl2::event::Event;
use sdl2::image::{InitFlag, LoadTexture}; use sdl2::image::{InitFlag, LoadTexture};
use sdl2::keyboard::Keycode; use sdl2::keyboard::Scancode;
use sdl2::messagebox::*; use sdl2::messagebox::*;
use sdl2::pixels::Color; use sdl2::pixels::Color;
use sdl2::rect::Rect; use sdl2::rect::Rect;
@ -255,18 +255,18 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
for event in event_pump.poll_iter() { for event in event_pump.poll_iter() {
match event { match event {
Event::KeyDown { Event::KeyDown {
keycode: Some(keycode), scancode: Some(scancode),
.. ..
} => match keycode { } => match scancode {
Keycode::Space => frame_limiter = false, Scancode::Space => frame_limiter = false,
k => input.borrow_mut().on_keyboard_key_down(k), k => input.borrow_mut().on_keyboard_key_down(k),
}, },
Event::KeyUp { Event::KeyUp {
keycode: Some(keycode), scancode: Some(scancode),
.. ..
} => match keycode { } => match scancode {
#[cfg(feature = "debugger")] #[cfg(feature = "debugger")]
Keycode::F1 => { Scancode::F1 => {
let mut debugger = Debugger::new(gba); let mut debugger = Debugger::new(gba);
info!("starting debugger..."); info!("starting debugger...");
debugger.repl(matches.value_of("script_file")).unwrap(); debugger.repl(matches.value_of("script_file")).unwrap();
@ -274,8 +274,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
info!("ending debugger...") info!("ending debugger...")
} }
#[cfg(feature = "gdb")] #[cfg(feature = "gdb")]
Keycode::F2 => spawn_and_run_gdb_server(&mut gba, DEFAULT_GDB_SERVER_ADDR)?, Scancode::F2 => spawn_and_run_gdb_server(&mut gba, DEFAULT_GDB_SERVER_ADDR)?,
Keycode::F5 => { Scancode::F5 => {
info!("Saving state ..."); info!("Saving state ...");
let save = gba.save_state()?; let save = gba.save_state()?;
write_bin_file(&savestate_path, &save)?; write_bin_file(&savestate_path, &save)?;
@ -285,7 +285,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
bytesize::ByteSize::b(save.len() as u64) bytesize::ByteSize::b(save.len() as u64)
); );
} }
Keycode::F9 => { Scancode::F9 => {
if savestate_path.is_file() { if savestate_path.is_file() {
let save = read_bin_file(&savestate_path)?; let save = read_bin_file(&savestate_path)?;
info!("Restoring state from {:?}...", savestate_path); info!("Restoring state from {:?}...", savestate_path);
@ -295,7 +295,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
info!("Savestate not created, please create one by pressing F5"); info!("Savestate not created, please create one by pressing F5");
} }
} }
Keycode::Space => frame_limiter = true, Scancode::Space => frame_limiter = true,
k => input.borrow_mut().on_keyboard_key_up(k), k => input.borrow_mut().on_keyboard_key_up(k),
}, },
Event::Quit { .. } => break 'running, Event::Quit { .. } => break 'running,