From 1ed1ce9506e65f76fe5236194516f23d662bba0b Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Sun, 5 May 2024 17:16:00 +0100
Subject: internal: new shared_ptr and weak_ptr implementation (#5883)

moves std::shared_ptrs to a new implementation

Advantages:
- you can dereference a weak_ptr directly. This will obviously segfault on a nullptr deref if it's expired.
   - this is useful to avoid the .lock() hell where we are 100% sure the pointer _should_ be valid. (and if it isn't, it should throw.)
- weak_ptrs are still valid while the SP is being destroyed.
   - reasoning: while an object (e.g. CWindow) is being destroyed, its `weak_ptr self` should be accessible (the sp is still alive, and so is CWindow), but it's not because by stl it's already expired (to prevent resurrection)
   - this impl solves it differently. w_p is expired, but can still be dereferenced and used. Creating `s_p`s is not possible anymore, though.
   - this is useful in destructors and callbacks.
---
 src/plugins/PluginSystem.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/plugins/PluginSystem.hpp')

diff --git a/src/plugins/PluginSystem.hpp b/src/plugins/PluginSystem.hpp
index a442c31c..333b49e5 100644
--- a/src/plugins/PluginSystem.hpp
+++ b/src/plugins/PluginSystem.hpp
@@ -8,22 +8,22 @@ class IHyprWindowDecoration;
 
 class CPlugin {
   public:
-    std::string                                                          name        = "";
-    std::string                                                          description = "";
-    std::string                                                          author      = "";
-    std::string                                                          version     = "";
+    std::string                                               name        = "";
+    std::string                                               description = "";
+    std::string                                               author      = "";
+    std::string                                               version     = "";
 
-    std::string                                                          path = "";
+    std::string                                               path = "";
 
-    bool                                                                 m_bLoadedWithConfig = false;
+    bool                                                      m_bLoadedWithConfig = false;
 
-    HANDLE                                                               m_pHandle = nullptr;
+    HANDLE                                                    m_pHandle = nullptr;
 
-    std::vector<IHyprLayout*>                                            registeredLayouts;
-    std::vector<IHyprWindowDecoration*>                                  registeredDecorations;
-    std::vector<std::pair<std::string, std::weak_ptr<HOOK_CALLBACK_FN>>> registeredCallbacks;
-    std::vector<std::string>                                             registeredDispatchers;
-    std::vector<std::shared_ptr<SHyprCtlCommand>>                        registeredHyprctlCommands;
+    std::vector<IHyprLayout*>                                 registeredLayouts;
+    std::vector<IHyprWindowDecoration*>                       registeredDecorations;
+    std::vector<std::pair<std::string, WP<HOOK_CALLBACK_FN>>> registeredCallbacks;
+    std::vector<std::string>                                  registeredDispatchers;
+    std::vector<SP<SHyprCtlCommand>>                          registeredHyprctlCommands;
 };
 
 class CPluginSystem {
-- 
cgit v1.2.3