mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +11:00
9602716ed2
* Rename EventsLoop and associated types to EventLoop * Rename WindowEvent::Refresh to WindowEvent::Redraw * Remove second thread from win32 backend * Update run_forever to hijack thread * Replace windows Mutex with parking_lot Mutex * Implement new ControlFlow and associated events * Add StartCause::Init support, timer example * Add ability to send custom user events * Fully invert windows control flow so win32 calls into winit's callback * Add request_redraw * Rename platform to platform_impl * Rename os to platform, add Ext trait postfixes * Add platform::desktop module with EventLoopExt::run_return * Re-organize into module structure * Improve documentation * Small changes to examples * Improve docs for run and run_return * Change instances of "events_loop" to "event_loop" * Rename MonitorId to MonitorHandle * Add CHANGELOG entry * Improve WaitUntil timer precision * When SendEvent is called during event closure, buffer events * Fix resize lag when waiting in some situations * Update send test and errors that broke some examples/APIs * Improve clarity/fix typos in docs * Fix unreachable panic after setting ControlFlow to Poll during some RedrawRequested events. * Fix crash when running in release mode * Remove crossbeam dependency and make drop events work again * Remove serde implementations from ControlFlow * Fix 1.24.1 build * Fix freeze when setting decorations * Replace &EventLoop in callback with &EventLoopWindowTarget * Document and implement Debug for EventLoopWindowTarget * Fix some deadlocks that could occur when changing window state * Fix thread executor not executing closure when called from non-loop thread * Fix buffered events not getting dispatched * Fix crash with runner refcell not getting dropped * Address review feedback * Fix CHANGELOG typo * Catch panics in user callback
124 lines
4.3 KiB
Rust
124 lines
4.3 KiB
Rust
extern crate winit;
|
|
|
|
use std::io::{self, Write};
|
|
use winit::monitor::MonitorHandle;
|
|
use winit::window::WindowBuilder;
|
|
use winit::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInput};
|
|
use winit::event_loop::{EventLoop, ControlFlow};
|
|
|
|
fn main() {
|
|
let event_loop = EventLoop::new();
|
|
|
|
#[cfg(target_os = "macos")]
|
|
let mut macos_use_simple_fullscreen = false;
|
|
|
|
let monitor = {
|
|
// On macOS there are two fullscreen modes "native" and "simple"
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
print!("Please choose the fullscreen mode: (1) native, (2) simple: ");
|
|
io::stdout().flush().unwrap();
|
|
|
|
let mut num = String::new();
|
|
io::stdin().read_line(&mut num).unwrap();
|
|
let num = num.trim().parse().ok().expect("Please enter a number");
|
|
match num {
|
|
2 => macos_use_simple_fullscreen = true,
|
|
_ => {}
|
|
}
|
|
|
|
// Prompt for monitor when using native fullscreen
|
|
if !macos_use_simple_fullscreen {
|
|
Some(prompt_for_monitor(&event_loop))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
#[cfg(not(target_os = "macos"))]
|
|
Some(prompt_for_monitor(&event_loop))
|
|
};
|
|
|
|
let mut is_fullscreen = monitor.is_some();
|
|
let mut is_maximized = false;
|
|
let mut decorations = true;
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("Hello world!")
|
|
.with_fullscreen(monitor)
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
println!("{:?}", event);
|
|
*control_flow = ControlFlow::Wait;
|
|
|
|
match event {
|
|
Event::WindowEvent { event, .. } => match event {
|
|
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
|
|
WindowEvent::KeyboardInput {
|
|
input:
|
|
KeyboardInput {
|
|
virtual_keycode: Some(virtual_code),
|
|
state,
|
|
..
|
|
},
|
|
..
|
|
} => match (virtual_code, state) {
|
|
(VirtualKeyCode::Escape, _) => *control_flow = ControlFlow::Exit,
|
|
(VirtualKeyCode::F, ElementState::Pressed) => {
|
|
#[cfg(target_os = "macos")]
|
|
{
|
|
if macos_use_simple_fullscreen {
|
|
use winit::os::macos::WindowExt;
|
|
if WindowExt::set_simple_fullscreen(&window, !is_fullscreen) {
|
|
is_fullscreen = !is_fullscreen;
|
|
}
|
|
|
|
return ControlFlow::Continue;
|
|
}
|
|
}
|
|
|
|
is_fullscreen = !is_fullscreen;
|
|
if !is_fullscreen {
|
|
window.set_fullscreen(None);
|
|
} else {
|
|
window.set_fullscreen(Some(window.get_current_monitor()));
|
|
}
|
|
}
|
|
(VirtualKeyCode::M, ElementState::Pressed) => {
|
|
is_maximized = !is_maximized;
|
|
window.set_maximized(is_maximized);
|
|
}
|
|
(VirtualKeyCode::D, ElementState::Pressed) => {
|
|
decorations = !decorations;
|
|
window.set_decorations(decorations);
|
|
}
|
|
_ => (),
|
|
},
|
|
_ => (),
|
|
},
|
|
_ => {}
|
|
}
|
|
});
|
|
}
|
|
|
|
// Enumerate monitors and prompt user to choose one
|
|
fn prompt_for_monitor(event_loop: &EventLoop<()>) -> MonitorHandle {
|
|
for (num, monitor) in event_loop.get_available_monitors().enumerate() {
|
|
println!("Monitor #{}: {:?}", num, monitor.get_name());
|
|
}
|
|
|
|
print!("Please write the number of the monitor to use: ");
|
|
io::stdout().flush().unwrap();
|
|
|
|
let mut num = String::new();
|
|
io::stdin().read_line(&mut num).unwrap();
|
|
let num = num.trim().parse().ok().expect("Please enter a number");
|
|
let monitor = event_loop.get_available_monitors().nth(num).expect("Please enter a valid ID");
|
|
|
|
println!("Using {:?}", monitor.get_name());
|
|
|
|
monitor
|
|
}
|