mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-10-25 10:39:01 -06:00
* Issue #324: vendor winit 0.30.13 as published The crate as released on crates.io, without its asset files (docs/res/*.svg and examples/data/*.png, AGENTS.md §1). Not used yet: the next commit patches it and adds it to [patch.crates-io]. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Issue #324: on Windows 11, a window dragged to another monitor takes its scale winit 0.30.13 handles WM_DPICHANGED by checking that the new window rect is on the monitor `MonitorFromWindow` names. During a drag that is still the monitor being left, so winit nudged the window back onto it, which sent another WM_DPICHANGED: the window grew and stayed on the wrong monitor at the wrong scale. From Windows 11 (build 22000) on, apply the rect Windows suggests, as winit master does since 488c036a (rust-windowing/winit#4341); no 0.30 release has it. Windows 10 keeps the old adjustment, as on winit master. The vendored copy goes in [patch.crates-io]; a test fails if winit resolves from crates.io again or the vendored copy loses the patch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
70 lines
2.2 KiB
Rust
70 lines
2.2 KiB
Rust
//! A demonstration of embedding a winit window in an existing X11 application.
|
|
use std::error::Error;
|
|
|
|
#[cfg(x11_platform)]
|
|
fn main() -> Result<(), Box<dyn Error>> {
|
|
use winit::application::ApplicationHandler;
|
|
use winit::event::WindowEvent;
|
|
use winit::event_loop::{ActiveEventLoop, EventLoop};
|
|
use winit::platform::x11::WindowAttributesExtX11;
|
|
use winit::window::{Window, WindowId};
|
|
|
|
#[path = "util/fill.rs"]
|
|
mod fill;
|
|
|
|
pub struct XEmbedDemo {
|
|
parent_window_id: u32,
|
|
window: Option<Window>,
|
|
}
|
|
|
|
impl ApplicationHandler for XEmbedDemo {
|
|
fn resumed(&mut self, event_loop: &ActiveEventLoop) {
|
|
let window_attributes = Window::default_attributes()
|
|
.with_title("An embedded window!")
|
|
.with_inner_size(winit::dpi::LogicalSize::new(128.0, 128.0))
|
|
.with_embed_parent_window(self.parent_window_id);
|
|
|
|
self.window = Some(event_loop.create_window(window_attributes).unwrap());
|
|
}
|
|
|
|
fn window_event(
|
|
&mut self,
|
|
event_loop: &ActiveEventLoop,
|
|
_window_id: WindowId,
|
|
event: WindowEvent,
|
|
) {
|
|
let window = self.window.as_ref().unwrap();
|
|
match event {
|
|
WindowEvent::CloseRequested => event_loop.exit(),
|
|
WindowEvent::RedrawRequested => {
|
|
window.pre_present_notify();
|
|
fill::fill_window(window);
|
|
},
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
fn about_to_wait(&mut self, _event_loop: &ActiveEventLoop) {
|
|
self.window.as_ref().unwrap().request_redraw();
|
|
}
|
|
}
|
|
|
|
// 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>()?;
|
|
|
|
tracing_subscriber::fmt::init();
|
|
let event_loop = EventLoop::new()?;
|
|
|
|
let mut app = XEmbedDemo { parent_window_id, window: None };
|
|
event_loop.run_app(&mut app).map_err(Into::into)
|
|
}
|
|
|
|
#[cfg(not(x11_platform))]
|
|
fn main() -> Result<(), Box<dyn Error>> {
|
|
println!("This example is only supported on X11 platforms.");
|
|
Ok(())
|
|
}
|