From f310b53a987090aa34400f5945882c70d5580756 Mon Sep 17 00:00:00 2001
From: bel <bel@bel.bel>
Date: Wed, 22 Mar 2023 21:55:51 -0600
Subject: [PATCH] drop extra alias

---
 src/.gui.rs.swp | Bin 0 -> 16384 bytes
 src/gui.rs      | 104 +++++++++++++++---------------------------------
 2 files changed, 32 insertions(+), 72 deletions(-)
 create mode 100644 src/.gui.rs.swp

diff --git a/src/.gui.rs.swp b/src/.gui.rs.swp
new file mode 100644
index 0000000000000000000000000000000000000000..846497acc445092a3be9159df54ac4047e37da63
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/src/gui.rs b/src/gui.rs
index 2d87721..3062e39 100644
--- a/src/gui.rs
+++ b/src/gui.rs
@@ -17,19 +17,19 @@ struct Main {
 
 struct Inputs {
    stick: Stick,
-   a: char,
-   b: char,
-   x: char,
-   y: char,
-   l: char,
-   r: char,
+   a: iced::keyboard::KeyCode,
+   b: iced::keyboard::KeyCode,
+   x: iced::keyboard::KeyCode,
+   y: iced::keyboard::KeyCode,
+   l: iced::keyboard::KeyCode,
+   r: iced::keyboard::KeyCode,
 }
 
 struct Stick {
-   up: char,
-   down: char,
-   left: char,
-   right: char,
+   up: iced::keyboard::KeyCode,
+   down: iced::keyboard::KeyCode,
+   left: iced::keyboard::KeyCode,
+   right: iced::keyboard::KeyCode,
 }
 
 #[derive(Debug, Clone)]
@@ -63,17 +63,17 @@ impl Application for Main {
          configuring: None,
          inputs: Inputs{
             stick: Stick {
-               up: 'w',
-               down: 's',
-               left: 'a',
-               right: 'd',
+               up: iced::keyboard::KeyCode::W,
+               down: iced::keyboard::KeyCode::S,
+               left: iced::keyboard::KeyCode::A,
+               right: iced::keyboard::KeyCode::D,
             },
-            a: 'k',
-            b: 'j',
-            x: 'i',
-            y: 'u',
-            l: 'q',
-            r: 'e',
+            a: iced::keyboard::KeyCode::K,
+            b: iced::keyboard::KeyCode::J,
+            x: iced::keyboard::KeyCode::I,
+            y: iced::keyboard::KeyCode::U,
+            l: iced::keyboard::KeyCode::Q,
+            r: iced::keyboard::KeyCode::E,
          },
       }, Command::none())
    }
@@ -91,60 +91,20 @@ impl Application for Main {
                   modifiers: _,
                   ..
                }) => {
-                  let key_char = match key_code {
-                     iced::keyboard::KeyCode::Key1 => '1',
-                     iced::keyboard::KeyCode::Key2 => '2',
-                     iced::keyboard::KeyCode::Key3 => '3',
-                     iced::keyboard::KeyCode::Key4 => '4',
-                     iced::keyboard::KeyCode::Key5 => '5',
-                     iced::keyboard::KeyCode::Key6 => '6',
-                     iced::keyboard::KeyCode::Key7 => '7',
-                     iced::keyboard::KeyCode::Key8 => '8',
-                     iced::keyboard::KeyCode::Key9 => '9',
-                     iced::keyboard::KeyCode::Key0 => '0',
-                     iced::keyboard::KeyCode::A => 'a',
-                     iced::keyboard::KeyCode::B => 'b',
-                     iced::keyboard::KeyCode::C => 'c',
-                     iced::keyboard::KeyCode::D => 'd',
-                     iced::keyboard::KeyCode::E => 'e',
-                     iced::keyboard::KeyCode::F => 'f',
-                     iced::keyboard::KeyCode::G => 'g',
-                     iced::keyboard::KeyCode::H => 'h',
-                     iced::keyboard::KeyCode::I => 'i',
-                     iced::keyboard::KeyCode::J => 'j',
-                     iced::keyboard::KeyCode::K => 'k',
-                     iced::keyboard::KeyCode::L => 'l',
-                     iced::keyboard::KeyCode::M => 'm',
-                     iced::keyboard::KeyCode::N => 'n',
-                     iced::keyboard::KeyCode::O => 'o',
-                     iced::keyboard::KeyCode::P => 'p',
-                     iced::keyboard::KeyCode::Q => 'q',
-                     iced::keyboard::KeyCode::R => 'r',
-                     iced::keyboard::KeyCode::S => 's',
-                     iced::keyboard::KeyCode::T => 't',
-                     iced::keyboard::KeyCode::U => 'u',
-                     iced::keyboard::KeyCode::V => 'v',
-                     iced::keyboard::KeyCode::W => 'w',
-                     iced::keyboard::KeyCode::X => 'x',
-                     iced::keyboard::KeyCode::Y => 'y',
-                     iced::keyboard::KeyCode::Z => 'z',
-                     // TODO more
-                     _ => '`',
-                  };
-                  self.ntfy = format!("set {:?}", key_char.clone());
                   match self.configuring.as_ref().unwrap() {
-                     Message::Up => { self.inputs.stick.up = key_char },
-                     Message::Down => { self.inputs.stick.down = key_char },
-                     Message::Left => { self.inputs.stick.left = key_char },
-                     Message::Right => { self.inputs.stick.right = key_char },
-                     Message::A => { self.inputs.a = key_char },
-                     Message::B => { self.inputs.b = key_char },
-                     Message::X => { self.inputs.x = key_char },
-                     Message::Y => { self.inputs.y = key_char },
-                     Message::L => { self.inputs.l = key_char },
-                     Message::R => { self.inputs.r = key_char },
+                     Message::Up => { self.inputs.stick.up = key_code },
+                     Message::Down => { self.inputs.stick.down = key_code },
+                     Message::Left => { self.inputs.stick.left = key_code },
+                     Message::Right => { self.inputs.stick.right = key_code },
+                     Message::A => { self.inputs.a = key_code },
+                     Message::B => { self.inputs.b = key_code },
+                     Message::X => { self.inputs.x = key_code },
+                     Message::Y => { self.inputs.y = key_code },
+                     Message::L => { self.inputs.l = key_code },
+                     Message::R => { self.inputs.r = key_code },
                      _ => {},
                   };
+                  self.ntfy = format!("{:?} => {:?}", key_code.clone(), self.configuring.as_ref().unwrap());
                   self.configuring = None;
                },
                _ => {},
@@ -157,7 +117,7 @@ impl Application for Main {
                   modifiers: _,
                   ..
                }) => {
-                  println!("pushed {}", key_code);
+                  println!("pushed {:?}", key_code);
                },
                _ => {},
             }