expo: add a scroll overview

Author: vaxerski

hyprexpo/ExpoGesture.cpp

@@ -12,7 +12,7 @@ void CExpoGesture::begin(const ITrackpadGesture::STrackpadGestureBegin& e) {
     m_firstUpdate = true;
 
     if (!g_pOverview)
-        g_pOverview = std::make_unique<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
+        g_pOverview = makeShared<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
     else {
         g_pOverview->selectHoveredWorkspace();
         g_pOverview->setClosing(true);

hyprexpo/IOverview.hpp

@@ -0,0 +1,32 @@
+#pragma once
+#include <hyprland/src/helpers/memory/Memory.hpp>
+
+class IOverview {
+  public:
+    IOverview()          = default;
+    virtual ~IOverview() = default;
+
+    virtual void  render()           = 0;
+    virtual void  damage()           = 0;
+    virtual void  onDamageReported() = 0;
+    virtual void  onPreRender()      = 0;
+
+    virtual void  setClosing(bool closing) = 0;
+
+    virtual void  resetSwipe()                = 0;
+    virtual void  onSwipeUpdate(double delta) = 0;
+    virtual void  onSwipeEnd()                = 0;
+
+    virtual void  close()                  = 0;
+    virtual void  selectHoveredWorkspace() = 0;
+
+    virtual void  fullRender() = 0;
+
+    bool          blockOverviewRendering = false;
+    bool          blockDamageReporting   = false;
+
+    PHLMONITORREF pMonitor;
+    bool          m_isSwiping = false;
+};
+
+inline SP<IOverview> g_pOverview;

hyprexpo/Makefile

@@ -6,6 +6,6 @@ else
 endif
 
 all:
-	$(CXX) -shared -fPIC $(EXTRA_FLAGS) main.cpp overview.cpp ExpoGesture.cpp OverviewPassElement.cpp -o hyprexpo.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -Wno-narrowing
+	$(CXX) -shared -fPIC $(EXTRA_FLAGS) main.cpp overview.cpp ExpoGesture.cpp OverviewPassElement.cpp scrollOverview.cpp -o hyprexpo.so -g `pkg-config --cflags pixman-1 libdrm hyprland pangocairo libinput libudev wayland-server xkbcommon` -std=c++2b -Wno-narrowing
 clean:
 	rm ./hyprexpo.so

hyprexpo/globals.hpp

@@ -2,4 +2,5 @@
 
 #include <hyprland/src/plugins/PluginAPI.hpp>
 
-inline HANDLE PHANDLE = nullptr;
+inline HANDLE PHANDLE = nullptr;
+inline bool IS_SCROLLING = false;

hyprexpo/main.cpp

@@ -9,12 +9,14 @@
 #include <hyprland/src/render/Renderer.hpp>
 #include <hyprland/src/managers/input/trackpad/GestureTypes.hpp>
 #include <hyprland/src/managers/input/trackpad/TrackpadGestures.hpp>
+#include <hyprland/src/managers/LayoutManager.hpp>
 
 #include <hyprutils/string/ConstVarList.hpp>
 using namespace Hyprutils::String;
 
 #include "globals.hpp"
 #include "overview.hpp"
+#include "scrollOverview.hpp"
 #include "ExpoGesture.hpp"
 
 // Methods
@@ -66,6 +68,8 @@ static void hkAddDamageB(void* thisptr, const pixman_region32_t* rg) {
 
 static SDispatchResult onExpoDispatcher(std::string arg) {
 
+    IS_SCROLLING = g_pLayoutManager->getCurrentLayout()->getLayoutName() == "scrolling";
+
     if (g_pOverview && g_pOverview->m_isSwiping)
         return {.success = false, .error = "already swiping"};
 
@@ -81,7 +85,10 @@ static SDispatchResult onExpoDispatcher(std::string arg) {
             g_pOverview->close();
         else {
             renderingOverview = true;
-            g_pOverview       = std::make_unique<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
+            if (IS_SCROLLING)
+                g_pOverview = makeShared<CScrollOverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
+            else
+                makeShared<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
             renderingOverview = false;
         }
         return {};
@@ -97,7 +104,10 @@ static SDispatchResult onExpoDispatcher(std::string arg) {
         return {};
 
     renderingOverview = true;
-    g_pOverview       = std::make_unique<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
+    if (IS_SCROLLING)
+        g_pOverview = makeShared<CScrollOverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
+    else
+        makeShared<COverview>(g_pCompositor->m_lastMonitor->m_activeWorkspace);
     renderingOverview = false;
     return {};
 }
@@ -107,7 +117,7 @@ static void failNotif(const std::string& reason) {
 }
 
 static Hyprlang::CParseResult expoGestureKeyword(const char* LHS, const char* RHS) {
-    Hyprlang::CParseResult    result;
+    Hyprlang::CParseResult result;
 
     if (g_unloading)
         return result;

hyprexpo/overview.cpp

@@ -8,6 +8,7 @@
 #include <hyprland/src/managers/animation/AnimationManager.hpp>
 #include <hyprland/src/managers/animation/DesktopAnimationManager.hpp>
 #include <hyprland/src/managers/input/InputManager.hpp>
+#include <hyprland/src/managers/LayoutManager.hpp>
 #include <hyprland/src/helpers/time/Time.hpp>
 #undef private
 #include "OverviewPassElement.hpp"

hyprexpo/overview.hpp

@@ -9,43 +9,40 @@
 #include <hyprland/src/managers/HookSystemManager.hpp>
 #include <vector>
 
+#include "IOverview.hpp"
+
 // saves on resources, but is a bit broken rn with blur.
 // hyprland's fault, but cba to fix.
 constexpr bool ENABLE_LOWRES = false;
 
 class CMonitor;
 
-class COverview {
+class COverview : public IOverview {
   public:
     COverview(PHLWORKSPACE startedOn_, bool swipe = false);
-    ~COverview();
+    virtual ~COverview();
 
-    void render();
-    void damage();
-    void onDamageReported();
-    void onPreRender();
+    virtual void render();
+    virtual void damage();
+    virtual void onDamageReported();
+    virtual void onPreRender();
 
-    void setClosing(bool closing);
+    virtual void setClosing(bool closing);
 
-    void resetSwipe();
-    void onSwipeUpdate(double delta);
-    void onSwipeEnd();
+    virtual void resetSwipe();
+    virtual void onSwipeUpdate(double delta);
+    virtual void onSwipeEnd();
 
     // close without a selection
-    void          close();
-    void          selectHoveredWorkspace();
-
-    bool          blockOverviewRendering = false;
-    bool          blockDamageReporting   = false;
+    virtual void  close();
+    virtual void  selectHoveredWorkspace();
 
-    PHLMONITORREF pMonitor;
-    bool          m_isSwiping = false;
+  virtual void fullRender();
 
   private:
     void       redrawID(int id, bool forcelowres = false);
     void       redrawAll(bool forcelowres = false);
     void       onWorkspaceChange();
-    void       fullRender();
 
     int        SIDE_LENGTH = 3;
     int        GAP_WIDTH   = 5;
@@ -84,5 +81,3 @@ class COverview {
 
     friend class COverviewPassElement;
 };
-
-inline std::unique_ptr<COverview> g_pOverview;