mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +11:00
0df436901a
* First name consistency pass. More to come! * Remove multitouch variable (hopefully this compiles!) * Remove CreationError::NotSupported * Add new error handling types * Remove `get_` prefix from getters. This is as per the Rust naming conventions recommended in https://rust-lang-nursery.github.io/api-guidelines/naming.html#getter-names-follow-rust-convention-c-getter * Make changes to Window position and size function signatures * Remove CreationError in favor of OsError * Begin updating iOS backend * Change MonitorHandle::outer_position to just position * Fix build on Windows and Linux * Add Display and Error implementations to Error types * Attempt to fix iOS build. I can't actually check that this works since I can't cross-compile to iOS on a Windows machine (thanks apple :/) but this should be one of several commits to get it working. * Attempt to fix iOS errors, and muck up Travis to make debugging easier * More iOS fixins * Add Debug and Display impls to OsError * Fix Display impl * Fix unused code warnings and travis * Rename set_ime_spot to set_ime_position * Add CHANGELOG entry * Rename set_cursor to set_cursor_icon and MouseCursor to CursorIcon * Organize Window functions into multiple, categorized impls * Improve clarity of function ordering and docs in EventLoop
116 lines
5 KiB
Rust
116 lines
5 KiB
Rust
extern crate env_logger;
|
|
extern crate winit;
|
|
|
|
use std::{collections::HashMap, sync::mpsc, thread, time::Duration};
|
|
|
|
use winit::{
|
|
event::{ElementState, Event, KeyboardInput, VirtualKeyCode, WindowEvent},
|
|
event_loop::{ControlFlow, EventLoop}, window::{CursorIcon, WindowBuilder},
|
|
};
|
|
|
|
const WINDOW_COUNT: usize = 3;
|
|
const WINDOW_SIZE: (u32, u32) = (600, 400);
|
|
|
|
fn main() {
|
|
env_logger::init();
|
|
let event_loop = EventLoop::new();
|
|
let mut window_senders = HashMap::with_capacity(WINDOW_COUNT);
|
|
for _ in 0..WINDOW_COUNT {
|
|
let window = WindowBuilder::new()
|
|
.with_inner_size(WINDOW_SIZE.into())
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
let (tx, rx) = mpsc::channel();
|
|
window_senders.insert(window.id(), tx);
|
|
thread::spawn(move || {
|
|
while let Ok(event) = rx.recv() {
|
|
match event {
|
|
WindowEvent::KeyboardInput { input: KeyboardInput {
|
|
state: ElementState::Released,
|
|
virtual_keycode: Some(key),
|
|
modifiers,
|
|
..
|
|
}, .. } => {
|
|
window.set_title(&format!("{:?}", key));
|
|
let state = !modifiers.shift;
|
|
use self::VirtualKeyCode::*;
|
|
match key {
|
|
A => window.set_always_on_top(state),
|
|
C => window.set_cursor_icon(match state {
|
|
true => CursorIcon::Progress,
|
|
false => CursorIcon::Default,
|
|
}),
|
|
D => window.set_decorations(!state),
|
|
F => window.set_fullscreen(match state {
|
|
true => Some(window.current_monitor()),
|
|
false => None,
|
|
}),
|
|
G => window.set_cursor_grab(state).unwrap(),
|
|
H => window.set_cursor_visible(!state),
|
|
I => {
|
|
println!("Info:");
|
|
println!("-> outer_position : {:?}", window.outer_position());
|
|
println!("-> inner_position : {:?}", window.inner_position());
|
|
println!("-> outer_size : {:?}", window.outer_size());
|
|
println!("-> inner_size : {:?}", window.inner_size());
|
|
},
|
|
L => window.set_min_inner_size(match state {
|
|
true => Some(WINDOW_SIZE.into()),
|
|
false => None,
|
|
}),
|
|
M => window.set_maximized(state),
|
|
P => window.set_outer_position({
|
|
let mut position = window.outer_position().unwrap();
|
|
let sign = if state { 1.0 } else { -1.0 };
|
|
position.x += 10.0 * sign;
|
|
position.y += 10.0 * sign;
|
|
position
|
|
}),
|
|
Q => window.request_redraw(),
|
|
R => window.set_resizable(state),
|
|
S => window.set_inner_size(match state {
|
|
true => (WINDOW_SIZE.0 + 100, WINDOW_SIZE.1 + 100),
|
|
false => WINDOW_SIZE,
|
|
}.into()),
|
|
W => window.set_cursor_position((
|
|
WINDOW_SIZE.0 as i32 / 2,
|
|
WINDOW_SIZE.1 as i32 / 2,
|
|
).into()).unwrap(),
|
|
Z => {
|
|
window.set_visible(false);
|
|
thread::sleep(Duration::from_secs(1));
|
|
window.set_visible(true);
|
|
},
|
|
_ => (),
|
|
}
|
|
},
|
|
_ => (),
|
|
}
|
|
}
|
|
});
|
|
}
|
|
event_loop.run(move |event, _event_loop, control_flow| {
|
|
*control_flow = match !window_senders.is_empty() {
|
|
true => ControlFlow::Wait,
|
|
false => ControlFlow::Exit,
|
|
};
|
|
match event {
|
|
Event::WindowEvent { event, window_id } => {
|
|
match event {
|
|
WindowEvent::CloseRequested
|
|
| WindowEvent::Destroyed
|
|
| WindowEvent::KeyboardInput { input: KeyboardInput {
|
|
virtual_keycode: Some(VirtualKeyCode::Escape),
|
|
.. }, .. } => {
|
|
window_senders.remove(&window_id);
|
|
},
|
|
_ => if let Some(tx) = window_senders.get(&window_id) {
|
|
tx.send(event).unwrap();
|
|
},
|
|
}
|
|
}
|
|
_ => (),
|
|
}
|
|
})
|
|
}
|