From 34451bff185d8875f55747ee97ed746828e30f40 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 8 Jun 2023 20:11:59 +0200
Subject: Implement basic cursor availability

---
 core/src/mouse/cursor.rs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 core/src/mouse/cursor.rs

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
new file mode 100644
index 00000000..d4cb415d
--- /dev/null
+++ b/core/src/mouse/cursor.rs
@@ -0,0 +1,51 @@
+use crate::{Point, Rectangle, Vector};
+
+/// The mouse cursor state.
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Cursor {
+    /// The cursor has a defined position.
+    Available(Point),
+
+    /// The cursor is currently unavailable (i.e. out of bounds or busy).
+    Unavailable,
+}
+
+impl Cursor {
+    /// Returns the absolute position of the [`Cursor`], if available.
+    pub fn position(self) -> Option<Point> {
+        match self {
+            Cursor::Available(position) => Some(position),
+            Cursor::Unavailable => None,
+        }
+    }
+
+    /// Returns the absolute position of the [`Cursor`], if available and inside
+    /// the given bounds.
+    ///
+    /// If the [`Cursor`] is not over the provided bounds, this method will
+    /// return `None`.
+    pub fn position_over(self, bounds: &Rectangle) -> Option<Point> {
+        self.position().filter(|p| bounds.contains(*p))
+    }
+
+    /// Returns the relative position of the [`Cursor`] inside the given bounds,
+    /// if available.
+    ///
+    /// If the [`Cursor`] is not over the provided bounds, this method will
+    /// return `None`.
+    pub fn position_in(self, bounds: &Rectangle) -> Option<Point> {
+        self.position_over(bounds)
+            .map(|p| p - Vector::new(bounds.x, bounds.y))
+    }
+
+    /// Returns the relative position of the [`Cursor`] from the given origin,
+    /// if available.
+    pub fn position_from(self, origin: Point) -> Option<Point> {
+        self.position().map(|p| p - Vector::new(origin.x, origin.y))
+    }
+
+    /// Returns true if the [`Cursor`] is over the given `bounds`.
+    pub fn is_over(self, bounds: &Rectangle) -> bool {
+        self.position_over(bounds).is_some()
+    }
+}
-- 
cgit 


From 5c8cfb411ed0a9a6e55bd1193cd7e97252e63d28 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 8 Jun 2023 20:16:46 +0200
Subject: Take `Rectangle` by value in `Cursor` API

---
 core/src/mouse/cursor.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
index d4cb415d..223ed96d 100644
--- a/core/src/mouse/cursor.rs
+++ b/core/src/mouse/cursor.rs
@@ -24,7 +24,7 @@ impl Cursor {
     ///
     /// If the [`Cursor`] is not over the provided bounds, this method will
     /// return `None`.
-    pub fn position_over(self, bounds: &Rectangle) -> Option<Point> {
+    pub fn position_over(self, bounds: Rectangle) -> Option<Point> {
         self.position().filter(|p| bounds.contains(*p))
     }
 
@@ -33,7 +33,7 @@ impl Cursor {
     ///
     /// If the [`Cursor`] is not over the provided bounds, this method will
     /// return `None`.
-    pub fn position_in(self, bounds: &Rectangle) -> Option<Point> {
+    pub fn position_in(self, bounds: Rectangle) -> Option<Point> {
         self.position_over(bounds)
             .map(|p| p - Vector::new(bounds.x, bounds.y))
     }
@@ -45,7 +45,7 @@ impl Cursor {
     }
 
     /// Returns true if the [`Cursor`] is over the given `bounds`.
-    pub fn is_over(self, bounds: &Rectangle) -> bool {
+    pub fn is_over(self, bounds: Rectangle) -> bool {
         self.position_over(bounds).is_some()
     }
 }
-- 
cgit 


From aba98e49654852281ed17bedd1becac6f9db8700 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 8 Jun 2023 20:35:40 +0200
Subject: Extend cursor availability to the shell level

---
 core/src/mouse/cursor.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/src/mouse')

diff --git a/core/src/mouse/cursor.rs b/core/src/mouse/cursor.rs
index 223ed96d..203526e9 100644
--- a/core/src/mouse/cursor.rs
+++ b/core/src/mouse/cursor.rs
@@ -1,12 +1,13 @@
 use crate::{Point, Rectangle, Vector};
 
 /// The mouse cursor state.
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Default)]
 pub enum Cursor {
     /// The cursor has a defined position.
     Available(Point),
 
     /// The cursor is currently unavailable (i.e. out of bounds or busy).
+    #[default]
     Unavailable,
 }
 
-- 
cgit