From 3d82d199f0ec6d8bf6252ed0795b4d883ade84ff Mon Sep 17 00:00:00 2001
From: Tom Englund <tomenglund26@gmail.com>
Date: Wed, 7 Aug 2024 13:23:00 +0200
Subject: cursormgr: implement inheriting themes for xcursor (#7197)

* cursormgr: reduce duplicated code

add a few functions such as setCursorBuffer and setAnimationTimer to
reduce duplicated code and also avoid future mishaps of forgetting to
clear buffer or disarm timer. and generally reduce spaghetti even tho
pasta can be delicious.

* xcursormgr: implent inherited themes

implent index.theme parsing and inherited themes.

* cursormgr: ensure a fallback xcursor exist

ensure a xcursor fallback exist otherwise it wont load the proper theme
if we at launch have hyprcursor enabled and then set it to false in
config and reload. also use the env var when using hyprctl setcursor
incase its empty.
---
 src/managers/XCursorManager.hpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'src/managers/XCursorManager.hpp')

diff --git a/src/managers/XCursorManager.hpp b/src/managers/XCursorManager.hpp
index 9ced076f..20637055 100644
--- a/src/managers/XCursorManager.hpp
+++ b/src/managers/XCursorManager.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include <string>
 #include <vector>
+#include <unordered_set>
 #include <array>
 #include <cstdint>
 #include <hyprutils/math/Vector2D.hpp>
@@ -32,15 +33,15 @@ class CXCursorManager {
     SP<SXCursors> getShape(std::string const& shape, int size);
 
   private:
-    SP<SXCursors>              createCursor(std::string const& shape, XcursorImages* xImages);
-    std::vector<std::string>   themePaths(std::string const& theme);
-    std::string                getLegacyShapeName(std::string const& shape);
-    std::vector<SP<SXCursors>> loadStandardCursors(std::string const& name, int size);
-    std::vector<SP<SXCursors>> loadAllFromDir(std::string const& path, int size);
+    SP<SXCursors>                   createCursor(std::string const& shape, XcursorImages* xImages);
+    std::unordered_set<std::string> themePaths(std::string const& theme);
+    std::string                     getLegacyShapeName(std::string const& shape);
+    std::vector<SP<SXCursors>>      loadStandardCursors(std::string const& name, int size);
+    std::vector<SP<SXCursors>>      loadAllFromDir(std::string const& path, int size);
 
-    int                        lastLoadSize = 0;
-    std::string                themeName    = "";
-    SP<SXCursors>              defaultCursor;
-    SP<SXCursors>              hyprCursor;
-    std::vector<SP<SXCursors>> cursors;
+    int                             lastLoadSize = 0;
+    std::string                     themeName    = "";
+    SP<SXCursors>                   defaultCursor;
+    SP<SXCursors>                   hyprCursor;
+    std::vector<SP<SXCursors>>      cursors;
 };
\ No newline at end of file
-- 
cgit v1.2.3