From 56c3cff855587e4c0357461a66b21f4db325d5c0 Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 8 Mar 2022 20:14:01 +0100
Subject: [PATCH] EWMH desktop counting fix

---
 src/ewmh/ewmh.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ewmh/ewmh.cpp b/src/ewmh/ewmh.cpp
index dae2e25..40aa9c7 100644
--- a/src/ewmh/ewmh.cpp
+++ b/src/ewmh/ewmh.cpp
@@ -75,11 +75,11 @@ void EWMH::updateDesktops() {
     if (!g_pWindowManager->getMonitorFromCursor()) {
         Debug::log(ERR, "Monitor was null! (updateDesktops EWMH) Using LastWindow");
         if (const auto PWINDOW = g_pWindowManager->getWindowFromDrawable(g_pWindowManager->LastWindow); PWINDOW)
-            ACTIVEWORKSPACE = g_pWindowManager->activeWorkspaces[PWINDOW->getWorkspaceID()];
+            ACTIVEWORKSPACE = g_pWindowManager->activeWorkspaces[PWINDOW->getWorkspaceID()] - 1; // because xorg counts from zero
         else
             ACTIVEWORKSPACE = 0;
     } else {
-       ACTIVEWORKSPACE = g_pWindowManager->activeWorkspaces[g_pWindowManager->getMonitorFromCursor()->ID];
+       ACTIVEWORKSPACE = g_pWindowManager->activeWorkspaces[g_pWindowManager->getMonitorFromCursor()->ID] - 1;
     }
     
     if (DesktopInfo::lastid != ACTIVEWORKSPACE) {