From 6eba737fce8f50798d81c24eb70872ff46a2da3a Mon Sep 17 00:00:00 2001
From: Victor Berger <victor.berger@m4x.org>
Date: Tue, 22 Dec 2015 14:35:55 +0100
Subject: api/wayland: fix cursor errors

---
 src/api/wayland/events.rs |  3 ++-
 src/api/wayland/window.rs | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/api/wayland/events.rs b/src/api/wayland/events.rs
index 8aeddac..8b18020 100644
--- a/src/api/wayland/events.rs
+++ b/src/api/wayland/events.rs
@@ -21,7 +21,8 @@ pub fn translate_event(
     focuses: &mut WaylandFocuses,
     known_surfaces: &HashSet<ProxyId>,
     seat: Option<&WlSeat>,
-) -> Option<(GlutinEvent, ProxyId)> {
+    ) -> Option<(GlutinEvent, ProxyId)>
+{
     let WaylandEvent::Wayland(wayland_evt) = evt;
     match wayland_evt {
         WPE::WlSeat(_, seat_evt) => match seat_evt {
diff --git a/src/api/wayland/window.rs b/src/api/wayland/window.rs
index a9285fa..0005a83 100644
--- a/src/api/wayland/window.rs
+++ b/src/api/wayland/window.rs
@@ -298,9 +298,14 @@ impl Window {
     }
 
     #[inline]
-    pub fn set_cursor_state(&self, _state: CursorState) -> Result<(), String> {
-        // TODO
-        Ok(())
+    pub fn set_cursor_state(&self, state: CursorState) -> Result<(), String> {
+        use CursorState::{Grab, Normal, Hide};
+        // TODO : not yet possible on wayland to grab cursor
+        match state {
+            Grab => Err("Cursor cannot be grabbed on wayland yet.".to_string()),
+            Hide => Err("Cursor cannot be hidden on wayland yet.".to_string()),
+            Normal => Ok(())
+        }
     }
 
     #[inline]
@@ -311,7 +316,7 @@ impl Window {
     #[inline]
     pub fn set_cursor_position(&self, _x: i32, _y: i32) -> Result<(), ()> {
         // TODO: not yet possible on wayland
-        Ok(())
+        Err(())
     }
 
     #[inline]
-- 
cgit v1.2.3