2019-07-06 02:37:25 +10:00
|
|
|
#![allow(non_snake_case)]
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-08-27 12:05:42 +10:00
|
|
|
mod runner;
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
use parking_lot::Mutex;
|
2019-06-22 01:33:15 +10:00
|
|
|
use std::{
|
2020-07-05 05:46:41 +10:00
|
|
|
collections::VecDeque,
|
2019-06-22 01:33:15 +10:00
|
|
|
marker::PhantomData,
|
|
|
|
mem, panic, ptr,
|
|
|
|
rc::Rc,
|
|
|
|
sync::{
|
|
|
|
mpsc::{self, Receiver, Sender},
|
|
|
|
Arc,
|
|
|
|
},
|
2020-05-05 05:14:13 +10:00
|
|
|
thread,
|
2019-06-22 01:33:15 +10:00
|
|
|
time::{Duration, Instant},
|
|
|
|
};
|
|
|
|
use winapi::shared::basetsd::{DWORD_PTR, UINT_PTR};
|
|
|
|
|
|
|
|
use winapi::{
|
|
|
|
shared::{
|
|
|
|
minwindef::{BOOL, DWORD, HIWORD, INT, LOWORD, LPARAM, LRESULT, UINT, WPARAM},
|
|
|
|
windef::{HWND, POINT, RECT},
|
|
|
|
windowsx, winerror,
|
|
|
|
},
|
|
|
|
um::{
|
|
|
|
commctrl, libloaderapi, ole2, processthreadsapi, winbase,
|
2020-01-04 17:28:34 +11:00
|
|
|
winnt::{HANDLE, LONG, LPCSTR, SHORT},
|
2019-06-22 01:33:15 +10:00
|
|
|
winuser,
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
};
|
2019-06-22 01:33:15 +10:00
|
|
|
|
|
|
|
use crate::{
|
2019-06-20 06:49:43 +10:00
|
|
|
dpi::{PhysicalPosition, PhysicalSize},
|
2019-08-27 12:05:42 +10:00
|
|
|
event::{DeviceEvent, Event, Force, KeyboardInput, Touch, TouchPhase, WindowEvent},
|
2019-06-22 01:33:15 +10:00
|
|
|
event_loop::{ControlFlow, EventLoopClosed, EventLoopWindowTarget as RootELW},
|
2020-09-08 03:20:47 +10:00
|
|
|
monitor::MonitorHandle as RootMonitorHandle,
|
2019-06-22 01:33:15 +10:00
|
|
|
platform_impl::platform::{
|
2019-12-23 06:04:09 +11:00
|
|
|
dark_mode::try_dark_mode,
|
2020-01-04 17:29:40 +11:00
|
|
|
dpi::{become_dpi_aware, dpi_to_scale_factor, enable_non_client_dpi_scaling},
|
2019-06-22 01:33:15 +10:00
|
|
|
drop_handler::FileDropHandler,
|
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-07 09:43:55 +11:00
|
|
|
event::{self, handle_extended_keys, process_key_params, vkey_to_winit_vkey},
|
2020-07-05 05:46:41 +10:00
|
|
|
monitor::{self, MonitorHandle},
|
|
|
|
raw_input, util,
|
2019-06-22 01:33:15 +10:00
|
|
|
window_state::{CursorFlags, WindowFlags, WindowState},
|
|
|
|
wrap_device_id, WindowId, DEVICE_ID,
|
|
|
|
},
|
2019-10-06 07:23:30 +11:00
|
|
|
window::{Fullscreen, WindowId as RootWindowId},
|
2019-02-06 02:30:33 +11:00
|
|
|
};
|
2020-05-05 05:14:13 +10:00
|
|
|
use runner::{EventLoopRunner, EventLoopRunnerShared};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-07-06 02:37:25 +10:00
|
|
|
type GetPointerFrameInfoHistory = unsafe extern "system" fn(
|
|
|
|
pointerId: UINT,
|
|
|
|
entriesCount: *mut UINT,
|
|
|
|
pointerCount: *mut UINT,
|
|
|
|
pointerInfo: *mut winuser::POINTER_INFO,
|
|
|
|
) -> BOOL;
|
|
|
|
|
|
|
|
type SkipPointerFrameMessages = unsafe extern "system" fn(pointerId: UINT) -> BOOL;
|
2019-07-26 17:12:06 +10:00
|
|
|
type GetPointerDeviceRects = unsafe extern "system" fn(
|
|
|
|
device: HANDLE,
|
|
|
|
pointerDeviceRect: *mut RECT,
|
|
|
|
displayRect: *mut RECT,
|
|
|
|
) -> BOOL;
|
2019-07-06 02:37:25 +10:00
|
|
|
|
2019-09-10 04:15:49 +10:00
|
|
|
type GetPointerTouchInfo =
|
|
|
|
unsafe extern "system" fn(pointerId: UINT, touchInfo: *mut winuser::POINTER_TOUCH_INFO) -> BOOL;
|
|
|
|
|
|
|
|
type GetPointerPenInfo =
|
|
|
|
unsafe extern "system" fn(pointId: UINT, penInfo: *mut winuser::POINTER_PEN_INFO) -> BOOL;
|
|
|
|
|
2019-07-06 02:37:25 +10:00
|
|
|
lazy_static! {
|
|
|
|
static ref GET_POINTER_FRAME_INFO_HISTORY: Option<GetPointerFrameInfoHistory> =
|
|
|
|
get_function!("user32.dll", GetPointerFrameInfoHistory);
|
|
|
|
static ref SKIP_POINTER_FRAME_MESSAGES: Option<SkipPointerFrameMessages> =
|
|
|
|
get_function!("user32.dll", SkipPointerFrameMessages);
|
2019-07-26 17:12:06 +10:00
|
|
|
static ref GET_POINTER_DEVICE_RECTS: Option<GetPointerDeviceRects> =
|
|
|
|
get_function!("user32.dll", GetPointerDeviceRects);
|
2019-09-10 04:15:49 +10:00
|
|
|
static ref GET_POINTER_TOUCH_INFO: Option<GetPointerTouchInfo> =
|
|
|
|
get_function!("user32.dll", GetPointerTouchInfo);
|
|
|
|
static ref GET_POINTER_PEN_INFO: Option<GetPointerPenInfo> =
|
|
|
|
get_function!("user32.dll", GetPointerPenInfo);
|
2019-07-06 02:37:25 +10:00
|
|
|
}
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
pub(crate) struct SubclassInput<T: 'static> {
|
2019-02-06 02:30:33 +11:00
|
|
|
pub window_state: Arc<Mutex<WindowState>>,
|
|
|
|
pub event_loop_runner: EventLoopRunnerShared<T>,
|
2020-06-29 08:17:27 +10:00
|
|
|
pub file_drop_handler: Option<FileDropHandler>,
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> SubclassInput<T> {
|
2020-01-07 07:28:58 +11:00
|
|
|
unsafe fn send_event(&self, event: Event<'_, T>) {
|
2019-02-06 02:30:33 +11:00
|
|
|
self.event_loop_runner.send_event(event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
struct ThreadMsgTargetSubclassInput<T: 'static> {
|
2019-02-06 02:30:33 +11:00
|
|
|
event_loop_runner: EventLoopRunnerShared<T>,
|
|
|
|
user_event_receiver: Receiver<T>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> ThreadMsgTargetSubclassInput<T> {
|
2020-01-07 07:28:58 +11:00
|
|
|
unsafe fn send_event(&self, event: Event<'_, T>) {
|
2019-02-06 02:30:33 +11:00
|
|
|
self.event_loop_runner.send_event(event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub struct EventLoop<T: 'static> {
|
|
|
|
thread_msg_sender: Sender<T>,
|
|
|
|
window_target: RootELW<T>,
|
|
|
|
}
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
pub struct EventLoopWindowTarget<T: 'static> {
|
2019-02-06 02:30:33 +11:00
|
|
|
thread_id: DWORD,
|
|
|
|
thread_msg_target: HWND,
|
|
|
|
pub(crate) runner_shared: EventLoopRunnerShared<T>,
|
|
|
|
}
|
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
macro_rules! main_thread_check {
|
|
|
|
($fn_name:literal) => {{
|
|
|
|
let thread_id = unsafe { processthreadsapi::GetCurrentThreadId() };
|
|
|
|
if thread_id != main_thread_id() {
|
|
|
|
panic!(concat!(
|
|
|
|
"Initializing the event loop outside of the main thread is a significant \
|
|
|
|
cross-platform compatibility hazard. If you really, absolutely need to create an \
|
|
|
|
EventLoop on a different thread, please use the `EventLoopExtWindows::",
|
|
|
|
$fn_name,
|
|
|
|
"` function."
|
|
|
|
));
|
|
|
|
}
|
|
|
|
}};
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
impl<T: 'static> EventLoop<T> {
|
|
|
|
pub fn new() -> EventLoop<T> {
|
2019-10-19 02:51:06 +11:00
|
|
|
main_thread_check!("new_any_thread");
|
|
|
|
|
|
|
|
Self::new_any_thread()
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
pub fn new_any_thread() -> EventLoop<T> {
|
|
|
|
become_dpi_aware();
|
|
|
|
Self::new_dpi_unaware_any_thread()
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
pub fn new_dpi_unaware() -> EventLoop<T> {
|
|
|
|
main_thread_check!("new_dpi_unaware_any_thread");
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
Self::new_dpi_unaware_any_thread()
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn new_dpi_unaware_any_thread() -> EventLoop<T> {
|
2019-02-06 02:30:33 +11:00
|
|
|
let thread_id = unsafe { processthreadsapi::GetCurrentThreadId() };
|
2020-05-05 05:14:13 +10:00
|
|
|
|
|
|
|
let thread_msg_target = create_event_target_window();
|
|
|
|
|
|
|
|
let send_thread_msg_target = thread_msg_target as usize;
|
|
|
|
thread::spawn(move || wait_thread(thread_id, send_thread_msg_target as HWND));
|
|
|
|
let wait_thread_id = get_wait_thread_id();
|
|
|
|
|
|
|
|
let runner_shared = Rc::new(EventLoopRunner::new(thread_msg_target, wait_thread_id));
|
|
|
|
|
|
|
|
let thread_msg_sender =
|
|
|
|
subclass_event_target_window(thread_msg_target, runner_shared.clone());
|
2019-12-31 06:11:11 +11:00
|
|
|
raw_input::register_all_mice_and_keyboards_for_raw_input(thread_msg_target);
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
EventLoop {
|
|
|
|
thread_msg_sender,
|
|
|
|
window_target: RootELW {
|
|
|
|
p: EventLoopWindowTarget {
|
|
|
|
thread_id,
|
|
|
|
thread_msg_target,
|
|
|
|
runner_shared,
|
|
|
|
},
|
|
|
|
_marker: PhantomData,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
pub fn window_target(&self) -> &RootELW<T> {
|
|
|
|
&self.window_target
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
pub fn run<F>(mut self, event_handler: F) -> !
|
2019-06-22 01:33:15 +10:00
|
|
|
where
|
2019-06-20 06:49:43 +10:00
|
|
|
F: 'static + FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
|
2019-02-06 02:30:33 +11:00
|
|
|
{
|
|
|
|
self.run_return(event_handler);
|
|
|
|
::std::process::exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn run_return<F>(&mut self, mut event_handler: F)
|
2019-06-22 01:33:15 +10:00
|
|
|
where
|
2019-06-20 06:49:43 +10:00
|
|
|
F: FnMut(Event<'_, T>, &RootELW<T>, &mut ControlFlow),
|
2019-02-06 02:30:33 +11:00
|
|
|
{
|
|
|
|
let event_loop_windows_ref = &self.window_target;
|
|
|
|
|
2019-08-27 12:05:42 +10:00
|
|
|
unsafe {
|
|
|
|
self.window_target
|
|
|
|
.p
|
|
|
|
.runner_shared
|
2020-05-05 05:14:13 +10:00
|
|
|
.set_event_handler(move |event, control_flow| {
|
2019-08-27 12:05:42 +10:00
|
|
|
event_handler(event, event_loop_windows_ref, control_flow)
|
2020-05-05 05:14:13 +10:00
|
|
|
});
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2019-08-27 12:05:42 +10:00
|
|
|
let runner = &self.window_target.p.runner_shared;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
unsafe {
|
2019-06-29 08:07:36 +10:00
|
|
|
let mut msg = mem::zeroed();
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
runner.poll();
|
2019-02-06 02:30:33 +11:00
|
|
|
'main: loop {
|
2020-05-05 05:14:13 +10:00
|
|
|
if 0 == winuser::GetMessageW(&mut msg, ptr::null_mut(), 0, 0) {
|
|
|
|
break 'main;
|
2020-01-07 07:28:58 +11:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
winuser::TranslateMessage(&mut msg);
|
|
|
|
winuser::DispatchMessageW(&mut msg);
|
2020-01-07 07:28:58 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
if let Err(payload) = runner.take_panic_error() {
|
|
|
|
runner.reset_runner();
|
|
|
|
panic::resume_unwind(payload);
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
2020-01-07 07:28:58 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
if runner.control_flow() == ControlFlow::Exit && !runner.handling_events() {
|
|
|
|
break 'main;
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
unsafe {
|
2020-07-03 06:53:47 +10:00
|
|
|
runner.loop_destroyed();
|
2020-05-05 05:14:13 +10:00
|
|
|
}
|
|
|
|
runner.reset_runner();
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn create_proxy(&self) -> EventLoopProxy<T> {
|
|
|
|
EventLoopProxy {
|
|
|
|
target_window: self.window_target.p.thread_msg_target,
|
|
|
|
event_send: self.thread_msg_sender.clone(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> EventLoopWindowTarget<T> {
|
|
|
|
#[inline(always)]
|
|
|
|
pub(crate) fn create_thread_executor(&self) -> EventLoopThreadExecutor {
|
|
|
|
EventLoopThreadExecutor {
|
|
|
|
thread_id: self.thread_id,
|
|
|
|
target_window: self.thread_msg_target,
|
|
|
|
}
|
|
|
|
}
|
2020-07-05 05:46:41 +10:00
|
|
|
|
|
|
|
// TODO: Investigate opportunities for caching
|
|
|
|
pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
|
|
|
|
monitor::available_monitors()
|
|
|
|
}
|
|
|
|
|
2020-09-08 03:20:47 +10:00
|
|
|
pub fn primary_monitor(&self) -> Option<RootMonitorHandle> {
|
|
|
|
let monitor = monitor::primary_monitor();
|
|
|
|
Some(RootMonitorHandle { inner: monitor })
|
2020-07-05 05:46:41 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2019-10-19 02:51:06 +11:00
|
|
|
fn main_thread_id() -> DWORD {
|
|
|
|
static mut MAIN_THREAD_ID: DWORD = 0;
|
|
|
|
#[used]
|
|
|
|
#[allow(non_upper_case_globals)]
|
|
|
|
#[link_section = ".CRT$XCU"]
|
|
|
|
static INIT_MAIN_THREAD_ID: unsafe fn() = {
|
|
|
|
unsafe fn initer() {
|
|
|
|
MAIN_THREAD_ID = processthreadsapi::GetCurrentThreadId();
|
|
|
|
}
|
|
|
|
initer
|
|
|
|
};
|
|
|
|
|
|
|
|
unsafe { MAIN_THREAD_ID }
|
|
|
|
}
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
fn get_wait_thread_id() -> DWORD {
|
|
|
|
unsafe {
|
|
|
|
let mut msg = mem::zeroed();
|
|
|
|
let result = winuser::GetMessageW(
|
|
|
|
&mut msg,
|
|
|
|
-1 as _,
|
|
|
|
*SEND_WAIT_THREAD_ID_MSG_ID,
|
|
|
|
*SEND_WAIT_THREAD_ID_MSG_ID,
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
msg.message, *SEND_WAIT_THREAD_ID_MSG_ID,
|
|
|
|
"this shouldn't be possible. please open an issue with Winit. error code: {}",
|
|
|
|
result
|
|
|
|
);
|
|
|
|
msg.lParam as DWORD
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn wait_thread(parent_thread_id: DWORD, msg_window_id: HWND) {
|
|
|
|
unsafe {
|
|
|
|
let mut msg: winuser::MSG;
|
|
|
|
|
|
|
|
let cur_thread_id = processthreadsapi::GetCurrentThreadId();
|
|
|
|
winuser::PostThreadMessageW(
|
|
|
|
parent_thread_id,
|
|
|
|
*SEND_WAIT_THREAD_ID_MSG_ID,
|
2019-02-06 02:30:33 +11:00
|
|
|
0,
|
2020-05-05 05:14:13 +10:00
|
|
|
cur_thread_id as LPARAM,
|
2019-02-06 02:30:33 +11:00
|
|
|
);
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
let mut wait_until_opt = None;
|
|
|
|
'main: loop {
|
|
|
|
// Zeroing out the message ensures that the `WaitUntilInstantBox` doesn't get
|
|
|
|
// double-freed if `MsgWaitForMultipleObjectsEx` returns early and there aren't
|
|
|
|
// additional messages to process.
|
|
|
|
msg = mem::zeroed();
|
|
|
|
|
|
|
|
if wait_until_opt.is_some() {
|
|
|
|
if 0 != winuser::PeekMessageW(&mut msg, ptr::null_mut(), 0, 0, winuser::PM_REMOVE) {
|
|
|
|
winuser::TranslateMessage(&mut msg);
|
|
|
|
winuser::DispatchMessageW(&mut msg);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if 0 == winuser::GetMessageW(&mut msg, ptr::null_mut(), 0, 0) {
|
|
|
|
break 'main;
|
|
|
|
} else {
|
|
|
|
winuser::TranslateMessage(&mut msg);
|
|
|
|
winuser::DispatchMessageW(&mut msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if msg.message == *WAIT_UNTIL_MSG_ID {
|
|
|
|
wait_until_opt = Some(*WaitUntilInstantBox::from_raw(msg.lParam as *mut _));
|
|
|
|
} else if msg.message == *CANCEL_WAIT_UNTIL_MSG_ID {
|
|
|
|
wait_until_opt = None;
|
|
|
|
}
|
|
|
|
|
|
|
|
if let Some(wait_until) = wait_until_opt {
|
|
|
|
let now = Instant::now();
|
|
|
|
if now < wait_until {
|
|
|
|
// MsgWaitForMultipleObjects tends to overshoot just a little bit. We subtract
|
|
|
|
// 1 millisecond from the requested time and spinlock for the remainder to
|
|
|
|
// compensate for that.
|
|
|
|
let resume_reason = winuser::MsgWaitForMultipleObjectsEx(
|
|
|
|
0,
|
|
|
|
ptr::null(),
|
|
|
|
dur2timeout(wait_until - now).saturating_sub(1),
|
|
|
|
winuser::QS_ALLEVENTS,
|
|
|
|
winuser::MWMO_INPUTAVAILABLE,
|
|
|
|
);
|
|
|
|
if resume_reason == winerror::WAIT_TIMEOUT {
|
|
|
|
winuser::PostMessageW(msg_window_id, *PROCESS_NEW_EVENTS_MSG_ID, 0, 0);
|
|
|
|
wait_until_opt = None;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
winuser::PostMessageW(msg_window_id, *PROCESS_NEW_EVENTS_MSG_ID, 0, 0);
|
|
|
|
wait_until_opt = None;
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-19 11:27:47 +11:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
// Implementation taken from https://github.com/rust-lang/rust/blob/db5476571d9b27c862b95c1e64764b0ac8980e23/src/libstd/sys/windows/mod.rs
|
|
|
|
fn dur2timeout(dur: Duration) -> DWORD {
|
|
|
|
// 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-22 01:33:15 +10:00
|
|
|
dur.as_secs()
|
|
|
|
.checked_mul(1000)
|
|
|
|
.and_then(|ms| ms.checked_add((dur.subsec_nanos() as u64) / 1_000_000))
|
|
|
|
.and_then(|ms| {
|
|
|
|
ms.checked_add(if dur.subsec_nanos() % 1_000_000 > 0 {
|
|
|
|
1
|
|
|
|
} else {
|
|
|
|
0
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.map(|ms| {
|
|
|
|
if ms > DWORD::max_value() as u64 {
|
|
|
|
winbase::INFINITE
|
|
|
|
} else {
|
|
|
|
ms as DWORD
|
|
|
|
}
|
|
|
|
})
|
|
|
|
.unwrap_or(winbase::INFINITE)
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
impl<T> Drop for EventLoop<T> {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
unsafe {
|
|
|
|
winuser::DestroyWindow(self.window_target.p.thread_msg_target);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) struct EventLoopThreadExecutor {
|
|
|
|
thread_id: DWORD,
|
|
|
|
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 {
|
|
|
|
let cur_thread_id = unsafe { processthreadsapi::GetCurrentThreadId() };
|
|
|
|
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-22 01:33:15 +10:00
|
|
|
where
|
|
|
|
F: FnMut() + Send + 'static,
|
2019-02-06 02:30:33 +11:00
|
|
|
{
|
|
|
|
unsafe {
|
|
|
|
if self.in_event_loop_thread() {
|
|
|
|
function();
|
|
|
|
} else {
|
|
|
|
// We double-box because the first box is a fat pointer.
|
2019-06-18 04:27:00 +10:00
|
|
|
let boxed = Box::new(function) as Box<dyn FnMut()>;
|
2019-02-06 02:30:33 +11:00
|
|
|
let boxed2: ThreadExecFn = Box::new(boxed);
|
|
|
|
|
|
|
|
let raw = Box::into_raw(boxed2);
|
|
|
|
|
|
|
|
let res = winuser::PostMessageW(
|
2019-06-22 01:33:15 +10:00
|
|
|
self.target_window,
|
|
|
|
*EXEC_MSG_ID,
|
|
|
|
raw as *mut () as usize as WPARAM,
|
|
|
|
0,
|
2019-02-06 02:30:33 +11:00
|
|
|
);
|
|
|
|
assert!(res != 0, "PostMessage failed ; is the messages queue full?");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-18 04:27:00 +10:00
|
|
|
type ThreadExecFn = Box<Box<dyn FnMut()>>;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub struct EventLoopProxy<T: 'static> {
|
2019-02-06 02:30:33 +11:00
|
|
|
target_window: HWND,
|
|
|
|
event_send: Sender<T>,
|
|
|
|
}
|
2019-02-21 20:51:43 +11:00
|
|
|
unsafe impl<T: Send + 'static> Send for EventLoopProxy<T> {}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-08-06 06:51:42 +10:00
|
|
|
impl<T: 'static> Clone for EventLoopProxy<T> {
|
|
|
|
fn clone(&self) -> Self {
|
|
|
|
Self {
|
|
|
|
target_window: self.target_window,
|
|
|
|
event_send: self.event_send.clone(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
impl<T: 'static> EventLoopProxy<T> {
|
2019-12-08 04:22:03 +11:00
|
|
|
pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed<T>> {
|
2019-02-06 02:30:33 +11:00
|
|
|
unsafe {
|
|
|
|
if winuser::PostMessageW(self.target_window, *USER_EVENT_MSG_ID, 0, 0) != 0 {
|
|
|
|
self.event_send.send(event).ok();
|
|
|
|
Ok(())
|
|
|
|
} else {
|
2019-12-08 04:22:03 +11:00
|
|
|
Err(EventLoopClosed(event))
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
type WaitUntilInstantBox = Box<Instant>;
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
lazy_static! {
|
|
|
|
// Message sent by the `EventLoopProxy` when we want to wake up the thread.
|
|
|
|
// WPARAM and LPARAM are unused.
|
|
|
|
static ref USER_EVENT_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::WakeupMsg\0".as_ptr() as LPCSTR)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
// Message sent when we want to execute a closure in the thread.
|
2019-06-18 04:27:00 +10:00
|
|
|
// WPARAM contains a Box<Box<dyn FnMut()>> that must be retrieved with `Box::from_raw`,
|
2019-02-06 02:30:33 +11:00
|
|
|
// and LPARAM is unused.
|
|
|
|
static ref EXEC_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::ExecMsg\0".as_ptr() as *const i8)
|
|
|
|
}
|
|
|
|
};
|
2020-05-05 05:14:13 +10:00
|
|
|
static ref PROCESS_NEW_EVENTS_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::ProcessNewEvents\0".as_ptr() as *const i8)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
/// lparam is the wait thread's message id.
|
|
|
|
static ref SEND_WAIT_THREAD_ID_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::SendWaitThreadId\0".as_ptr() as *const i8)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
/// lparam points to a `Box<Instant>` signifying the time `PROCESS_NEW_EVENTS_MSG_ID` should
|
|
|
|
/// be sent.
|
|
|
|
static ref WAIT_UNTIL_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::WaitUntil\0".as_ptr() as *const i8)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
static ref CANCEL_WAIT_UNTIL_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::CancelWaitUntil\0".as_ptr() as *const i8)
|
|
|
|
}
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
// Message sent by a `Window` when it wants to be destroyed by the main thread.
|
|
|
|
// WPARAM and LPARAM are unused.
|
|
|
|
pub static ref DESTROY_MSG_ID: u32 = {
|
|
|
|
unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::DestroyMsg\0".as_ptr() as LPCSTR)
|
|
|
|
}
|
|
|
|
};
|
|
|
|
// WPARAM is a bool specifying the `WindowFlags::MARKER_RETAIN_STATE_ON_SIZE` flag. See the
|
|
|
|
// documentation in the `window_state` module for more information.
|
|
|
|
pub static ref SET_RETAIN_STATE_ON_SIZE_MSG_ID: u32 = unsafe {
|
|
|
|
winuser::RegisterWindowMessageA("Winit::SetRetainMaximized\0".as_ptr() as LPCSTR)
|
|
|
|
};
|
|
|
|
static ref THREAD_EVENT_TARGET_WINDOW_CLASS: Vec<u16> = unsafe {
|
|
|
|
use std::ffi::OsStr;
|
|
|
|
use std::os::windows::ffi::OsStrExt;
|
|
|
|
|
|
|
|
let class_name: Vec<_> = OsStr::new("Winit Thread Event Target")
|
|
|
|
.encode_wide()
|
|
|
|
.chain(Some(0).into_iter())
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
let class = winuser::WNDCLASSEXW {
|
|
|
|
cbSize: mem::size_of::<winuser::WNDCLASSEXW>() as UINT,
|
|
|
|
style: 0,
|
|
|
|
lpfnWndProc: Some(winuser::DefWindowProcW),
|
|
|
|
cbClsExtra: 0,
|
|
|
|
cbWndExtra: 0,
|
|
|
|
hInstance: libloaderapi::GetModuleHandleW(ptr::null()),
|
|
|
|
hIcon: ptr::null_mut(),
|
|
|
|
hCursor: ptr::null_mut(), // must be null in order for cursor state to work properly
|
|
|
|
hbrBackground: ptr::null_mut(),
|
|
|
|
lpszMenuName: ptr::null(),
|
|
|
|
lpszClassName: class_name.as_ptr(),
|
|
|
|
hIconSm: ptr::null_mut(),
|
|
|
|
};
|
|
|
|
|
|
|
|
winuser::RegisterClassExW(&class);
|
|
|
|
|
|
|
|
class_name
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
fn create_event_target_window() -> HWND {
|
2019-02-06 02:30:33 +11:00
|
|
|
unsafe {
|
|
|
|
let window = winuser::CreateWindowExW(
|
|
|
|
winuser::WS_EX_NOACTIVATE | winuser::WS_EX_TRANSPARENT | winuser::WS_EX_LAYERED,
|
|
|
|
THREAD_EVENT_TARGET_WINDOW_CLASS.as_ptr(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
0,
|
2019-06-22 01:33:15 +10:00
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
2019-02-06 02:30:33 +11:00
|
|
|
ptr::null_mut(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
libloaderapi::GetModuleHandleW(ptr::null()),
|
2019-06-22 01:33:15 +10:00
|
|
|
ptr::null_mut(),
|
2019-02-06 02:30:33 +11:00
|
|
|
);
|
|
|
|
winuser::SetWindowLongPtrW(
|
|
|
|
window,
|
|
|
|
winuser::GWL_STYLE,
|
|
|
|
// 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.
|
2019-06-22 01:33:15 +10:00
|
|
|
(winuser::WS_VISIBLE | winuser::WS_POPUP) as _,
|
2019-02-06 02:30:33 +11:00
|
|
|
);
|
2020-05-05 05:14:13 +10:00
|
|
|
window
|
|
|
|
}
|
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
fn subclass_event_target_window<T>(
|
|
|
|
window: HWND,
|
|
|
|
event_loop_runner: EventLoopRunnerShared<T>,
|
|
|
|
) -> Sender<T> {
|
|
|
|
unsafe {
|
2019-02-06 02:30:33 +11:00
|
|
|
let (tx, rx) = mpsc::channel();
|
|
|
|
|
|
|
|
let subclass_input = ThreadMsgTargetSubclassInput {
|
|
|
|
event_loop_runner,
|
|
|
|
user_event_receiver: rx,
|
|
|
|
};
|
|
|
|
let input_ptr = Box::into_raw(Box::new(subclass_input));
|
|
|
|
let subclass_result = commctrl::SetWindowSubclass(
|
|
|
|
window,
|
|
|
|
Some(thread_event_target_callback::<T>),
|
|
|
|
THREAD_EVENT_TARGET_SUBCLASS_ID,
|
2019-06-22 01:33:15 +10:00
|
|
|
input_ptr as DWORD_PTR,
|
2019-02-06 02:30:33 +11:00
|
|
|
);
|
|
|
|
assert_eq!(subclass_result, 1);
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
tx
|
2019-02-06 02:30:33 +11: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) {
|
|
|
|
window_state.mouse.buttons_down += 1;
|
|
|
|
winuser::SetCapture(window);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Release mouse input, stopping windows on this thread from receiving mouse input when the cursor
|
|
|
|
/// is outside the window.
|
|
|
|
unsafe fn release_mouse(window_state: &mut WindowState) {
|
|
|
|
window_state.mouse.buttons_down = window_state.mouse.buttons_down.saturating_sub(1);
|
|
|
|
if window_state.mouse.buttons_down == 0 {
|
|
|
|
winuser::ReleaseCapture();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
const WINDOW_SUBCLASS_ID: UINT_PTR = 0;
|
|
|
|
const THREAD_EVENT_TARGET_SUBCLASS_ID: UINT_PTR = 1;
|
|
|
|
pub(crate) fn subclass_window<T>(window: HWND, subclass_input: SubclassInput<T>) {
|
2020-05-05 05:14:13 +10:00
|
|
|
subclass_input.event_loop_runner.register_window(window);
|
2019-02-06 02:30:33 +11:00
|
|
|
let input_ptr = Box::into_raw(Box::new(subclass_input));
|
2019-06-22 01:33:15 +10:00
|
|
|
let subclass_result = unsafe {
|
|
|
|
commctrl::SetWindowSubclass(
|
|
|
|
window,
|
|
|
|
Some(public_window_callback::<T>),
|
|
|
|
WINDOW_SUBCLASS_ID,
|
|
|
|
input_ptr as DWORD_PTR,
|
|
|
|
)
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
assert_eq!(subclass_result, 1);
|
|
|
|
}
|
|
|
|
|
2019-09-10 04:15:49 +10:00
|
|
|
fn normalize_pointer_pressure(pressure: u32) -> Option<Force> {
|
|
|
|
match pressure {
|
|
|
|
1..=1024 => Some(Force::Normalized(pressure as f64 / 1024.0)),
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
/// Flush redraw events for Winit's windows.
|
|
|
|
///
|
|
|
|
/// Winit's API guarantees that all redraw events will be clustered together and dispatched all at
|
|
|
|
/// once, but the standard Windows message loop doesn't always exhibit that behavior. If multiple
|
|
|
|
/// windows have had redraws scheduled, but an input event is pushed to the message queue between
|
|
|
|
/// the `WM_PAINT` call for the first window and the `WM_PAINT` call for the second window, Windows
|
|
|
|
/// will dispatch the input event immediately instead of flushing all the redraw events. This
|
|
|
|
/// function explicitly pulls all of Winit's redraw events out of the event queue so that they
|
|
|
|
/// always all get processed in one fell swoop.
|
|
|
|
///
|
|
|
|
/// Returns `true` if this invocation flushed all the redraw events. If this function is re-entrant,
|
|
|
|
/// it won't flush the redraw events and will return `false`.
|
|
|
|
#[must_use]
|
|
|
|
unsafe fn flush_paint_messages<T: 'static>(
|
|
|
|
except: Option<HWND>,
|
|
|
|
runner: &EventLoopRunner<T>,
|
|
|
|
) -> bool {
|
|
|
|
if !runner.redrawing() {
|
|
|
|
runner.main_events_cleared();
|
|
|
|
let mut msg = mem::zeroed();
|
|
|
|
runner.owned_windows(|redraw_window| {
|
|
|
|
if Some(redraw_window) == except {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if 0 == winuser::PeekMessageW(
|
|
|
|
&mut msg,
|
|
|
|
redraw_window,
|
|
|
|
winuser::WM_PAINT,
|
|
|
|
winuser::WM_PAINT,
|
|
|
|
winuser::PM_REMOVE | winuser::PM_QS_PAINT,
|
|
|
|
) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
winuser::TranslateMessage(&mut msg);
|
|
|
|
winuser::DispatchMessageW(&mut msg);
|
|
|
|
});
|
|
|
|
true
|
|
|
|
} else {
|
|
|
|
false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
unsafe fn process_control_flow<T: 'static>(runner: &EventLoopRunner<T>) {
|
|
|
|
match runner.control_flow() {
|
|
|
|
ControlFlow::Poll => {
|
|
|
|
winuser::PostMessageW(runner.thread_msg_target(), *PROCESS_NEW_EVENTS_MSG_ID, 0, 0);
|
|
|
|
}
|
|
|
|
ControlFlow::Wait => (),
|
|
|
|
ControlFlow::WaitUntil(until) => {
|
|
|
|
winuser::PostThreadMessageW(
|
|
|
|
runner.wait_thread_id(),
|
|
|
|
*WAIT_UNTIL_MSG_ID,
|
|
|
|
0,
|
|
|
|
Box::into_raw(WaitUntilInstantBox::new(until)) as LPARAM,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
ControlFlow::Exit => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
/// Emit a `ModifiersChanged` event whenever modifiers have changed.
|
|
|
|
fn update_modifiers<T>(window: HWND, subclass_input: &SubclassInput<T>) {
|
|
|
|
use crate::event::WindowEvent::ModifiersChanged;
|
|
|
|
|
|
|
|
let modifiers = event::get_key_mods();
|
|
|
|
let mut window_state = subclass_input.window_state.lock();
|
|
|
|
if window_state.modifiers_state != modifiers {
|
|
|
|
window_state.modifiers_state = modifiers;
|
|
|
|
|
2020-03-08 17:22:53 +11:00
|
|
|
// Drop lock
|
|
|
|
drop(window_state);
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
unsafe {
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: ModifiersChanged(modifiers),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11: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
|
2019-06-20 06:49:43 +10:00
|
|
|
unsafe extern "system" fn public_window_callback<T: 'static>(
|
2019-02-06 02:30:33 +11:00
|
|
|
window: HWND,
|
|
|
|
msg: UINT,
|
|
|
|
wparam: WPARAM,
|
|
|
|
lparam: LPARAM,
|
|
|
|
_: UINT_PTR,
|
2019-06-22 01:33:15 +10:00
|
|
|
subclass_input_ptr: DWORD_PTR,
|
2019-02-06 02:30:33 +11:00
|
|
|
) -> LRESULT {
|
2019-08-27 12:05:42 +10:00
|
|
|
let subclass_input = &*(subclass_input_ptr as *const SubclassInput<T>);
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
winuser::RedrawWindow(
|
|
|
|
subclass_input.event_loop_runner.thread_msg_target(),
|
|
|
|
ptr::null(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
winuser::RDW_INTERNALPAINT,
|
|
|
|
);
|
|
|
|
|
|
|
|
// I decided to bind the closure to `callback` and pass it to catch_unwind rather than passing
|
|
|
|
// the closure to catch_unwind directly so that the match body indendation wouldn't change and
|
|
|
|
// the git blame and history would be preserved.
|
|
|
|
let callback = || match msg {
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_ENTERSIZEMOVE => {
|
2020-05-05 05:14:13 +10:00
|
|
|
subclass_input
|
|
|
|
.window_state
|
|
|
|
.lock()
|
|
|
|
.set_window_flags_in_place(|f| f.insert(WindowFlags::MARKER_IN_SIZE_MOVE));
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_EXITSIZEMOVE => {
|
2020-05-05 05:14:13 +10:00
|
|
|
subclass_input
|
|
|
|
.window_state
|
|
|
|
.lock()
|
|
|
|
.set_window_flags_in_place(|f| f.remove(WindowFlags::MARKER_IN_SIZE_MOVE));
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_NCCREATE => {
|
|
|
|
enable_non_client_dpi_scaling(window);
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-04-15 01:48:31 +10:00
|
|
|
winuser::WM_NCLBUTTONDOWN => {
|
|
|
|
if wparam == winuser::HTCAPTION as _ {
|
|
|
|
winuser::PostMessageW(window, winuser::WM_MOUSEMOVE, 0, 0);
|
|
|
|
}
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-04-15 01:48:31 +10:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_CLOSE => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::CloseRequested;
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: CloseRequested,
|
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_DESTROY => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::Destroyed;
|
2019-02-06 02:30:33 +11:00
|
|
|
ole2::RevokeDragDrop(window);
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: Destroyed,
|
|
|
|
});
|
2020-05-05 05:14:13 +10:00
|
|
|
subclass_input.event_loop_runner.remove_window(window);
|
2020-10-24 04:04:18 +11:00
|
|
|
0
|
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2020-10-24 04:04:18 +11:00
|
|
|
winuser::WM_NCDESTROY => {
|
2019-02-06 02:30:33 +11:00
|
|
|
drop(subclass_input);
|
2019-08-27 12:05:42 +10:00
|
|
|
Box::from_raw(subclass_input_ptr as *mut SubclassInput<T>);
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_PAINT => {
|
2020-05-05 05:14:13 +10:00
|
|
|
if subclass_input.event_loop_runner.should_buffer() {
|
|
|
|
// this branch can happen in response to `UpdateWindow`, if win32 decides to
|
|
|
|
// redraw the window outside the normal flow of the event loop.
|
|
|
|
winuser::RedrawWindow(
|
|
|
|
window,
|
|
|
|
ptr::null(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
winuser::RDW_INTERNALPAINT,
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
let managing_redraw =
|
|
|
|
flush_paint_messages(Some(window), &subclass_input.event_loop_runner);
|
|
|
|
subclass_input.send_event(Event::RedrawRequested(RootWindowId(WindowId(window))));
|
|
|
|
if managing_redraw {
|
|
|
|
subclass_input.event_loop_runner.redraw_events_cleared();
|
|
|
|
process_control_flow(&subclass_input.event_loop_runner);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-10-06 07:23:30 +11:00
|
|
|
winuser::WM_WINDOWPOSCHANGING => {
|
|
|
|
let mut window_state = subclass_input.window_state.lock();
|
|
|
|
if let Some(ref mut fullscreen) = window_state.fullscreen {
|
|
|
|
let window_pos = &mut *(lparam as *mut winuser::WINDOWPOS);
|
|
|
|
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,
|
|
|
|
};
|
|
|
|
let new_monitor =
|
|
|
|
winuser::MonitorFromRect(&new_rect, winuser::MONITOR_DEFAULTTONULL);
|
|
|
|
match fullscreen {
|
|
|
|
Fullscreen::Borderless(ref mut fullscreen_monitor) => {
|
2020-09-22 11:54:47 +10:00
|
|
|
if new_monitor != ptr::null_mut()
|
|
|
|
&& fullscreen_monitor
|
|
|
|
.as_ref()
|
|
|
|
.map(|monitor| new_monitor != monitor.inner.hmonitor())
|
|
|
|
.unwrap_or(true)
|
2019-10-06 07:23:30 +11:00
|
|
|
{
|
|
|
|
if let Ok(new_monitor_info) = monitor::get_monitor_info(new_monitor) {
|
|
|
|
let new_monitor_rect = new_monitor_info.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;
|
|
|
|
}
|
2020-09-22 11:54:47 +10:00
|
|
|
*fullscreen_monitor = Some(crate::monitor::MonitorHandle {
|
2020-07-05 05:46:41 +10:00
|
|
|
inner: MonitorHandle::new(new_monitor),
|
2020-09-22 11:54:47 +10:00
|
|
|
});
|
2019-10-06 07:23:30 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
Fullscreen::Exclusive(ref video_mode) => {
|
|
|
|
let old_monitor = video_mode.video_mode.monitor.hmonitor();
|
|
|
|
if let Ok(old_monitor_info) = monitor::get_monitor_info(old_monitor) {
|
|
|
|
let old_monitor_rect = old_monitor_info.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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
0
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
// WM_MOVE supplies client area positions, so we send Moved here instead.
|
|
|
|
winuser::WM_WINDOWPOSCHANGED => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::Moved;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
let windowpos = lparam as *const winuser::WINDOWPOS;
|
|
|
|
if (*windowpos).flags & winuser::SWP_NOMOVE != winuser::SWP_NOMOVE {
|
2019-06-20 06:49:43 +10:00
|
|
|
let physical_position =
|
2020-03-08 16:21:04 +11:00
|
|
|
PhysicalPosition::new((*windowpos).x as i32, (*windowpos).y as i32);
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-20 06:49:43 +10:00
|
|
|
event: Moved(physical_position),
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is necessary for us to still get sent WM_SIZE.
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_SIZE => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::Resized;
|
2019-02-06 02:30:33 +11:00
|
|
|
let w = LOWORD(lparam as DWORD) as u32;
|
|
|
|
let h = HIWORD(lparam as DWORD) as u32;
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
let physical_size = PhysicalSize::new(w, h);
|
2019-02-06 02:30:33 +11:00
|
|
|
let event = Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-20 06:49:43 +10:00
|
|
|
event: Resized(physical_size),
|
2019-02-06 02:30:33 +11:00
|
|
|
};
|
|
|
|
|
|
|
|
{
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
|
|
|
// See WindowFlags::MARKER_RETAIN_STATE_ON_SIZE docs for info on why this `if` check exists.
|
2019-06-22 01:33:15 +10:00
|
|
|
if !w
|
|
|
|
.window_flags()
|
|
|
|
.contains(WindowFlags::MARKER_RETAIN_STATE_ON_SIZE)
|
|
|
|
{
|
2019-02-06 02:30:33 +11:00
|
|
|
let maximized = wparam == winuser::SIZE_MAXIMIZED;
|
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MAXIMIZED, maximized));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
subclass_input.send_event(event);
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-11-30 07:49:43 +11:00
|
|
|
winuser::WM_CHAR | winuser::WM_SYSCHAR => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::ReceivedCharacter;
|
2019-09-17 04:26:56 +10:00
|
|
|
use std::char;
|
|
|
|
let is_high_surrogate = 0xD800 <= wparam && wparam <= 0xDBFF;
|
|
|
|
let is_low_surrogate = 0xDC00 <= wparam && wparam <= 0xDFFF;
|
2019-09-16 12:09:08 +10:00
|
|
|
|
2019-09-17 04:26:56 +10:00
|
|
|
if is_high_surrogate {
|
2019-09-16 12:09:08 +10:00
|
|
|
subclass_input.window_state.lock().high_surrogate = Some(wparam as u16);
|
2019-09-17 04:26:56 +10:00
|
|
|
} else if is_low_surrogate {
|
|
|
|
let high_surrogate = subclass_input.window_state.lock().high_surrogate.take();
|
|
|
|
|
|
|
|
if let Some(high_surrogate) = high_surrogate {
|
2019-09-16 12:09:08 +10:00
|
|
|
let pair = [high_surrogate, wparam as u16];
|
2019-09-17 04:26:56 +10:00
|
|
|
if let Some(Ok(chr)) = char::decode_utf16(pair.iter().copied()).next() {
|
2019-09-16 12:09:08 +10:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: ReceivedCharacter(chr),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2019-09-17 04:26:56 +10:00
|
|
|
subclass_input.window_state.lock().high_surrogate = None;
|
|
|
|
|
|
|
|
if let Some(chr) = char::from_u32(wparam as u32) {
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: ReceivedCharacter(chr),
|
|
|
|
});
|
|
|
|
}
|
2019-09-16 12:09:08 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-12-22 17:04:11 +11:00
|
|
|
// this is necessary for us to maintain minimize/restore state
|
2019-07-29 19:18:23 +10:00
|
|
|
winuser::WM_SYSCOMMAND => {
|
2019-12-22 17:04:11 +11:00
|
|
|
if wparam == winuser::SC_RESTORE {
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MINIMIZED, false));
|
|
|
|
}
|
|
|
|
if wparam == winuser::SC_MINIMIZE {
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
|
|
|
w.set_window_flags_in_place(|f| f.set(WindowFlags::MINIMIZED, true));
|
|
|
|
}
|
|
|
|
// Send `WindowEvent::Minimized` here if we decide to implement one
|
|
|
|
|
2019-07-29 19:18:23 +10:00
|
|
|
if wparam == winuser::SC_SCREENSAVE {
|
|
|
|
let window_state = subclass_input.window_state.lock();
|
|
|
|
if window_state.fullscreen.is_some() {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
winuser::DefWindowProcW(window, msg, wparam, lparam)
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_MOUSEMOVE => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::{CursorEntered, CursorMoved};
|
2019-02-06 02:30:33 +11:00
|
|
|
let mouse_was_outside_window = {
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
|
|
|
|
|
|
|
let was_outside_window = !w.mouse.cursor_flags().contains(CursorFlags::IN_WINDOW);
|
2019-06-22 01:33:15 +10:00
|
|
|
w.mouse
|
|
|
|
.set_cursor_flags(window, |f| f.set(CursorFlags::IN_WINDOW, true))
|
|
|
|
.ok();
|
2019-02-06 02:30:33 +11:00
|
|
|
was_outside_window
|
|
|
|
};
|
|
|
|
|
|
|
|
if mouse_was_outside_window {
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: CursorEntered {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
|
|
|
|
// Calling TrackMouseEvent in order to receive mouse leave events.
|
|
|
|
winuser::TrackMouseEvent(&mut winuser::TRACKMOUSEEVENT {
|
|
|
|
cbSize: mem::size_of::<winuser::TRACKMOUSEEVENT>() as DWORD,
|
|
|
|
dwFlags: winuser::TME_LEAVE,
|
|
|
|
hwndTrack: window,
|
|
|
|
dwHoverTime: winuser::HOVER_DEFAULT,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2020-01-10 15:19:50 +11:00
|
|
|
let x = windowsx::GET_X_LPARAM(lparam) as f64;
|
|
|
|
let y = windowsx::GET_Y_LPARAM(lparam) as f64;
|
2019-06-20 06:49:43 +10:00
|
|
|
let position = PhysicalPosition::new(x, y);
|
2020-03-07 08:15:49 +11:00
|
|
|
let cursor_moved;
|
|
|
|
{
|
|
|
|
// 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
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
|
|
|
cursor_moved = w.mouse.last_position != Some(position);
|
|
|
|
w.mouse.last_position = Some(position);
|
|
|
|
}
|
|
|
|
if cursor_moved {
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2020-03-07 08:15:49 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: CursorMoved {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
position,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
|
|
|
});
|
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_MOUSELEAVE => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::WindowEvent::CursorLeft;
|
2019-02-06 02:30:33 +11:00
|
|
|
{
|
|
|
|
let mut w = subclass_input.window_state.lock();
|
2019-06-22 01:33:15 +10:00
|
|
|
w.mouse
|
|
|
|
.set_cursor_flags(window, |f| f.set(CursorFlags::IN_WINDOW, false))
|
|
|
|
.ok();
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: CursorLeft {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_MOUSEWHEEL => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::MouseScrollDelta::LineDelta;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
let value = (wparam >> 16) as i16;
|
|
|
|
let value = value as i32;
|
|
|
|
let value = value as f32 / winuser::WHEEL_DELTA as f32;
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: WindowEvent::MouseWheel {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
delta: LineDelta(0.0, value),
|
|
|
|
phase: TouchPhase::Moved,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-02-23 01:31:16 +11:00
|
|
|
winuser::WM_MOUSEHWHEEL => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::MouseScrollDelta::LineDelta;
|
2019-02-23 01:31:16 +11:00
|
|
|
|
|
|
|
let value = (wparam >> 16) as i16;
|
|
|
|
let value = value as i32;
|
|
|
|
let value = value as f32 / winuser::WHEEL_DELTA as f32;
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-23 01:31:16 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: WindowEvent::MouseWheel {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
delta: LineDelta(value, 0.0),
|
|
|
|
phase: TouchPhase::Moved,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-23 01:31:16 +11:00
|
|
|
});
|
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-23 01:31:16 +11:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_KEYDOWN | winuser::WM_SYSKEYDOWN => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{ElementState::Pressed, VirtualKeyCode};
|
2019-02-06 02:30:33 +11:00
|
|
|
if msg == winuser::WM_SYSKEYDOWN && wparam as i32 == winuser::VK_F4 {
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
|
|
|
} else {
|
|
|
|
if let Some((scancode, vkey)) = process_key_params(wparam, lparam) {
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2020-01-10 16:29:31 +11:00
|
|
|
#[allow(deprecated)]
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::KeyboardInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
input: KeyboardInput {
|
|
|
|
state: Pressed,
|
2019-06-22 01:33:15 +10:00
|
|
|
scancode,
|
2019-02-06 02:30:33 +11:00
|
|
|
virtual_keycode: vkey,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-12-08 09:51:37 +11:00
|
|
|
is_synthetic: false,
|
2019-02-06 02:30:33 +11:00
|
|
|
},
|
|
|
|
});
|
|
|
|
// Windows doesn't emit a delete character by default, but in order to make it
|
|
|
|
// consistent with the other platforms we'll emit a delete character here.
|
|
|
|
if vkey == Some(VirtualKeyCode::Delete) {
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::ReceivedCharacter('\u{7F}'),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
0
|
|
|
|
}
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_KEYUP | winuser::WM_SYSKEYUP => {
|
2019-06-18 04:27:00 +10:00
|
|
|
use crate::event::ElementState::Released;
|
2019-02-06 02:30:33 +11:00
|
|
|
if let Some((scancode, vkey)) = process_key_params(wparam, lparam) {
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2020-01-10 16:29:31 +11:00
|
|
|
#[allow(deprecated)]
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::KeyboardInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
input: KeyboardInput {
|
|
|
|
state: Released,
|
2019-06-22 01:33:15 +10:00
|
|
|
scancode,
|
2019-02-06 02:30:33 +11:00
|
|
|
virtual_keycode: vkey,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-12-08 09:51:37 +11:00
|
|
|
is_synthetic: false,
|
2019-02-06 02:30:33 +11:00
|
|
|
},
|
|
|
|
});
|
|
|
|
}
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_LBUTTONDOWN => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{ElementState::Pressed, MouseButton::Left, WindowEvent::MouseInput};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
capture_mouse(window, &mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Pressed,
|
|
|
|
button: Left,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_LBUTTONUP => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Released, MouseButton::Left, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
release_mouse(&mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Released,
|
|
|
|
button: Left,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_RBUTTONDOWN => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Pressed, MouseButton::Right, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
capture_mouse(window, &mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Pressed,
|
|
|
|
button: Right,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_RBUTTONUP => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Released, MouseButton::Right, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
release_mouse(&mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Released,
|
|
|
|
button: Right,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_MBUTTONDOWN => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Pressed, MouseButton::Middle, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
capture_mouse(window, &mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Pressed,
|
|
|
|
button: Middle,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_MBUTTONUP => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Released, MouseButton::Middle, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
release_mouse(&mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Released,
|
|
|
|
button: Middle,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_XBUTTONDOWN => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Pressed, MouseButton::Other, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
let xbutton = winuser::GET_XBUTTON_WPARAM(wparam);
|
|
|
|
|
|
|
|
capture_mouse(window, &mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Pressed,
|
|
|
|
button: Other(xbutton as u8),
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_XBUTTONUP => {
|
2019-06-22 01:33:15 +10:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Released, MouseButton::Other, WindowEvent::MouseInput,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
let xbutton = winuser::GET_XBUTTON_WPARAM(wparam);
|
|
|
|
|
|
|
|
release_mouse(&mut *subclass_input.window_state.lock());
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2019-06-22 01:33:15 +10:00
|
|
|
event: MouseInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
state: Released,
|
|
|
|
button: Other(xbutton as u8),
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
2019-02-06 02:30:33 +11:00
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_TOUCH => {
|
2019-06-22 01:33:15 +10:00
|
|
|
let pcount = LOWORD(wparam as DWORD) as usize;
|
|
|
|
let mut inputs = Vec::with_capacity(pcount);
|
|
|
|
inputs.set_len(pcount);
|
2019-02-06 02:30:33 +11:00
|
|
|
let htouch = lparam as winuser::HTOUCHINPUT;
|
|
|
|
if winuser::GetTouchInputInfo(
|
|
|
|
htouch,
|
|
|
|
pcount as UINT,
|
|
|
|
inputs.as_mut_ptr(),
|
|
|
|
mem::size_of::<winuser::TOUCHINPUT>() as INT,
|
2019-06-22 01:33:15 +10:00
|
|
|
) > 0
|
|
|
|
{
|
2019-02-06 02:30:33 +11:00
|
|
|
for input in &inputs {
|
2019-07-18 02:25:35 +10:00
|
|
|
let mut location = POINT {
|
|
|
|
x: input.x / 100,
|
|
|
|
y: input.y / 100,
|
|
|
|
};
|
|
|
|
|
|
|
|
if winuser::ScreenToClient(window, &mut location as *mut _) == 0 {
|
|
|
|
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-20 06:49:43 +10:00
|
|
|
let location = PhysicalPosition::new(x, y);
|
2019-06-22 01:33:15 +10:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
2019-02-06 02:30:33 +11:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::Touch(Touch {
|
2019-06-22 01:33:15 +10:00
|
|
|
phase: if input.dwFlags & winuser::TOUCHEVENTF_DOWN != 0 {
|
2019-02-06 02:30:33 +11:00
|
|
|
TouchPhase::Started
|
|
|
|
} else if input.dwFlags & winuser::TOUCHEVENTF_UP != 0 {
|
|
|
|
TouchPhase::Ended
|
|
|
|
} else if input.dwFlags & winuser::TOUCHEVENTF_MOVE != 0 {
|
|
|
|
TouchPhase::Moved
|
|
|
|
} else {
|
|
|
|
continue;
|
|
|
|
},
|
|
|
|
location,
|
2019-09-10 04:15:49 +10:00
|
|
|
force: None, // WM_TOUCH doesn't support pressure information
|
2019-02-06 02:30:33 +11:00
|
|
|
id: input.dwID as u64,
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
}),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
2019-06-22 01:33:15 +10:00
|
|
|
winuser::CloseTouchInputHandle(htouch);
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-06-27 19:34:38 +10:00
|
|
|
winuser::WM_POINTERDOWN | winuser::WM_POINTERUPDATE | winuser::WM_POINTERUP => {
|
2019-07-26 17:12:06 +10:00
|
|
|
if let (
|
|
|
|
Some(GetPointerFrameInfoHistory),
|
|
|
|
Some(SkipPointerFrameMessages),
|
|
|
|
Some(GetPointerDeviceRects),
|
|
|
|
) = (
|
2019-07-06 02:37:25 +10:00
|
|
|
*GET_POINTER_FRAME_INFO_HISTORY,
|
|
|
|
*SKIP_POINTER_FRAME_MESSAGES,
|
2019-07-26 17:12:06 +10:00
|
|
|
*GET_POINTER_DEVICE_RECTS,
|
2019-07-06 02:37:25 +10:00
|
|
|
) {
|
|
|
|
let pointer_id = LOWORD(wparam as DWORD) as UINT;
|
|
|
|
let mut entries_count = 0 as UINT;
|
|
|
|
let mut pointers_count = 0 as UINT;
|
|
|
|
if GetPointerFrameInfoHistory(
|
|
|
|
pointer_id,
|
|
|
|
&mut entries_count as *mut _,
|
|
|
|
&mut pointers_count as *mut _,
|
|
|
|
std::ptr::null_mut(),
|
|
|
|
) == 0
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2019-06-27 19:34:38 +10:00
|
|
|
|
2019-07-06 02:37:25 +10:00
|
|
|
let pointer_info_count = (entries_count * pointers_count) as usize;
|
|
|
|
let mut pointer_infos = Vec::with_capacity(pointer_info_count);
|
|
|
|
pointer_infos.set_len(pointer_info_count);
|
|
|
|
if GetPointerFrameInfoHistory(
|
|
|
|
pointer_id,
|
|
|
|
&mut entries_count as *mut _,
|
|
|
|
&mut pointers_count as *mut _,
|
|
|
|
pointer_infos.as_mut_ptr(),
|
|
|
|
) == 0
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2019-06-27 19:34:38 +10:00
|
|
|
|
2019-07-06 02:37:25 +10: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-10 04:15:49 +10:00
|
|
|
let mut device_rect = mem::MaybeUninit::uninit();
|
|
|
|
let mut display_rect = mem::MaybeUninit::uninit();
|
2019-07-26 17:12:06 +10:00
|
|
|
|
|
|
|
if (GetPointerDeviceRects(
|
|
|
|
pointer_info.sourceDevice,
|
2019-09-10 04:15:49 +10:00
|
|
|
device_rect.as_mut_ptr(),
|
|
|
|
display_rect.as_mut_ptr(),
|
2019-07-26 17:12:06 +10:00
|
|
|
)) == 0
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2019-09-10 04:15:49 +10:00
|
|
|
let device_rect = device_rect.assume_init();
|
|
|
|
let display_rect = display_rect.assume_init();
|
|
|
|
|
2019-07-26 17:12:06 +10: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-18 02:25:35 +10:00
|
|
|
let mut location = POINT {
|
2019-07-26 17:12:06 +10:00
|
|
|
x: x.floor() as i32,
|
|
|
|
y: y.floor() as i32,
|
2019-07-18 02:25:35 +10:00
|
|
|
};
|
|
|
|
|
|
|
|
if winuser::ScreenToClient(window, &mut location as *mut _) == 0 {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2019-09-10 04:15:49 +10:00
|
|
|
let force = match pointer_info.pointerType {
|
|
|
|
winuser::PT_TOUCH => {
|
|
|
|
let mut touch_info = mem::MaybeUninit::uninit();
|
|
|
|
GET_POINTER_TOUCH_INFO.and_then(|GetPointerTouchInfo| {
|
|
|
|
match GetPointerTouchInfo(
|
|
|
|
pointer_info.pointerId,
|
|
|
|
touch_info.as_mut_ptr(),
|
|
|
|
) {
|
|
|
|
0 => None,
|
|
|
|
_ => normalize_pointer_pressure(
|
|
|
|
touch_info.assume_init().pressure,
|
|
|
|
),
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
winuser::PT_PEN => {
|
|
|
|
let mut pen_info = mem::MaybeUninit::uninit();
|
|
|
|
GET_POINTER_PEN_INFO.and_then(|GetPointerPenInfo| {
|
|
|
|
match GetPointerPenInfo(
|
|
|
|
pointer_info.pointerId,
|
|
|
|
pen_info.as_mut_ptr(),
|
|
|
|
) {
|
|
|
|
0 => None,
|
|
|
|
_ => {
|
|
|
|
normalize_pointer_pressure(pen_info.assume_init().pressure)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
_ => None,
|
|
|
|
};
|
|
|
|
|
2019-07-26 17:12:06 +10:00
|
|
|
let x = location.x as f64 + x.fract();
|
|
|
|
let y = location.y as f64 + y.fract();
|
2019-06-20 06:49:43 +10:00
|
|
|
let location = PhysicalPosition::new(x, y);
|
2019-07-06 02:37:25 +10:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::Touch(Touch {
|
|
|
|
phase: if pointer_info.pointerFlags & winuser::POINTER_FLAG_DOWN != 0 {
|
|
|
|
TouchPhase::Started
|
|
|
|
} else if pointer_info.pointerFlags & winuser::POINTER_FLAG_UP != 0 {
|
|
|
|
TouchPhase::Ended
|
|
|
|
} else if pointer_info.pointerFlags & winuser::POINTER_FLAG_UPDATE != 0
|
|
|
|
{
|
|
|
|
TouchPhase::Moved
|
|
|
|
} else {
|
|
|
|
continue;
|
|
|
|
},
|
|
|
|
location,
|
2019-09-10 04:15:49 +10:00
|
|
|
force,
|
2019-07-06 02:37:25 +10:00
|
|
|
id: pointer_info.pointerId as u64,
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
}),
|
|
|
|
});
|
|
|
|
}
|
2019-06-27 19:34:38 +10:00
|
|
|
|
2019-07-06 02:37:25 +10:00
|
|
|
SkipPointerFrameMessages(pointer_id);
|
|
|
|
}
|
2019-06-27 19:34:38 +10:00
|
|
|
0
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_SETFOCUS => {
|
2019-12-28 08:26:23 +11:00
|
|
|
use crate::event::{ElementState::Released, WindowEvent::Focused};
|
|
|
|
for windows_keycode in event::get_pressed_keys() {
|
|
|
|
let scancode =
|
|
|
|
winuser::MapVirtualKeyA(windows_keycode as _, winuser::MAPVK_VK_TO_VSC);
|
|
|
|
let virtual_keycode = event::vkey_to_winit_vkey(windows_keycode);
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
update_modifiers(window, subclass_input);
|
|
|
|
|
2020-01-10 16:29:31 +11:00
|
|
|
#[allow(deprecated)]
|
2019-12-28 08:26:23 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::KeyboardInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
input: KeyboardInput {
|
|
|
|
scancode,
|
|
|
|
virtual_keycode,
|
|
|
|
state: Released,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
|
|
|
is_synthetic: true,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: Focused(true),
|
|
|
|
});
|
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_KILLFOCUS => {
|
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-07 09:43:55 +11:00
|
|
|
use crate::event::{
|
|
|
|
ElementState::Released,
|
|
|
|
ModifiersState,
|
|
|
|
WindowEvent::{Focused, ModifiersChanged},
|
|
|
|
};
|
2019-12-28 08:26:23 +11:00
|
|
|
for windows_keycode in event::get_pressed_keys() {
|
|
|
|
let scancode =
|
|
|
|
winuser::MapVirtualKeyA(windows_keycode as _, winuser::MAPVK_VK_TO_VSC);
|
|
|
|
let virtual_keycode = event::vkey_to_winit_vkey(windows_keycode);
|
|
|
|
|
2020-01-10 16:29:31 +11:00
|
|
|
#[allow(deprecated)]
|
2019-12-28 08:26:23 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: WindowEvent::KeyboardInput {
|
|
|
|
device_id: DEVICE_ID,
|
|
|
|
input: KeyboardInput {
|
|
|
|
scancode,
|
|
|
|
virtual_keycode,
|
|
|
|
state: Released,
|
|
|
|
modifiers: event::get_key_mods(),
|
|
|
|
},
|
|
|
|
is_synthetic: true,
|
|
|
|
},
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
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-07 09:43:55 +11:00
|
|
|
subclass_input.window_state.lock().modifiers_state = ModifiersState::empty();
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: ModifiersChanged(ModifiersState::empty()),
|
|
|
|
});
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: Focused(false),
|
|
|
|
});
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_SETCURSOR => {
|
|
|
|
let set_cursor_to = {
|
|
|
|
let window_state = subclass_input.window_state.lock();
|
2019-06-22 01:33:15 +10:00
|
|
|
if window_state
|
|
|
|
.mouse
|
|
|
|
.cursor_flags()
|
|
|
|
.contains(CursorFlags::IN_WINDOW)
|
|
|
|
{
|
2019-02-06 02:30:33 +11:00
|
|
|
Some(window_state.mouse.cursor)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
match set_cursor_to {
|
|
|
|
Some(cursor) => {
|
2019-06-22 01:33:15 +10:00
|
|
|
let cursor = winuser::LoadCursorW(ptr::null_mut(), cursor.to_windows_cursor());
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::SetCursor(cursor);
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-06-22 01:33:15 +10:00
|
|
|
None => winuser::DefWindowProcW(window, msg, wparam, lparam),
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_DROPFILES => {
|
|
|
|
// See `FileDropHandler` for implementation.
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
winuser::WM_GETMINMAXINFO => {
|
|
|
|
let mmi = lparam as *mut winuser::MINMAXINFO;
|
|
|
|
|
|
|
|
let window_state = subclass_input.window_state.lock();
|
|
|
|
|
|
|
|
if window_state.min_size.is_some() || window_state.max_size.is_some() {
|
|
|
|
if let Some(min_size) = window_state.min_size {
|
2020-02-14 06:41:41 +11:00
|
|
|
let min_size = min_size.to_physical(window_state.scale_factor);
|
2020-01-04 17:29:40 +11:00
|
|
|
let (width, height): (u32, u32) = util::adjust_size(window, min_size).into();
|
2019-06-22 01:33:15 +10:00
|
|
|
(*mmi).ptMinTrackSize = POINT {
|
|
|
|
x: width as i32,
|
|
|
|
y: height as i32,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
if let Some(max_size) = window_state.max_size {
|
2020-02-14 06:41:41 +11:00
|
|
|
let max_size = max_size.to_physical(window_state.scale_factor);
|
2020-01-04 17:29:40 +11:00
|
|
|
let (width, height): (u32, u32) = util::adjust_size(window, max_size).into();
|
2019-06-22 01:33:15 +10:00
|
|
|
(*mmi).ptMaxTrackSize = POINT {
|
|
|
|
x: width as i32,
|
|
|
|
y: height as i32,
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11: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.
|
|
|
|
winuser::WM_DPICHANGED => {
|
2020-01-06 08:57:32 +11:00
|
|
|
use crate::event::WindowEvent::ScaleFactorChanged;
|
2019-02-06 02:30:33 +11: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
|
|
|
|
let new_dpi_x = u32::from(LOWORD(wparam as DWORD));
|
2020-02-14 06:41:41 +11:00
|
|
|
let new_scale_factor = dpi_to_scale_factor(new_dpi_x);
|
|
|
|
let old_scale_factor: f64;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
|
|
|
let allow_resize = {
|
|
|
|
let mut window_state = subclass_input.window_state.lock();
|
2020-02-14 06:41:41 +11:00
|
|
|
old_scale_factor = window_state.scale_factor;
|
|
|
|
window_state.scale_factor = new_scale_factor;
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2020-02-14 06:41:41 +11:00
|
|
|
if new_scale_factor == old_scale_factor {
|
2020-01-04 17:28:34 +11:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
window_state.fullscreen.is_none()
|
|
|
|
&& !window_state.window_flags().contains(WindowFlags::MAXIMIZED)
|
2019-02-06 02:30:33 +11:00
|
|
|
};
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
let style = winuser::GetWindowLongW(window, winuser::GWL_STYLE) as _;
|
|
|
|
let style_ex = winuser::GetWindowLongW(window, winuser::GWL_EXSTYLE) as _;
|
|
|
|
|
|
|
|
// New size as suggested by Windows.
|
2020-01-04 17:28:34 +11:00
|
|
|
let suggested_rect = *(lparam as *const RECT);
|
2019-06-20 06:49:43 +10: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 17:28:34 +11:00
|
|
|
let margin_left: i32;
|
|
|
|
let margin_top: i32;
|
|
|
|
// let margin_right: i32;
|
|
|
|
// let margin_bottom: i32;
|
2019-06-20 06:49:43 +10:00
|
|
|
{
|
2020-01-22 06:43:36 +11:00
|
|
|
let adjusted_rect =
|
|
|
|
util::adjust_window_rect_with_styles(window, style, style_ex, suggested_rect)
|
|
|
|
.unwrap_or(suggested_rect);
|
2020-01-04 17:28:34 +11: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-20 06:49:43 +10:00
|
|
|
}
|
|
|
|
|
2020-01-04 17:28:34 +11:00
|
|
|
let old_physical_inner_rect = {
|
|
|
|
let mut old_physical_inner_rect = mem::zeroed();
|
|
|
|
winuser::GetClientRect(window, &mut old_physical_inner_rect);
|
|
|
|
let mut origin = mem::zeroed();
|
|
|
|
winuser::ClientToScreen(window, &mut origin);
|
2020-01-04 17:29:40 +11:00
|
|
|
|
2020-01-04 17:28:34 +11:00
|
|
|
old_physical_inner_rect.left += origin.x;
|
|
|
|
old_physical_inner_rect.right += origin.x;
|
|
|
|
old_physical_inner_rect.top += origin.y;
|
|
|
|
old_physical_inner_rect.bottom += origin.y;
|
2020-01-04 17:29:40 +11:00
|
|
|
|
2020-01-04 17:28:34 +11:00
|
|
|
old_physical_inner_rect
|
2020-01-04 17:29:40 +11:00
|
|
|
};
|
2020-01-04 17:28:34 +11: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-20 06:49:43 +10:00
|
|
|
// `allow_resize` prevents us from re-applying DPI adjustment to the restored size after
|
|
|
|
// exiting fullscreen (the restored size is already DPI adjusted).
|
2020-01-03 16:28:41 +11:00
|
|
|
let mut new_physical_inner_size = match allow_resize {
|
|
|
|
// 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-14 06:41:41 +11:00
|
|
|
.to_logical::<f64>(old_scale_factor)
|
|
|
|
.to_physical::<u32>(new_scale_factor),
|
2020-01-03 16:28:41 +11:00
|
|
|
false => old_physical_inner_size,
|
|
|
|
};
|
2019-06-20 06:49:43 +10:00
|
|
|
|
2020-01-07 07:28:58 +11:00
|
|
|
let _ = subclass_input.send_event(Event::WindowEvent {
|
2019-06-20 06:49:43 +10:00
|
|
|
window_id: RootWindowId(WindowId(window)),
|
2020-01-06 08:57:32 +11:00
|
|
|
event: ScaleFactorChanged {
|
2020-02-14 06:41:41 +11:00
|
|
|
scale_factor: new_scale_factor,
|
2020-01-03 16:28:41 +11:00
|
|
|
new_inner_size: &mut new_physical_inner_size,
|
2019-06-20 06:49:43 +10:00
|
|
|
},
|
|
|
|
});
|
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
let dragging_window: bool;
|
|
|
|
|
|
|
|
{
|
|
|
|
let window_state = subclass_input.window_state.lock();
|
|
|
|
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 17:28:34 +11: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,
|
|
|
|
right: suggested_ul.0 + new_physical_inner_size.width as LONG,
|
|
|
|
bottom: suggested_ul.1 + new_physical_inner_size.height as LONG,
|
|
|
|
};
|
|
|
|
|
2020-01-22 06:43:36 +11:00
|
|
|
conservative_rect = util::adjust_window_rect_with_styles(
|
|
|
|
window,
|
2020-01-04 17:28:34 +11:00
|
|
|
style,
|
|
|
|
style_ex,
|
2020-01-22 06:43:36 +11:00
|
|
|
conservative_rect,
|
|
|
|
)
|
|
|
|
.unwrap_or(conservative_rect);
|
2020-01-04 17:28:34 +11:00
|
|
|
|
2020-05-05 05:14:13 +10:00
|
|
|
// If we're dragging the window, offset the window so that the cursor's
|
2020-01-04 17:28:34 +11:00
|
|
|
// relative horizontal position in the title bar is preserved.
|
|
|
|
if dragging_window {
|
|
|
|
let bias = {
|
|
|
|
let cursor_pos = {
|
|
|
|
let mut pos = mem::zeroed();
|
|
|
|
winuser::GetCursorPos(&mut pos);
|
|
|
|
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)
|
|
|
|
as LONG)
|
|
|
|
- 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.
|
|
|
|
let new_dpi_monitor = winuser::MonitorFromWindow(window, 0);
|
|
|
|
let conservative_rect_monitor = winuser::MonitorFromRect(&conservative_rect, 0);
|
|
|
|
new_outer_rect = if conservative_rect_monitor == new_dpi_monitor {
|
|
|
|
conservative_rect
|
|
|
|
} else {
|
|
|
|
let get_monitor_rect = |monitor| {
|
|
|
|
let mut monitor_info = winuser::MONITORINFO {
|
|
|
|
cbSize: mem::size_of::<winuser::MONITORINFO>() as _,
|
|
|
|
..mem::zeroed()
|
|
|
|
};
|
|
|
|
winuser::GetMonitorInfoW(monitor, &mut monitor_info);
|
|
|
|
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.
|
|
|
|
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;
|
|
|
|
|
|
|
|
if winuser::MonitorFromRect(&conservative_rect, 0) == new_dpi_monitor {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
conservative_rect
|
|
|
|
};
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2020-01-04 17:28:34 +11:00
|
|
|
winuser::SetWindowPos(
|
|
|
|
window,
|
|
|
|
ptr::null_mut(),
|
|
|
|
new_outer_rect.left,
|
|
|
|
new_outer_rect.top,
|
|
|
|
new_outer_rect.right - new_outer_rect.left,
|
|
|
|
new_outer_rect.bottom - new_outer_rect.top,
|
|
|
|
winuser::SWP_NOZORDER | winuser::SWP_NOACTIVATE,
|
|
|
|
);
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
|
2019-12-23 06:04:09 +11:00
|
|
|
winuser::WM_SETTINGCHANGE => {
|
|
|
|
use crate::event::WindowEvent::ThemeChanged;
|
|
|
|
|
|
|
|
let is_dark_mode = try_dark_mode(window);
|
|
|
|
let mut window_state = subclass_input.window_state.lock();
|
|
|
|
let changed = window_state.is_dark_mode != is_dark_mode;
|
|
|
|
|
|
|
|
if changed {
|
|
|
|
use crate::window::Theme::*;
|
|
|
|
let theme = if is_dark_mode { Dark } else { Light };
|
|
|
|
|
|
|
|
window_state.is_dark_mode = is_dark_mode;
|
|
|
|
mem::drop(window_state);
|
|
|
|
subclass_input.send_event(Event::WindowEvent {
|
|
|
|
window_id: RootWindowId(WindowId(window)),
|
|
|
|
event: ThemeChanged(theme),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
_ => {
|
|
|
|
if msg == *DESTROY_MSG_ID {
|
|
|
|
winuser::DestroyWindow(window);
|
|
|
|
0
|
|
|
|
} else if msg == *SET_RETAIN_STATE_ON_SIZE_MSG_ID {
|
|
|
|
let mut window_state = subclass_input.window_state.lock();
|
2019-06-22 01:33:15 +10:00
|
|
|
window_state.set_window_flags_in_place(|f| {
|
|
|
|
f.set(WindowFlags::MARKER_RETAIN_STATE_ON_SIZE, wparam != 0)
|
|
|
|
});
|
2019-02-06 02:30:33 +11:00
|
|
|
0
|
|
|
|
} else {
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
|
|
|
}
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
};
|
|
|
|
|
|
|
|
subclass_input
|
|
|
|
.event_loop_runner
|
|
|
|
.catch_unwind(callback)
|
|
|
|
.unwrap_or(-1)
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
|
|
|
|
2019-06-20 06:49:43 +10:00
|
|
|
unsafe extern "system" fn thread_event_target_callback<T: 'static>(
|
2019-02-06 02:30:33 +11:00
|
|
|
window: HWND,
|
|
|
|
msg: UINT,
|
|
|
|
wparam: WPARAM,
|
|
|
|
lparam: LPARAM,
|
|
|
|
_: UINT_PTR,
|
2019-06-22 01:33:15 +10:00
|
|
|
subclass_input_ptr: DWORD_PTR,
|
2019-02-06 02:30:33 +11:00
|
|
|
) -> LRESULT {
|
2019-06-22 01:33:15 +10:00
|
|
|
let subclass_input = &mut *(subclass_input_ptr as *mut ThreadMsgTargetSubclassInput<T>);
|
2020-05-05 05:14:13 +10:00
|
|
|
let runner = subclass_input.event_loop_runner.clone();
|
|
|
|
|
|
|
|
if msg != winuser::WM_PAINT {
|
|
|
|
winuser::RedrawWindow(
|
|
|
|
window,
|
|
|
|
ptr::null(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
winuser::RDW_INTERNALPAINT,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
// I decided to bind the closure to `callback` and pass it to catch_unwind rather than passing
|
|
|
|
// the closure to catch_unwind directly so that the match body indendation wouldn't change and
|
|
|
|
// the git blame and history would be preserved.
|
|
|
|
let callback = || match msg {
|
2019-02-06 02:30:33 +11:00
|
|
|
winuser::WM_DESTROY => {
|
|
|
|
Box::from_raw(subclass_input);
|
|
|
|
drop(subclass_input);
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
// Because WM_PAINT comes after all other messages, we use it during modal loops to detect
|
|
|
|
// when the event queue has been emptied. See `process_event` for more details.
|
|
|
|
winuser::WM_PAINT => {
|
|
|
|
winuser::ValidateRect(window, ptr::null());
|
2020-05-05 05:14:13 +10:00
|
|
|
// If the WM_PAINT handler in `public_window_callback` has already flushed the redraw
|
|
|
|
// events, `handling_events` will return false and we won't emit a second
|
|
|
|
// `RedrawEventsCleared` event.
|
|
|
|
if subclass_input.event_loop_runner.handling_events() {
|
2020-07-03 06:53:47 +10:00
|
|
|
if subclass_input.event_loop_runner.should_buffer() {
|
|
|
|
// This branch can be triggered when a nested win32 event loop is triggered
|
|
|
|
// inside of the `event_handler` callback.
|
|
|
|
winuser::RedrawWindow(
|
|
|
|
window,
|
|
|
|
ptr::null(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
winuser::RDW_INTERNALPAINT,
|
|
|
|
);
|
|
|
|
} else {
|
|
|
|
// This WM_PAINT handler will never be re-entrant because `flush_paint_messages`
|
|
|
|
// doesn't call WM_PAINT for the thread event target (i.e. this window).
|
|
|
|
assert!(flush_paint_messages(
|
|
|
|
None,
|
|
|
|
&subclass_input.event_loop_runner
|
|
|
|
));
|
|
|
|
subclass_input.event_loop_runner.redraw_events_cleared();
|
|
|
|
process_control_flow(&subclass_input.event_loop_runner);
|
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
|
2020-11-25 09:05:29 +11:00
|
|
|
// Default WM_PAINT behaviour. This makes sure modals and popups are shown immediatly when opening them.
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-12-31 06:11:11 +11:00
|
|
|
|
|
|
|
winuser::WM_INPUT_DEVICE_CHANGE => {
|
|
|
|
let event = match wparam as _ {
|
|
|
|
winuser::GIDC_ARRIVAL => DeviceEvent::Added,
|
|
|
|
winuser::GIDC_REMOVAL => DeviceEvent::Removed,
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id: wrap_device_id(lparam as _),
|
|
|
|
event,
|
|
|
|
});
|
|
|
|
|
|
|
|
0
|
|
|
|
}
|
|
|
|
|
|
|
|
winuser::WM_INPUT => {
|
|
|
|
use crate::event::{
|
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-07 09:43:55 +11:00
|
|
|
DeviceEvent::{Button, Key, Motion, MouseMotion, MouseWheel},
|
2019-12-31 06:11:11 +11:00
|
|
|
ElementState::{Pressed, Released},
|
|
|
|
MouseScrollDelta::LineDelta,
|
|
|
|
};
|
|
|
|
|
|
|
|
if let Some(data) = raw_input::get_raw_input_data(lparam as _) {
|
|
|
|
let device_id = wrap_device_id(data.header.hDevice as _);
|
|
|
|
|
|
|
|
if data.header.dwType == winuser::RIM_TYPEMOUSE {
|
|
|
|
let mouse = data.data.mouse();
|
|
|
|
|
|
|
|
if util::has_flag(mouse.usFlags, winuser::MOUSE_MOVE_RELATIVE) {
|
|
|
|
let x = mouse.lLastX as f64;
|
|
|
|
let y = mouse.lLastY as f64;
|
|
|
|
|
|
|
|
if x != 0.0 {
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: Motion { axis: 0, value: x },
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if y != 0.0 {
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: Motion { axis: 1, value: y },
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
if x != 0.0 || y != 0.0 {
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: MouseMotion { delta: (x, y) },
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if util::has_flag(mouse.usButtonFlags, winuser::RI_MOUSE_WHEEL) {
|
|
|
|
let delta = mouse.usButtonData as SHORT / winuser::WHEEL_DELTA;
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: MouseWheel {
|
|
|
|
delta: LineDelta(0.0, delta as f32),
|
|
|
|
},
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
let button_state = raw_input::get_raw_mouse_button_state(mouse.usButtonFlags);
|
|
|
|
// Left, middle, and right, respectively.
|
|
|
|
for (index, state) in button_state.iter().enumerate() {
|
|
|
|
if let Some(state) = *state {
|
|
|
|
// This gives us consistency with X11, since there doesn't
|
|
|
|
// seem to be anything else reasonable to do for a mouse
|
|
|
|
// button ID.
|
|
|
|
let button = (index + 1) as _;
|
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: Button { button, state },
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if data.header.dwType == winuser::RIM_TYPEKEYBOARD {
|
|
|
|
let keyboard = data.data.keyboard();
|
|
|
|
|
|
|
|
let pressed = keyboard.Message == winuser::WM_KEYDOWN
|
|
|
|
|| keyboard.Message == winuser::WM_SYSKEYDOWN;
|
|
|
|
let released = keyboard.Message == winuser::WM_KEYUP
|
|
|
|
|| keyboard.Message == winuser::WM_SYSKEYUP;
|
|
|
|
|
|
|
|
if pressed || released {
|
|
|
|
let state = if pressed { Pressed } else { Released };
|
|
|
|
|
|
|
|
let scancode = keyboard.MakeCode as _;
|
|
|
|
let extended = util::has_flag(keyboard.Flags, winuser::RI_KEY_E0 as _)
|
|
|
|
| util::has_flag(keyboard.Flags, winuser::RI_KEY_E1 as _);
|
|
|
|
|
|
|
|
if let Some((vkey, scancode)) =
|
|
|
|
handle_extended_keys(keyboard.VKey as _, scancode, extended)
|
|
|
|
{
|
|
|
|
let virtual_keycode = vkey_to_winit_vkey(vkey);
|
|
|
|
|
2020-01-10 16:29:31 +11:00
|
|
|
#[allow(deprecated)]
|
2019-12-31 06:11:11 +11:00
|
|
|
subclass_input.send_event(Event::DeviceEvent {
|
|
|
|
device_id,
|
|
|
|
event: Key(KeyboardInput {
|
|
|
|
scancode,
|
|
|
|
state,
|
|
|
|
virtual_keycode,
|
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-07 09:43:55 +11:00
|
|
|
modifiers: event::get_key_mods(),
|
2019-12-31 06:11:11 +11:00
|
|
|
}),
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
commctrl::DefSubclassProc(window, msg, wparam, lparam)
|
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
_ if msg == *USER_EVENT_MSG_ID => {
|
|
|
|
if let Ok(event) = subclass_input.user_event_receiver.recv() {
|
|
|
|
subclass_input.send_event(Event::UserEvent(event));
|
|
|
|
}
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2019-02-06 02:30:33 +11:00
|
|
|
_ if msg == *EXEC_MSG_ID => {
|
|
|
|
let mut function: ThreadExecFn = Box::from_raw(wparam as usize as *mut _);
|
|
|
|
function();
|
|
|
|
0
|
2019-06-25 02:14:55 +10:00
|
|
|
}
|
2020-05-05 05:14:13 +10:00
|
|
|
_ if msg == *PROCESS_NEW_EVENTS_MSG_ID => {
|
|
|
|
winuser::PostThreadMessageW(
|
|
|
|
subclass_input.event_loop_runner.wait_thread_id(),
|
|
|
|
*CANCEL_WAIT_UNTIL_MSG_ID,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
);
|
|
|
|
|
|
|
|
// if the control_flow is WaitUntil, make sure the given moment has actually passed
|
|
|
|
// before emitting NewEvents
|
|
|
|
if let ControlFlow::WaitUntil(wait_until) =
|
|
|
|
subclass_input.event_loop_runner.control_flow()
|
|
|
|
{
|
|
|
|
let mut msg = mem::zeroed();
|
|
|
|
while Instant::now() < wait_until {
|
|
|
|
if 0 != winuser::PeekMessageW(&mut msg, ptr::null_mut(), 0, 0, 0) {
|
|
|
|
// This works around a "feature" in PeekMessageW. If the message PeekMessageW
|
|
|
|
// gets is a WM_PAINT message that had RDW_INTERNALPAINT set (i.e. doesn't
|
|
|
|
// have an update region), PeekMessageW will remove that window from the
|
|
|
|
// redraw queue even though we told it not to remove messages from the
|
|
|
|
// queue. We fix it by re-dispatching an internal paint message to that
|
|
|
|
// window.
|
|
|
|
if msg.message == winuser::WM_PAINT {
|
|
|
|
let mut rect = mem::zeroed();
|
|
|
|
if 0 == winuser::GetUpdateRect(msg.hwnd, &mut rect, 0) {
|
|
|
|
winuser::RedrawWindow(
|
|
|
|
msg.hwnd,
|
|
|
|
ptr::null(),
|
|
|
|
ptr::null_mut(),
|
|
|
|
winuser::RDW_INTERNALPAINT,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
subclass_input.event_loop_runner.poll();
|
|
|
|
0
|
|
|
|
}
|
2019-06-22 01:33:15 +10:00
|
|
|
_ => commctrl::DefSubclassProc(window, msg, wparam, lparam),
|
2020-05-05 05:14:13 +10:00
|
|
|
};
|
|
|
|
|
|
|
|
runner.catch_unwind(callback).unwrap_or(-1)
|
2019-02-06 02:30:33 +11:00
|
|
|
}
|