mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-23 22:01:31 +11:00
f9758528f6
Inner panics could make it hard to trouble shoot the issues and for some users it's not desirable. The inner panics were left only when they are used to `assert!` during development. This reverts commit 9f91bc413fe20618bd7090829832bb074aab15c3 which reverted the original patch which was merged without a proper review. Fixes: #500.
70 lines
2 KiB
Rust
70 lines
2 KiB
Rust
//! A demonstration of embedding a winit window in an existing X11 application.
|
|
|
|
#[cfg(x11_platform)]
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
#[cfg(x11_platform)]
|
|
mod imple {
|
|
use super::fill;
|
|
use simple_logger::SimpleLogger;
|
|
use winit::{
|
|
event::{Event, WindowEvent},
|
|
event_loop::EventLoop,
|
|
platform::x11::WindowBuilderExtX11,
|
|
window::WindowBuilder,
|
|
};
|
|
|
|
pub(super) fn entry() -> Result<(), Box<dyn std::error::Error>> {
|
|
// First argument should be a 32-bit X11 window ID.
|
|
let parent_window_id = std::env::args()
|
|
.nth(1)
|
|
.ok_or("Expected a 32-bit X11 window ID as the first argument.")?
|
|
.parse::<u32>()?;
|
|
|
|
SimpleLogger::new().init().unwrap();
|
|
let event_loop = EventLoop::new()?;
|
|
|
|
let window = WindowBuilder::new()
|
|
.with_title("An embedded window!")
|
|
.with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
|
|
.with_embed_parent_window(parent_window_id)
|
|
.build(&event_loop)
|
|
.unwrap();
|
|
|
|
event_loop.run(move |event, _, control_flow| {
|
|
control_flow.set_wait();
|
|
|
|
match event {
|
|
Event::WindowEvent {
|
|
event: WindowEvent::CloseRequested,
|
|
window_id,
|
|
} if window_id == window.id() => control_flow.set_exit(),
|
|
Event::AboutToWait => {
|
|
window.request_redraw();
|
|
}
|
|
Event::RedrawRequested(_) => {
|
|
// Notify the windowing system that we'll be presenting to the window.
|
|
window.pre_present_notify();
|
|
fill::fill_window(&window);
|
|
}
|
|
_ => (),
|
|
}
|
|
})?;
|
|
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(not(x11_platform))]
|
|
mod imple {
|
|
pub(super) fn entry() -> Result<(), Box<dyn std::error::Error>> {
|
|
println!("This example is only supported on X11 platforms.");
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|
imple::entry()
|
|
}
|