alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2025-01-11 21:31:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on x11

Browse source
This commit is contained in:
Pierre Krieger 2015-03-26 17:33:49 +01:00
parent 3d692870e2
commit aaa1c76841
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -283,7 +283,7 @@ pub struct Window {
current_size: Cell<(libc::c_int, libc::c_int)>, current_size: Cell<(libc::c_int, libc::c_int)>,
/// Events that have been retreived with XLib but not dispatched with iterators yet /// Events that have been retreived with XLib but not dispatched with iterators yet
pending_events: Mutex<VecDeque<Event>>, pending_events: Mutex<VecDeque<Event>>,
cursor_state: CursorState, cursor_state: Mutex<CursorState>,
} }
impl Window { impl Window {
@ -603,7 +603,7 @@ impl Window {
wm_delete_window: wm_delete_window, wm_delete_window: wm_delete_window,
current_size: Cell::new((0, 0)), current_size: Cell::new((0, 0)),
pending_events: Mutex::new(VecDeque::new()), pending_events: Mutex::new(VecDeque::new()),
cursor_state: CursorState::Normal, cursor_state: Mutex::new(CursorState::Normal),
}; };
// returning // returning
@ -786,17 +786,20 @@ impl Window {
} }
pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> { pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
match (state, self.cursor_state) { let mut cursor_state = self.cursor_state.lock().unwrap();
match (state, *cursor_state) {
(CursorState::Normal, CursorState::Grab) => { (CursorState::Normal, CursorState::Grab) => {
unsafe { unsafe {
ffi::XUngrabPointer(self.x.display, ffi::CurrentTime); ffi::XUngrabPointer(self.x.display, ffi::CurrentTime);
self.cursor_state = CursorState::Normal; *cursor_state = CursorState::Normal;
Ok(())
} }
}, },
(CursorState::Grab, CursorState::Normal) => { (CursorState::Grab, CursorState::Normal) => {
unsafe { unsafe {
self.cursor_state = CursorState::Grab; *cursor_state = CursorState::Grab;
match ffi::XGrabPointer( match ffi::XGrabPointer(
self.x.display, self.x.window, false, self.x.display, self.x.window, false,