Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add logging when WM_CAPTURECHANGED is dropped #822

Merged
merged 1 commit into from
Apr 9, 2020
Merged

Add logging when WM_CAPTURECHANGED is dropped #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions druid-shell/src/platform/windows/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,18 +272,9 @@ impl WndState {
self.captured_mouse_buttons |= 1 << (button as u32);
}

fn exit_mouse_capture(&mut self, button: MouseButton) {
fn exit_mouse_capture(&mut self, button: MouseButton) -> bool {
self.captured_mouse_buttons &= !(1 << (button as u32));
if self.captured_mouse_buttons == 0 {
unsafe {
if ReleaseCapture() == FALSE {
warn!(
"failed to release mouse capture: {}",
Error::Hr(HRESULT_FROM_WIN32(GetLastError()))
);
}
}
}
self.captured_mouse_buttons == 0
}
}

Expand Down Expand Up @@ -625,6 +616,7 @@ impl WndProc for MyWndProc {
WM_LBUTTONDBLCLK | WM_LBUTTONDOWN | WM_LBUTTONUP | WM_MBUTTONDBLCLK
| WM_MBUTTONDOWN | WM_MBUTTONUP | WM_RBUTTONDBLCLK | WM_RBUTTONDOWN | WM_RBUTTONUP
| WM_XBUTTONDBLCLK | WM_XBUTTONDOWN | WM_XBUTTONUP => {
let mut should_release_capture = false;
if let Ok(mut s) = self.state.try_borrow_mut() {
let s = s.as_mut().unwrap();
let button = match msg {
Expand Down Expand Up @@ -666,11 +658,26 @@ impl WndProc for MyWndProc {
s.handler.mouse_down(&event);
} else {
s.handler.mouse_up(&event);
s.exit_mouse_capture(button);
should_release_capture = s.exit_mouse_capture(button);
}
} else {
self.log_dropped_msg(hwnd, msg, wparam, lparam);
}

// ReleaseCapture() is deferred: it needs to be called without having a mutable
// reference to the window state, because it will generate a reentrant
// WM_CAPTURECHANGED event.
if should_release_capture {
unsafe {
if ReleaseCapture() == FALSE {
warn!(
"failed to release mouse capture: {}",
Error::Hr(HRESULT_FROM_WIN32(GetLastError()))
);
}
}
}

Some(0)
}
XI_REQUEST_DESTROY => {
Expand Down Expand Up @@ -705,6 +712,8 @@ impl WndProc for MyWndProc {
if let Ok(mut s) = self.state.try_borrow_mut() {
let s = s.as_mut().unwrap();
s.captured_mouse_buttons = 0;
} else {
self.log_dropped_msg(hwnd, msg, wparam, lparam);
}
Some(0)
}
Expand Down