Cleanup key handling

This commit is contained in:
Kevin Hamacher 2020-02-20 10:28:42 +01:00
parent 3b28268279
commit ab7ee0988f

View File

@ -176,71 +176,28 @@ impl Interconnect {
self.display.dump_vram(); self.display.dump_vram();
return TickResult::Shutdown; return TickResult::Shutdown;
} }
Event::KeyDown { Event::KeyDown { keycode: k, .. } => match k {
keycode: Some(Keycode::Left), Some(Keycode::Left) => self.press_key(Key::LEFT),
.. Some(Keycode::Down) => self.press_key(Key::DOWN),
} => self.press_key(Key::LEFT), Some(Keycode::Up) => self.press_key(Key::UP),
Event::KeyDown { Some(Keycode::Right) => self.press_key(Key::RIGHT),
keycode: Some(Keycode::Down), Some(Keycode::A) => self.press_key(Key::START),
.. Some(Keycode::S) => self.press_key(Key::SELECT),
} => self.press_key(Key::DOWN), Some(Keycode::Z) => self.press_key(Key::A),
Event::KeyDown { Some(Keycode::X) => self.press_key(Key::B),
keycode: Some(Keycode::Up), _ => {}
.. },
} => self.press_key(Key::UP), Event::KeyUp { keycode: k, .. } => match k {
Event::KeyDown { Some(Keycode::Left) => self.release_key(Key::LEFT),
keycode: Some(Keycode::Right), Some(Keycode::Down) => self.release_key(Key::DOWN),
.. Some(Keycode::Up) => self.release_key(Key::UP),
} => self.press_key(Key::RIGHT), Some(Keycode::Right) => self.release_key(Key::RIGHT),
Event::KeyDown { Some(Keycode::A) => self.release_key(Key::START),
keycode: Some(Keycode::A), Some(Keycode::S) => self.release_key(Key::SELECT),
.. Some(Keycode::Z) => self.release_key(Key::A),
} => self.press_key(Key::START), Some(Keycode::X) => self.release_key(Key::B),
Event::KeyDown { _ => {}
keycode: Some(Keycode::S), },
..
} => self.press_key(Key::SELECT),
Event::KeyDown {
keycode: Some(Keycode::Z),
..
} => self.press_key(Key::A),
Event::KeyDown {
keycode: Some(Keycode::X),
..
} => self.press_key(Key::B),
Event::KeyUp {
keycode: Some(Keycode::Left),
..
} => self.release_key(Key::LEFT),
Event::KeyUp {
keycode: Some(Keycode::Down),
..
} => self.release_key(Key::DOWN),
Event::KeyUp {
keycode: Some(Keycode::Up),
..
} => self.release_key(Key::UP),
Event::KeyUp {
keycode: Some(Keycode::Right),
..
} => self.release_key(Key::RIGHT),
Event::KeyUp {
keycode: Some(Keycode::A),
..
} => self.release_key(Key::START),
Event::KeyUp {
keycode: Some(Keycode::S),
..
} => self.release_key(Key::SELECT),
Event::KeyUp {
keycode: Some(Keycode::Z),
..
} => self.release_key(Key::A),
Event::KeyUp {
keycode: Some(Keycode::X),
..
} => self.release_key(Key::B),
_ => {} _ => {}
} }
} }