alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 14:51:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix set_cursor_state on X11

Browse source 
When the state is not changed, no code must be executed. Such no-ops previously
hit the unimplemented cursor hiding.
This commit is contained in:
Eduard Bopp 2015-05-25 21:01:39 +02:00
parent d089ea8674
commit 267b2c027a
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/api/x11/window.rs
View file

@ -711,20 +711,22 @@ impl Window {
} }
pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> { pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
use CursorState::{ Grab, Normal };
let mut cursor_state = self.cursor_state.lock().unwrap(); let mut cursor_state = self.cursor_state.lock().unwrap();
match (state, *cursor_state) { match (state, *cursor_state) {
(CursorState::Normal, CursorState::Grab) => { (Normal, Grab) => {
unsafe { unsafe {
(self.x.display.xlib.XUngrabPointer)(self.x.display.display, ffi::CurrentTime); (self.x.display.xlib.XUngrabPointer)(self.x.display.display, ffi::CurrentTime);
*cursor_state = CursorState::Normal; *cursor_state = Normal;
Ok(()) Ok(())
} }
}, },
(CursorState::Grab, CursorState::Normal) => { (Grab, Normal) => {
unsafe { unsafe {
*cursor_state = CursorState::Grab; *cursor_state = Grab;
match (self.x.display.xlib.XGrabPointer)( match (self.x.display.xlib.XGrabPointer)(
self.x.display.display, self.x.window, ffi::False, self.x.display.display, self.x.window, ffi::False,
@ -745,6 +747,9 @@ impl Window {
} }
}, },
// Nothing needs to change
(Grab, Grab) | (Normal, Normal) => Ok(()),
_ => unimplemented!(), _ => unimplemented!(),
} }
} }