Merge pull request #47 from Mr-Badger/fix/jump-to-active-window

Fix issue when trying to jump to active window or non existent virtual desktop
widavies · Aug 2, 2024 · dba1863 · dba1863
2 parents 37c9430 + 6ca1d3e
commit dba1863
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 2 deletions.
diff --git a/WinJump/Core/VirtualDesktopDefinitions/IVirtualDesktopAPI.cs b/WinJump/Core/VirtualDesktopDefinitions/IVirtualDesktopAPI.cs
@@ -20,6 +20,12 @@ public interface IVirtualDesktopAPI : IDisposable {
     /// <returns>0-indexed, where '0' is the first desktop</returns>
     int GetCurrentDesktop();
 
+    /// <summary>
+    /// Returns how many virtual desktops there are.
+    /// </summary>
+    /// <returns>Virtual desktop count</returns>
+    public int GetDesktopCount();
+
     /// <summary>
     /// Jumps to the virtual desktop.
     /// </summary>

diff --git a/WinJump/Core/VirtualDesktopDefinitions/Windows10_17763.cs b/WinJump/Core/VirtualDesktopDefinitions/Windows10_17763.cs
@@ -17,6 +17,10 @@ public int GetCurrentDesktop() {
                 return DesktopManager.GetCurrentDesktopNum();
             }
 
+            public int GetDesktopCount() {
+                return DesktopManager.GetDesktopCount();
+            }
+
             public void JumpToDesktop(int index) {
                 DesktopManager.SwitchDesktop(index);
             }
@@ -110,6 +114,10 @@ internal static int GetCurrentDesktopNum() {
                 return GetIndex(vd);
             }
 
+            internal static int GetDesktopCount() {
+                return VirtualDesktopManagerInternal.GetCount();
+            }
+
             internal static void MoveCurrentlyFocusedToDesktop(int index) {
                 int processId;
                 IntPtr hWnd = GetForegroundWindow();

diff --git a/WinJump/Core/VirtualDesktopDefinitions/Windows11_22000.cs b/WinJump/Core/VirtualDesktopDefinitions/Windows11_22000.cs
@@ -17,6 +17,10 @@ public int GetCurrentDesktop() {
                 return DesktopManager.GetCurrentDesktopNum();
             }
 
+            public int GetDesktopCount() {
+                return DesktopManager.GetDesktopCount();
+            }
+
             public void JumpToDesktop(int index) {
                 DesktopManager.SwitchDesktop(index);
             }
@@ -110,6 +114,10 @@ internal static int GetCurrentDesktopNum() {
                 return GetIndex(vd);
             }
 
+            internal static int GetDesktopCount() {
+                return VirtualDesktopManagerInternal.GetCount(IntPtr.Zero);
+            }
+
             internal static void MoveCurrentlyFocusedToDesktop(int index) {
                 int processId;
                 IntPtr hWnd = GetForegroundWindow();

diff --git a/WinJump/Core/VirtualDesktopDefinitions/Windows11_22621.cs b/WinJump/Core/VirtualDesktopDefinitions/Windows11_22621.cs
@@ -17,6 +17,10 @@ public int GetCurrentDesktop() {
                 return DesktopManager.GetCurrentDesktopNum();
             }
 
+            public int GetDesktopCount() {
+                return DesktopManager.GetDesktopCount();
+            }
+
             public void JumpToDesktop(int index) {
                 DesktopManager.SwitchDesktop(index);
             }
@@ -107,6 +111,10 @@ internal static int GetCurrentDesktopNum() {
 
                 return GetIndex(vd);
             }
+
+            internal static int GetDesktopCount() {
+                return VirtualDesktopManagerInternal.GetCount(IntPtr.Zero);
+            }
 
             internal static void MoveCurrentlyFocusedToDesktop(int index) {
                 int processId;

diff --git a/WinJump/Core/VirtualDesktopDefinitions/Windows11_22621_2215.cs b/WinJump/Core/VirtualDesktopDefinitions/Windows11_22621_2215.cs
@@ -17,6 +17,10 @@ public int GetCurrentDesktop() {
                 return DesktopManager.GetCurrentDesktopNum();
             }
 
+            public int GetDesktopCount() {
+                return DesktopManager.GetDesktopCount();
+            }
+
             public void JumpToDesktop(int index) {
                 DesktopManager.SwitchDesktop(index);
             }
@@ -110,6 +114,10 @@ internal static int GetCurrentDesktopNum() {
                 return GetIndex(vd);
             }
 
+            internal static int GetDesktopCount() {
+                return VirtualDesktopManagerInternal.GetCount();
+            }
+
             internal static void MoveCurrentlyFocusedToDesktop(int index) {
                 int processId;
                 IntPtr hWnd = GetForegroundWindow();

diff --git a/WinJump/Core/VirtualDesktopDefinitions/Windows11_22631_3085.cs b/WinJump/Core/VirtualDesktopDefinitions/Windows11_22631_3085.cs
@@ -17,6 +17,10 @@ public int GetCurrentDesktop() {
                 return DesktopManager.GetCurrentDesktopNum();
             }
 
+            public int GetDesktopCount() {
+                return DesktopManager.GetDesktopCount();
+            }
+
             public void JumpToDesktop(int index) {
                 DesktopManager.SwitchDesktop(index);
             }
@@ -110,6 +114,10 @@ internal static int GetCurrentDesktopNum() {
                 return GetIndex(vd);
             }
 
+            internal static int GetDesktopCount() {
+                return VirtualDesktopManagerInternal.GetCount();
+            }
+
             internal static void MoveCurrentlyFocusedToDesktop(int index) {
                 int processId;
                 IntPtr hWnd = GetForegroundWindow();

diff --git a/WinJump/Core/WinJumpManager.cs b/WinJump/Core/WinJumpManager.cs
@@ -251,9 +251,24 @@ public void JumpTo(uint index, uint fallback) {
     }
 
     public void JumpTo(uint index) {
+
+        var allowJump = true;
         WrapCall(() => {
-            api.JumpToDesktop((int) index);
-        }, true);
+            // If the desktop is the same as the current one or doesn't exist, don't allow the jump
+            if(api.GetCurrentDesktop() == index) {
+                allowJump = false;
+            }
+            else if(index >= api.GetDesktopCount())
+            {
+                allowJump = false;
+            }
+        });
+
+        if(allowJump) {
+            WrapCall(() => {
+                api.JumpToDesktop((int) index);
+            }, true);
+        }
     }
 
     public void JumpToNoHack(uint index) {