Added cursor support

examples/main.cpp

@@ -27,7 +27,7 @@ int main(int argc, char** argv)
     window.SetTitle("New Title");
 
     window.SetIcon(64, 64, icon_data);
-    // window.SetMouseCursor(SDL_SYSTEM_CURSOR_CROSSHAIR);
+    window.SetMouseCursor(sdlu::Cursor::Type::Crosshair);
     window.SetMaxFramerate(144);
 
     SDL_Event event;

include/SDLU.hpp

@@ -2,6 +2,7 @@
 
 #include <graphics/Graphics.hpp>
 #include <structures/Mouse.hpp>
+#include <structures/Cursor.hpp>
 
 namespace sdlu {
 	// TODO: Eventually we should initialize things once the object gets created

include/structures/Cursor.hpp

@@ -0,0 +1,38 @@
+#pragma once 
+
+#include "Vector2.hpp"
+#include "Util.hpp"
+
+struct SDL_Cursor;
+struct SDL_Surface;
+
+SDLU_BEGIN
+
+class Cursor
+{
+public:
+	enum class Type {
+		Arrow, IBeam, Wait, Crosshair, WaitArrow,
+		SizeNWSE, SizeNESW, SizeWE, SizeNS, SizeAll,
+		No, Hand
+	};
+
+	friend class Window;
+
+public:
+	Cursor();
+	Cursor(Type type);
+	Cursor(const Cursor& other) = delete;
+	Cursor(Cursor&& other) noexcept;
+
+	~Cursor();
+
+	bool LoadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hotspot);
+	bool LoadFromSurface(SDL_Surface* surface, Vector2u hotspot);
+	bool LoadFromSystem(Type type);
+
+private:
+	SDL_Cursor* cursor;
+};
+
+SDLU_END

include/structures/Window.hpp

@@ -17,6 +17,8 @@ struct SDL_Surface;
 struct SDL_Cursor;
 
 SDLU_BEGIN
+class Cursor;
+
 /**
     * @brief Stores information about a window. You probably want RenderWindow.
     */
@@ -230,28 +232,9 @@ public:
     /**
         * @brief Changes the mouse cursor
         *
-        * @param[in] surface   A pointer to a SDL_Surface containing sprite data
-        * @param[in] clickspot The effective position of the cursor relative to the top left of the sprite
+        * @param[in] cursor   The cursor object holding cursor data
         */
-    void SetMouseCursor(SDL_Surface* surface, Vector2u clickspot);
-
-    /**
-        * @brief Changes the mouse cursor
-        *
-        * @param[in] pixels    An array of color data (RGBA as seperate 8-bit values)
-        * @param[in] size      Size of the cursor
-        * @param[in] clickspot The effective position of the cursor relative to the top left of the sprite
-        */
-    void SetMouseCursor(const Uint8* pixels, Vector2u size, Vector2u clickspot);
-
-    /**
-        * @brief Changes the mouse cursor
-        *
-        * @param[in] pixels    An array of color data (RGBA as one 32-bit value)
-        * @param[in] size      Size of the cursor
-        * @param[in] clickspot The effective position of the cursor relative to the top left of the sprite
-        */
-    void SetMouseCursor(const Uint32* pixels, Vector2u size, Vector2u clickspot);
+    void SetMouseCursor(const Cursor& cursor);
 
 protected:
     SDL_Window* window;

src/structures/Cursor.cpp

@@ -0,0 +1,62 @@
+#include "structures/Cursor.hpp"
+
+#include <SDL2/SDL_mouse.h>
+
+SDLU_BEGIN
+
+Cursor::Cursor() :
+	cursor(SDL_CreateSystemCursor(static_cast<SDL_SystemCursor>(Type::Arrow)))
+{
+	
+}
+
+Cursor::Cursor(Type type) :
+	cursor(SDL_CreateSystemCursor(static_cast<SDL_SystemCursor>(type)))
+{
+}
+
+Cursor::Cursor(Cursor&& other) noexcept
+{
+	this->cursor = other.cursor;
+	other.cursor = nullptr;
+}
+
+Cursor::~Cursor()
+{
+	SDL_FreeCursor(cursor);
+}
+
+bool Cursor::LoadFromPixels(const Uint8* pixels, Vector2u size, Vector2u hotspot)
+{
+	SDL_FreeCursor(cursor);
+	cursor = SDL_CreateCursor(pixels, nullptr, size.x, size.y, hotspot.x, hotspot.y);
+
+	if (IS_NULLPTR(cursor))
+		return false;
+
+	return true;
+}
+
+bool Cursor::LoadFromSurface(SDL_Surface* surface, Vector2u hotspot)
+{
+	SDL_FreeCursor(cursor);
+	cursor = SDL_CreateColorCursor(surface, hotspot.x, hotspot.y);
+
+	if (IS_NULLPTR(cursor))
+		return false;
+
+	return true;
+}
+
+bool Cursor::LoadFromSystem(Type type)
+{
+	SDL_FreeCursor(cursor);
+	cursor = SDL_CreateSystemCursor(static_cast<SDL_SystemCursor>(type));
+
+	if (IS_NULLPTR(cursor))
+		return false;
+
+	return true;
+}
+
+SDLU_END

src/structures/Window.cpp

@@ -3,6 +3,8 @@
 #include <SDL.h>
 #include <cstring>
 
+#include "structures/Cursor.hpp"
+
 SDLU_BEGIN
 Window::Window() :
     window(nullptr)
@@ -204,30 +206,9 @@ void Window::SetMouseCursor(SDL_Cursor* cursor)
     SDL_SetCursor(cursor);
 }
 
-void Window::SetMouseCursor(SDL_Surface* surface, Vector2u clickspot)
+void Window::SetMouseCursor(const Cursor& cursor)
 {
-    SDL_Cursor* _cursor = SDL_CreateColorCursor(surface, clickspot.x, clickspot.y);
-    SDL_SetCursor(_cursor);
-}
-
-void Window::SetMouseCursor(const Uint8* pixels, Vector2u size, Vector2u clickspot)
-{
-    size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4;
-    void* _pixels = malloc(_size);
-    memcpy(_pixels, pixels, _size);
-    SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
-        size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA8888);
-    this->SetMouseCursor(surface, clickspot);
-}
-
-void Window::SetMouseCursor(const Uint32* pixels, Vector2u size, Vector2u clickspot)
-{
-    size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4;
-    void* _pixels = malloc(_size);
-    memcpy(_pixels, pixels, _size);
-    SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
-        size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA32);
-    this->SetMouseCursor(surface, clickspot);
+    SDL_SetCursor(cursor.cursor);
 }
 
 void Window::OnCreate()