gogs
/
rusty-pipe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop extra alias

master
bel 2023-03-22 21:55:51 -06:00
parent ef44fa5d51
commit f310b53a98
2 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/.gui.rs.swp Normal file
View File

Binary file not shown.

104
src/gui.rs
View File

@ -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);
},
_ => {},
}