drop extra alias
bel
parent
ef44fa5d51
commit
f310b53a98
Binary file not shown.
104
src/gui.rs
104
src/gui.rs
|
|
@ -17,19 +17,19 @@ struct Main {
|
||||||
|
|
||||||
struct Inputs {
|
struct Inputs {
|
||||||
stick: Stick,
|
stick: Stick,
|
||||||
a: char,
|
a: iced::keyboard::KeyCode,
|
||||||
b: char,
|
b: iced::keyboard::KeyCode,
|
||||||
x: char,
|
x: iced::keyboard::KeyCode,
|
||||||
y: char,
|
y: iced::keyboard::KeyCode,
|
||||||
l: char,
|
l: iced::keyboard::KeyCode,
|
||||||
r: char,
|
r: iced::keyboard::KeyCode,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Stick {
|
struct Stick {
|
||||||
up: char,
|
up: iced::keyboard::KeyCode,
|
||||||
down: char,
|
down: iced::keyboard::KeyCode,
|
||||||
left: char,
|
left: iced::keyboard::KeyCode,
|
||||||
right: char,
|
right: iced::keyboard::KeyCode,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
|
|
@ -63,17 +63,17 @@ impl Application for Main {
|
||||||
configuring: None,
|
configuring: None,
|
||||||
inputs: Inputs{
|
inputs: Inputs{
|
||||||
stick: Stick {
|
stick: Stick {
|
||||||
up: 'w',
|
up: iced::keyboard::KeyCode::W,
|
||||||
down: 's',
|
down: iced::keyboard::KeyCode::S,
|
||||||
left: 'a',
|
left: iced::keyboard::KeyCode::A,
|
||||||
right: 'd',
|
right: iced::keyboard::KeyCode::D,
|
||||||
},
|
},
|
||||||
a: 'k',
|
a: iced::keyboard::KeyCode::K,
|
||||||
b: 'j',
|
b: iced::keyboard::KeyCode::J,
|
||||||
x: 'i',
|
x: iced::keyboard::KeyCode::I,
|
||||||
y: 'u',
|
y: iced::keyboard::KeyCode::U,
|
||||||
l: 'q',
|
l: iced::keyboard::KeyCode::Q,
|
||||||
r: 'e',
|
r: iced::keyboard::KeyCode::E,
|
||||||
},
|
},
|
||||||
}, Command::none())
|
}, Command::none())
|
||||||
}
|
}
|
||||||
|
|
@ -91,60 +91,20 @@ impl Application for Main {
|
||||||
modifiers: _,
|
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() {
|
match self.configuring.as_ref().unwrap() {
|
||||||
Message::Up => { self.inputs.stick.up = key_char },
|
Message::Up => { self.inputs.stick.up = key_code },
|
||||||
Message::Down => { self.inputs.stick.down = key_char },
|
Message::Down => { self.inputs.stick.down = key_code },
|
||||||
Message::Left => { self.inputs.stick.left = key_char },
|
Message::Left => { self.inputs.stick.left = key_code },
|
||||||
Message::Right => { self.inputs.stick.right = key_char },
|
Message::Right => { self.inputs.stick.right = key_code },
|
||||||
Message::A => { self.inputs.a = key_char },
|
Message::A => { self.inputs.a = key_code },
|
||||||
Message::B => { self.inputs.b = key_char },
|
Message::B => { self.inputs.b = key_code },
|
||||||
Message::X => { self.inputs.x = key_char },
|
Message::X => { self.inputs.x = key_code },
|
||||||
Message::Y => { self.inputs.y = key_char },
|
Message::Y => { self.inputs.y = key_code },
|
||||||
Message::L => { self.inputs.l = key_char },
|
Message::L => { self.inputs.l = key_code },
|
||||||
Message::R => { self.inputs.r = key_char },
|
Message::R => { self.inputs.r = key_code },
|
||||||
_ => {},
|
_ => {},
|
||||||
};
|
};
|
||||||
|
self.ntfy = format!("{:?} => {:?}", key_code.clone(), self.configuring.as_ref().unwrap());
|
||||||
self.configuring = None;
|
self.configuring = None;
|
||||||
},
|
},
|
||||||
_ => {},
|
_ => {},
|
||||||
|
|
@ -157,7 +117,7 @@ impl Application for Main {
|
||||||
modifiers: _,
|
modifiers: _,
|
||||||
..
|
..
|
||||||
}) => {
|
}) => {
|
||||||
println!("pushed {}", key_code);
|
println!("pushed {:?}", key_code);
|
||||||
},
|
},
|
||||||
_ => {},
|
_ => {},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue