mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-29 00:11:30 +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
80 lines
1.8 KiB
Rust
80 lines
1.8 KiB
Rust
#![cfg(target_os = "windows")]
|
|
|
|
use winapi;
|
|
use winapi::shared::windef::HWND;
|
|
|
|
pub use self::event_loop::{EventLoop, EventLoopWindowTarget, EventLoopProxy};
|
|
pub use self::monitor::MonitorHandle;
|
|
pub use self::window::Window;
|
|
|
|
use window::Icon;
|
|
use event::DeviceId as RootDeviceId;
|
|
|
|
#[derive(Clone, Default)]
|
|
pub struct PlatformSpecificWindowBuilderAttributes {
|
|
pub parent: Option<HWND>,
|
|
pub taskbar_icon: Option<Icon>,
|
|
pub no_redirection_bitmap: bool,
|
|
}
|
|
|
|
unsafe impl Send for PlatformSpecificWindowBuilderAttributes {}
|
|
unsafe impl Sync for PlatformSpecificWindowBuilderAttributes {}
|
|
|
|
// Cursor name in UTF-16. Used to set cursor in `WM_SETCURSOR`.
|
|
#[derive(Debug, Clone, Copy)]
|
|
pub struct Cursor(pub *const winapi::ctypes::wchar_t);
|
|
unsafe impl Send for Cursor {}
|
|
unsafe impl Sync for Cursor {}
|
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub struct DeviceId(u32);
|
|
|
|
impl DeviceId {
|
|
pub unsafe fn dummy() -> Self {
|
|
DeviceId(0)
|
|
}
|
|
}
|
|
|
|
impl DeviceId {
|
|
pub fn persistent_identifier(&self) -> Option<String> {
|
|
if self.0 != 0 {
|
|
raw_input::get_raw_input_device_name(self.0 as _)
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
}
|
|
|
|
// Constant device ID, to be removed when this backend is updated to report real device IDs.
|
|
const DEVICE_ID: RootDeviceId = RootDeviceId(DeviceId(0));
|
|
|
|
fn wrap_device_id(id: u32) -> RootDeviceId {
|
|
RootDeviceId(DeviceId(id))
|
|
}
|
|
|
|
pub type OsError = std::io::Error;
|
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
pub struct WindowId(HWND);
|
|
unsafe impl Send for WindowId {}
|
|
unsafe impl Sync for WindowId {}
|
|
|
|
impl WindowId {
|
|
pub unsafe fn dummy() -> Self {
|
|
use std::ptr::null_mut;
|
|
|
|
WindowId(null_mut())
|
|
}
|
|
}
|
|
|
|
mod dpi;
|
|
mod drop_handler;
|
|
mod event;
|
|
mod event_loop;
|
|
mod icon;
|
|
mod monitor;
|
|
mod raw_input;
|
|
mod util;
|
|
mod window;
|
|
mod window_state;
|