mirror of
https://github.com/roc-lang/roc.git
synced 2024-11-11 16:51:53 +03:00
Extract text_state
This commit is contained in:
Richard Feldman
parent
3b603dc1c4
commit
bf2f7de69e
@ -1,3 +1,4 @@
|
||||
use crate::text_state::handle_text_input;
|
||||
use gfx_hal::{
|
||||
device::Device,
|
||||
window::{Extent2D, PresentMode, PresentationSurface, Surface},
|
||||
@ -7,7 +8,9 @@ use glsl_to_spirv::ShaderType;
|
||||
use std::io;
|
||||
use std::mem::ManuallyDrop;
|
||||
use std::path::Path;
|
||||
use winit::event::{ElementState, ModifiersState, VirtualKeyCode};
|
||||
use winit::event::ModifiersState;
|
||||
|
||||
pub mod text_state;
|
||||
|
||||
/// The editor is actually launched from the CLI if you pass it zero arguments,
|
||||
/// or if you provide it 1 or more files or directories to open on launch.
|
||||
@ -368,19 +371,6 @@ fn run_event_loop() {
|
||||
let pipeline_layout = &res.pipeline_layouts[0];
|
||||
let pipeline = &res.pipelines[0];
|
||||
|
||||
let triangles = text_state.chars().enumerate().flat_map(|(index, char)| {
|
||||
if char == ' ' {
|
||||
// Don't render spaces
|
||||
None
|
||||
} else {
|
||||
Some(PushConstants {
|
||||
color: [0.77254902, 0.658823529, 1.0, 0.5],
|
||||
pos: [0.06 * index as f32, 0.0],
|
||||
scale: [0.05, 0.05],
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
unsafe {
|
||||
use gfx_hal::pool::CommandPool;
|
||||
|
||||
@ -468,6 +458,19 @@ fn run_event_loop() {
|
||||
}
|
||||
};
|
||||
|
||||
let triangles = text_state.chars().enumerate().flat_map(|(index, char)| {
|
||||
if char == ' ' {
|
||||
// Don't render spaces
|
||||
None
|
||||
} else {
|
||||
Some(PushConstants {
|
||||
color: [0.77254902, 0.658823529, 1.0, 0.5],
|
||||
pos: [0.06 * index as f32, 0.0],
|
||||
scale: [0.05, 0.05],
|
||||
})
|
||||
}
|
||||
});
|
||||
|
||||
unsafe {
|
||||
use gfx_hal::command::{
|
||||
ClearColor, ClearValue, CommandBuffer, CommandBufferFlags, SubpassContents,
|
||||
@ -554,131 +557,3 @@ unsafe fn push_constant_bytes<T>(push_constants: &T) -> &[u32] {
|
||||
let start_ptr = push_constants as *const T as *const u32;
|
||||
std::slice::from_raw_parts(start_ptr, size_in_u32s)
|
||||
}
|
||||
|
||||
fn handle_text_input(
|
||||
text_state: &mut String,
|
||||
elem_state: ElementState,
|
||||
virtual_keycode: VirtualKeyCode,
|
||||
_modifiers: ModifiersState,
|
||||
) {
|
||||
use winit::event::VirtualKeyCode::*;
|
||||
|
||||
if let ElementState::Released = elem_state {
|
||||
return;
|
||||
}
|
||||
|
||||
match virtual_keycode {
|
||||
Key1 | Numpad1 => text_state.push_str("1"),
|
||||
Key2 | Numpad2 => text_state.push_str("2"),
|
||||
Key3 | Numpad3 => text_state.push_str("3"),
|
||||
Key4 | Numpad4 => text_state.push_str("4"),
|
||||
Key5 | Numpad5 => text_state.push_str("5"),
|
||||
Key6 | Numpad6 => text_state.push_str("6"),
|
||||
Key7 | Numpad7 => text_state.push_str("7"),
|
||||
Key8 | Numpad8 => text_state.push_str("8"),
|
||||
Key9 | Numpad9 => text_state.push_str("9"),
|
||||
Key0 | Numpad0 => text_state.push_str("0"),
|
||||
A => text_state.push_str("a"),
|
||||
B => text_state.push_str("b"),
|
||||
C => text_state.push_str("c"),
|
||||
D => text_state.push_str("d"),
|
||||
E => text_state.push_str("e"),
|
||||
F => text_state.push_str("f"),
|
||||
G => text_state.push_str("g"),
|
||||
H => text_state.push_str("h"),
|
||||
I => text_state.push_str("i"),
|
||||
J => text_state.push_str("j"),
|
||||
K => text_state.push_str("k"),
|
||||
L => text_state.push_str("l"),
|
||||
M => text_state.push_str("m"),
|
||||
N => text_state.push_str("n"),
|
||||
O => text_state.push_str("o"),
|
||||
P => text_state.push_str("p"),
|
||||
Q => text_state.push_str("q"),
|
||||
R => text_state.push_str("r"),
|
||||
S => text_state.push_str("s"),
|
||||
T => text_state.push_str("t"),
|
||||
U => text_state.push_str("u"),
|
||||
V => text_state.push_str("v"),
|
||||
W => text_state.push_str("w"),
|
||||
X => text_state.push_str("x"),
|
||||
Y => text_state.push_str("y"),
|
||||
Z => text_state.push_str("z"),
|
||||
Escape | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | F13 | F14 | F15
|
||||
| F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | Snapshot | Scroll | Pause
|
||||
| Insert | Home | Delete | End | PageDown | PageUp | Left | Up | Right | Down | Compose
|
||||
| Caret | Numlock | AbntC1 | AbntC2 | Ax | Calculator | Capital | Convert | Kana
|
||||
| Kanji | LAlt | LBracket | LControl | LShift | LWin | Mail | MediaSelect | PlayPause
|
||||
| Power | PrevTrack | MediaStop | Mute | MyComputer | NavigateForward
|
||||
| NavigateBackward | NextTrack | NoConvert | OEM102 | RAlt | Sysrq | RBracket
|
||||
| RControl | RShift | RWin | Sleep | Stop | Unlabeled | VolumeDown | VolumeUp | Wake
|
||||
| WebBack | WebFavorites | WebForward | WebHome | WebRefresh | WebSearch | Apps | Tab
|
||||
| WebStop => {
|
||||
// TODO handle
|
||||
dbg!(virtual_keycode);
|
||||
}
|
||||
Back => {
|
||||
text_state.pop();
|
||||
}
|
||||
Return | NumpadEnter => {
|
||||
text_state.push_str("\n");
|
||||
}
|
||||
Space => {
|
||||
text_state.push_str(" ");
|
||||
}
|
||||
Comma | NumpadComma => {
|
||||
text_state.push_str(",");
|
||||
}
|
||||
Add => {
|
||||
text_state.push_str("+");
|
||||
}
|
||||
Apostrophe => {
|
||||
text_state.push_str("'");
|
||||
}
|
||||
At => {
|
||||
text_state.push_str("@");
|
||||
}
|
||||
Backslash => {
|
||||
text_state.push_str("\\");
|
||||
}
|
||||
Colon => {
|
||||
text_state.push_str(":");
|
||||
}
|
||||
Period | Decimal => {
|
||||
text_state.push_str(".");
|
||||
}
|
||||
Equals | NumpadEquals => {
|
||||
text_state.push_str("=");
|
||||
}
|
||||
Grave => {
|
||||
text_state.push_str("`");
|
||||
}
|
||||
Minus | Subtract => {
|
||||
text_state.push_str("-");
|
||||
}
|
||||
Multiply => {
|
||||
text_state.push_str("*");
|
||||
}
|
||||
Semicolon => {
|
||||
text_state.push_str(";");
|
||||
}
|
||||
Slash | Divide => {
|
||||
text_state.push_str("/");
|
||||
}
|
||||
Underline => {
|
||||
text_state.push_str("_");
|
||||
}
|
||||
Yen => {
|
||||
text_state.push_str("¥");
|
||||
}
|
||||
Copy => {
|
||||
todo!("copy");
|
||||
}
|
||||
Paste => {
|
||||
todo!("paste");
|
||||
}
|
||||
Cut => {
|
||||
todo!("cut");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
129
editor/src/text_state.rs
Normal file
129
editor/src/text_state.rs
Normal file
@ -0,0 +1,129 @@
|
||||
use winit::event::{ElementState, ModifiersState, VirtualKeyCode};
|
||||
|
||||
pub fn handle_text_input(
|
||||
text_state: &mut String,
|
||||
elem_state: ElementState,
|
||||
virtual_keycode: VirtualKeyCode,
|
||||
_modifiers: ModifiersState,
|
||||
) {
|
||||
use winit::event::VirtualKeyCode::*;
|
||||
|
||||
if let ElementState::Released = elem_state {
|
||||
return;
|
||||
}
|
||||
|
||||
match virtual_keycode {
|
||||
Key1 | Numpad1 => text_state.push_str("1"),
|
||||
Key2 | Numpad2 => text_state.push_str("2"),
|
||||
Key3 | Numpad3 => text_state.push_str("3"),
|
||||
Key4 | Numpad4 => text_state.push_str("4"),
|
||||
Key5 | Numpad5 => text_state.push_str("5"),
|
||||
Key6 | Numpad6 => text_state.push_str("6"),
|
||||
Key7 | Numpad7 => text_state.push_str("7"),
|
||||
Key8 | Numpad8 => text_state.push_str("8"),
|
||||
Key9 | Numpad9 => text_state.push_str("9"),
|
||||
Key0 | Numpad0 => text_state.push_str("0"),
|
||||
A => text_state.push_str("a"),
|
||||
B => text_state.push_str("b"),
|
||||
C => text_state.push_str("c"),
|
||||
D => text_state.push_str("d"),
|
||||
E => text_state.push_str("e"),
|
||||
F => text_state.push_str("f"),
|
||||
G => text_state.push_str("g"),
|
||||
H => text_state.push_str("h"),
|
||||
I => text_state.push_str("i"),
|
||||
J => text_state.push_str("j"),
|
||||
K => text_state.push_str("k"),
|
||||
L => text_state.push_str("l"),
|
||||
M => text_state.push_str("m"),
|
||||
N => text_state.push_str("n"),
|
||||
O => text_state.push_str("o"),
|
||||
P => text_state.push_str("p"),
|
||||
Q => text_state.push_str("q"),
|
||||
R => text_state.push_str("r"),
|
||||
S => text_state.push_str("s"),
|
||||
T => text_state.push_str("t"),
|
||||
U => text_state.push_str("u"),
|
||||
V => text_state.push_str("v"),
|
||||
W => text_state.push_str("w"),
|
||||
X => text_state.push_str("x"),
|
||||
Y => text_state.push_str("y"),
|
||||
Z => text_state.push_str("z"),
|
||||
Escape | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | F13 | F14 | F15
|
||||
| F16 | F17 | F18 | F19 | F20 | F21 | F22 | F23 | F24 | Snapshot | Scroll | Pause
|
||||
| Insert | Home | Delete | End | PageDown | PageUp | Left | Up | Right | Down | Compose
|
||||
| Caret | Numlock | AbntC1 | AbntC2 | Ax | Calculator | Capital | Convert | Kana
|
||||
| Kanji | LAlt | LBracket | LControl | LShift | LWin | Mail | MediaSelect | PlayPause
|
||||
| Power | PrevTrack | MediaStop | Mute | MyComputer | NavigateForward
|
||||
| NavigateBackward | NextTrack | NoConvert | OEM102 | RAlt | Sysrq | RBracket
|
||||
| RControl | RShift | RWin | Sleep | Stop | Unlabeled | VolumeDown | VolumeUp | Wake
|
||||
| WebBack | WebFavorites | WebForward | WebHome | WebRefresh | WebSearch | Apps | Tab
|
||||
| WebStop => {
|
||||
// TODO handle
|
||||
dbg!(virtual_keycode);
|
||||
}
|
||||
Back => {
|
||||
text_state.pop();
|
||||
}
|
||||
Return | NumpadEnter => {
|
||||
text_state.push_str("\n");
|
||||
}
|
||||
Space => {
|
||||
text_state.push_str(" ");
|
||||
}
|
||||
Comma | NumpadComma => {
|
||||
text_state.push_str(",");
|
||||
}
|
||||
Add => {
|
||||
text_state.push_str("+");
|
||||
}
|
||||
Apostrophe => {
|
||||
text_state.push_str("'");
|
||||
}
|
||||
At => {
|
||||
text_state.push_str("@");
|
||||
}
|
||||
Backslash => {
|
||||
text_state.push_str("\\");
|
||||
}
|
||||
Colon => {
|
||||
text_state.push_str(":");
|
||||
}
|
||||
Period | Decimal => {
|
||||
text_state.push_str(".");
|
||||
}
|
||||
Equals | NumpadEquals => {
|
||||
text_state.push_str("=");
|
||||
}
|
||||
Grave => {
|
||||
text_state.push_str("`");
|
||||
}
|
||||
Minus | Subtract => {
|
||||
text_state.push_str("-");
|
||||
}
|
||||
Multiply => {
|
||||
text_state.push_str("*");
|
||||
}
|
||||
Semicolon => {
|
||||
text_state.push_str(";");
|
||||
}
|
||||
Slash | Divide => {
|
||||
text_state.push_str("/");
|
||||
}
|
||||
Underline => {
|
||||
text_state.push_str("_");
|
||||
}
|
||||
Yen => {
|
||||
text_state.push_str("¥");
|
||||
}
|
||||
Copy => {
|
||||
todo!("copy");
|
||||
}
|
||||
Paste => {
|
||||
todo!("paste");
|
||||
}
|
||||
Cut => {
|
||||
todo!("cut");
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user