Rework input devices

truncate_client/Cargo.toml

@@ -7,7 +7,8 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-eframe = "0.26.2"
+eframe = { version = "0.26.2", features = ["serde"] }
+egui = { version = "*", features = ["serde"] }
 epaint = { version = "0.26.2", features = ["color-hex"] }
 color-hex = "0.2.0"
 futures-util = { version = "0.3", default-features = false, features = [
@@ -33,7 +34,7 @@ tracing = "0.1.40"
 tokio = { version = "1", features = ["full"] }
 tokio-tungstenite = { version = "0.18", features = ["rustls-tls-webpki-roots"] }
 tungstenite = { version = "0.18", default-features = false }
-gilrs = "0.10"
+gilrs = { version = "0.10", features = ["serde-serialize"] }
 
 # web:
 [target.'cfg(target_arch = "wasm32")'.dependencies]

truncate_client/src/app_inner.rs

@@ -248,13 +248,21 @@ pub fn render(outer: &mut OuterApplication, ui: &mut egui::Ui, current_time: Dur
         outer.tx_player.try_send(msg).unwrap();
     };
 
+    let mut switchboard = outer.switchboard.lock().unwrap();
+
     match &mut outer.game_status {
         GameStatus::None(_, _) => { /* handled above */ }
         GameStatus::Generator(generator) => {
-            generator.render(ui, &outer.theme, current_time);
+            generator.render(ui, &mut switchboard, &outer.theme, current_time);
         }
         GameStatus::Tutorial(tutorial) => {
-            for msg in tutorial.render(ui, outer.map_texture.clone(), &outer.theme, current_time) {
+            for msg in tutorial.render(
+                ui,
+                outer.map_texture.clone(),
+                &outer.theme,
+                &mut switchboard,
+                current_time,
+            ) {
                 send(msg);
             }
         }
@@ -296,6 +304,7 @@ pub fn render(outer: &mut OuterApplication, ui: &mut egui::Ui, current_time: Dur
                 &outer.theme,
                 current_time,
                 &outer.backchannel,
+                &mut switchboard,
                 &outer.logged_in_as,
             ) {
                 send(msg);
@@ -308,6 +317,7 @@ pub fn render(outer: &mut OuterApplication, ui: &mut egui::Ui, current_time: Dur
                 &outer.theme,
                 current_time,
                 &outer.backchannel,
+                &mut switchboard,
                 &outer.logged_in_as,
             ) {
                 send(msg);
@@ -379,18 +389,23 @@ pub fn render(outer: &mut OuterApplication, ui: &mut egui::Ui, current_time: Dur
             }
         }
         GameStatus::Active(game) => {
-            if let Some(msg) = game.render(ui, current_time, None) {
+            for msg in game.render(ui, current_time, &mut switchboard, None) {
                 // Online games can only play as the logged in player
                 debug_assert!(msg.player_id.is_none());
                 send(msg.message);
             }
         }
         GameStatus::Concluded(game, _winner) => {
-            if let Some(AssignedPlayerMessage {
-                message: PlayerMessage::Rematch,
-                ..
-            }) = game.render(ui, current_time, None)
-            {
+            let msgs = game.render(ui, current_time, &mut switchboard, None);
+            if msgs.iter().any(|m| {
+                matches!(
+                    m,
+                    AssignedPlayerMessage {
+                        message: PlayerMessage::Rematch,
+                        ..
+                    }
+                )
+            }) {
                 send(PlayerMessage::Rematch);
             }
         }

truncate_client/src/app_outer.rs

@@ -1,4 +1,4 @@
-use std::sync::OnceLock;
+use std::sync::{Arc, Mutex, OnceLock};
 
 use futures::channel::mpsc::{Receiver, Sender};
 use serde::{Deserialize, Serialize};
@@ -8,6 +8,7 @@ type S = Sender<PlayerMessage>;
 
 use super::utils::Theme;
 use crate::app_inner::AppInnerStorage;
+use crate::utils::control_devices::Switchboard;
 use crate::{app_inner, utils::glyph_utils::Glypher};
 use eframe::egui::{self, Frame, Margin, TextureOptions};
 #[cfg(target_arch = "wasm32")]
@@ -116,6 +117,7 @@ pub struct OuterApplication {
     pub log_frames: bool,
     pub frames: debug::FrameHistory,
     pub event_dispatcher: EventDispatcher,
+    pub switchboard: Arc<Mutex<Switchboard>>,
 }
 
 impl OuterApplication {
@@ -282,6 +284,7 @@ impl OuterApplication {
                 tx_player,
                 sent: vec![],
             },
+            switchboard: Arc::new(Mutex::new(Switchboard::load())),
         }
     }
 }

truncate_client/src/regions/active_game/mod.rs

@@ -22,7 +22,7 @@ use hashbrown::HashMap;
 use crate::{
     lil_bits::{BoardUI, DictionaryUI},
     utils::{
-        control_devices,
+        control_devices::{self, Switchboard},
         depot::{
             AestheticDepot, AudioDepot, BoardDepot, GameplayDepot, InteractionDepot, RegionDepot,
             TimingDepot, TruncateDepot, UIStateDepot,
@@ -34,7 +34,7 @@ use crate::{
 };
 
 #[cfg(not(target_arch = "wasm32"))]
-use crate::utils::control_devices::gamepad::GamepadInput;
+use crate::utils::control_devices::gamepad::GamepadManager;
 
 mod actions_menu;
 mod control_strip;
@@ -76,8 +76,6 @@ pub struct ActiveGame {
     pub turn_reports: Vec<Vec<Change>>,
     pub location: GameLocation,
     pub dictionary_ui: Option<DictionaryUI>,
-    #[cfg(not(target_arch = "wasm32"))]
-    pub gamepad_input: Arc<Mutex<GamepadInput>>,
 }
 
 impl ActiveGame {
@@ -171,8 +169,6 @@ impl ActiveGame {
             turn_reports: vec![],
             location,
             dictionary_ui: None,
-            #[cfg(not(target_arch = "wasm32"))]
-            gamepad_input: Arc::new(Mutex::new(GamepadInput::new())),
         }
     }
 }
@@ -182,9 +178,11 @@ impl ActiveGame {
         &mut self,
         ui: &mut egui::Ui,
         current_time: Duration,
+        switchboard: &mut Switchboard,
         game_ref: Option<&truncate_core::game::Game>,
-    ) -> Option<AssignedPlayerMessage> {
+    ) -> Vec<AssignedPlayerMessage> {
         self.depot.timing.current_time = current_time;
+        let mut msgs = vec![];
         let cur_tick = get_qs_tick(current_time);
         if cur_tick > self.depot.aesthetics.qs_tick {
             self.depot.aesthetics.qs_tick = cur_tick;
@@ -206,20 +204,7 @@ impl ActiveGame {
             }
         }
 
-        let kb_msg = control_devices::keyboard::handle_input(
-            ui.ctx(),
-            &self.board,
-            &self.hands,
-            &mut self.depot,
-        );
-
-        #[cfg(not(target_arch = "wasm32"))]
-        let pad_msg = self.gamepad_input.lock().unwrap().handle_input(
-            ui.ctx(),
-            &self.board,
-            &self.hands,
-            &mut self.depot,
-        );
+        msgs.extend(switchboard.operate(ui.ctx(), &self.board, &self.hands, &mut self.depot));
 
         if !self.depot.ui_state.is_touch {
             // If we ever receive any touch event,
@@ -323,10 +308,11 @@ impl ActiveGame {
             .or(dict_player_message.map(|message| wrap(message)))
             .or(sidebar_player_message.map(|message| wrap(message)));
 
-        #[cfg(not(target_arch = "wasm32"))]
-        return kb_msg.or(pad_msg).or(player_message);
-        #[cfg(target_arch = "wasm32")]
-        kb_msg.or(player_message)
+        if let Some(player_message) = player_message {
+            msgs.push(player_message);
+        }
+
+        msgs
     }
 
     pub fn apply_new_timing(&mut self, state_message: GameStateMessage) {