From 267b2c027a3cbe4fb3188a9afbee3c5008b44b58 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Mon, 25 May 2015 21:01:39 +0200 Subject: [PATCH] Fix set_cursor_state on X11 When the state is not changed, no code must be executed. Such no-ops previously hit the unimplemented cursor hiding. --- src/api/x11/window.rs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/api/x11/window.rs b/src/api/x11/window.rs index 38838f5e..42134d0c 100644 --- a/src/api/x11/window.rs +++ b/src/api/x11/window.rs @@ -711,20 +711,22 @@ impl Window { } pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> { + use CursorState::{ Grab, Normal }; + let mut cursor_state = self.cursor_state.lock().unwrap(); match (state, *cursor_state) { - (CursorState::Normal, CursorState::Grab) => { + (Normal, Grab) => { unsafe { (self.x.display.xlib.XUngrabPointer)(self.x.display.display, ffi::CurrentTime); - *cursor_state = CursorState::Normal; + *cursor_state = Normal; Ok(()) } }, - (CursorState::Grab, CursorState::Normal) => { + (Grab, Normal) => { unsafe { - *cursor_state = CursorState::Grab; + *cursor_state = Grab; match (self.x.display.xlib.XGrabPointer)( 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!(), } }