mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-26 23:21:30 +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
121 lines
3.6 KiB
Rust
121 lines
3.6 KiB
Rust
#![cfg(target_os = "windows")]
|
|
|
|
use std::os::raw::c_void;
|
|
|
|
use libc;
|
|
use winapi::shared::windef::HWND;
|
|
|
|
use event::DeviceId;
|
|
use monitor::MonitorHandle;
|
|
use event_loop::EventLoop;
|
|
use window::{Icon, Window, WindowBuilder};
|
|
use platform_impl::EventLoop as WindowsEventLoop;
|
|
|
|
/// Additional methods on `EventLoop` that are specific to Windows.
|
|
pub trait EventLoopExtWindows {
|
|
/// By default, winit on Windows will attempt to enable process-wide DPI awareness. If that's
|
|
/// undesirable, you can create an `EventLoop` using this function instead.
|
|
fn new_dpi_unaware() -> Self where Self: Sized;
|
|
}
|
|
|
|
impl<T> EventLoopExtWindows for EventLoop<T> {
|
|
#[inline]
|
|
fn new_dpi_unaware() -> Self {
|
|
EventLoop {
|
|
event_loop: WindowsEventLoop::with_dpi_awareness(false),
|
|
_marker: ::std::marker::PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `Window` that are specific to Windows.
|
|
pub trait WindowExtWindows {
|
|
/// Returns the native handle that is used by this window.
|
|
///
|
|
/// The pointer will become invalid when the native window was destroyed.
|
|
fn get_hwnd(&self) -> *mut libc::c_void;
|
|
|
|
/// This sets `ICON_BIG`. A good ceiling here is 256x256.
|
|
fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>);
|
|
}
|
|
|
|
impl WindowExtWindows for Window {
|
|
#[inline]
|
|
fn get_hwnd(&self) -> *mut libc::c_void {
|
|
self.window.hwnd() as *mut _
|
|
}
|
|
|
|
#[inline]
|
|
fn set_taskbar_icon(&self, taskbar_icon: Option<Icon>) {
|
|
self.window.set_taskbar_icon(taskbar_icon)
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `WindowBuilder` that are specific to Windows.
|
|
pub trait WindowBuilderExtWindows {
|
|
/// Sets a parent to the window to be created.
|
|
fn with_parent_window(self, parent: HWND) -> WindowBuilder;
|
|
|
|
/// This sets `ICON_BIG`. A good ceiling here is 256x256.
|
|
fn with_taskbar_icon(self, taskbar_icon: Option<Icon>) -> WindowBuilder;
|
|
|
|
/// This sets `WS_EX_NOREDIRECTIONBITMAP`.
|
|
fn with_no_redirection_bitmap(self, flag: bool) -> WindowBuilder;
|
|
}
|
|
|
|
impl WindowBuilderExtWindows for WindowBuilder {
|
|
#[inline]
|
|
fn with_parent_window(mut self, parent: HWND) -> WindowBuilder {
|
|
self.platform_specific.parent = Some(parent);
|
|
self
|
|
}
|
|
|
|
#[inline]
|
|
fn with_taskbar_icon(mut self, taskbar_icon: Option<Icon>) -> WindowBuilder {
|
|
self.platform_specific.taskbar_icon = taskbar_icon;
|
|
self
|
|
}
|
|
|
|
#[inline]
|
|
fn with_no_redirection_bitmap(mut self, flag: bool) -> WindowBuilder {
|
|
self.platform_specific.no_redirection_bitmap = flag;
|
|
self
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `MonitorHandle` that are specific to Windows.
|
|
pub trait MonitorHandleExtWindows {
|
|
/// Returns the name of the monitor adapter specific to the Win32 API.
|
|
fn native_id(&self) -> String;
|
|
|
|
/// Returns the handle of the monitor - `HMONITOR`.
|
|
fn hmonitor(&self) -> *mut c_void;
|
|
}
|
|
|
|
impl MonitorHandleExtWindows for MonitorHandle {
|
|
#[inline]
|
|
fn native_id(&self) -> String {
|
|
self.inner.get_native_identifier()
|
|
}
|
|
|
|
#[inline]
|
|
fn hmonitor(&self) -> *mut c_void {
|
|
self.inner.get_hmonitor() as *mut _
|
|
}
|
|
}
|
|
|
|
/// Additional methods on `DeviceId` that are specific to Windows.
|
|
pub trait DeviceIdExtWindows {
|
|
/// Returns an identifier that persistently refers to this specific device.
|
|
///
|
|
/// Will return `None` if the device is no longer available.
|
|
fn get_persistent_identifier(&self) -> Option<String>;
|
|
}
|
|
|
|
impl DeviceIdExtWindows for DeviceId {
|
|
#[inline]
|
|
fn get_persistent_identifier(&self) -> Option<String> {
|
|
self.0.get_persistent_identifier()
|
|
}
|
|
}
|