implements PLN-0136
This commit is contained in:
@@ -43,9 +43,27 @@ impl FbViewport {
|
||||
|
||||
pub struct HostInputHandler {
|
||||
pub signals: InputSignals,
|
||||
system_controls: HostSystemControls,
|
||||
display_size: (usize, usize),
|
||||
}
|
||||
|
||||
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct HostSystemControls {
|
||||
home_requested: bool,
|
||||
}
|
||||
|
||||
impl HostSystemControls {
|
||||
pub fn request_home(&mut self) {
|
||||
self.home_requested = true;
|
||||
}
|
||||
|
||||
pub fn take_home_requested(&mut self) -> bool {
|
||||
let requested = self.home_requested;
|
||||
self.home_requested = false;
|
||||
requested
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for HostInputHandler {
|
||||
fn default() -> Self {
|
||||
Self::new((480, 270))
|
||||
@@ -54,35 +72,47 @@ impl Default for HostInputHandler {
|
||||
|
||||
impl HostInputHandler {
|
||||
pub fn new(display_size: (usize, usize)) -> Self {
|
||||
Self { signals: InputSignals::default(), display_size }
|
||||
Self {
|
||||
signals: InputSignals::default(),
|
||||
system_controls: HostSystemControls::default(),
|
||||
display_size,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn take_home_requested(&mut self) -> bool {
|
||||
self.system_controls.take_home_requested()
|
||||
}
|
||||
|
||||
pub fn handle_key_code(&mut self, code: KeyCode, state: ElementState) {
|
||||
let is_down = state == ElementState::Pressed;
|
||||
|
||||
match code {
|
||||
KeyCode::Escape | KeyCode::Home if is_down => self.system_controls.request_home(),
|
||||
|
||||
KeyCode::ArrowUp => self.signals.up_signal = is_down,
|
||||
KeyCode::ArrowDown => self.signals.down_signal = is_down,
|
||||
KeyCode::ArrowLeft => self.signals.left_signal = is_down,
|
||||
KeyCode::ArrowRight => self.signals.right_signal = is_down,
|
||||
|
||||
KeyCode::KeyA => self.signals.a_signal = is_down,
|
||||
KeyCode::KeyD => self.signals.b_signal = is_down,
|
||||
KeyCode::KeyW => self.signals.x_signal = is_down,
|
||||
KeyCode::KeyS => self.signals.y_signal = is_down,
|
||||
KeyCode::KeyQ => self.signals.l_signal = is_down,
|
||||
KeyCode::KeyE => self.signals.r_signal = is_down,
|
||||
|
||||
KeyCode::KeyZ => self.signals.start_signal = is_down,
|
||||
KeyCode::ShiftLeft | KeyCode::ShiftRight => self.signals.select_signal = is_down,
|
||||
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn handle_event(&mut self, event: &WindowEvent, window: &Window) {
|
||||
match event {
|
||||
WindowEvent::KeyboardInput { event, .. } => {
|
||||
if let PhysicalKey::Code(code) = event.physical_key {
|
||||
let is_down = event.state == ElementState::Pressed;
|
||||
|
||||
match code {
|
||||
KeyCode::ArrowUp => self.signals.up_signal = is_down,
|
||||
KeyCode::ArrowDown => self.signals.down_signal = is_down,
|
||||
KeyCode::ArrowLeft => self.signals.left_signal = is_down,
|
||||
KeyCode::ArrowRight => self.signals.right_signal = is_down,
|
||||
|
||||
KeyCode::KeyA => self.signals.a_signal = is_down,
|
||||
KeyCode::KeyD => self.signals.b_signal = is_down,
|
||||
KeyCode::KeyW => self.signals.x_signal = is_down,
|
||||
KeyCode::KeyS => self.signals.y_signal = is_down,
|
||||
KeyCode::KeyQ => self.signals.l_signal = is_down,
|
||||
KeyCode::KeyE => self.signals.r_signal = is_down,
|
||||
|
||||
KeyCode::KeyZ => self.signals.start_signal = is_down,
|
||||
KeyCode::ShiftLeft | KeyCode::ShiftRight => {
|
||||
self.signals.select_signal = is_down
|
||||
}
|
||||
|
||||
_ => {}
|
||||
}
|
||||
self.handle_key_code(code, event.state);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,3 +164,69 @@ impl HostInputHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn assert_no_pad_signal(signals: InputSignals) {
|
||||
assert!(!signals.up_signal);
|
||||
assert!(!signals.down_signal);
|
||||
assert!(!signals.left_signal);
|
||||
assert!(!signals.right_signal);
|
||||
assert!(!signals.a_signal);
|
||||
assert!(!signals.b_signal);
|
||||
assert!(!signals.x_signal);
|
||||
assert!(!signals.y_signal);
|
||||
assert!(!signals.l_signal);
|
||||
assert!(!signals.r_signal);
|
||||
assert!(!signals.start_signal);
|
||||
assert!(!signals.select_signal);
|
||||
assert!(!signals.f_signal);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn escape_requests_home_without_mutating_guest_pad() {
|
||||
let mut input = HostInputHandler::default();
|
||||
|
||||
input.handle_key_code(KeyCode::Escape, ElementState::Pressed);
|
||||
|
||||
assert!(input.take_home_requested());
|
||||
assert!(!input.take_home_requested());
|
||||
assert_no_pad_signal(input.signals);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn physical_home_requests_home_without_mutating_guest_pad() {
|
||||
let mut input = HostInputHandler::default();
|
||||
|
||||
input.handle_key_code(KeyCode::Home, ElementState::Pressed);
|
||||
|
||||
assert!(input.take_home_requested());
|
||||
assert_no_pad_signal(input.signals);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn home_release_does_not_emit_a_new_home_request() {
|
||||
let mut input = HostInputHandler::default();
|
||||
|
||||
input.handle_key_code(KeyCode::Home, ElementState::Released);
|
||||
|
||||
assert!(!input.take_home_requested());
|
||||
assert_no_pad_signal(input.signals);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existing_keyboard_pad_mapping_is_preserved() {
|
||||
let mut input = HostInputHandler::default();
|
||||
|
||||
input.handle_key_code(KeyCode::KeyZ, ElementState::Pressed);
|
||||
input.handle_key_code(KeyCode::ShiftLeft, ElementState::Pressed);
|
||||
input.handle_key_code(KeyCode::ArrowUp, ElementState::Pressed);
|
||||
|
||||
assert!(input.signals.start_signal);
|
||||
assert!(input.signals.select_signal);
|
||||
assert!(input.signals.up_signal);
|
||||
assert!(!input.take_home_requested());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -372,6 +372,12 @@ impl ApplicationHandler for HostRunner {
|
||||
self.firmware.os.fs().mount(Box::new(backend));
|
||||
}
|
||||
|
||||
if self.input.take_home_requested() {
|
||||
self.firmware.request_home_from_host();
|
||||
self.invalidate_host_surface();
|
||||
self.request_redraw_if_needed();
|
||||
}
|
||||
|
||||
// 3. Timing Management (The heart of determinism).
|
||||
// We measure the elapsed time since the last iteration and add it to an
|
||||
// accumulator. We then execute exactly as many 60Hz slices as the
|
||||
|
||||
Reference in New Issue
Block a user