2019-07-05 18:37:25 +02:00
|
|
|
#![allow(non_snake_case)]
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2019-08-26 22:05:42 -04:00
|
|
|
mod runner;
|
|
|
|
|
|
2019-06-21 11:33:15 -04:00
|
|
|
use std::cell::Cell;
|
2020-07-04 15:46:41 -04:00
|
|
|
use std::collections::VecDeque;
|
2022-03-30 10:30:45 +02:00
|
|
|
use std::ffi::c_void;
|
2019-06-21 11:33:15 -04:00
|
|
|
use std::marker::PhantomData;
|
|
|
|
|
use std::rc::Rc;
|
2023-02-04 06:38:21 -08:00
|
|
|
use std::sync::atomic::{AtomicU32, Ordering};
|
2022-08-31 18:32:19 +02:00
|
|
|
use std::sync::{Arc, Mutex, MutexGuard};
|
2019-06-21 11:33:15 -04:00
|
|
|
use std::time::{Duration, Instant};
|
|
|
|
|
use std::{mem, panic, ptr};
|
|
|
|
|
|
2024-02-25 08:19:27 -08:00
|
|
|
use runner::EventLoopRunner;
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::Devices::HumanInterfaceDevice::MOUSE_MOVE_RELATIVE;
|
2023-12-22 18:42:17 +01:00
|
|
|
use windows_sys::Win32::Foundation::{HWND, LPARAM, LRESULT, POINT, RECT, WPARAM};
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::Graphics::Gdi::{
|
2023-06-18 11:42:57 +01:00
|
|
|
GetMonitorInfoW, MonitorFromRect, MonitorFromWindow, RedrawWindow, ScreenToClient,
|
|
|
|
|
ValidateRect, MONITORINFO, MONITOR_DEFAULTTONULL, RDW_INTERNALPAINT, SC_SCREENSAVE,
|
2019-06-21 11:33:15 -04:00
|
|
|
};
|
2023-06-03 15:02:37 -07:00
|
|
|
use windows_sys::Win32::System::Ole::RevokeDragDrop;
|
|
|
|
|
use windows_sys::Win32::System::Threading::{GetCurrentThreadId, INFINITE};
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::UI::Controls::{HOVER_DEFAULT, WM_MOUSELEAVE};
|
2022-05-07 05:29:25 +03:00
|
|
|
use windows_sys::Win32::UI::Input::Ime::{GCS_COMPSTR, GCS_RESULTSTR, ISC_SHOWUICOMPOSITIONWINDOW};
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::UI::Input::KeyboardAndMouse::{
|
2023-12-22 18:42:17 +01:00
|
|
|
ReleaseCapture, SetCapture, TrackMouseEvent, TME_LEAVE, TRACKMOUSEEVENT,
|
2022-03-07 22:58:12 +01:00
|
|
|
};
|
2023-12-22 18:42:17 +01:00
|
|
|
use windows_sys::Win32::UI::Input::Pointer::{
|
|
|
|
|
POINTER_FLAG_DOWN, POINTER_FLAG_UP, POINTER_FLAG_UPDATE,
|
2024-04-26 19:11:44 +04:00
|
|
|
};
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::UI::Input::Touch::{
|
|
|
|
|
CloseTouchInputHandle, GetTouchInputInfo, TOUCHEVENTF_DOWN, TOUCHEVENTF_MOVE, TOUCHEVENTF_UP,
|
|
|
|
|
TOUCHINPUT,
|
|
|
|
|
};
|
2023-05-28 20:02:59 +02:00
|
|
|
use windows_sys::Win32::UI::Input::{RAWINPUT, RIM_TYPEKEYBOARD, RIM_TYPEMOUSE};
|
2022-03-07 22:58:12 +01:00
|
|
|
use windows_sys::Win32::UI::WindowsAndMessaging::{
|
2023-10-17 06:53:22 +03:30
|
|
|
CreateWindowExW, DefWindowProcW, DestroyWindow, DispatchMessageW, GetClientRect, GetCursorPos,
|
|
|
|
|
GetMenu, GetMessageW, KillTimer, LoadCursorW, PeekMessageW, PostMessageW, RegisterClassExW,
|
2023-06-18 11:42:57 +01:00
|
|
|
RegisterWindowMessageA, SetCursor, SetTimer, SetWindowPos, TranslateMessage, CREATESTRUCTW,
|
2024-08-05 12:01:31 +02:00
|
|
|
GWL_STYLE, GWL_USERDATA, HTCAPTION, HTCLIENT, MINMAXINFO, MNC_CLOSE, MSG, NCCALCSIZE_PARAMS,
|
|
|
|
|
PM_REMOVE, PT_PEN, PT_TOUCH, RI_MOUSE_HWHEEL, RI_MOUSE_WHEEL, SC_MINIMIZE, SC_RESTORE,
|
|
|
|
|
SIZE_MAXIMIZED, SWP_NOACTIVATE, SWP_NOMOVE, SWP_NOSIZE, SWP_NOZORDER, WHEEL_DELTA, WINDOWPOS,
|
|
|
|
|
WMSZ_BOTTOM, WMSZ_BOTTOMLEFT, WMSZ_BOTTOMRIGHT, WMSZ_LEFT, WMSZ_RIGHT, WMSZ_TOP, WMSZ_TOPLEFT,
|
|
|
|
|
WMSZ_TOPRIGHT, WM_CAPTURECHANGED, WM_CLOSE, WM_CREATE, WM_DESTROY, WM_DPICHANGED,
|
|
|
|
|
WM_ENTERSIZEMOVE, WM_EXITSIZEMOVE, WM_GETMINMAXINFO, WM_IME_COMPOSITION, WM_IME_ENDCOMPOSITION,
|
|
|
|
|
WM_IME_SETCONTEXT, WM_IME_STARTCOMPOSITION, WM_INPUT, WM_KEYDOWN, WM_KEYUP, WM_KILLFOCUS,
|
|
|
|
|
WM_LBUTTONDOWN, WM_LBUTTONUP, WM_MBUTTONDOWN, WM_MBUTTONUP, WM_MENUCHAR, WM_MOUSEHWHEEL,
|
|
|
|
|
WM_MOUSEMOVE, WM_MOUSEWHEEL, WM_NCACTIVATE, WM_NCCALCSIZE, WM_NCCREATE, WM_NCDESTROY,
|
|
|
|
|
WM_NCLBUTTONDOWN, WM_PAINT, WM_POINTERDOWN, WM_POINTERUP, WM_POINTERUPDATE, WM_RBUTTONDOWN,
|
|
|
|
|
WM_RBUTTONUP, WM_SETCURSOR, WM_SETFOCUS, WM_SETTINGCHANGE, WM_SIZE, WM_SIZING, WM_SYSCOMMAND,
|
|
|
|
|
WM_SYSKEYDOWN, WM_SYSKEYUP, WM_TOUCH, WM_WINDOWPOSCHANGED, WM_WINDOWPOSCHANGING,
|
|
|
|
|
WM_XBUTTONDOWN, WM_XBUTTONUP, WNDCLASSEXW, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW,
|
|
|
|
|
WS_EX_TRANSPARENT, WS_OVERLAPPED, WS_POPUP, WS_VISIBLE,
|
2019-02-05 10:30:33 -05:00
|
|
|
};
|
2019-06-21 11:33:15 -04:00
|
|
|
|
2023-12-16 22:02:17 +02:00
|
|
|
use super::window::set_skip_taskbar;
|
|
|
|
|
use super::SelectedCursor;
|
2024-05-20 20:27:36 +04:00
|
|
|
use crate::application::ApplicationHandler;
|
2019-06-19 16:49:43 -04:00
|
|
|
use crate::dpi::{PhysicalPosition, PhysicalSize};
|
2023-08-13 23:20:09 +04:00
|
|
|
use crate::error::EventLoopError;
|
2023-07-31 00:39:01 +04:00
|
|
|
use crate::event::{
|
2024-08-05 12:01:31 +02:00
|
|
|
Event, Force, Ime, InnerSizeWriter, RawKeyEvent, Touch, TouchPhase, WindowEvent,
|
2023-07-31 00:39:01 +04:00
|
|
|
};
|
2024-06-24 13:04:55 +03:00
|
|
|
use crate::event_loop::{ActiveEventLoop as RootAEL, ControlFlow, DeviceEvents};
|
2023-12-22 18:42:17 +01:00
|
|
|
use crate::keyboard::ModifiersState;
|
|
|
|
|
use crate::platform::pump_events::PumpStatus;
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::platform_impl::platform::dark_mode::try_theme;
|
2021-11-17 18:33:44 +01:00
|
|
|
use crate::platform_impl::platform::dpi::{become_dpi_aware, dpi_to_scale_factor};
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::platform_impl::platform::drop_handler::FileDropHandler;
|
2024-02-03 07:27:17 +04:00
|
|
|
use crate::platform_impl::platform::icon::WinCursor;
|
2022-05-07 05:29:25 +03:00
|
|
|
use crate::platform_impl::platform::ime::ImeContext;
|
2023-05-28 20:02:59 +02:00
|
|
|
use crate::platform_impl::platform::keyboard::KeyEventBuilder;
|
|
|
|
|
use crate::platform_impl::platform::keyboard_layout::LAYOUT_CACHE;
|
2020-07-04 15:46:41 -04:00
|
|
|
use crate::platform_impl::platform::monitor::{self, MonitorHandle};
|
2021-07-16 12:40:48 +02:00
|
|
|
use crate::platform_impl::platform::window::InitData;
|
2022-05-07 05:29:25 +03:00
|
|
|
use crate::platform_impl::platform::window_state::{
|
|
|
|
|
CursorFlags, ImeState, WindowFlags, WindowState,
|
2024-04-26 19:11:44 +04:00
|
|
|
};
|
2023-10-17 06:53:22 +03:30
|
|
|
use crate::platform_impl::platform::{
|
2022-09-21 10:04:28 +02:00
|
|
|
raw_input, util, wrap_device_id, Fullscreen, WindowId, DEVICE_ID,
|
2019-06-21 11:33:15 -04:00
|
|
|
};
|
2024-02-25 08:19:27 -08:00
|
|
|
use crate::utils::Lazy;
|
2024-02-03 07:27:17 +04:00
|
|
|
use crate::window::{
|
|
|
|
|
CustomCursor as RootCustomCursor, CustomCursorSource, WindowId as RootWindowId,
|
2019-02-05 10:30:33 -05:00
|
|
|
};
|
2022-07-22 19:33:22 +02:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
pub(crate) struct WindowData {
|
2019-02-05 10:30:33 -05:00
|
|
|
pub window_state: Arc<Mutex<WindowState>>,
|
2024-06-24 13:04:55 +03:00
|
|
|
pub event_loop_runner: Rc<EventLoopRunner>,
|
2023-05-28 20:02:59 +02:00
|
|
|
pub key_event_builder: KeyEventBuilder,
|
2021-08-30 19:40:02 +02:00
|
|
|
pub _file_drop_handler: Option<FileDropHandler>,
|
2021-07-16 12:40:48 +02:00
|
|
|
pub userdata_removed: Cell<bool>,
|
2020-12-20 12:54:42 +01:00
|
|
|
pub recurse_depth: Cell<u32>,
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
impl WindowData {
|
2024-06-24 13:04:55 +03:00
|
|
|
fn send_event(&self, event: Event) {
|
2019-02-05 10:30:33 -05:00
|
|
|
self.event_loop_runner.send_event(event);
|
|
|
|
|
}
|
2022-08-31 18:32:19 +02:00
|
|
|
|
|
|
|
|
fn window_state_lock(&self) -> MutexGuard<'_, WindowState> {
|
|
|
|
|
self.window_state.lock().unwrap()
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
struct ThreadMsgTargetData {
|
2024-06-24 13:04:55 +03:00
|
|
|
event_loop_runner: Rc<EventLoopRunner>,
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
impl ThreadMsgTargetData {
|
2024-06-24 13:04:55 +03:00
|
|
|
fn send_event(&self, event: Event) {
|
2019-02-05 10:30:33 -05:00
|
|
|
self.event_loop_runner.send_event(event);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
/// The result of a subclass procedure (the message handling callback)
|
|
|
|
|
#[derive(Clone, Copy)]
|
|
|
|
|
pub(crate) enum ProcResult {
|
|
|
|
|
DefWindowProc(WPARAM),
|
|
|
|
|
Value(isize),
|
|
|
|
|
}
|
|
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
pub struct EventLoop {
|
2024-01-31 17:29:59 +04:00
|
|
|
window_target: RootAEL,
|
2022-03-30 10:30:45 +02:00
|
|
|
msg_hook: Option<Box<dyn FnMut(*const c_void) -> bool + 'static>>,
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2022-02-16 22:09:03 +01:00
|
|
|
pub(crate) struct PlatformSpecificEventLoopAttributes {
|
|
|
|
|
pub(crate) any_thread: bool,
|
|
|
|
|
pub(crate) dpi_aware: bool,
|
2022-03-30 10:30:45 +02:00
|
|
|
pub(crate) msg_hook: Option<Box<dyn FnMut(*const c_void) -> bool + 'static>>,
|
2022-02-16 22:09:03 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
impl Default for PlatformSpecificEventLoopAttributes {
|
|
|
|
|
fn default() -> Self {
|
|
|
|
|
Self { any_thread: false, dpi_aware: true, msg_hook: None }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-31 17:29:59 +04:00
|
|
|
pub struct ActiveEventLoop {
|
2022-03-07 22:58:12 +01:00
|
|
|
thread_id: u32,
|
2019-02-05 10:30:33 -05:00
|
|
|
thread_msg_target: HWND,
|
2024-06-24 13:04:55 +03:00
|
|
|
pub(crate) runner_shared: Rc<EventLoopRunner>,
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
impl EventLoop {
|
2023-08-13 23:20:09 +04:00
|
|
|
pub(crate) fn new(
|
|
|
|
|
attributes: &mut PlatformSpecificEventLoopAttributes,
|
|
|
|
|
) -> Result<Self, EventLoopError> {
|
2022-03-07 22:58:12 +01:00
|
|
|
let thread_id = unsafe { GetCurrentThreadId() };
|
2022-02-16 22:09:03 +01:00
|
|
|
|
|
|
|
|
if !attributes.any_thread && thread_id != main_thread_id() {
|
|
|
|
|
panic!(
|
2019-10-18 11:51:06 -04:00
|
|
|
"Initializing the event loop outside of the main thread is a significant \
|
2022-02-16 22:09:03 +01:00
|
|
|
cross-platform compatibility hazard. If you absolutely need to create an \
|
|
|
|
|
EventLoop on a different thread, you can use the \
|
|
|
|
|
`EventLoopBuilderExtWindows::any_thread` function."
|
|
|
|
|
);
|
2019-10-18 11:51:06 -04:00
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-02-16 22:09:03 +01:00
|
|
|
if attributes.dpi_aware {
|
|
|
|
|
become_dpi_aware();
|
|
|
|
|
}
|
2020-05-04 15:14:13 -04:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
let thread_msg_target = create_event_target_window();
|
2020-05-04 15:14:13 -04:00
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
let runner_shared = Rc::new(EventLoopRunner::new(thread_msg_target));
|
2020-05-04 15:14:13 -04:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
insert_event_target_window_data(thread_msg_target, runner_shared.clone());
|
2022-08-11 15:17:46 +02:00
|
|
|
raw_input::register_all_mice_and_keyboards_for_raw_input(
|
|
|
|
|
thread_msg_target,
|
|
|
|
|
Default::default(),
|
|
|
|
|
);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-08-13 23:20:09 +04:00
|
|
|
Ok(EventLoop {
|
2024-01-31 17:29:59 +04:00
|
|
|
window_target: RootAEL {
|
|
|
|
|
p: ActiveEventLoop { thread_id, thread_msg_target, runner_shared },
|
2019-02-05 10:30:33 -05:00
|
|
|
_marker: PhantomData,
|
|
|
|
|
},
|
2022-03-30 10:30:45 +02:00
|
|
|
msg_hook: attributes.msg_hook.take(),
|
2023-08-13 23:20:09 +04:00
|
|
|
})
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-01-31 17:29:59 +04:00
|
|
|
pub fn window_target(&self) -> &RootAEL {
|
2019-10-18 11:51:06 -04:00
|
|
|
&self.window_target
|
|
|
|
|
}
|
|
|
|
|
|
2024-07-11 15:38:09 +02:00
|
|
|
pub fn run_app<A: ApplicationHandler>(mut self, app: A) -> Result<(), EventLoopError> {
|
2024-05-20 20:27:36 +04:00
|
|
|
self.run_app_on_demand(app)
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
pub fn run_app_on_demand<A: ApplicationHandler>(
|
2024-05-20 20:27:36 +04:00
|
|
|
&mut self,
|
2024-07-11 15:38:09 +02:00
|
|
|
mut app: A,
|
2024-05-20 20:27:36 +04:00
|
|
|
) -> Result<(), EventLoopError> {
|
2024-07-14 20:51:38 +02:00
|
|
|
self.window_target.p.clear_exit();
|
2023-06-18 11:42:57 +01:00
|
|
|
{
|
|
|
|
|
let runner = &self.window_target.p.runner_shared;
|
|
|
|
|
|
|
|
|
|
let event_loop_windows_ref = &self.window_target;
|
|
|
|
|
// # Safety
|
|
|
|
|
// We make sure to call runner.clear_event_handler() before
|
|
|
|
|
// returning
|
|
|
|
|
unsafe {
|
2024-06-24 13:04:55 +03:00
|
|
|
runner.set_event_handler(move |event| match event {
|
|
|
|
|
Event::NewEvents(cause) => app.new_events(event_loop_windows_ref, cause),
|
|
|
|
|
Event::WindowEvent { window_id, event } => {
|
|
|
|
|
app.window_event(event_loop_windows_ref, window_id, event)
|
|
|
|
|
},
|
|
|
|
|
Event::DeviceEvent { device_id, event } => {
|
|
|
|
|
app.device_event(event_loop_windows_ref, device_id, event)
|
|
|
|
|
},
|
|
|
|
|
Event::UserWakeUp => app.proxy_wake_up(event_loop_windows_ref),
|
|
|
|
|
Event::Suspended => app.suspended(event_loop_windows_ref),
|
|
|
|
|
Event::Resumed => app.resumed(event_loop_windows_ref),
|
2024-06-30 00:41:57 +02:00
|
|
|
Event::CreateSurfaces => app.can_create_surfaces(event_loop_windows_ref),
|
2024-06-24 13:04:55 +03:00
|
|
|
Event::AboutToWait => app.about_to_wait(event_loop_windows_ref),
|
|
|
|
|
Event::LoopExiting => app.exiting(event_loop_windows_ref),
|
|
|
|
|
Event::MemoryWarning => app.memory_warning(event_loop_windows_ref),
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
});
|
2023-06-18 11:42:57 +01:00
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
let exit_code = loop {
|
2023-09-07 08:25:04 +02:00
|
|
|
self.wait_and_dispatch_message(None);
|
|
|
|
|
|
|
|
|
|
if let Some(code) = self.exit_code() {
|
2023-06-18 11:42:57 +01:00
|
|
|
break code;
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
self.dispatch_peeked_messages();
|
|
|
|
|
|
|
|
|
|
if let Some(code) = self.exit_code() {
|
2023-06-18 11:42:57 +01:00
|
|
|
break code;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
2019-08-26 22:05:42 -04:00
|
|
|
let runner = &self.window_target.p.runner_shared;
|
2023-06-18 11:42:57 +01:00
|
|
|
runner.loop_destroyed();
|
|
|
|
|
|
|
|
|
|
// # Safety
|
|
|
|
|
// We assume that this will effectively call `runner.clear_event_handler()`
|
|
|
|
|
// to meet the safety requirements for calling `runner.set_event_handler()` above.
|
|
|
|
|
runner.reset_runner();
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
if exit_code == 0 {
|
|
|
|
|
Ok(())
|
|
|
|
|
} else {
|
2023-08-13 23:20:09 +04:00
|
|
|
Err(EventLoopError::ExitFailure(exit_code))
|
2023-06-18 11:42:57 +01:00
|
|
|
}
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
pub fn pump_app_events<A: ApplicationHandler>(
|
2024-05-20 20:27:36 +04:00
|
|
|
&mut self,
|
|
|
|
|
timeout: Option<Duration>,
|
2024-07-11 15:38:09 +02:00
|
|
|
mut app: A,
|
2024-05-20 20:27:36 +04:00
|
|
|
) -> PumpStatus {
|
2023-06-18 11:42:57 +01:00
|
|
|
{
|
|
|
|
|
let runner = &self.window_target.p.runner_shared;
|
|
|
|
|
let event_loop_windows_ref = &self.window_target;
|
2024-06-24 13:04:55 +03:00
|
|
|
// let user_event_receiver = &self.user_event_receiver;
|
2023-06-18 11:42:57 +01:00
|
|
|
|
|
|
|
|
// # Safety
|
|
|
|
|
// We make sure to call runner.clear_event_handler() before
|
|
|
|
|
// returning
|
|
|
|
|
//
|
|
|
|
|
// Note: we're currently assuming nothing can panic and unwind
|
|
|
|
|
// to leave the runner in an unsound state with an associated
|
|
|
|
|
// event handler.
|
|
|
|
|
unsafe {
|
2024-06-24 13:04:55 +03:00
|
|
|
runner.set_event_handler(move |event| match event {
|
|
|
|
|
Event::NewEvents(cause) => app.new_events(event_loop_windows_ref, cause),
|
|
|
|
|
Event::WindowEvent { window_id, event } => {
|
|
|
|
|
app.window_event(event_loop_windows_ref, window_id, event)
|
|
|
|
|
},
|
|
|
|
|
Event::DeviceEvent { device_id, event } => {
|
|
|
|
|
app.device_event(event_loop_windows_ref, device_id, event)
|
|
|
|
|
},
|
|
|
|
|
Event::UserWakeUp => app.proxy_wake_up(event_loop_windows_ref),
|
|
|
|
|
Event::Suspended => app.suspended(event_loop_windows_ref),
|
|
|
|
|
Event::Resumed => app.resumed(event_loop_windows_ref),
|
2024-06-30 00:41:57 +02:00
|
|
|
Event::CreateSurfaces => app.can_create_surfaces(event_loop_windows_ref),
|
2024-06-24 13:04:55 +03:00
|
|
|
Event::AboutToWait => app.about_to_wait(event_loop_windows_ref),
|
|
|
|
|
Event::LoopExiting => app.exiting(event_loop_windows_ref),
|
|
|
|
|
Event::MemoryWarning => app.memory_warning(event_loop_windows_ref),
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
});
|
2024-05-20 20:27:36 +04:00
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
runner.wakeup();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
self.wait_and_dispatch_message(timeout);
|
|
|
|
|
|
|
|
|
|
if self.exit_code().is_none() {
|
2023-07-24 00:07:49 +01:00
|
|
|
self.dispatch_peeked_messages();
|
|
|
|
|
}
|
2023-06-18 11:42:57 +01:00
|
|
|
|
|
|
|
|
let runner = &self.window_target.p.runner_shared;
|
|
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
let status = if let Some(code) = runner.exit_code() {
|
2023-06-18 11:42:57 +01:00
|
|
|
runner.loop_destroyed();
|
|
|
|
|
|
|
|
|
|
// Immediately reset the internal state for the loop to allow
|
|
|
|
|
// the loop to be run more than once.
|
|
|
|
|
runner.reset_runner();
|
|
|
|
|
PumpStatus::Exit(code)
|
|
|
|
|
} else {
|
|
|
|
|
runner.prepare_wait();
|
|
|
|
|
PumpStatus::Continue
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// We wait until we've checked for an exit status before clearing the
|
2023-07-28 17:19:53 +01:00
|
|
|
// application callback, in case we need to dispatch a LoopExiting event
|
2023-06-18 11:42:57 +01:00
|
|
|
//
|
|
|
|
|
// # Safety
|
|
|
|
|
// This pairs up with our call to `runner.set_event_handler` and ensures
|
|
|
|
|
// the application's callback can't be held beyond its lifetime.
|
|
|
|
|
runner.clear_event_handler();
|
|
|
|
|
|
|
|
|
|
status
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-24 00:07:49 +01:00
|
|
|
/// Wait for one message and dispatch it, optionally with a timeout
|
2023-09-07 08:25:04 +02:00
|
|
|
fn wait_and_dispatch_message(&mut self, timeout: Option<Duration>) {
|
2023-06-18 11:42:57 +01:00
|
|
|
fn get_msg_with_timeout(msg: &mut MSG, timeout: Option<Duration>) -> PumpStatus {
|
|
|
|
|
unsafe {
|
|
|
|
|
// A timeout of None means wait indefinitely (so we don't need to call SetTimer)
|
|
|
|
|
let timer_id = timeout.map(|timeout| SetTimer(0, 0, dur2timeout(timeout), None));
|
|
|
|
|
let get_status = GetMessageW(msg, 0, 0, 0);
|
|
|
|
|
if let Some(timer_id) = timer_id {
|
|
|
|
|
KillTimer(0, timer_id);
|
|
|
|
|
}
|
|
|
|
|
// A return value of 0 implies `WM_QUIT`
|
|
|
|
|
if get_status == 0 {
|
|
|
|
|
PumpStatus::Exit(0)
|
|
|
|
|
} else {
|
|
|
|
|
PumpStatus::Continue
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Fetch the next MSG either via PeekMessage or GetMessage depending on whether the
|
|
|
|
|
/// requested timeout is `ZERO` (and so we don't want to block)
|
|
|
|
|
///
|
2024-03-22 01:44:23 +08:00
|
|
|
/// Returns `None` if no MSG was read, else a `Continue` or `Exit` status
|
2023-06-18 11:42:57 +01:00
|
|
|
fn wait_for_msg(msg: &mut MSG, timeout: Option<Duration>) -> Option<PumpStatus> {
|
|
|
|
|
if timeout == Some(Duration::ZERO) {
|
|
|
|
|
unsafe {
|
|
|
|
|
if PeekMessageW(msg, 0, 0, 0, PM_REMOVE) != 0 {
|
|
|
|
|
Some(PumpStatus::Continue)
|
|
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Some(get_msg_with_timeout(msg, timeout))
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-11-08 16:21:33 +01:00
|
|
|
let runner = &self.window_target.p.runner_shared;
|
|
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
// We aim to be consistent with the MacOS backend which has a RunLoop
|
2023-07-28 17:37:56 +01:00
|
|
|
// observer that will dispatch AboutToWait when about to wait for
|
2023-06-18 11:42:57 +01:00
|
|
|
// events, and NewEvents after the RunLoop wakes up.
|
|
|
|
|
//
|
|
|
|
|
// We emulate similar behaviour by treating `GetMessage` as our wait
|
|
|
|
|
// point and wake up point (when it returns) and we drain all other
|
|
|
|
|
// pending messages via `PeekMessage` until we come back to "wait" via
|
|
|
|
|
// `GetMessage`
|
|
|
|
|
//
|
|
|
|
|
runner.prepare_wait();
|
|
|
|
|
|
2023-11-08 16:21:33 +01:00
|
|
|
let control_flow_timeout = match runner.control_flow() {
|
|
|
|
|
ControlFlow::Wait => None,
|
|
|
|
|
ControlFlow::Poll => Some(Duration::ZERO),
|
|
|
|
|
ControlFlow::WaitUntil(wait_deadline) => {
|
|
|
|
|
let start = Instant::now();
|
|
|
|
|
Some(wait_deadline.saturating_duration_since(start))
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
let timeout = min_timeout(control_flow_timeout, timeout);
|
|
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
// # Safety
|
|
|
|
|
// The Windows API has no documented requirement for bitwise
|
|
|
|
|
// initializing a `MSG` struct (it can be uninitialized memory for the C
|
|
|
|
|
// API) and there's no API to construct or initialize a `MSG`. This
|
2024-02-19 11:58:44 +07:00
|
|
|
// is the simplest way avoid uninitialized memory in Rust
|
2023-06-18 11:42:57 +01:00
|
|
|
let mut msg = unsafe { mem::zeroed() };
|
|
|
|
|
let msg_status = wait_for_msg(&mut msg, timeout);
|
|
|
|
|
|
|
|
|
|
// Before we potentially exit, make sure to consistently emit an event for the wake up
|
|
|
|
|
runner.wakeup();
|
|
|
|
|
|
|
|
|
|
match msg_status {
|
|
|
|
|
None => {}, // No MSG to dispatch
|
|
|
|
|
Some(PumpStatus::Exit(code)) => {
|
2023-09-07 08:25:04 +02:00
|
|
|
runner.set_exit_code(code);
|
2023-06-18 11:42:57 +01:00
|
|
|
},
|
|
|
|
|
Some(PumpStatus::Continue) => {
|
|
|
|
|
unsafe {
|
|
|
|
|
let handled = if let Some(callback) = self.msg_hook.as_deref_mut() {
|
|
|
|
|
callback(&mut msg as *mut _ as *mut _)
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
};
|
|
|
|
|
if !handled {
|
|
|
|
|
TranslateMessage(&msg);
|
|
|
|
|
DispatchMessageW(&msg);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if let Err(payload) = runner.take_panic_error() {
|
|
|
|
|
runner.reset_runner();
|
|
|
|
|
panic::resume_unwind(payload);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Dispatch all queued messages via `PeekMessageW`
|
2023-09-07 08:25:04 +02:00
|
|
|
fn dispatch_peeked_messages(&mut self) {
|
2023-06-18 11:42:57 +01:00
|
|
|
let runner = &self.window_target.p.runner_shared;
|
|
|
|
|
|
|
|
|
|
// We generally want to continue dispatching all pending messages
|
|
|
|
|
// but we also allow dispatching to be interrupted as a means to
|
|
|
|
|
// ensure the `pump_events` won't indefinitely block an external
|
|
|
|
|
// event loop if there are too many pending events. This interrupt
|
|
|
|
|
// flag will be set after dispatching `RedrawRequested` events.
|
|
|
|
|
runner.interrupt_msg_dispatch.set(false);
|
|
|
|
|
|
|
|
|
|
// # Safety
|
|
|
|
|
// The Windows API has no documented requirement for bitwise
|
|
|
|
|
// initializing a `MSG` struct (it can be uninitialized memory for the C
|
|
|
|
|
// API) and there's no API to construct or initialize a `MSG`. This
|
2024-02-19 11:58:44 +07:00
|
|
|
// is the simplest way avoid uninitialized memory in Rust
|
2023-06-18 11:42:57 +01:00
|
|
|
let mut msg = unsafe { mem::zeroed() };
|
|
|
|
|
|
|
|
|
|
loop {
|
|
|
|
|
unsafe {
|
|
|
|
|
if PeekMessageW(&mut msg, 0, 0, 0, PM_REMOVE) == false.into() {
|
|
|
|
|
break;
|
2020-01-06 15:28:58 -05:00
|
|
|
}
|
2022-03-30 10:30:45 +02:00
|
|
|
|
|
|
|
|
let handled = if let Some(callback) = self.msg_hook.as_deref_mut() {
|
|
|
|
|
callback(&mut msg as *mut _ as *mut _)
|
|
|
|
|
} else {
|
|
|
|
|
false
|
|
|
|
|
};
|
|
|
|
|
if !handled {
|
|
|
|
|
TranslateMessage(&msg);
|
|
|
|
|
DispatchMessageW(&msg);
|
|
|
|
|
}
|
2023-06-18 11:42:57 +01:00
|
|
|
}
|
2020-01-06 15:28:58 -05:00
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
if let Err(payload) = runner.take_panic_error() {
|
|
|
|
|
runner.reset_runner();
|
|
|
|
|
panic::resume_unwind(payload);
|
|
|
|
|
}
|
2020-01-06 15:28:58 -05:00
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
if let Some(_code) = runner.exit_code() {
|
2023-06-18 11:42:57 +01:00
|
|
|
break;
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2023-06-18 11:42:57 +01:00
|
|
|
if runner.interrupt_msg_dispatch.get() {
|
|
|
|
|
break;
|
|
|
|
|
}
|
2020-05-04 15:14:13 -04:00
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
fn exit_code(&self) -> Option<i32> {
|
|
|
|
|
self.window_target.p.exit_code()
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-01-31 17:29:59 +04:00
|
|
|
impl ActiveEventLoop {
|
2024-06-29 17:19:09 +02:00
|
|
|
pub fn create_proxy(&self) -> EventLoopProxy {
|
|
|
|
|
EventLoopProxy { target_window: self.thread_msg_target }
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
#[inline(always)]
|
|
|
|
|
pub(crate) fn create_thread_executor(&self) -> EventLoopThreadExecutor {
|
|
|
|
|
EventLoopThreadExecutor { thread_id: self.thread_id, target_window: self.thread_msg_target }
|
|
|
|
|
}
|
2020-07-04 15:46:41 -04:00
|
|
|
|
2024-02-03 07:27:17 +04:00
|
|
|
pub fn create_custom_cursor(&self, source: CustomCursorSource) -> RootCustomCursor {
|
|
|
|
|
let inner = match WinCursor::new(&source.inner.0) {
|
|
|
|
|
Ok(cursor) => cursor,
|
|
|
|
|
Err(err) => {
|
2024-02-25 19:20:39 -08:00
|
|
|
tracing::warn!("Failed to create custom cursor: {err}");
|
2024-02-03 07:27:17 +04:00
|
|
|
WinCursor::Failed
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
RootCustomCursor { inner }
|
|
|
|
|
}
|
|
|
|
|
|
2020-07-04 15:46:41 -04:00
|
|
|
// TODO: Investigate opportunities for caching
|
|
|
|
|
pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
|
|
|
|
|
monitor::available_monitors()
|
|
|
|
|
}
|
|
|
|
|
|
2022-09-21 10:04:28 +02:00
|
|
|
pub fn primary_monitor(&self) -> Option<MonitorHandle> {
|
2020-09-07 20:20:47 +03:00
|
|
|
let monitor = monitor::primary_monitor();
|
2022-09-21 10:04:28 +02:00
|
|
|
Some(monitor)
|
2020-07-04 15:46:41 -04:00
|
|
|
}
|
2022-07-21 22:22:36 +03:00
|
|
|
|
2023-10-14 19:07:39 -07:00
|
|
|
#[cfg(feature = "rwh_06")]
|
|
|
|
|
pub fn raw_display_handle_rwh_06(
|
|
|
|
|
&self,
|
|
|
|
|
) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
|
|
|
|
|
Ok(rwh_06::RawDisplayHandle::Windows(rwh_06::WindowsDisplayHandle::new()))
|
2022-07-21 22:22:36 +03:00
|
|
|
}
|
2022-08-11 15:17:46 +02:00
|
|
|
|
2023-05-30 21:32:31 +02:00
|
|
|
pub fn listen_device_events(&self, allowed: DeviceEvents) {
|
|
|
|
|
raw_input::register_all_mice_and_keyboards_for_raw_input(self.thread_msg_target, allowed);
|
2022-08-11 15:17:46 +02:00
|
|
|
}
|
2023-09-07 08:25:04 +02:00
|
|
|
|
|
|
|
|
pub(crate) fn set_control_flow(&self, control_flow: ControlFlow) {
|
|
|
|
|
self.runner_shared.set_control_flow(control_flow)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(crate) fn control_flow(&self) -> ControlFlow {
|
|
|
|
|
self.runner_shared.control_flow()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(crate) fn exit(&self) {
|
|
|
|
|
self.runner_shared.set_exit_code(0)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(crate) fn exiting(&self) -> bool {
|
|
|
|
|
self.runner_shared.exit_code().is_some()
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-22 20:00:20 +04:00
|
|
|
pub(crate) fn clear_exit(&self) {
|
|
|
|
|
self.runner_shared.clear_exit();
|
|
|
|
|
}
|
|
|
|
|
|
2024-01-15 11:58:11 -08:00
|
|
|
pub(crate) fn owned_display_handle(&self) -> OwnedDisplayHandle {
|
|
|
|
|
OwnedDisplayHandle
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-07 08:25:04 +02:00
|
|
|
fn exit_code(&self) -> Option<i32> {
|
|
|
|
|
self.runner_shared.exit_code()
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-01-15 11:58:11 -08:00
|
|
|
#[derive(Clone)]
|
|
|
|
|
pub(crate) struct OwnedDisplayHandle;
|
|
|
|
|
|
|
|
|
|
impl OwnedDisplayHandle {
|
|
|
|
|
#[cfg(feature = "rwh_06")]
|
|
|
|
|
#[inline]
|
|
|
|
|
pub fn raw_display_handle_rwh_06(
|
|
|
|
|
&self,
|
|
|
|
|
) -> Result<rwh_06::RawDisplayHandle, rwh_06::HandleError> {
|
|
|
|
|
Ok(rwh_06::WindowsDisplayHandle::new().into())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2021-06-05 10:46:44 +00:00
|
|
|
/// Returns the id of the main thread.
|
|
|
|
|
///
|
|
|
|
|
/// Windows has no real API to check if the current executing thread is the "main thread", unlike
|
|
|
|
|
/// macOS.
|
|
|
|
|
///
|
|
|
|
|
/// Windows will let us look up the current thread's id, but there's no API that lets us check what
|
|
|
|
|
/// the id of the main thread is. We would somehow need to get the main thread's id before a
|
|
|
|
|
/// developer could spin off any other threads inside of the main entrypoint in order to emulate the
|
|
|
|
|
/// capabilities of other platforms.
|
|
|
|
|
///
|
|
|
|
|
/// We can get the id of the main thread by using CRT initialization. CRT initialization can be used
|
|
|
|
|
/// to setup global state within a program. The OS will call a list of function pointers which
|
|
|
|
|
/// assign values to a static variable. To have get a hold of the main thread id, we need to place
|
|
|
|
|
/// our function pointer inside of the `.CRT$XCU` section so it is called before the main
|
|
|
|
|
/// entrypoint.
|
|
|
|
|
///
|
|
|
|
|
/// Full details of CRT initialization can be found here:
|
2022-06-17 14:19:09 +02:00
|
|
|
/// <https://docs.microsoft.com/en-us/cpp/c-runtime-library/crt-initialization?view=msvc-160>
|
2022-03-07 22:58:12 +01:00
|
|
|
fn main_thread_id() -> u32 {
|
|
|
|
|
static mut MAIN_THREAD_ID: u32 = 0;
|
2021-06-05 10:46:44 +00:00
|
|
|
|
|
|
|
|
/// Function pointer used in CRT initialization section to set the above static field's value.
|
|
|
|
|
|
|
|
|
|
// Mark as used so this is not removable.
|
2019-10-18 11:51:06 -04:00
|
|
|
#[used]
|
|
|
|
|
#[allow(non_upper_case_globals)]
|
2021-06-05 10:46:44 +00:00
|
|
|
// Place the function pointer inside of CRT initialization section so it is loaded before
|
|
|
|
|
// main entrypoint.
|
|
|
|
|
//
|
|
|
|
|
// See: https://doc.rust-lang.org/stable/reference/abi.html#the-link_section-attribute
|
2019-10-18 11:51:06 -04:00
|
|
|
#[link_section = ".CRT$XCU"]
|
|
|
|
|
static INIT_MAIN_THREAD_ID: unsafe fn() = {
|
|
|
|
|
unsafe fn initer() {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { MAIN_THREAD_ID = GetCurrentThreadId() };
|
2019-10-18 11:51:06 -04:00
|
|
|
}
|
|
|
|
|
initer
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
unsafe { MAIN_THREAD_ID }
|
|
|
|
|
}
|
|
|
|
|
|
2023-07-24 00:07:49 +01:00
|
|
|
/// Returns the minimum `Option<Duration>`, taking into account that `None`
|
|
|
|
|
/// equates to an infinite timeout, not a zero timeout (so can't just use
|
|
|
|
|
/// `Option::min`)
|
|
|
|
|
fn min_timeout(a: Option<Duration>, b: Option<Duration>) -> Option<Duration> {
|
|
|
|
|
a.map_or(b, |a_timeout| b.map_or(Some(a_timeout), |b_timeout| Some(a_timeout.min(b_timeout))))
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
// Implementation taken from https://github.com/rust-lang/rust/blob/db5476571d9b27c862b95c1e64764b0ac8980e23/src/libstd/sys/windows/mod.rs
|
2022-03-07 22:58:12 +01:00
|
|
|
fn dur2timeout(dur: Duration) -> u32 {
|
2019-02-05 10:30:33 -05:00
|
|
|
// Note that a duration is a (u64, u32) (seconds, nanoseconds) pair, and the
|
|
|
|
|
// timeouts in windows APIs are typically u32 milliseconds. To translate, we
|
|
|
|
|
// have two pieces to take care of:
|
|
|
|
|
//
|
|
|
|
|
// * Nanosecond precision is rounded up
|
|
|
|
|
// * Greater than u32::MAX milliseconds (50 days) is rounded up to INFINITE (never time out).
|
2019-06-21 11:33:15 -04:00
|
|
|
dur.as_secs()
|
|
|
|
|
.checked_mul(1000)
|
|
|
|
|
.and_then(|ms| ms.checked_add((dur.subsec_nanos() as u64) / 1_000_000))
|
|
|
|
|
.and_then(
|
|
|
|
|
|ms| {
|
2022-11-23 13:07:58 +01:00
|
|
|
if dur.subsec_nanos() % 1_000_000 > 0 {
|
|
|
|
|
ms.checked_add(1)
|
2019-06-21 11:33:15 -04:00
|
|
|
} else {
|
2022-11-23 13:07:58 +01:00
|
|
|
Some(ms)
|
|
|
|
|
}
|
2019-06-21 11:33:15 -04:00
|
|
|
},
|
|
|
|
|
)
|
2022-03-07 22:58:12 +01:00
|
|
|
.map(|ms| if ms > u32::MAX as u64 { INFINITE } else { ms as u32 })
|
|
|
|
|
.unwrap_or(INFINITE)
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
impl Drop for EventLoop {
|
2019-02-05 10:30:33 -05:00
|
|
|
fn drop(&mut self) {
|
|
|
|
|
unsafe {
|
2022-03-07 22:58:12 +01:00
|
|
|
DestroyWindow(self.window_target.p.thread_msg_target);
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pub(crate) struct EventLoopThreadExecutor {
|
2022-03-07 22:58:12 +01:00
|
|
|
thread_id: u32,
|
2019-02-05 10:30:33 -05:00
|
|
|
target_window: HWND,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsafe impl Send for EventLoopThreadExecutor {}
|
|
|
|
|
unsafe impl Sync for EventLoopThreadExecutor {}
|
|
|
|
|
|
|
|
|
|
impl EventLoopThreadExecutor {
|
|
|
|
|
/// Check to see if we're in the parent event loop's thread.
|
|
|
|
|
pub(super) fn in_event_loop_thread(&self) -> bool {
|
2022-03-07 22:58:12 +01:00
|
|
|
let cur_thread_id = unsafe { GetCurrentThreadId() };
|
2019-02-05 10:30:33 -05:00
|
|
|
self.thread_id == cur_thread_id
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Executes a function in the event loop thread. If we're already in the event loop thread,
|
|
|
|
|
/// we just call the function directly.
|
|
|
|
|
///
|
|
|
|
|
/// The `Inserted` can be used to inject a `WindowState` for the callback to use. The state is
|
|
|
|
|
/// removed automatically if the callback receives a `WM_CLOSE` message for the window.
|
|
|
|
|
///
|
|
|
|
|
/// Note that if you are using this to change some property of a window and updating
|
|
|
|
|
/// `WindowState` then you should call this within the lock of `WindowState`. Otherwise the
|
|
|
|
|
/// events may be sent to the other thread in different order to the one in which you set
|
|
|
|
|
/// `WindowState`, leaving them out of sync.
|
|
|
|
|
///
|
|
|
|
|
/// Note that we use a FnMut instead of a FnOnce because we're too lazy to create an equivalent
|
|
|
|
|
/// to the unstable FnBox.
|
|
|
|
|
pub(super) fn execute_in_thread<F>(&self, mut function: F)
|
2019-06-21 11:33:15 -04:00
|
|
|
where
|
|
|
|
|
F: FnMut() + Send + 'static,
|
2019-02-05 10:30:33 -05:00
|
|
|
{
|
|
|
|
|
unsafe {
|
|
|
|
|
if self.in_event_loop_thread() {
|
|
|
|
|
function();
|
|
|
|
|
} else {
|
|
|
|
|
// We double-box because the first box is a fat pointer.
|
2022-03-07 22:58:12 +01:00
|
|
|
let boxed2: ThreadExecFn = Box::new(Box::new(function));
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
let raw = Box::into_raw(boxed2);
|
|
|
|
|
|
2023-02-04 06:38:21 -08:00
|
|
|
let res = PostMessageW(self.target_window, EXEC_MSG_ID.get(), raw as usize, 0);
|
2022-03-07 22:58:12 +01:00
|
|
|
assert!(res != false.into(), "PostMessage failed; is the messages queue full?");
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-06-18 02:27:00 +08:00
|
|
|
type ThreadExecFn = Box<Box<dyn FnMut()>>;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
#[derive(Clone)]
|
|
|
|
|
pub struct EventLoopProxy {
|
2019-02-05 10:30:33 -05:00
|
|
|
target_window: HWND,
|
|
|
|
|
}
|
|
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
unsafe impl Send for EventLoopProxy {}
|
2019-08-06 05:51:42 +09:00
|
|
|
|
2024-06-24 13:04:55 +03:00
|
|
|
impl EventLoopProxy {
|
|
|
|
|
pub fn wake_up(&self) {
|
|
|
|
|
unsafe { PostMessageW(self.target_window, USER_EVENT_MSG_ID.get(), 0, 0) };
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-02-04 06:38:21 -08:00
|
|
|
/// A lazily-initialized window message ID.
|
|
|
|
|
pub struct LazyMessageId {
|
|
|
|
|
/// The ID.
|
|
|
|
|
id: AtomicU32,
|
|
|
|
|
|
|
|
|
|
/// The name of the message.
|
|
|
|
|
name: &'static str,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// An invalid custom window ID.
|
|
|
|
|
const INVALID_ID: u32 = 0x0;
|
|
|
|
|
|
|
|
|
|
impl LazyMessageId {
|
|
|
|
|
/// Create a new `LazyId`.
|
|
|
|
|
const fn new(name: &'static str) -> Self {
|
|
|
|
|
Self { id: AtomicU32::new(INVALID_ID), name }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Get the message ID.
|
|
|
|
|
pub fn get(&self) -> u32 {
|
|
|
|
|
// Load the ID.
|
|
|
|
|
let id = self.id.load(Ordering::Relaxed);
|
|
|
|
|
|
|
|
|
|
if id != INVALID_ID {
|
|
|
|
|
return id;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Register the message.
|
|
|
|
|
// SAFETY: We are sure that the pointer is a valid C string ending with '\0'.
|
|
|
|
|
assert!(self.name.ends_with('\0'));
|
|
|
|
|
let new_id = unsafe { RegisterWindowMessageA(self.name.as_ptr()) };
|
|
|
|
|
|
|
|
|
|
assert_ne!(
|
|
|
|
|
new_id,
|
|
|
|
|
0,
|
|
|
|
|
"RegisterWindowMessageA returned zero for '{}': {}",
|
|
|
|
|
self.name,
|
|
|
|
|
std::io::Error::last_os_error()
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
// Store the new ID. Since `RegisterWindowMessageA` returns the same value for any given
|
|
|
|
|
// string, the target value will always either be a). `INVALID_ID` or b). the
|
|
|
|
|
// correct ID. Therefore a compare-and-swap operation here (or really any
|
|
|
|
|
// consideration) is never necessary.
|
|
|
|
|
self.id.store(new_id, Ordering::Relaxed);
|
|
|
|
|
|
|
|
|
|
new_id
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-06-08 11:50:26 -07:00
|
|
|
// Message sent by the `EventLoopProxy` when we want to wake up the thread.
|
|
|
|
|
// WPARAM and LPARAM are unused.
|
2023-02-04 06:38:21 -08:00
|
|
|
static USER_EVENT_MSG_ID: LazyMessageId = LazyMessageId::new("Winit::WakeupMsg\0");
|
2022-06-08 11:50:26 -07:00
|
|
|
// Message sent when we want to execute a closure in the thread.
|
|
|
|
|
// WPARAM contains a Box<Box<dyn FnMut()>> that must be retrieved with `Box::from_raw`,
|
|
|
|
|
// and LPARAM is unused.
|
2023-02-04 06:38:21 -08:00
|
|
|
static EXEC_MSG_ID: LazyMessageId = LazyMessageId::new("Winit::ExecMsg\0");
|
2022-06-08 11:50:26 -07:00
|
|
|
// Message sent by a `Window` when it wants to be destroyed by the main thread.
|
|
|
|
|
// WPARAM and LPARAM are unused.
|
2024-02-25 08:19:27 -08:00
|
|
|
pub(crate) static DESTROY_MSG_ID: LazyMessageId = LazyMessageId::new("Winit::DestroyMsg\0");
|
2022-06-08 11:50:26 -07:00
|
|
|
// WPARAM is a bool specifying the `WindowFlags::MARKER_RETAIN_STATE_ON_SIZE` flag. See the
|
|
|
|
|
// documentation in the `window_state` module for more information.
|
2024-02-25 08:19:27 -08:00
|
|
|
pub(crate) static SET_RETAIN_STATE_ON_SIZE_MSG_ID: LazyMessageId =
|
2023-02-04 06:38:21 -08:00
|
|
|
LazyMessageId::new("Winit::SetRetainMaximized\0");
|
2022-06-08 11:50:26 -07:00
|
|
|
static THREAD_EVENT_TARGET_WINDOW_CLASS: Lazy<Vec<u16>> =
|
|
|
|
|
Lazy::new(|| util::encode_wide("Winit Thread Event Target"));
|
2022-07-22 19:33:22 +02:00
|
|
|
/// When the taskbar is created, it registers a message with the "TaskbarCreated" string and then
|
|
|
|
|
/// broadcasts this message to all top-level windows <https://docs.microsoft.com/en-us/windows/win32/shell/taskbar#taskbar-creation-notification>
|
2024-02-25 08:19:27 -08:00
|
|
|
pub(crate) static TASKBAR_CREATED: LazyMessageId = LazyMessageId::new("TaskbarCreated\0");
|
2019-02-05 10:30:33 -05:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
fn create_event_target_window() -> HWND {
|
2022-08-15 02:36:37 +02:00
|
|
|
use windows_sys::Win32::UI::WindowsAndMessaging::{CS_HREDRAW, CS_VREDRAW};
|
2021-07-16 12:40:48 +02:00
|
|
|
unsafe {
|
2022-03-07 22:58:12 +01:00
|
|
|
let class = WNDCLASSEXW {
|
|
|
|
|
cbSize: mem::size_of::<WNDCLASSEXW>() as u32,
|
2022-08-15 02:36:37 +02:00
|
|
|
style: CS_HREDRAW | CS_VREDRAW,
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
lpfnWndProc: Some(thread_event_target_callback),
|
2019-02-05 10:30:33 -05:00
|
|
|
cbClsExtra: 0,
|
|
|
|
|
cbWndExtra: 0,
|
2022-05-29 17:12:46 +02:00
|
|
|
hInstance: util::get_instance_handle(),
|
2022-03-07 22:58:12 +01:00
|
|
|
hIcon: 0,
|
|
|
|
|
hCursor: 0, // must be null in order for cursor state to work properly
|
|
|
|
|
hbrBackground: 0,
|
2019-02-05 10:30:33 -05:00
|
|
|
lpszMenuName: ptr::null(),
|
2021-07-16 12:40:48 +02:00
|
|
|
lpszClassName: THREAD_EVENT_TARGET_WINDOW_CLASS.as_ptr(),
|
2022-03-07 22:58:12 +01:00
|
|
|
hIconSm: 0,
|
2019-02-05 10:30:33 -05:00
|
|
|
};
|
|
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
RegisterClassExW(&class);
|
2021-07-16 12:40:48 +02:00
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
unsafe {
|
2021-08-11 14:02:40 -04:00
|
|
|
// WS_EX_TOOLWINDOW prevents this window from ever showing up in the taskbar, which
|
|
|
|
|
// we want to avoid. If you remove this style, this window won't show up in the
|
|
|
|
|
// taskbar *initially*, but it can show up at some later point. This can sometimes
|
|
|
|
|
// happen on its own after several hours have passed, although this has proven
|
|
|
|
|
// difficult to reproduce. Alternatively, it can be manually triggered by killing
|
|
|
|
|
// `explorer.exe` and then starting the process back up.
|
|
|
|
|
// It is unclear why the bug is triggered by waiting for several hours.
|
2022-03-07 22:58:12 +01:00
|
|
|
let window = CreateWindowExW(
|
2021-08-11 14:02:40 -04:00
|
|
|
WS_EX_NOACTIVATE | WS_EX_TRANSPARENT | WS_EX_LAYERED | WS_EX_TOOLWINDOW,
|
2019-02-05 10:30:33 -05:00
|
|
|
THREAD_EVENT_TARGET_WINDOW_CLASS.as_ptr(),
|
2022-03-07 22:58:12 +01:00
|
|
|
ptr::null(),
|
|
|
|
|
WS_OVERLAPPED,
|
2019-02-05 10:30:33 -05:00
|
|
|
0,
|
2019-06-21 11:33:15 -04:00
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
|
|
|
|
0,
|
2022-03-07 22:58:12 +01:00
|
|
|
0,
|
2022-05-29 17:12:46 +02:00
|
|
|
util::get_instance_handle(),
|
2022-03-07 22:58:12 +01:00
|
|
|
ptr::null(),
|
2019-02-05 10:30:33 -05:00
|
|
|
);
|
2022-03-07 22:58:12 +01:00
|
|
|
|
|
|
|
|
super::set_window_long(
|
2019-02-05 10:30:33 -05:00
|
|
|
window,
|
2022-03-07 22:58:12 +01:00
|
|
|
GWL_STYLE,
|
2019-02-05 10:30:33 -05:00
|
|
|
// The window technically has to be visible to receive WM_PAINT messages (which are
|
|
|
|
|
// used for delivering events during resizes), but it isn't displayed to
|
|
|
|
|
// the user because of the LAYERED style.
|
2022-03-07 22:58:12 +01:00
|
|
|
(WS_VISIBLE | WS_POPUP) as isize,
|
2019-02-05 10:30:33 -05:00
|
|
|
);
|
2020-05-04 15:14:13 -04:00
|
|
|
window
|
|
|
|
|
}
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
fn insert_event_target_window_data(
|
2021-07-16 12:40:48 +02:00
|
|
|
thread_msg_target: HWND,
|
2024-06-24 13:04:55 +03:00
|
|
|
event_loop_runner: Rc<EventLoopRunner>,
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
) {
|
|
|
|
|
let userdata = ThreadMsgTargetData { event_loop_runner };
|
2021-07-16 12:40:48 +02:00
|
|
|
let input_ptr = Box::into_raw(Box::new(userdata));
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
unsafe { super::set_window_long(thread_msg_target, GWL_USERDATA, input_ptr as isize) };
|
2020-12-20 12:54:42 +01:00
|
|
|
}
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
/// Capture mouse input, allowing `window` to receive mouse events when the cursor is outside of
|
|
|
|
|
/// the window.
|
|
|
|
|
unsafe fn capture_mouse(window: HWND, window_state: &mut WindowState) {
|
2020-12-15 03:31:13 -03:00
|
|
|
window_state.mouse.capture_count += 1;
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { SetCapture(window) };
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Release mouse input, stopping windows on this thread from receiving mouse input when the cursor
|
|
|
|
|
/// is outside the window.
|
2022-08-31 18:32:19 +02:00
|
|
|
unsafe fn release_mouse(mut window_state: MutexGuard<'_, WindowState>) {
|
2020-12-15 03:31:13 -03:00
|
|
|
window_state.mouse.capture_count = window_state.mouse.capture_count.saturating_sub(1);
|
|
|
|
|
if window_state.mouse.capture_count == 0 {
|
|
|
|
|
// ReleaseCapture() causes a WM_CAPTURECHANGED where we lock the window_state.
|
|
|
|
|
drop(window_state);
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { ReleaseCapture() };
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-09 20:15:49 +02:00
|
|
|
fn normalize_pointer_pressure(pressure: u32) -> Option<Force> {
|
|
|
|
|
match pressure {
|
|
|
|
|
1..=1024 => Some(Force::Normalized(pressure as f64 / 1024.0)),
|
|
|
|
|
_ => None,
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
/// Emit a `ModifiersChanged` event whenever modifiers have changed.
|
2023-05-28 20:02:59 +02:00
|
|
|
/// Returns the current modifier state
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
fn update_modifiers(window: HWND, userdata: &WindowData) {
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
use crate::event::WindowEvent::ModifiersChanged;
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
let modifiers = {
|
|
|
|
|
let mut layouts = LAYOUT_CACHE.lock().unwrap();
|
|
|
|
|
layouts.get_agnostic_mods()
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let mut window_state = userdata.window_state.lock().unwrap();
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
if window_state.modifiers_state != modifiers {
|
|
|
|
|
window_state.modifiers_state = modifiers;
|
|
|
|
|
|
2020-03-08 01:22:53 -05:00
|
|
|
// Drop lock
|
|
|
|
|
drop(window_state);
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: ModifiersChanged(modifiers.into()),
|
|
|
|
|
});
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe fn gain_active_focus(window: HWND, userdata: &WindowData) {
|
2023-05-28 20:02:59 +02:00
|
|
|
use crate::event::WindowEvent::Focused;
|
|
|
|
|
|
|
|
|
|
update_modifiers(window, userdata);
|
2022-07-15 01:27:27 -07:00
|
|
|
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: Focused(true),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe fn lose_active_focus(window: HWND, userdata: &WindowData) {
|
2023-05-28 20:02:59 +02:00
|
|
|
use crate::event::WindowEvent::{Focused, ModifiersChanged};
|
2022-07-15 01:27:27 -07:00
|
|
|
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().modifiers_state = ModifiersState::empty();
|
2022-07-15 01:27:27 -07:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2023-05-28 20:02:59 +02:00
|
|
|
event: ModifiersChanged(ModifiersState::empty().into()),
|
2022-07-15 01:27:27 -07:00
|
|
|
});
|
|
|
|
|
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: Focused(false),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
/// Any window whose callback is configured to this function will have its events propagated
|
|
|
|
|
/// through the events loop of the thread the window was created in.
|
|
|
|
|
// This is the callback that is called by `DispatchMessage` in the events loop.
|
|
|
|
|
//
|
|
|
|
|
// Returning 0 tells the Win32 API that the message has been processed.
|
|
|
|
|
// FIXME: detect WM_DWMCOMPOSITIONCHANGED and call DwmEnableBlurBehindWindow if necessary
|
2024-01-13 21:36:53 +01:00
|
|
|
pub(super) unsafe extern "system" fn public_window_callback(
|
2019-02-05 10:30:33 -05:00
|
|
|
window: HWND,
|
2022-03-07 22:58:12 +01:00
|
|
|
msg: u32,
|
2019-02-05 10:30:33 -05:00
|
|
|
wparam: WPARAM,
|
|
|
|
|
lparam: LPARAM,
|
|
|
|
|
) -> LRESULT {
|
2023-09-29 16:07:44 +02:00
|
|
|
let userdata = unsafe { super::get_window_long(window, GWL_USERDATA) };
|
2022-03-07 22:58:12 +01:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
let userdata_ptr = match (userdata, msg) {
|
2022-03-07 22:58:12 +01:00
|
|
|
(0, WM_NCCREATE) => {
|
2023-09-29 16:07:44 +02:00
|
|
|
let createstruct = unsafe { &mut *(lparam as *mut CREATESTRUCTW) };
|
2024-01-13 21:36:53 +01:00
|
|
|
let initdata = unsafe { &mut *(createstruct.lpCreateParams as *mut InitData<'_>) };
|
2021-07-16 12:40:48 +02:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
let result = match unsafe { initdata.on_nccreate(window) } {
|
|
|
|
|
Some(userdata) => unsafe {
|
2022-03-07 22:58:12 +01:00
|
|
|
super::set_window_long(window, GWL_USERDATA, userdata as _);
|
|
|
|
|
DefWindowProcW(window, msg, wparam, lparam)
|
2023-09-29 16:07:44 +02:00
|
|
|
},
|
2021-11-17 18:33:44 +01:00
|
|
|
None => -1, // failed to create the window
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return result;
|
2021-07-16 12:40:48 +02:00
|
|
|
},
|
|
|
|
|
// Getting here should quite frankly be impossible,
|
|
|
|
|
// but we'll make window creation fail here just in case.
|
2022-03-07 22:58:12 +01:00
|
|
|
(0, WM_CREATE) => return -1,
|
2023-09-29 16:07:44 +02:00
|
|
|
(_, WM_CREATE) => unsafe {
|
2022-03-07 22:58:12 +01:00
|
|
|
let createstruct = &mut *(lparam as *mut CREATESTRUCTW);
|
|
|
|
|
let initdata = createstruct.lpCreateParams;
|
2024-01-13 21:36:53 +01:00
|
|
|
let initdata = &mut *(initdata as *mut InitData<'_>);
|
2021-11-17 18:33:44 +01:00
|
|
|
|
|
|
|
|
initdata.on_create();
|
2022-03-07 22:58:12 +01:00
|
|
|
return DefWindowProcW(window, msg, wparam, lparam);
|
2023-09-29 16:07:44 +02:00
|
|
|
},
|
|
|
|
|
(0, _) => return unsafe { DefWindowProcW(window, msg, wparam, lparam) },
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
_ => userdata as *mut WindowData,
|
2021-07-16 12:40:48 +02:00
|
|
|
};
|
2020-12-20 12:54:42 +01:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
let (result, userdata_removed, recurse_depth) = {
|
2023-09-29 16:07:44 +02:00
|
|
|
let userdata = unsafe { &*(userdata_ptr) };
|
2020-12-20 12:54:42 +01:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.recurse_depth.set(userdata.recurse_depth.get() + 1);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
let result = unsafe { public_window_callback_inner(window, msg, wparam, lparam, userdata) };
|
2021-07-16 12:40:48 +02:00
|
|
|
|
|
|
|
|
let userdata_removed = userdata.userdata_removed.get();
|
|
|
|
|
let recurse_depth = userdata.recurse_depth.get() - 1;
|
|
|
|
|
userdata.recurse_depth.set(recurse_depth);
|
|
|
|
|
|
|
|
|
|
(result, userdata_removed, recurse_depth)
|
2020-12-20 12:54:42 +01:00
|
|
|
};
|
|
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
if userdata_removed && recurse_depth == 0 {
|
2023-09-29 16:07:44 +02:00
|
|
|
drop(unsafe { Box::from_raw(userdata_ptr) });
|
2020-12-20 12:54:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result
|
|
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe fn public_window_callback_inner(
|
2020-12-20 12:54:42 +01:00
|
|
|
window: HWND,
|
2022-03-07 22:58:12 +01:00
|
|
|
msg: u32,
|
2020-12-20 12:54:42 +01:00
|
|
|
wparam: WPARAM,
|
|
|
|
|
lparam: LPARAM,
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
userdata: &WindowData,
|
2020-12-20 12:54:42 +01:00
|
|
|
) -> LRESULT {
|
2023-05-28 20:02:59 +02:00
|
|
|
let mut result = ProcResult::DefWindowProc(wparam);
|
|
|
|
|
|
|
|
|
|
// Send new modifiers before sending key events.
|
|
|
|
|
let mods_changed_callback = || match msg {
|
|
|
|
|
WM_KEYDOWN | WM_SYSKEYDOWN | WM_KEYUP | WM_SYSKEYUP => {
|
|
|
|
|
update_modifiers(window, userdata);
|
|
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
},
|
|
|
|
|
_ => (),
|
|
|
|
|
};
|
|
|
|
|
userdata
|
|
|
|
|
.event_loop_runner
|
|
|
|
|
.catch_unwind(mods_changed_callback)
|
|
|
|
|
.unwrap_or_else(|| result = ProcResult::Value(-1));
|
|
|
|
|
|
|
|
|
|
let keyboard_callback = || {
|
|
|
|
|
use crate::event::WindowEvent::KeyboardInput;
|
|
|
|
|
let events =
|
|
|
|
|
userdata.key_event_builder.process_message(window, msg, wparam, lparam, &mut result);
|
|
|
|
|
for event in events {
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: KeyboardInput {
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
event: event.event,
|
|
|
|
|
is_synthetic: event.is_synthetic,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
userdata
|
|
|
|
|
.event_loop_runner
|
|
|
|
|
.catch_unwind(keyboard_callback)
|
|
|
|
|
.unwrap_or_else(|| result = ProcResult::Value(-1));
|
|
|
|
|
|
2020-05-04 15:14:13 -04:00
|
|
|
// I decided to bind the closure to `callback` and pass it to catch_unwind rather than passing
|
2024-02-19 11:58:44 +07:00
|
|
|
// the closure to catch_unwind directly so that the match body indentation wouldn't change and
|
2020-05-04 15:14:13 -04:00
|
|
|
// the git blame and history would be preserved.
|
|
|
|
|
let callback = || match msg {
|
2022-08-15 02:36:37 +02:00
|
|
|
WM_NCCALCSIZE => {
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_flags = userdata.window_state_lock().window_flags;
|
2022-08-15 02:36:37 +02:00
|
|
|
if wparam == 0 || window_flags.contains(WindowFlags::MARKER_DECORATIONS) {
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
|
|
|
|
return;
|
2022-08-15 02:36:37 +02:00
|
|
|
}
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
let params = unsafe { &mut *(lparam as *mut NCCALCSIZE_PARAMS) };
|
2023-01-28 14:04:47 +01:00
|
|
|
|
|
|
|
|
if util::is_maximized(window) {
|
|
|
|
|
// Limit the window size when maximized to the current monitor.
|
|
|
|
|
// Otherwise it would include the non-existent decorations.
|
|
|
|
|
//
|
|
|
|
|
// Use `MonitorFromRect` instead of `MonitorFromWindow` to select
|
|
|
|
|
// the correct monitor here.
|
|
|
|
|
// See https://github.com/MicrosoftEdge/WebView2Feedback/issues/2549
|
2023-09-29 16:07:44 +02:00
|
|
|
let monitor = unsafe { MonitorFromRect(¶ms.rgrc[0], MONITOR_DEFAULTTONULL) };
|
2023-01-28 14:04:47 +01:00
|
|
|
if let Ok(monitor_info) = monitor::get_monitor_info(monitor) {
|
|
|
|
|
params.rgrc[0] = monitor_info.monitorInfo.rcWork;
|
|
|
|
|
}
|
|
|
|
|
} else if window_flags.contains(WindowFlags::MARKER_UNDECORATED_SHADOW) {
|
|
|
|
|
// Extend the client area to cover the whole non-client area.
|
|
|
|
|
// https://docs.microsoft.com/en-us/windows/win32/winmsg/wm-nccalcsize#remarks
|
|
|
|
|
//
|
|
|
|
|
// HACK(msiglreith): To add the drop shadow we slightly tweak the non-client area.
|
|
|
|
|
// This leads to a small black 1px border on the top. Adding a margin manually
|
|
|
|
|
// on all 4 borders would result in the caption getting drawn by the DWM.
|
|
|
|
|
//
|
|
|
|
|
// Another option would be to allow the DWM to paint inside the client area.
|
|
|
|
|
// Unfortunately this results in janky resize behavior, where the compositor is
|
|
|
|
|
// ahead of the window surface. Currently, there seems no option to achieve this
|
|
|
|
|
// with the Windows API.
|
2022-08-15 02:36:37 +02:00
|
|
|
params.rgrc[0].top += 1;
|
|
|
|
|
params.rgrc[0].bottom += 1;
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2022-08-15 02:36:37 +02:00
|
|
|
},
|
|
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_ENTERSIZEMOVE => {
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata
|
2022-08-31 18:32:19 +02:00
|
|
|
.window_state_lock()
|
2020-05-04 15:14:13 -04:00
|
|
|
.set_window_flags_in_place(|f| f.insert(WindowFlags::MARKER_IN_SIZE_MOVE));
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2020-05-04 15:14:13 -04:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_EXITSIZEMOVE => {
|
2022-12-07 01:18:50 +03:00
|
|
|
let mut state = userdata.window_state_lock();
|
|
|
|
|
if state.dragging {
|
|
|
|
|
state.dragging = false;
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { PostMessageW(window, WM_LBUTTONUP, 0, lparam) };
|
2022-12-07 01:18:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
state.set_window_flags_in_place(|f| f.remove(WindowFlags::MARKER_IN_SIZE_MOVE));
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2020-05-04 15:14:13 -04:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_NCLBUTTONDOWN => {
|
|
|
|
|
if wparam == HTCAPTION as _ {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { PostMessageW(window, WM_MOUSEMOVE, 0, lparam) };
|
2019-04-14 11:48:31 -04:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-04-14 11:48:31 -04:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_CLOSE => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::WindowEvent::CloseRequested;
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: CloseRequested,
|
|
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_DESTROY => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::WindowEvent::Destroyed;
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { RevokeDragDrop(window) };
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: Destroyed,
|
|
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2020-10-24 00:04:18 +07:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_NCDESTROY => {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { super::set_window_long(window, GWL_USERDATA, 0) };
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.userdata_removed.set(true);
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_PAINT => {
|
2023-10-20 14:52:01 +04:00
|
|
|
userdata.window_state_lock().redraw_requested =
|
|
|
|
|
userdata.event_loop_runner.should_buffer();
|
|
|
|
|
|
|
|
|
|
// We'll buffer only in response to `UpdateWindow`, if win32 decides to redraw the
|
|
|
|
|
// window outside the normal flow of the event loop. This way mark event as handled
|
|
|
|
|
// and request a normal redraw with `RedrawWindow`.
|
|
|
|
|
if !userdata.event_loop_runner.should_buffer() {
|
2023-08-27 16:15:09 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::RedrawRequested,
|
|
|
|
|
});
|
2020-05-04 15:14:13 -04:00
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-10-20 14:52:01 +04:00
|
|
|
// NOTE: calling `RedrawWindow` during `WM_PAINT` does nothing, since to mark
|
|
|
|
|
// `WM_PAINT` as handled we should call the `DefWindowProcW`. Call it and check whether
|
|
|
|
|
// user asked for redraw during `RedrawRequested` event handling and request it again
|
|
|
|
|
// after marking `WM_PAINT` as handled.
|
|
|
|
|
result = ProcResult::Value(unsafe { DefWindowProcW(window, msg, wparam, lparam) });
|
|
|
|
|
if std::mem::take(&mut userdata.window_state_lock().redraw_requested) {
|
|
|
|
|
unsafe { RedrawWindow(window, ptr::null(), 0, RDW_INTERNALPAINT) };
|
|
|
|
|
}
|
|
|
|
|
},
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_WINDOWPOSCHANGING => {
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut window_state = userdata.window_state_lock();
|
2019-10-05 16:23:30 -04:00
|
|
|
if let Some(ref mut fullscreen) = window_state.fullscreen {
|
2023-09-29 16:07:44 +02:00
|
|
|
let window_pos = unsafe { &mut *(lparam as *mut WINDOWPOS) };
|
2019-10-05 16:23:30 -04:00
|
|
|
let new_rect = RECT {
|
|
|
|
|
left: window_pos.x,
|
|
|
|
|
top: window_pos.y,
|
|
|
|
|
right: window_pos.x + window_pos.cx,
|
|
|
|
|
bottom: window_pos.y + window_pos.cy,
|
|
|
|
|
};
|
2022-04-30 13:21:08 +02:00
|
|
|
|
|
|
|
|
const NOMOVE_OR_NOSIZE: u32 = SWP_NOMOVE | SWP_NOSIZE;
|
|
|
|
|
|
|
|
|
|
let new_rect = if window_pos.flags & NOMOVE_OR_NOSIZE != 0 {
|
2022-08-15 02:36:37 +02:00
|
|
|
let cur_rect = util::WindowArea::Outer.get_rect(window).expect(
|
2024-03-28 11:45:34 -07:00
|
|
|
"Unexpected GetWindowRect failure; please report this error to \
|
|
|
|
|
rust-windowing/winit",
|
|
|
|
|
);
|
2022-04-30 13:21:08 +02:00
|
|
|
|
|
|
|
|
match window_pos.flags & NOMOVE_OR_NOSIZE {
|
|
|
|
|
NOMOVE_OR_NOSIZE => None,
|
|
|
|
|
|
|
|
|
|
SWP_NOMOVE => Some(RECT {
|
|
|
|
|
left: cur_rect.left,
|
|
|
|
|
top: cur_rect.top,
|
|
|
|
|
right: cur_rect.left + window_pos.cx,
|
|
|
|
|
bottom: cur_rect.top + window_pos.cy,
|
|
|
|
|
}),
|
|
|
|
|
|
|
|
|
|
SWP_NOSIZE => Some(RECT {
|
|
|
|
|
left: window_pos.x,
|
|
|
|
|
top: window_pos.y,
|
|
|
|
|
right: window_pos.x - cur_rect.left + cur_rect.right,
|
|
|
|
|
bottom: window_pos.y - cur_rect.top + cur_rect.bottom,
|
|
|
|
|
}),
|
|
|
|
|
|
|
|
|
|
_ => unreachable!(),
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
Some(new_rect)
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if let Some(new_rect) = new_rect {
|
2023-09-29 16:07:44 +02:00
|
|
|
let new_monitor = unsafe { MonitorFromRect(&new_rect, MONITOR_DEFAULTTONULL) };
|
2022-04-30 13:21:08 +02:00
|
|
|
match fullscreen {
|
|
|
|
|
Fullscreen::Borderless(ref mut fullscreen_monitor) => {
|
|
|
|
|
if new_monitor != 0
|
|
|
|
|
&& fullscreen_monitor
|
|
|
|
|
.as_ref()
|
2022-09-21 10:04:28 +02:00
|
|
|
.map(|monitor| new_monitor != monitor.hmonitor())
|
2022-04-30 13:21:08 +02:00
|
|
|
.unwrap_or(true)
|
|
|
|
|
{
|
|
|
|
|
if let Ok(new_monitor_info) = monitor::get_monitor_info(new_monitor)
|
|
|
|
|
{
|
|
|
|
|
let new_monitor_rect = new_monitor_info.monitorInfo.rcMonitor;
|
|
|
|
|
window_pos.x = new_monitor_rect.left;
|
|
|
|
|
window_pos.y = new_monitor_rect.top;
|
|
|
|
|
window_pos.cx = new_monitor_rect.right - new_monitor_rect.left;
|
|
|
|
|
window_pos.cy = new_monitor_rect.bottom - new_monitor_rect.top;
|
|
|
|
|
}
|
2022-09-21 10:04:28 +02:00
|
|
|
*fullscreen_monitor = Some(MonitorHandle::new(new_monitor));
|
2019-10-05 16:23:30 -04:00
|
|
|
}
|
|
|
|
|
},
|
2022-04-30 13:21:08 +02:00
|
|
|
Fullscreen::Exclusive(ref video_mode) => {
|
2022-09-21 10:04:28 +02:00
|
|
|
let old_monitor = video_mode.monitor.hmonitor();
|
2022-04-30 13:21:08 +02:00
|
|
|
if let Ok(old_monitor_info) = monitor::get_monitor_info(old_monitor) {
|
|
|
|
|
let old_monitor_rect = old_monitor_info.monitorInfo.rcMonitor;
|
|
|
|
|
window_pos.x = old_monitor_rect.left;
|
|
|
|
|
window_pos.y = old_monitor_rect.top;
|
|
|
|
|
window_pos.cx = old_monitor_rect.right - old_monitor_rect.left;
|
|
|
|
|
window_pos.cy = old_monitor_rect.bottom - old_monitor_rect.top;
|
|
|
|
|
}
|
2019-10-05 16:23:30 -04:00
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-10-05 16:23:30 -04:00
|
|
|
},
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
// WM_MOVE supplies client area positions, so we send Moved here instead.
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_WINDOWPOSCHANGED => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::WindowEvent::Moved;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
let windowpos = lparam as *const WINDOWPOS;
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe { (*windowpos).flags & SWP_NOMOVE != SWP_NOMOVE } {
|
|
|
|
|
let physical_position =
|
|
|
|
|
unsafe { PhysicalPosition::new((*windowpos).x, (*windowpos).y) };
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-19 16:49:43 -04:00
|
|
|
event: Moved(physical_position),
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This is necessary for us to still get sent WM_SIZE.
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_SIZE => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::WindowEvent::Resized;
|
2022-03-07 22:58:12 +01:00
|
|
|
let w = super::loword(lparam as u32) as u32;
|
|
|
|
|
let h = super::hiword(lparam as u32) as u32;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2019-06-19 16:49:43 -04:00
|
|
|
let physical_size = PhysicalSize::new(w, h);
|
2019-02-05 10:30:33 -05:00
|
|
|
let event = Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-19 16:49:43 -04:00
|
|
|
event: Resized(physical_size),
|
2019-02-05 10:30:33 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
{
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut w = userdata.window_state_lock();
|
2019-02-05 10:30:33 -05:00
|
|
|
// See WindowFlags::MARKER_RETAIN_STATE_ON_SIZE docs for info on why this `if` check
|
|
|
|
|
// exists.
|
2019-06-21 11:33:15 -04:00
|
|
|
if !w.window_flags().contains(WindowFlags::MARKER_RETAIN_STATE_ON_SIZE) {
|
2022-03-07 22:58:12 +01:00
|
|
|
let maximized = wparam == SIZE_MAXIMIZED as usize;
|
2019-02-05 10:30:33 -05:00
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MAXIMIZED, maximized));
|
|
|
|
|
}
|
|
|
|
|
}
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(event);
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2024-04-21 13:05:41 +00:00
|
|
|
WM_SIZING => {
|
|
|
|
|
/// Calculate the amount to add to round `value` to the nearest multiple of `increment`.
|
|
|
|
|
fn snap_to_nearest_increment_delta(value: i32, increment: i32) -> i32 {
|
|
|
|
|
let half_one = increment / 2;
|
|
|
|
|
let half_two = increment - half_one;
|
|
|
|
|
half_one - (value - half_two) % increment
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let scale_factor = userdata.window_state_lock().scale_factor;
|
|
|
|
|
let Some(inc) = userdata
|
|
|
|
|
.window_state_lock()
|
|
|
|
|
.resize_increments
|
|
|
|
|
.map(|inc| inc.to_physical(scale_factor))
|
|
|
|
|
.filter(|inc| inc.width > 0 && inc.height > 0)
|
|
|
|
|
else {
|
|
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
return;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let side = wparam as u32;
|
|
|
|
|
// The desired new size of the window, decorations included.
|
|
|
|
|
let rect = unsafe { &mut *(lparam as *mut RECT) };
|
|
|
|
|
|
|
|
|
|
// We need to calculate the dimensions of the window decorations to get the true
|
|
|
|
|
// size of the window's contents
|
|
|
|
|
let adj_rect = userdata
|
|
|
|
|
.window_state_lock()
|
|
|
|
|
.window_flags
|
|
|
|
|
.adjust_rect(window, *rect)
|
|
|
|
|
.unwrap_or(*rect);
|
|
|
|
|
let deco_width = rect.left - adj_rect.left + adj_rect.right - rect.right;
|
|
|
|
|
let deco_height = rect.top - adj_rect.top + adj_rect.bottom - rect.bottom;
|
|
|
|
|
|
|
|
|
|
let width = rect.right - rect.left - deco_width;
|
|
|
|
|
let height = rect.bottom - rect.top - deco_height;
|
|
|
|
|
|
|
|
|
|
let mut width_delta = snap_to_nearest_increment_delta(width, inc.width);
|
|
|
|
|
let mut height_delta = snap_to_nearest_increment_delta(height, inc.height);
|
|
|
|
|
|
|
|
|
|
// Windows won't bound check the value of `rect` after we're done here, so we
|
|
|
|
|
// have to check manually. If the width/height we snap to would go out of bounds, just
|
|
|
|
|
// set it equal to the min/max bound.
|
|
|
|
|
let min_size =
|
|
|
|
|
userdata.window_state_lock().min_size.map(|size| size.to_physical(scale_factor));
|
|
|
|
|
let max_size =
|
|
|
|
|
userdata.window_state_lock().max_size.map(|size| size.to_physical(scale_factor));
|
|
|
|
|
let final_width = width + width_delta;
|
|
|
|
|
let final_height = height + height_delta;
|
|
|
|
|
if let Some(min_size) = min_size {
|
|
|
|
|
if final_width < min_size.width {
|
|
|
|
|
width_delta += min_size.width - final_width;
|
|
|
|
|
}
|
|
|
|
|
if final_height < min_size.height {
|
|
|
|
|
height_delta += min_size.height - final_height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if let Some(max_size) = max_size {
|
|
|
|
|
if final_width > max_size.width {
|
|
|
|
|
width_delta -= final_width - max_size.width;
|
|
|
|
|
}
|
|
|
|
|
if final_height > max_size.height {
|
|
|
|
|
height_delta -= final_height - max_size.height;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match side {
|
|
|
|
|
WMSZ_LEFT | WMSZ_BOTTOMLEFT | WMSZ_TOPLEFT => {
|
|
|
|
|
rect.left -= width_delta;
|
|
|
|
|
},
|
|
|
|
|
WMSZ_RIGHT | WMSZ_BOTTOMRIGHT | WMSZ_TOPRIGHT => {
|
|
|
|
|
rect.right += width_delta;
|
|
|
|
|
},
|
|
|
|
|
_ => {},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
match side {
|
|
|
|
|
WMSZ_TOP | WMSZ_TOPLEFT | WMSZ_TOPRIGHT => {
|
|
|
|
|
rect.top -= height_delta;
|
|
|
|
|
},
|
|
|
|
|
WMSZ_BOTTOM | WMSZ_BOTTOMLEFT | WMSZ_BOTTOMRIGHT => {
|
|
|
|
|
rect.bottom += height_delta;
|
|
|
|
|
},
|
|
|
|
|
_ => {},
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
|
|
|
|
},
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
WM_MENUCHAR => {
|
|
|
|
|
result = ProcResult::Value((MNC_CLOSE << 16) as isize);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-05-07 05:29:25 +03:00
|
|
|
WM_IME_STARTCOMPOSITION => {
|
2022-08-31 18:32:19 +02:00
|
|
|
let ime_allowed = userdata.window_state_lock().ime_allowed;
|
2022-05-07 05:29:25 +03:00
|
|
|
if ime_allowed {
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().ime_state = ImeState::Enabled;
|
2022-05-07 05:29:25 +03:00
|
|
|
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Enabled),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2022-05-07 05:29:25 +03:00
|
|
|
},
|
|
|
|
|
|
|
|
|
|
WM_IME_COMPOSITION => {
|
|
|
|
|
let ime_allowed_and_composing = {
|
2022-08-31 18:32:19 +02:00
|
|
|
let w = userdata.window_state_lock();
|
2022-05-07 05:29:25 +03:00
|
|
|
w.ime_allowed && w.ime_state != ImeState::Disabled
|
|
|
|
|
};
|
|
|
|
|
// Windows Hangul IME sends WM_IME_COMPOSITION after WM_IME_ENDCOMPOSITION, so
|
|
|
|
|
// check whether composing.
|
|
|
|
|
if ime_allowed_and_composing {
|
2023-09-29 16:07:44 +02:00
|
|
|
let ime_context = unsafe { ImeContext::current(window) };
|
2022-05-07 05:29:25 +03:00
|
|
|
|
|
|
|
|
if lparam == 0 {
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Preedit(String::new(), None)),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Google Japanese Input and ATOK have both flags, so
|
|
|
|
|
// first, receive composing result if exist.
|
|
|
|
|
if (lparam as u32 & GCS_RESULTSTR) != 0 {
|
2023-09-29 16:07:44 +02:00
|
|
|
if let Some(text) = unsafe { ime_context.get_composed_text() } {
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().ime_state = ImeState::Enabled;
|
2022-05-07 05:29:25 +03:00
|
|
|
|
2022-09-11 00:48:24 +03:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Preedit(String::new(), None)),
|
|
|
|
|
});
|
2022-05-07 05:29:25 +03:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Commit(text)),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Next, receive preedit range for next composing if exist.
|
|
|
|
|
if (lparam as u32 & GCS_COMPSTR) != 0 {
|
2023-09-29 16:07:44 +02:00
|
|
|
if let Some((text, first, last)) =
|
|
|
|
|
unsafe { ime_context.get_composing_text_and_cursor() }
|
|
|
|
|
{
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().ime_state = ImeState::Preedit;
|
2022-05-07 05:29:25 +03:00
|
|
|
let cursor_range = first.map(|f| (f, last.unwrap_or(f)));
|
|
|
|
|
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Preedit(text, cursor_range)),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Not calling DefWindowProc to hide composing text drawn by IME.
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2022-05-07 05:29:25 +03:00
|
|
|
},
|
|
|
|
|
|
|
|
|
|
WM_IME_ENDCOMPOSITION => {
|
|
|
|
|
let ime_allowed_or_composing = {
|
2022-08-31 18:32:19 +02:00
|
|
|
let w = userdata.window_state_lock();
|
2022-05-07 05:29:25 +03:00
|
|
|
w.ime_allowed || w.ime_state != ImeState::Disabled
|
|
|
|
|
};
|
|
|
|
|
if ime_allowed_or_composing {
|
2022-08-31 18:32:19 +02:00
|
|
|
if userdata.window_state_lock().ime_state == ImeState::Preedit {
|
2022-05-07 05:29:25 +03:00
|
|
|
// Windows Hangul IME sends WM_IME_COMPOSITION after WM_IME_ENDCOMPOSITION, so
|
|
|
|
|
// trying receiving composing result and commit if exists.
|
2023-09-29 16:07:44 +02:00
|
|
|
let ime_context = unsafe { ImeContext::current(window) };
|
|
|
|
|
if let Some(text) = unsafe { ime_context.get_composed_text() } {
|
2022-09-11 00:48:24 +03:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Preedit(String::new(), None)),
|
|
|
|
|
});
|
2022-05-07 05:29:25 +03:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Commit(text)),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().ime_state = ImeState::Disabled;
|
2022-05-07 05:29:25 +03:00
|
|
|
|
|
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Ime(Ime::Disabled),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2022-05-07 05:29:25 +03:00
|
|
|
},
|
|
|
|
|
|
|
|
|
|
WM_IME_SETCONTEXT => {
|
|
|
|
|
// Hide composing text drawn by IME.
|
|
|
|
|
let wparam = wparam & (!ISC_SHOWUICOMPOSITIONWINDOW as usize);
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2022-05-07 05:29:25 +03:00
|
|
|
},
|
|
|
|
|
|
2019-12-22 01:04:11 -05:00
|
|
|
// this is necessary for us to maintain minimize/restore state
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_SYSCOMMAND => {
|
|
|
|
|
if wparam == SC_RESTORE as usize {
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut w = userdata.window_state_lock();
|
2019-12-22 01:04:11 -05:00
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MINIMIZED, false));
|
|
|
|
|
}
|
2022-03-07 22:58:12 +01:00
|
|
|
if wparam == SC_MINIMIZE as usize {
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut w = userdata.window_state_lock();
|
2019-12-22 01:04:11 -05:00
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MINIMIZED, true));
|
|
|
|
|
}
|
|
|
|
|
// Send `WindowEvent::Minimized` here if we decide to implement one
|
|
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
if wparam == SC_SCREENSAVE as usize {
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_state = userdata.window_state_lock();
|
2019-07-29 11:18:23 +02:00
|
|
|
if window_state.fullscreen.is_some() {
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
return;
|
2019-07-29 11:18:23 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-07-29 11:18:23 +02:00
|
|
|
},
|
|
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MOUSEMOVE => {
|
2023-10-17 06:53:22 +03:30
|
|
|
use crate::event::WindowEvent::{CursorEntered, CursorLeft, CursorMoved};
|
|
|
|
|
|
|
|
|
|
let x = super::get_x_lparam(lparam as u32) as i32;
|
|
|
|
|
let y = super::get_y_lparam(lparam as u32) as i32;
|
|
|
|
|
let position = PhysicalPosition::new(x as f64, y as f64);
|
|
|
|
|
|
|
|
|
|
let cursor_moved;
|
|
|
|
|
{
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut w = userdata.window_state_lock();
|
2023-10-17 06:53:22 +03:30
|
|
|
let mouse_was_inside_window =
|
|
|
|
|
w.mouse.cursor_flags().contains(CursorFlags::IN_WINDOW);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-10-17 06:53:22 +03:30
|
|
|
match get_pointer_move_kind(window, mouse_was_inside_window, x, y) {
|
|
|
|
|
PointerMoveKind::Enter => {
|
|
|
|
|
w.mouse
|
|
|
|
|
.set_cursor_flags(window, |f| f.set(CursorFlags::IN_WINDOW, true))
|
|
|
|
|
.ok();
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-10-22 19:38:54 +04:00
|
|
|
drop(w);
|
2023-10-17 06:53:22 +03:30
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: CursorEntered { device_id: DEVICE_ID },
|
|
|
|
|
});
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-10-17 06:53:22 +03:30
|
|
|
// Calling TrackMouseEvent in order to receive mouse leave events.
|
|
|
|
|
unsafe {
|
|
|
|
|
TrackMouseEvent(&mut TRACKMOUSEEVENT {
|
|
|
|
|
cbSize: mem::size_of::<TRACKMOUSEEVENT>() as u32,
|
|
|
|
|
dwFlags: TME_LEAVE,
|
|
|
|
|
hwndTrack: window,
|
|
|
|
|
dwHoverTime: HOVER_DEFAULT,
|
|
|
|
|
})
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
PointerMoveKind::Leave => {
|
|
|
|
|
w.mouse
|
|
|
|
|
.set_cursor_flags(window, |f| f.set(CursorFlags::IN_WINDOW, false))
|
|
|
|
|
.ok();
|
|
|
|
|
|
2023-10-22 19:38:54 +04:00
|
|
|
drop(w);
|
2023-10-17 06:53:22 +03:30
|
|
|
userdata.send_event(Event::WindowEvent {
|
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: CursorLeft { device_id: DEVICE_ID },
|
|
|
|
|
});
|
|
|
|
|
},
|
2023-10-25 18:32:16 +04:00
|
|
|
PointerMoveKind::None => drop(w),
|
2023-10-17 06:53:22 +03:30
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2020-03-06 22:15:49 +01:00
|
|
|
// handle spurious WM_MOUSEMOVE messages
|
|
|
|
|
// see https://devblogs.microsoft.com/oldnewthing/20031001-00/?p=42343
|
|
|
|
|
// and http://debugandconquer.blogspot.com/2015/08/the-cause-of-spurious-mouse-move.html
|
2023-10-22 19:38:54 +04:00
|
|
|
let mut w = userdata.window_state_lock();
|
2020-03-06 22:15:49 +01:00
|
|
|
cursor_moved = w.mouse.last_position != Some(position);
|
|
|
|
|
w.mouse.last_position = Some(position);
|
|
|
|
|
}
|
2023-10-17 06:53:22 +03:30
|
|
|
|
2020-03-06 22:15:49 +01:00
|
|
|
if cursor_moved {
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2020-03-06 22:15:49 +01:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: CursorMoved { device_id: DEVICE_ID, position },
|
|
|
|
|
});
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MOUSELEAVE => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::WindowEvent::CursorLeft;
|
2019-02-05 10:30:33 -05:00
|
|
|
{
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut w = userdata.window_state_lock();
|
2019-06-21 11:33:15 -04:00
|
|
|
w.mouse.set_cursor_flags(window, |f| f.set(CursorFlags::IN_WINDOW, false)).ok();
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: CursorLeft { device_id: DEVICE_ID },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MOUSEWHEEL => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::MouseScrollDelta::LineDelta;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
let value = (wparam >> 16) as i16;
|
2022-03-07 22:58:12 +01:00
|
|
|
let value = value as f32 / WHEEL_DELTA as f32;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: WindowEvent::MouseWheel {
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
delta: LineDelta(0.0, value),
|
|
|
|
|
phase: TouchPhase::Moved,
|
|
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MOUSEHWHEEL => {
|
2019-06-18 02:27:00 +08:00
|
|
|
use crate::event::MouseScrollDelta::LineDelta;
|
2019-02-22 15:31:16 +01:00
|
|
|
|
|
|
|
|
let value = (wparam >> 16) as i16;
|
2022-03-13 14:22:02 +01:00
|
|
|
let value = -value as f32 / WHEEL_DELTA as f32; // NOTE: inverted! See https://github.com/rust-windowing/winit/pull/2105/
|
2019-02-22 15:31:16 +01:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-22 15:31:16 +01:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: WindowEvent::MouseWheel {
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
delta: LineDelta(value, 0.0),
|
|
|
|
|
phase: TouchPhase::Moved,
|
|
|
|
|
},
|
2019-02-22 15:31:16 +01:00
|
|
|
});
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-22 15:31:16 +01:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_KEYDOWN | WM_SYSKEYDOWN => {
|
2022-09-01 00:03:48 +02:00
|
|
|
if msg == WM_SYSKEYDOWN {
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_KEYUP | WM_SYSKEYUP => {
|
2023-09-29 16:07:44 +02:00
|
|
|
if msg == WM_SYSKEYUP && unsafe { GetMenu(window) != 0 } {
|
2023-02-01 08:03:58 -03:00
|
|
|
// let Windows handle event if the window has a native menu, a modal event loop
|
|
|
|
|
// is started here on Alt key up.
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2022-10-20 17:59:12 +02:00
|
|
|
}
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_LBUTTONDOWN => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Pressed;
|
|
|
|
|
use crate::event::MouseButton::Left;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { capture_mouse(window, &mut userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Pressed, button: Left },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_LBUTTONUP => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Released;
|
|
|
|
|
use crate::event::MouseButton::Left;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { release_mouse(userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Released, button: Left },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_RBUTTONDOWN => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Pressed;
|
|
|
|
|
use crate::event::MouseButton::Right;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { capture_mouse(window, &mut userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Pressed, button: Right },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_RBUTTONUP => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Released;
|
|
|
|
|
use crate::event::MouseButton::Right;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { release_mouse(userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Released, button: Right },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MBUTTONDOWN => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Pressed;
|
|
|
|
|
use crate::event::MouseButton::Middle;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { capture_mouse(window, &mut userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Pressed, button: Middle },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_MBUTTONUP => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Released;
|
|
|
|
|
use crate::event::MouseButton::Middle;
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { release_mouse(userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput { device_id: DEVICE_ID, state: Released, button: Middle },
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_XBUTTONDOWN => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Pressed;
|
2023-06-16 11:51:09 +03:00
|
|
|
use crate::event::MouseButton::{Back, Forward, Other};
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2022-03-07 22:58:12 +01:00
|
|
|
let xbutton = super::get_xbutton_wparam(wparam as u32);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { capture_mouse(window, &mut userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput {
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
state: Pressed,
|
2023-06-16 11:51:09 +03:00
|
|
|
button: match xbutton {
|
|
|
|
|
1 => Back,
|
|
|
|
|
2 => Forward,
|
|
|
|
|
_ => Other(xbutton),
|
|
|
|
|
},
|
2019-06-21 11:33:15 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_XBUTTONUP => {
|
2019-06-21 11:33:15 -04:00
|
|
|
use crate::event::ElementState::Released;
|
2023-06-16 11:51:09 +03:00
|
|
|
use crate::event::MouseButton::{Back, Forward, Other};
|
|
|
|
|
use crate::event::WindowEvent::MouseInput;
|
2022-03-07 22:58:12 +01:00
|
|
|
let xbutton = super::get_xbutton_wparam(wparam as u32);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { release_mouse(userdata.window_state_lock()) };
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
update_modifiers(window, userdata);
|
Move `ModifiersChanged` variant to `WindowEvent` (#1381)
* Move `ModifiersChanged` variant to `WindowEvent`
* macos: Fix flags_changed for ModifiersChanged variant move
I haven't look too deep at what this does internally, but at least
cargo-check is fully happy now. :)
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Fire a ModifiersChanged event on window_did_resign_key
From debugging, I determined that macOS' emission of a flagsChanged
around window switching is inconsistent. It is fair to assume, I think,
that when the user switches windows, they do not expect their former
modifiers state to remain effective; so I think it's best to clear that
state by sending a ModifiersChanged(ModifiersState::empty()).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Fix build
I don't know enough about the code to implement the fix as it is done on
this branch, but this commit at least fixes the build.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* windows: Send ModifiersChanged(ModifiersState::empty) on KILLFOCUS
Very similar to the changes made in [1], as focus is lost, send an event
to the window indicating that the modifiers have been released.
It's unclear to me (without a Windows device to test this on) whether
this is necessary, but it certainly ensures that unfocused windows will
have at least received this event, which is an improvement.
[1]: f79f21641a31da3e4039d41be89047cdcc6028f7
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* macos: Add a hook to update stale modifiers
Sometimes, `ViewState` and `event` might have different values for their
stored `modifiers` flags. These are internally stored as a bitmask in
the latter and an enum in the former.
We can check to see if they differ, and if they do, automatically
dispatch an event to update consumers of modifier state as well as the
stored `state.modifiers`. That's what the hook does.
This hook is then called in the key_down, mouse_entered, mouse_exited,
mouse_click, scroll_wheel, and pressure_change_with_event callbacks,
which each will contain updated modifiers.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Only call event_mods once when determining whether to update state
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* flags_changed: Memoize window_id collection
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_did_resign_key: Remove synthetic ModifiersChanged event
We no longer need to emit this event, since we are checking the state of
our modifiers before emitting most other events.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Add a call to update_potentially_stale_modifiers
Now, cover all events (that I can think of, at least) where stale
modifiers might affect how user programs behave. Effectively, every
human-interface event (keypress, mouse click, keydown, etc.) will cause
a ModifiersChanged event to be fired if something has changed.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* key_up: Add a call to update_potentially_stale_modifiers
We also want to make sure modifiers state is synchronized here, too.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* mouse_motion: Remove update_potentially_stale_modifiers invocation
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Retry CI
* ViewState: Promote visibility of modifiers to the macos impl
This is so that we can interact with the ViewState directly from the
WindowDelegate.
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* window_delegate: Synthetically set modifiers state to empty on resignKey
This logic is implemented similarly on other platforms, so we wish to
regain parity here. Originally this behavior was implemented to always
fire an event with ModifiersState::empty(), but that was not the best as
it was not necessarily correct and could be a duplicate event.
This solution is perhaps the most elegant possible to implement the
desired behavior of sending a synthetic empty modifiers event when a
window loses focus, trading some safety for interoperation between the
NSWindowDelegate and the NSView (as the objc runtime must now be
consulted in order to acquire access to the ViewState which is "owned"
by the NSView).
Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>
* Check for modifiers change in window events
* Fix modifier changed on macOS
Since the `mouse_entered` function was generating a mouse motion, which
updates the modifier state, a modifiers changed event was incorrectly
generated.
The updating of the modifier state has also been changed to make sure it
consistently happens before events that have a modifier state attached
to it, without happening on any other event.
This of course means that no `CursorMoved` event is generated anymore
when the user enters the window without it being focused, however I'd
say that is consistent with how winit should behave.
* Fix unused variable warning
* Move changelog entry into `Unreleased` section
Co-authored-by: Freya Gentz <zegentzy@protonmail.com>
Co-authored-by: Kristofer Rye <kristofer.rye@gmail.com>
Co-authored-by: Christian Duerr <contact@christianduerr.com>
2020-03-06 15:43:55 -07:00
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-21 11:33:15 -04:00
|
|
|
event: MouseInput {
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
state: Released,
|
2023-06-16 11:51:09 +03:00
|
|
|
button: match xbutton {
|
|
|
|
|
1 => Back,
|
|
|
|
|
2 => Forward,
|
|
|
|
|
_ => Other(xbutton),
|
|
|
|
|
},
|
2019-06-21 11:33:15 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_CAPTURECHANGED => {
|
2021-01-19 17:41:02 +01:00
|
|
|
// lparam here is a handle to the window which is gaining mouse capture.
|
|
|
|
|
// If it is the same as our window, then we're essentially retaining the capture. This
|
|
|
|
|
// can happen if `SetCapture` is called on our window when it already has the mouse
|
|
|
|
|
// capture.
|
2022-03-07 22:58:12 +01:00
|
|
|
if lparam != window {
|
2022-08-31 18:32:19 +02:00
|
|
|
userdata.window_state_lock().mouse.capture_count = 0;
|
2021-01-19 17:41:02 +01:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2020-12-15 03:31:13 -03:00
|
|
|
},
|
|
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_TOUCH => {
|
|
|
|
|
let pcount = super::loword(wparam as u32) as usize;
|
2019-06-21 11:33:15 -04:00
|
|
|
let mut inputs = Vec::with_capacity(pcount);
|
2022-03-07 22:58:12 +01:00
|
|
|
let htouch = lparam;
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe {
|
|
|
|
|
GetTouchInputInfo(
|
|
|
|
|
htouch,
|
|
|
|
|
pcount as u32,
|
|
|
|
|
inputs.as_mut_ptr(),
|
|
|
|
|
mem::size_of::<TOUCHINPUT>() as i32,
|
|
|
|
|
) > 0
|
|
|
|
|
} {
|
|
|
|
|
unsafe { inputs.set_len(pcount) };
|
2019-02-05 10:30:33 -05:00
|
|
|
for input in &inputs {
|
2019-07-17 18:25:35 +02:00
|
|
|
let mut location = POINT { x: input.x / 100, y: input.y / 100 };
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe { ScreenToClient(window, &mut location) } == false.into() {
|
2019-07-17 18:25:35 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let x = location.x as f64 + (input.x % 100) as f64 / 100f64;
|
|
|
|
|
let y = location.y as f64 + (input.y % 100) as f64 / 100f64;
|
2019-06-19 16:49:43 -04:00
|
|
|
let location = PhysicalPosition::new(x, y);
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-02-05 10:30:33 -05:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Touch(Touch {
|
2022-03-07 22:58:12 +01:00
|
|
|
phase: if util::has_flag(input.dwFlags, TOUCHEVENTF_DOWN) {
|
2019-02-05 10:30:33 -05:00
|
|
|
TouchPhase::Started
|
2022-03-07 22:58:12 +01:00
|
|
|
} else if util::has_flag(input.dwFlags, TOUCHEVENTF_UP) {
|
2019-02-05 10:30:33 -05:00
|
|
|
TouchPhase::Ended
|
2022-03-07 22:58:12 +01:00
|
|
|
} else if util::has_flag(input.dwFlags, TOUCHEVENTF_MOVE) {
|
2019-02-05 10:30:33 -05:00
|
|
|
TouchPhase::Moved
|
|
|
|
|
} else {
|
|
|
|
|
continue;
|
|
|
|
|
},
|
|
|
|
|
location,
|
2019-09-09 20:15:49 +02:00
|
|
|
force: None, // WM_TOUCH doesn't support pressure information
|
2019-02-05 10:30:33 -05:00
|
|
|
id: input.dwID as u64,
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
}),
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { CloseTouchInputHandle(htouch) };
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_POINTERDOWN | WM_POINTERUPDATE | WM_POINTERUP => {
|
2019-07-26 09:12:06 +02:00
|
|
|
if let (
|
|
|
|
|
Some(GetPointerFrameInfoHistory),
|
|
|
|
|
Some(SkipPointerFrameMessages),
|
|
|
|
|
Some(GetPointerDeviceRects),
|
|
|
|
|
) = (
|
2023-12-22 18:42:17 +01:00
|
|
|
*util::GET_POINTER_FRAME_INFO_HISTORY,
|
|
|
|
|
*util::SKIP_POINTER_FRAME_MESSAGES,
|
|
|
|
|
*util::GET_POINTER_DEVICE_RECTS,
|
2019-07-05 18:37:25 +02:00
|
|
|
) {
|
2022-03-07 22:58:12 +01:00
|
|
|
let pointer_id = super::loword(wparam as u32) as u32;
|
|
|
|
|
let mut entries_count = 0u32;
|
|
|
|
|
let mut pointers_count = 0u32;
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe {
|
|
|
|
|
GetPointerFrameInfoHistory(
|
|
|
|
|
pointer_id,
|
|
|
|
|
&mut entries_count,
|
|
|
|
|
&mut pointers_count,
|
|
|
|
|
ptr::null_mut(),
|
|
|
|
|
)
|
|
|
|
|
} == false.into()
|
2019-07-05 18:37:25 +02:00
|
|
|
{
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
return;
|
2019-07-05 18:37:25 +02:00
|
|
|
}
|
2019-06-27 11:34:38 +02:00
|
|
|
|
2019-07-05 18:37:25 +02:00
|
|
|
let pointer_info_count = (entries_count * pointers_count) as usize;
|
|
|
|
|
let mut pointer_infos = Vec::with_capacity(pointer_info_count);
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe {
|
|
|
|
|
GetPointerFrameInfoHistory(
|
|
|
|
|
pointer_id,
|
|
|
|
|
&mut entries_count,
|
|
|
|
|
&mut pointers_count,
|
|
|
|
|
pointer_infos.as_mut_ptr(),
|
|
|
|
|
)
|
|
|
|
|
} == false.into()
|
2019-07-05 18:37:25 +02:00
|
|
|
{
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
return;
|
2019-07-05 18:37:25 +02:00
|
|
|
}
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { pointer_infos.set_len(pointer_info_count) };
|
2019-06-27 11:34:38 +02:00
|
|
|
|
2019-07-05 18:37:25 +02:00
|
|
|
// https://docs.microsoft.com/en-us/windows/desktop/api/winuser/nf-winuser-getpointerframeinfohistory
|
|
|
|
|
// The information retrieved appears in reverse chronological order, with the most
|
|
|
|
|
// recent entry in the first row of the returned array
|
|
|
|
|
for pointer_info in pointer_infos.iter().rev() {
|
2019-09-09 20:15:49 +02:00
|
|
|
let mut device_rect = mem::MaybeUninit::uninit();
|
|
|
|
|
let mut display_rect = mem::MaybeUninit::uninit();
|
2019-07-26 09:12:06 +02:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe {
|
|
|
|
|
GetPointerDeviceRects(
|
|
|
|
|
pointer_info.sourceDevice,
|
|
|
|
|
device_rect.as_mut_ptr(),
|
|
|
|
|
display_rect.as_mut_ptr(),
|
|
|
|
|
)
|
|
|
|
|
} == false.into()
|
2019-07-26 09:12:06 +02:00
|
|
|
{
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
let device_rect = unsafe { device_rect.assume_init() };
|
|
|
|
|
let display_rect = unsafe { display_rect.assume_init() };
|
2019-09-09 20:15:49 +02:00
|
|
|
|
2019-07-26 09:12:06 +02:00
|
|
|
// For the most precise himetric to pixel conversion we calculate the ratio
|
|
|
|
|
// between the resolution of the display device (pixel) and
|
|
|
|
|
// the touch device (himetric).
|
|
|
|
|
let himetric_to_pixel_ratio_x = (display_rect.right - display_rect.left) as f64
|
|
|
|
|
/ (device_rect.right - device_rect.left) as f64;
|
|
|
|
|
let himetric_to_pixel_ratio_y = (display_rect.bottom - display_rect.top) as f64
|
|
|
|
|
/ (device_rect.bottom - device_rect.top) as f64;
|
|
|
|
|
|
|
|
|
|
// ptHimetricLocation's origin is 0,0 even on multi-monitor setups.
|
|
|
|
|
// On multi-monitor setups we need to translate the himetric location to the
|
|
|
|
|
// rect of the display device it's attached to.
|
|
|
|
|
let x = display_rect.left as f64
|
|
|
|
|
+ pointer_info.ptHimetricLocation.x as f64 * himetric_to_pixel_ratio_x;
|
|
|
|
|
let y = display_rect.top as f64
|
|
|
|
|
+ pointer_info.ptHimetricLocation.y as f64 * himetric_to_pixel_ratio_y;
|
|
|
|
|
|
2019-07-17 18:25:35 +02:00
|
|
|
let mut location = POINT { x: x.floor() as i32, y: y.floor() as i32 };
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe { ScreenToClient(window, &mut location) } == false.into() {
|
2019-07-17 18:25:35 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
2019-09-09 20:15:49 +02:00
|
|
|
let force = match pointer_info.pointerType {
|
2022-03-07 22:58:12 +01:00
|
|
|
PT_TOUCH => {
|
2019-09-09 20:15:49 +02:00
|
|
|
let mut touch_info = mem::MaybeUninit::uninit();
|
2023-12-22 18:42:17 +01:00
|
|
|
util::GET_POINTER_TOUCH_INFO.and_then(|GetPointerTouchInfo| {
|
2023-09-29 16:07:44 +02:00
|
|
|
match unsafe {
|
|
|
|
|
GetPointerTouchInfo(
|
|
|
|
|
pointer_info.pointerId,
|
|
|
|
|
touch_info.as_mut_ptr(),
|
|
|
|
|
)
|
|
|
|
|
} {
|
2019-09-09 20:15:49 +02:00
|
|
|
0 => None,
|
2023-09-29 16:07:44 +02:00
|
|
|
_ => normalize_pointer_pressure(unsafe {
|
|
|
|
|
touch_info.assume_init().pressure
|
|
|
|
|
}),
|
2019-09-09 20:15:49 +02:00
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
2022-03-07 22:58:12 +01:00
|
|
|
PT_PEN => {
|
2019-09-09 20:15:49 +02:00
|
|
|
let mut pen_info = mem::MaybeUninit::uninit();
|
2023-12-22 18:42:17 +01:00
|
|
|
util::GET_POINTER_PEN_INFO.and_then(|GetPointerPenInfo| {
|
2023-09-29 16:07:44 +02:00
|
|
|
match unsafe {
|
|
|
|
|
GetPointerPenInfo(pointer_info.pointerId, pen_info.as_mut_ptr())
|
|
|
|
|
} {
|
2019-09-09 20:15:49 +02:00
|
|
|
0 => None,
|
2023-09-29 16:07:44 +02:00
|
|
|
_ => normalize_pointer_pressure(unsafe {
|
|
|
|
|
pen_info.assume_init().pressure
|
|
|
|
|
}),
|
2019-09-09 20:15:49 +02:00
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
_ => None,
|
|
|
|
|
};
|
|
|
|
|
|
2019-07-26 09:12:06 +02:00
|
|
|
let x = location.x as f64 + x.fract();
|
|
|
|
|
let y = location.y as f64 + y.fract();
|
2019-06-19 16:49:43 -04:00
|
|
|
let location = PhysicalPosition::new(x, y);
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-07-05 18:37:25 +02:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: WindowEvent::Touch(Touch {
|
2022-03-07 22:58:12 +01:00
|
|
|
phase: if util::has_flag(pointer_info.pointerFlags, POINTER_FLAG_DOWN) {
|
2019-07-05 18:37:25 +02:00
|
|
|
TouchPhase::Started
|
2022-03-07 22:58:12 +01:00
|
|
|
} else if util::has_flag(pointer_info.pointerFlags, POINTER_FLAG_UP) {
|
2019-07-05 18:37:25 +02:00
|
|
|
TouchPhase::Ended
|
2022-03-07 22:58:12 +01:00
|
|
|
} else if util::has_flag(pointer_info.pointerFlags, POINTER_FLAG_UPDATE)
|
2019-07-05 18:37:25 +02:00
|
|
|
{
|
|
|
|
|
TouchPhase::Moved
|
|
|
|
|
} else {
|
|
|
|
|
continue;
|
|
|
|
|
},
|
|
|
|
|
location,
|
2019-09-09 20:15:49 +02:00
|
|
|
force,
|
2019-07-05 18:37:25 +02:00
|
|
|
id: pointer_info.pointerId as u64,
|
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
|
}),
|
|
|
|
|
});
|
|
|
|
|
}
|
2019-06-27 11:34:38 +02:00
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { SkipPointerFrameMessages(pointer_id) };
|
2019-07-05 18:37:25 +02:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-27 11:34:38 +02:00
|
|
|
},
|
|
|
|
|
|
2022-07-15 01:27:27 -07:00
|
|
|
WM_NCACTIVATE => {
|
2022-09-20 20:26:37 +02:00
|
|
|
let is_active = wparam != false.into();
|
2022-08-31 18:32:19 +02:00
|
|
|
let active_focus_changed = userdata.window_state_lock().set_active(is_active);
|
2022-07-15 01:27:27 -07:00
|
|
|
if active_focus_changed {
|
|
|
|
|
if is_active {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { gain_active_focus(window, userdata) };
|
2022-07-15 01:27:27 -07:00
|
|
|
} else {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { lose_active_focus(window, userdata) };
|
2022-07-15 01:27:27 -07:00
|
|
|
}
|
2019-12-27 16:26:23 -05:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2022-07-15 01:27:27 -07:00
|
|
|
},
|
2019-12-27 16:26:23 -05:00
|
|
|
|
2022-07-15 01:27:27 -07:00
|
|
|
WM_SETFOCUS => {
|
2022-08-31 18:32:19 +02:00
|
|
|
let active_focus_changed = userdata.window_state_lock().set_focused(true);
|
2022-07-15 01:27:27 -07:00
|
|
|
if active_focus_changed {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { gain_active_focus(window, userdata) };
|
2022-07-15 01:27:27 -07:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_KILLFOCUS => {
|
2022-08-31 18:32:19 +02:00
|
|
|
let active_focus_changed = userdata.window_state_lock().set_focused(false);
|
2022-07-15 01:27:27 -07:00
|
|
|
if active_focus_changed {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { lose_active_focus(window, userdata) };
|
2019-12-27 16:26:23 -05:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_SETCURSOR => {
|
2019-02-05 10:30:33 -05:00
|
|
|
let set_cursor_to = {
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_state = userdata.window_state_lock();
|
2021-01-05 17:39:13 +01:00
|
|
|
// The return value for the preceding `WM_NCHITTEST` message is conveniently
|
|
|
|
|
// provided through the low-order word of lParam. We use that here since
|
|
|
|
|
// `WM_MOUSEMOVE` seems to come after `WM_SETCURSOR` for a given cursor movement.
|
2022-03-07 22:58:12 +01:00
|
|
|
let in_client_area = super::loword(lparam as u32) as u32 == HTCLIENT;
|
2021-01-05 17:39:13 +01:00
|
|
|
if in_client_area {
|
2023-12-16 22:02:17 +02:00
|
|
|
Some(window_state.mouse.selected_cursor.clone())
|
2019-02-05 10:30:33 -05:00
|
|
|
} else {
|
|
|
|
|
None
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
match set_cursor_to {
|
2023-12-16 22:02:17 +02:00
|
|
|
Some(selected_cursor) => {
|
|
|
|
|
let hcursor = match selected_cursor {
|
|
|
|
|
SelectedCursor::Named(cursor_icon) => unsafe {
|
|
|
|
|
LoadCursorW(0, util::to_windows_cursor(cursor_icon))
|
|
|
|
|
},
|
|
|
|
|
SelectedCursor::Custom(cursor) => cursor.as_raw_handle(),
|
|
|
|
|
};
|
|
|
|
|
unsafe { SetCursor(hcursor) };
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2023-05-28 20:02:59 +02:00
|
|
|
None => result = ProcResult::DefWindowProc(wparam),
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_GETMINMAXINFO => {
|
|
|
|
|
let mmi = lparam as *mut MINMAXINFO;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_state = userdata.window_state_lock();
|
2022-08-15 02:36:37 +02:00
|
|
|
let window_flags = window_state.window_flags;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
if window_state.min_size.is_some() || window_state.max_size.is_some() {
|
|
|
|
|
if let Some(min_size) = window_state.min_size {
|
2020-02-13 20:41:41 +01:00
|
|
|
let min_size = min_size.to_physical(window_state.scale_factor);
|
2022-08-15 02:36:37 +02:00
|
|
|
let (width, height): (u32, u32) =
|
|
|
|
|
window_flags.adjust_size(window, min_size).into();
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { (*mmi).ptMinTrackSize = POINT { x: width as i32, y: height as i32 } };
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
if let Some(max_size) = window_state.max_size {
|
2020-02-13 20:41:41 +01:00
|
|
|
let max_size = max_size.to_physical(window_state.scale_factor);
|
2022-08-15 02:36:37 +02:00
|
|
|
let (width, height): (u32, u32) =
|
|
|
|
|
window_flags.adjust_size(window, max_size).into();
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { (*mmi).ptMaxTrackSize = POINT { x: width as i32, y: height as i32 } };
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
// Only sent on Windows 8.1 or newer. On Windows 7 and older user has to log out to change
|
|
|
|
|
// DPI, therefore all applications are closed while DPI is changing.
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_DPICHANGED => {
|
2020-01-05 16:57:32 -05:00
|
|
|
use crate::event::WindowEvent::ScaleFactorChanged;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
|
|
|
|
// This message actually provides two DPI values - x and y. However MSDN says that
|
|
|
|
|
// "you only need to use either the X-axis or the Y-axis value when scaling your
|
|
|
|
|
// application since they are the same".
|
|
|
|
|
// https://msdn.microsoft.com/en-us/library/windows/desktop/dn312083(v=vs.85).aspx
|
2022-03-07 22:58:12 +01:00
|
|
|
let new_dpi_x = super::loword(wparam as u32) as u32;
|
2020-02-13 20:41:41 +01:00
|
|
|
let new_scale_factor = dpi_to_scale_factor(new_dpi_x);
|
|
|
|
|
let old_scale_factor: f64;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-08-15 02:36:37 +02:00
|
|
|
let (allow_resize, window_flags) = {
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut window_state = userdata.window_state_lock();
|
2020-02-13 20:41:41 +01:00
|
|
|
old_scale_factor = window_state.scale_factor;
|
|
|
|
|
window_state.scale_factor = new_scale_factor;
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2020-02-13 20:41:41 +01:00
|
|
|
if new_scale_factor == old_scale_factor {
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
|
|
|
|
return;
|
2020-01-04 01:28:34 -05:00
|
|
|
}
|
|
|
|
|
|
2022-08-15 02:36:37 +02:00
|
|
|
let allow_resize = window_state.fullscreen.is_none()
|
|
|
|
|
&& !window_state.window_flags().contains(WindowFlags::MAXIMIZED);
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-08-15 02:36:37 +02:00
|
|
|
(allow_resize, window_state.window_flags)
|
|
|
|
|
};
|
2019-06-19 16:49:43 -04:00
|
|
|
|
|
|
|
|
// New size as suggested by Windows.
|
2023-09-29 16:07:44 +02:00
|
|
|
let suggested_rect = unsafe { *(lparam as *const RECT) };
|
2019-06-19 16:49:43 -04:00
|
|
|
|
|
|
|
|
// The window rect provided is the window's outer size, not it's inner size. However,
|
|
|
|
|
// win32 doesn't provide an `UnadjustWindowRectEx` function to get the client rect from
|
|
|
|
|
// the outer rect, so we instead adjust the window rect to get the decoration margins
|
|
|
|
|
// and remove them from the outer size.
|
2020-01-04 01:28:34 -05:00
|
|
|
let margin_left: i32;
|
|
|
|
|
let margin_top: i32;
|
|
|
|
|
// let margin_right: i32;
|
|
|
|
|
// let margin_bottom: i32;
|
2019-06-19 16:49:43 -04:00
|
|
|
{
|
2022-08-15 02:36:37 +02:00
|
|
|
let adjusted_rect =
|
|
|
|
|
window_flags.adjust_rect(window, suggested_rect).unwrap_or(suggested_rect);
|
2020-01-04 01:28:34 -05:00
|
|
|
margin_left = suggested_rect.left - adjusted_rect.left;
|
|
|
|
|
margin_top = suggested_rect.top - adjusted_rect.top;
|
|
|
|
|
// margin_right = adjusted_rect.right - suggested_rect.right;
|
|
|
|
|
// margin_bottom = adjusted_rect.bottom - suggested_rect.bottom;
|
2019-06-19 16:49:43 -04:00
|
|
|
}
|
|
|
|
|
|
2022-08-15 02:36:37 +02:00
|
|
|
let old_physical_inner_rect = util::WindowArea::Inner
|
|
|
|
|
.get_rect(window)
|
|
|
|
|
.expect("failed to query (old) inner window area");
|
2020-01-04 01:28:34 -05:00
|
|
|
let old_physical_inner_size = PhysicalSize::new(
|
|
|
|
|
(old_physical_inner_rect.right - old_physical_inner_rect.left) as u32,
|
|
|
|
|
(old_physical_inner_rect.bottom - old_physical_inner_rect.top) as u32,
|
|
|
|
|
);
|
|
|
|
|
|
2019-06-19 16:49:43 -04:00
|
|
|
// `allow_resize` prevents us from re-applying DPI adjustment to the restored size after
|
|
|
|
|
// exiting fullscreen (the restored size is already DPI adjusted).
|
2023-07-31 00:39:01 +04:00
|
|
|
let new_physical_inner_size = match allow_resize {
|
2020-01-03 00:28:41 -05:00
|
|
|
// We calculate our own size because the default suggested rect doesn't do a great
|
|
|
|
|
// job of preserving the window's logical size.
|
|
|
|
|
true => old_physical_inner_size
|
2020-02-13 20:41:41 +01:00
|
|
|
.to_logical::<f64>(old_scale_factor)
|
|
|
|
|
.to_physical::<u32>(new_scale_factor),
|
2020-01-03 00:28:41 -05:00
|
|
|
false => old_physical_inner_size,
|
|
|
|
|
};
|
2019-06-19 16:49:43 -04:00
|
|
|
|
2023-07-31 00:39:01 +04:00
|
|
|
let new_inner_size = Arc::new(Mutex::new(new_physical_inner_size));
|
2022-06-10 13:43:33 +03:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2019-06-19 16:49:43 -04:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2020-01-05 16:57:32 -05:00
|
|
|
event: ScaleFactorChanged {
|
2020-02-13 20:41:41 +01:00
|
|
|
scale_factor: new_scale_factor,
|
2023-07-31 00:39:01 +04:00
|
|
|
inner_size_writer: InnerSizeWriter::new(Arc::downgrade(&new_inner_size)),
|
2019-06-19 16:49:43 -04:00
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
|
2023-07-31 00:39:01 +04:00
|
|
|
let new_physical_inner_size = *new_inner_size.lock().unwrap();
|
|
|
|
|
drop(new_inner_size);
|
|
|
|
|
|
2020-05-04 15:14:13 -04:00
|
|
|
let dragging_window: bool;
|
|
|
|
|
|
|
|
|
|
{
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_state = userdata.window_state_lock();
|
2020-05-04 15:14:13 -04:00
|
|
|
dragging_window =
|
|
|
|
|
window_state.window_flags().contains(WindowFlags::MARKER_IN_SIZE_MOVE);
|
|
|
|
|
// Unset maximized if we're changing the window's size.
|
|
|
|
|
if new_physical_inner_size != old_physical_inner_size {
|
|
|
|
|
WindowState::set_window_flags(window_state, window, |f| {
|
|
|
|
|
f.set(WindowFlags::MAXIMIZED, false)
|
|
|
|
|
});
|
|
|
|
|
}
|
2020-01-04 01:28:34 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
let new_outer_rect: RECT;
|
|
|
|
|
{
|
|
|
|
|
let suggested_ul =
|
|
|
|
|
(suggested_rect.left + margin_left, suggested_rect.top + margin_top);
|
|
|
|
|
|
|
|
|
|
let mut conservative_rect = RECT {
|
|
|
|
|
left: suggested_ul.0,
|
|
|
|
|
top: suggested_ul.1,
|
2022-03-07 22:58:12 +01:00
|
|
|
right: suggested_ul.0 + new_physical_inner_size.width as i32,
|
|
|
|
|
bottom: suggested_ul.1 + new_physical_inner_size.height as i32,
|
2020-01-04 01:28:34 -05:00
|
|
|
};
|
|
|
|
|
|
2022-08-15 02:36:37 +02:00
|
|
|
conservative_rect = window_flags
|
|
|
|
|
.adjust_rect(window, conservative_rect)
|
|
|
|
|
.unwrap_or(conservative_rect);
|
2020-01-04 01:28:34 -05:00
|
|
|
|
2020-05-04 15:14:13 -04:00
|
|
|
// If we're dragging the window, offset the window so that the cursor's
|
2020-01-04 01:28:34 -05:00
|
|
|
// relative horizontal position in the title bar is preserved.
|
|
|
|
|
if dragging_window {
|
|
|
|
|
let bias = {
|
|
|
|
|
let cursor_pos = {
|
2023-09-29 16:07:44 +02:00
|
|
|
let mut pos = unsafe { mem::zeroed() };
|
|
|
|
|
unsafe { GetCursorPos(&mut pos) };
|
2020-01-04 01:28:34 -05:00
|
|
|
pos
|
|
|
|
|
};
|
|
|
|
|
let suggested_cursor_horizontal_ratio = (cursor_pos.x - suggested_rect.left)
|
|
|
|
|
as f64
|
|
|
|
|
/ (suggested_rect.right - suggested_rect.left) as f64;
|
|
|
|
|
|
|
|
|
|
(cursor_pos.x
|
|
|
|
|
- (suggested_cursor_horizontal_ratio
|
|
|
|
|
* (conservative_rect.right - conservative_rect.left) as f64)
|
2022-03-07 22:58:12 +01:00
|
|
|
as i32)
|
2020-01-04 01:28:34 -05:00
|
|
|
- conservative_rect.left
|
|
|
|
|
};
|
|
|
|
|
conservative_rect.left += bias;
|
|
|
|
|
conservative_rect.right += bias;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Check to see if the new window rect is on the monitor with the new DPI factor.
|
|
|
|
|
// If it isn't, offset the window so that it is.
|
2023-09-29 16:07:44 +02:00
|
|
|
let new_dpi_monitor = unsafe { MonitorFromWindow(window, MONITOR_DEFAULTTONULL) };
|
2022-03-07 22:58:12 +01:00
|
|
|
let conservative_rect_monitor =
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { MonitorFromRect(&conservative_rect, MONITOR_DEFAULTTONULL) };
|
2020-01-04 01:28:34 -05:00
|
|
|
new_outer_rect = if conservative_rect_monitor == new_dpi_monitor {
|
|
|
|
|
conservative_rect
|
|
|
|
|
} else {
|
|
|
|
|
let get_monitor_rect = |monitor| {
|
2022-03-07 22:58:12 +01:00
|
|
|
let mut monitor_info = MONITORINFO {
|
|
|
|
|
cbSize: mem::size_of::<MONITORINFO>() as _,
|
2023-09-29 16:07:44 +02:00
|
|
|
..unsafe { mem::zeroed() }
|
2020-01-04 01:28:34 -05:00
|
|
|
};
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { GetMonitorInfoW(monitor, &mut monitor_info) };
|
2020-01-04 01:28:34 -05:00
|
|
|
monitor_info.rcMonitor
|
|
|
|
|
};
|
|
|
|
|
let wrong_monitor = conservative_rect_monitor;
|
|
|
|
|
let wrong_monitor_rect = get_monitor_rect(wrong_monitor);
|
|
|
|
|
let new_monitor_rect = get_monitor_rect(new_dpi_monitor);
|
|
|
|
|
|
|
|
|
|
// The direction to nudge the window in to get the window onto the monitor with
|
|
|
|
|
// the new DPI factor. We calculate this by seeing which monitor edges are
|
|
|
|
|
// shared and nudging away from the wrong monitor based on those.
|
2022-11-23 13:07:58 +01:00
|
|
|
#[allow(clippy::bool_to_int_with_if)]
|
2020-01-04 01:28:34 -05:00
|
|
|
let delta_nudge_to_dpi_monitor = (
|
|
|
|
|
if wrong_monitor_rect.left == new_monitor_rect.right {
|
|
|
|
|
-1
|
|
|
|
|
} else if wrong_monitor_rect.right == new_monitor_rect.left {
|
|
|
|
|
1
|
|
|
|
|
} else {
|
|
|
|
|
0
|
|
|
|
|
},
|
|
|
|
|
if wrong_monitor_rect.bottom == new_monitor_rect.top {
|
|
|
|
|
1
|
|
|
|
|
} else if wrong_monitor_rect.top == new_monitor_rect.bottom {
|
|
|
|
|
-1
|
|
|
|
|
} else {
|
|
|
|
|
0
|
|
|
|
|
},
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
let abort_after_iterations = new_monitor_rect.right - new_monitor_rect.left
|
|
|
|
|
+ new_monitor_rect.bottom
|
|
|
|
|
- new_monitor_rect.top;
|
|
|
|
|
for _ in 0..abort_after_iterations {
|
|
|
|
|
conservative_rect.left += delta_nudge_to_dpi_monitor.0;
|
|
|
|
|
conservative_rect.right += delta_nudge_to_dpi_monitor.0;
|
|
|
|
|
conservative_rect.top += delta_nudge_to_dpi_monitor.1;
|
|
|
|
|
conservative_rect.bottom += delta_nudge_to_dpi_monitor.1;
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
if unsafe { MonitorFromRect(&conservative_rect, MONITOR_DEFAULTTONULL) }
|
2022-03-07 22:58:12 +01:00
|
|
|
== new_dpi_monitor
|
|
|
|
|
{
|
2020-01-04 01:28:34 -05:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
conservative_rect
|
|
|
|
|
};
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe {
|
|
|
|
|
SetWindowPos(
|
|
|
|
|
window,
|
|
|
|
|
0,
|
|
|
|
|
new_outer_rect.left,
|
|
|
|
|
new_outer_rect.top,
|
|
|
|
|
new_outer_rect.right - new_outer_rect.left,
|
|
|
|
|
new_outer_rect.bottom - new_outer_rect.top,
|
|
|
|
|
SWP_NOZORDER | SWP_NOACTIVATE,
|
|
|
|
|
)
|
|
|
|
|
};
|
2020-01-04 01:28:34 -05:00
|
|
|
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2019-02-05 10:30:33 -05:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_SETTINGCHANGE => {
|
2019-12-22 19:04:09 +00:00
|
|
|
use crate::event::WindowEvent::ThemeChanged;
|
|
|
|
|
|
2022-08-31 18:32:19 +02:00
|
|
|
let preferred_theme = userdata.window_state_lock().preferred_theme;
|
2019-12-22 19:04:09 +00:00
|
|
|
|
2022-11-23 13:07:58 +01:00
|
|
|
if preferred_theme.is_none() {
|
2020-11-30 19:04:26 +01:00
|
|
|
let new_theme = try_theme(window, preferred_theme);
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut window_state = userdata.window_state_lock();
|
2019-12-22 19:04:09 +00:00
|
|
|
|
2020-11-30 19:04:26 +01:00
|
|
|
if window_state.current_theme != new_theme {
|
|
|
|
|
window_state.current_theme = new_theme;
|
2022-07-20 11:50:49 +03:00
|
|
|
drop(window_state);
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata.send_event(Event::WindowEvent {
|
2020-11-30 19:04:26 +01:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
|
event: ThemeChanged(new_theme),
|
|
|
|
|
});
|
|
|
|
|
}
|
2019-12-22 19:04:09 +00:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-12-22 19:04:09 +00:00
|
|
|
},
|
|
|
|
|
|
2019-02-05 10:30:33 -05:00
|
|
|
_ => {
|
2023-02-04 06:38:21 -08:00
|
|
|
if msg == DESTROY_MSG_ID.get() {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { DestroyWindow(window) };
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2023-02-04 06:38:21 -08:00
|
|
|
} else if msg == SET_RETAIN_STATE_ON_SIZE_MSG_ID.get() {
|
2022-08-31 18:32:19 +02:00
|
|
|
let mut window_state = userdata.window_state_lock();
|
2019-06-21 11:33:15 -04:00
|
|
|
window_state.set_window_flags_in_place(|f| {
|
|
|
|
|
f.set(WindowFlags::MARKER_RETAIN_STATE_ON_SIZE, wparam != 0)
|
|
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::Value(0);
|
2023-02-04 06:38:21 -08:00
|
|
|
} else if msg == TASKBAR_CREATED.get() {
|
2022-08-31 18:32:19 +02:00
|
|
|
let window_state = userdata.window_state_lock();
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { set_skip_taskbar(window, window_state.skip_taskbar) };
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-02-05 10:30:33 -05:00
|
|
|
} else {
|
2023-05-28 20:02:59 +02:00
|
|
|
result = ProcResult::DefWindowProc(wparam);
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2020-05-04 15:14:13 -04:00
|
|
|
};
|
|
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata
|
2020-05-04 15:14:13 -04:00
|
|
|
.event_loop_runner
|
|
|
|
|
.catch_unwind(callback)
|
2023-05-28 20:02:59 +02:00
|
|
|
.unwrap_or_else(|| result = ProcResult::Value(-1));
|
|
|
|
|
|
|
|
|
|
match result {
|
2023-09-29 16:07:44 +02:00
|
|
|
ProcResult::DefWindowProc(wparam) => unsafe { DefWindowProcW(window, msg, wparam, lparam) },
|
2023-05-28 20:02:59 +02:00
|
|
|
ProcResult::Value(val) => val,
|
|
|
|
|
}
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
|
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe extern "system" fn thread_event_target_callback(
|
2019-02-05 10:30:33 -05:00
|
|
|
window: HWND,
|
2022-03-07 22:58:12 +01:00
|
|
|
msg: u32,
|
2019-02-05 10:30:33 -05:00
|
|
|
wparam: WPARAM,
|
|
|
|
|
lparam: LPARAM,
|
|
|
|
|
) -> LRESULT {
|
2023-09-29 16:07:44 +02:00
|
|
|
let userdata_ptr =
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe { super::get_window_long(window, GWL_USERDATA) } as *mut ThreadMsgTargetData;
|
2021-07-16 12:40:48 +02:00
|
|
|
if userdata_ptr.is_null() {
|
|
|
|
|
// `userdata_ptr` will always be null for the first `WM_GETMINMAXINFO`, as well as
|
|
|
|
|
// `WM_NCCREATE` and `WM_CREATE`.
|
2023-09-29 16:07:44 +02:00
|
|
|
return unsafe { DefWindowProcW(window, msg, wparam, lparam) };
|
2021-07-16 12:40:48 +02:00
|
|
|
}
|
2023-09-29 16:07:44 +02:00
|
|
|
let userdata = unsafe { Box::from_raw(userdata_ptr) };
|
2020-05-04 15:14:13 -04:00
|
|
|
|
2022-03-07 22:58:12 +01:00
|
|
|
if msg != WM_PAINT {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { RedrawWindow(window, ptr::null(), 0, RDW_INTERNALPAINT) };
|
2020-05-04 15:14:13 -04:00
|
|
|
}
|
|
|
|
|
|
2021-07-16 12:40:48 +02:00
|
|
|
let mut userdata_removed = false;
|
2020-12-20 12:54:42 +01:00
|
|
|
|
2020-05-04 15:14:13 -04:00
|
|
|
// I decided to bind the closure to `callback` and pass it to catch_unwind rather than passing
|
2024-02-19 11:58:44 +07:00
|
|
|
// the closure to catch_unwind directly so that the match body indentation wouldn't change and
|
2020-05-04 15:14:13 -04:00
|
|
|
// the git blame and history would be preserved.
|
|
|
|
|
let callback = || match msg {
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_NCDESTROY => {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { super::set_window_long(window, GWL_USERDATA, 0) };
|
2021-07-16 12:40:48 +02:00
|
|
|
userdata_removed = true;
|
2019-02-05 10:30:33 -05:00
|
|
|
0
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2023-09-29 16:07:44 +02:00
|
|
|
WM_PAINT => unsafe {
|
2022-03-07 22:58:12 +01:00
|
|
|
ValidateRect(window, ptr::null());
|
2024-02-19 11:58:44 +07:00
|
|
|
// Default WM_PAINT behaviour. This makes sure modals and popups are shown immediately
|
|
|
|
|
// when opening them.
|
2022-03-07 22:58:12 +01:00
|
|
|
DefWindowProcW(window, msg, wparam, lparam)
|
2023-09-29 16:07:44 +02:00
|
|
|
},
|
2022-03-07 22:58:12 +01:00
|
|
|
WM_INPUT => {
|
2023-05-28 20:02:59 +02:00
|
|
|
if let Some(data) = raw_input::get_raw_input_data(lparam as _) {
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { handle_raw_input(&userdata, data) };
|
2019-12-30 14:11:11 -05:00
|
|
|
}
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
unsafe { DefWindowProcW(window, msg, wparam, lparam) }
|
2019-12-30 14:11:11 -05:00
|
|
|
},
|
|
|
|
|
|
2023-02-04 06:38:21 -08:00
|
|
|
_ if msg == USER_EVENT_MSG_ID.get() => {
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
// synthesis a placeholder UserEvent, so that if the callback is
|
|
|
|
|
// re-entered it can be buffered for later delivery. the real
|
|
|
|
|
// user event is still in the mpsc channel and will be pulled
|
|
|
|
|
// once the placeholder event is delivered to the wrapper
|
|
|
|
|
// `event_handler`
|
2024-06-24 13:04:55 +03:00
|
|
|
userdata.send_event(Event::UserWakeUp);
|
2019-02-05 10:30:33 -05:00
|
|
|
0
|
2019-06-24 12:14:55 -04:00
|
|
|
},
|
2023-02-04 06:38:21 -08:00
|
|
|
_ if msg == EXEC_MSG_ID.get() => {
|
2023-09-29 16:07:44 +02:00
|
|
|
let mut function: ThreadExecFn = unsafe { Box::from_raw(wparam as *mut _) };
|
2019-02-05 10:30:33 -05:00
|
|
|
function();
|
|
|
|
|
0
|
2020-05-04 15:14:13 -04:00
|
|
|
},
|
2023-09-29 16:07:44 +02:00
|
|
|
_ => unsafe { DefWindowProcW(window, msg, wparam, lparam) },
|
2020-05-04 15:14:13 -04:00
|
|
|
};
|
|
|
|
|
|
2020-12-20 12:54:42 +01:00
|
|
|
let result = userdata.event_loop_runner.catch_unwind(callback).unwrap_or(-1);
|
2021-07-16 12:40:48 +02:00
|
|
|
if userdata_removed {
|
2022-07-20 11:50:49 +03:00
|
|
|
drop(userdata);
|
2020-12-20 12:54:42 +01:00
|
|
|
} else {
|
2024-08-04 12:03:26 +02:00
|
|
|
Box::leak(userdata);
|
2020-12-20 12:54:42 +01:00
|
|
|
}
|
|
|
|
|
result
|
2019-02-05 10:30:33 -05:00
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
|
Windows: Make `EventLoopWindowTarget` independent of UserEvent type (#3061)
* make `EventLoopWindowTarget` independent of UserEvent type
the `EventLoopWindowTarget` is needed for window creation. conceptually,
only `EventLoop` and `EventLoopProxy` need to be parameterized, and all
other parts of the backend should be agnostic about the user event type,
parallel to how `Event<T>` is parameterized, but `WindowEvent` is not.
this change removes the dependency on the type of user events from the
`EventLoopWindowTarget` for the Windows backend, but keep a phantom data
to keep the API intact. to achieve this, I moved the `Receiver` end of
the mpsc channel from `ThreadMsgTargetData` into `EventLoop` itself, so
the `UserEvent` is only passed between `EventLoop` and `EventLoopProxy`,
all other part of the backend just use unit type as a placeholder for
user events.
it's similar to the macos backend where an erased `EventHandler` trait
object is used so all component except `EventLoop` and `EventLoopProxy`
need to be parameterized. however `EventLoop` of the Windows backend
already use an `Box<dyn FnMut>` to wrap the user provided event handler
callback, so no need for an dedicated trait object, I just modified the
wrapper to replace the placeholder user event with real value pulled
from the channel. I find this is the approach which need minimum change
to be made to existing code. but it does the job and could serve as a
starting point to future Windows backend re-works.
* fix CI clippy failure.
* make UserEventPlaceholder a new type instead of alias
* invariance is maintained by top-level EventLoopWindowTarget<T>
this field is transitional and her to keep API compatibility only.
the correct variance and such is already ensured by the top-level
`EventLoopWindowTarget`, just use `PhantomData<T>` here.
2024-01-04 23:47:07 +08:00
|
|
|
unsafe fn handle_raw_input(userdata: &ThreadMsgTargetData, data: RAWINPUT) {
|
2024-08-05 12:15:53 +02:00
|
|
|
use crate::event::DeviceEvent::{Button, Key, MouseMotion, MouseWheel};
|
2023-05-28 20:02:59 +02:00
|
|
|
use crate::event::ElementState::{Pressed, Released};
|
|
|
|
|
use crate::event::MouseScrollDelta::LineDelta;
|
|
|
|
|
|
|
|
|
|
let device_id = wrap_device_id(data.header.hDevice as _);
|
|
|
|
|
|
|
|
|
|
if data.header.dwType == RIM_TYPEMOUSE {
|
2023-09-29 16:07:44 +02:00
|
|
|
let mouse = unsafe { data.data.mouse };
|
2023-05-28 20:02:59 +02:00
|
|
|
|
|
|
|
|
if util::has_flag(mouse.usFlags as u32, MOUSE_MOVE_RELATIVE) {
|
|
|
|
|
let x = mouse.lLastX as f64;
|
|
|
|
|
let y = mouse.lLastY as f64;
|
|
|
|
|
|
|
|
|
|
if x != 0.0 || y != 0.0 {
|
|
|
|
|
userdata.send_event(Event::DeviceEvent {
|
|
|
|
|
device_id,
|
|
|
|
|
event: MouseMotion { delta: (x, y) },
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2023-09-29 16:07:44 +02:00
|
|
|
let button_flags = unsafe { mouse.Anonymous.Anonymous.usButtonFlags };
|
2023-05-28 20:02:59 +02:00
|
|
|
if util::has_flag(button_flags as u32, RI_MOUSE_WHEEL) {
|
2023-10-20 19:03:05 +02:00
|
|
|
let button_data = unsafe { mouse.Anonymous.Anonymous.usButtonData } as i16;
|
|
|
|
|
let delta = button_data as f32 / WHEEL_DELTA as f32;
|
2023-05-28 20:02:59 +02:00
|
|
|
userdata.send_event(Event::DeviceEvent {
|
|
|
|
|
device_id,
|
|
|
|
|
event: MouseWheel { delta: LineDelta(0.0, delta) },
|
|
|
|
|
});
|
|
|
|
|
}
|
2023-10-20 19:03:05 +02:00
|
|
|
if util::has_flag(button_flags as u32, RI_MOUSE_HWHEEL) {
|
|
|
|
|
let button_data = unsafe { mouse.Anonymous.Anonymous.usButtonData } as i16;
|
|
|
|
|
let delta = -button_data as f32 / WHEEL_DELTA as f32;
|
|
|
|
|
userdata.send_event(Event::DeviceEvent {
|
|
|
|
|
device_id,
|
|
|
|
|
event: MouseWheel { delta: LineDelta(delta, 0.0) },
|
|
|
|
|
});
|
|
|
|
|
}
|
2023-05-28 20:02:59 +02:00
|
|
|
|
|
|
|
|
let button_state = raw_input::get_raw_mouse_button_state(button_flags as u32);
|
2023-10-20 19:03:05 +02:00
|
|
|
for (button, state) in button_state.iter().enumerate() {
|
2023-05-28 20:02:59 +02:00
|
|
|
if let Some(state) = *state {
|
|
|
|
|
userdata.send_event(Event::DeviceEvent {
|
|
|
|
|
device_id,
|
2023-10-20 19:03:05 +02:00
|
|
|
event: Button { button: button as _, state },
|
2023-05-28 20:02:59 +02:00
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else if data.header.dwType == RIM_TYPEKEYBOARD {
|
2023-09-29 16:07:44 +02:00
|
|
|
let keyboard = unsafe { data.data.keyboard };
|
2023-05-28 20:02:59 +02:00
|
|
|
|
|
|
|
|
let pressed = keyboard.Message == WM_KEYDOWN || keyboard.Message == WM_SYSKEYDOWN;
|
|
|
|
|
let released = keyboard.Message == WM_KEYUP || keyboard.Message == WM_SYSKEYUP;
|
|
|
|
|
|
|
|
|
|
if !pressed && !released {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
2023-12-22 18:42:17 +01:00
|
|
|
if let Some(physical_key) = raw_input::get_keyboard_physical_key(keyboard) {
|
|
|
|
|
let state = if pressed { Pressed } else { Released };
|
|
|
|
|
|
|
|
|
|
userdata.send_event(Event::DeviceEvent {
|
|
|
|
|
device_id,
|
|
|
|
|
event: Key(RawKeyEvent { physical_key, state }),
|
|
|
|
|
});
|
2023-05-28 20:02:59 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2023-10-17 06:53:22 +03:30
|
|
|
|
|
|
|
|
enum PointerMoveKind {
|
|
|
|
|
/// Pointer enterd to the window.
|
|
|
|
|
Enter,
|
|
|
|
|
/// Pointer leaved the window client area.
|
|
|
|
|
Leave,
|
|
|
|
|
/// Pointer is inside the window or `GetClientRect` failed.
|
|
|
|
|
None,
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fn get_pointer_move_kind(
|
|
|
|
|
window: HWND,
|
|
|
|
|
mouse_was_inside_window: bool,
|
|
|
|
|
x: i32,
|
|
|
|
|
y: i32,
|
|
|
|
|
) -> PointerMoveKind {
|
|
|
|
|
let rect: RECT = unsafe {
|
|
|
|
|
let mut rect: RECT = mem::zeroed();
|
|
|
|
|
if GetClientRect(window, &mut rect) == false.into() {
|
|
|
|
|
return PointerMoveKind::None; // exit early if GetClientRect failed
|
|
|
|
|
}
|
|
|
|
|
rect
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
let x = (rect.left..rect.right).contains(&x);
|
|
|
|
|
let y = (rect.top..rect.bottom).contains(&y);
|
|
|
|
|
|
|
|
|
|
if !mouse_was_inside_window && x && y {
|
|
|
|
|
PointerMoveKind::Enter
|
|
|
|
|
} else if mouse_was_inside_window && !(x && y) {
|
|
|
|
|
PointerMoveKind::Leave
|
|
|
|
|
} else {
|
|
|
|
|
PointerMoveKind::None
|
|
|
|
|
}
|
|
|
|
|
}
|