properly software lock cursors with zoom_factor

hyprwm · Jun 12, 2024 · 33d613f · 33d613f
1 parent 8412ffc
commit 33d613f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp
@@ -150,6 +150,20 @@ CPointerManager::CPointerManager() {
     });
 }
 
+void CPointerManager::lockSoftwareAll() {
+    for (auto& state : monitorStates)
+        state->softwareLocks++;
+
+    updateCursorBackend();
+}
+
+void CPointerManager::unlockSoftwareAll() {
+    for (auto& state : monitorStates)
+        state->softwareLocks--;
+
+    updateCursorBackend();
+}
+
 void CPointerManager::lockSoftwareForMonitor(SP<CMonitor> mon) {
     auto state = stateFor(mon);
     state->softwareLocks++;

diff --git a/src/managers/PointerManager.hpp b/src/managers/PointerManager.hpp
@@ -43,6 +43,8 @@ class CPointerManager {
 
     void lockSoftwareForMonitor(SP<CMonitor> pMonitor);
     void unlockSoftwareForMonitor(SP<CMonitor> pMonitor);
+    void lockSoftwareAll();
+    void unlockSoftwareAll();
 
     void renderSoftwareCursorsFor(SP<CMonitor> pMonitor, timespec* now, CRegion& damage /* logical */, std::optional<Vector2D> overridePos = {} /* monitor-local */);
 

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
@@ -1253,6 +1253,15 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
 
     TRACY_GPU_ZONE("Render");
 
+    static bool zoomLock = false;
+    if (zoomLock && *PZOOMFACTOR == 1.f) {
+        g_pPointerManager->unlockSoftwareAll();
+        zoomLock = false;
+    } else if (!zoomLock && *PZOOMFACTOR != 1.f) {
+        g_pPointerManager->lockSoftwareAll();
+        zoomLock = true;
+    }
+
     if (pMonitor == g_pCompositor->getMonitorFromCursor())
         g_pHyprOpenGL->m_RenderData.mouseZoomFactor = std::clamp(*PZOOMFACTOR, 1.f, INFINITY);
     else
@@ -1265,10 +1274,6 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
         pMonitor->forceFullFrames                      = 10;
     }
 
-    bool lockSoftware = pMonitor == g_pCompositor->getMonitorFromCursor() && *PZOOMFACTOR != 1.f;
-    if (lockSoftware)
-        g_pPointerManager->lockSoftwareForMonitor(pMonitor->self.lock());
-
     CRegion damage, finalDamage;
     if (!beginRender(pMonitor, damage, RENDER_MODE_NORMAL)) {
         Debug::log(ERR, "renderer: couldn't beginRender()!");
@@ -1370,9 +1375,6 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
 
     endRender();
 
-    if (lockSoftware)
-        g_pPointerManager->unlockSoftwareForMonitor(pMonitor->self.lock());
-
     TRACY_GPU_COLLECT;
 
     if (!pMonitor->mirrors.empty()) {