Skip to content

Commit c601d38

Browse files
MScholtesMScholtes
authored
Update to V1.19
1 parent d4324cc commit c601d38

8 files changed

+79
-331
lines changed

‎Changes.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changes:
22

3+
Version 1.19, 2024-09-01
4+
- faster API call FindWindow instead of EnumWindows
5+
- Windows 11: animated switch to new desktop
6+
37
Version 1.18, 2024-06-16
48
- quiet mode for parameter /RemoveAll
59
- version for Windows 11 24H2 Insider

‎README.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ C# command line tool to manage virtual desktops in Windows 10 and Windows 11
33

44
**Pre-compiled binaries in Releases now**
55

6-
**Version 1.18, 2024-06-16**
7-
- quiet mode for parameter /RemoveAll
8-
- version for Windows 11 24H2 Insider
9-
- removed unnecessary version for Windows 11 22H2
6+
**Version 1.19, 2024-09-01**
7+
- faster API call FindWindow instead of EnumWindows
8+
- Windows 11: animated switch to new desktop
109

1110
(look for a powershell version here: https://github.com/MScholtes/PSVirtualDesktop or here: https://www.powershellgallery.com/packages/VirtualDesktop)
1211

‎ReadMe.txt

+4-5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,12 @@ VirtualDesktop
55

66
C# command line tool to manage virtual desktops in Windows 10 and Windows 11
77

8-
Version 1.18, 2024-06-16
9-
- quiet mode for parameter /RemoveAll
10-
- version for Windows 11 24H2 Insider
11-
- removed unnecessary version for Windows 11 22H2
8+
Version 1.19, 2024-09-01
9+
- faster API call FindWindow instead of EnumWindows
10+
- Windows 11: animated switch to new desktop
1211

1312
(look for a powershell version here:
14-
https://gallery.technet.microsoft.com/Powershell-commands-to-d0e79cc5
13+
https://github.com/MScholtes/PSVirtualDesktop
1514
or here:
1615
https://www.powershellgallery.com/packages/VirtualDesktop)
1716

‎VirtualDesktop.cs

+14-64
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Author: Markus Scholtes, 2024
2-
// Version 1.18, 2024-06-16
2+
// Version 1.19, 2024-09-01
33
// Version for Windows 10 1809 to 22H2
44
// Compile with:
55
// C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe VirtualDesktop.cs
@@ -20,8 +20,8 @@
2020
[assembly:AssemblyCopyright("© Markus Scholtes 2024")]
2121
[assembly:AssemblyTrademark("")]
2222
[assembly:AssemblyCulture("")]
23-
[assembly:AssemblyVersion("1.18.0.0")]
24-
[assembly:AssemblyFileVersion("1.18.0.0")]
23+
[assembly:AssemblyVersion("1.19.0.0")]
24+
[assembly:AssemblyFileVersion("1.19.0.0")]
2525

2626
// Based on http://stackoverflow.com/a/32417530, Windows 10 SDK, github project Grabacr07/VirtualDesktop and own research
2727

@@ -325,14 +325,12 @@ internal static string GetAppId(IntPtr hWnd)
325325
#endregion
326326

327327
#region public interface
328-
public class WindowInformation
329-
{ // stores window informations
330-
public string Title { get; set; }
331-
public int Handle { get; set; }
332-
}
333-
334328
public class Desktop
335329
{
330+
// get window handle to class and window name
331+
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
332+
private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
333+
336334
// get process id to window handle
337335
[DllImport("user32.dll")]
338336
private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
@@ -507,7 +505,7 @@ public static void RemoveAll()
507505
{ // remove all desktops but visible
508506
int desktopcount = DesktopManager.VirtualDesktopManagerInternal.GetCount();
509507
int desktopcurrent = DesktopManager.GetDesktopIndex(DesktopManager.VirtualDesktopManagerInternal.GetCurrentDesktop());
510-
508+
511509
if (desktopcurrent < desktopcount-1)
512510
{ // remove all desktops "right" from current
513511
for (int i = desktopcount-1; i > desktopcurrent; i--)
@@ -535,27 +533,27 @@ public bool IsVisible
535533

536534
public void MakeVisible()
537535
{ // make this desktop visible
538-
WindowInformation wi = FindWindow("Program Manager");
536+
IntPtr hWnd = FindWindow("Progman", "Program Manager");
539537

540538
// activate desktop to prevent flashing icons in taskbar
541539
int dummy;
542-
uint DesktopThreadId = GetWindowThreadProcessId(new IntPtr(wi.Handle), out dummy);
540+
uint DesktopThreadId = GetWindowThreadProcessId(hWnd, out dummy);
543541
uint ForegroundThreadId = GetWindowThreadProcessId(GetForegroundWindow(), out dummy);
544542
uint CurrentThreadId = GetCurrentThreadId();
545543

546544
if ((DesktopThreadId != 0) && (ForegroundThreadId != 0) && (ForegroundThreadId != CurrentThreadId))
547545
{
548546
AttachThreadInput(DesktopThreadId, CurrentThreadId, true);
549547
AttachThreadInput(ForegroundThreadId, CurrentThreadId, true);
550-
SetForegroundWindow(new IntPtr(wi.Handle));
548+
SetForegroundWindow(hWnd);
551549
AttachThreadInput(ForegroundThreadId, CurrentThreadId, false);
552550
AttachThreadInput(DesktopThreadId, CurrentThreadId, false);
553551
}
554552

555553
DesktopManager.VirtualDesktopManagerInternal.SwitchDesktop(ivd);
556554

557555
// direct desktop to give away focus
558-
ShowWindow(new IntPtr(wi.Handle), SW_MINIMIZE);
556+
ShowWindow(hWnd, SW_MINIMIZE);
559557
}
560558

561559
public Desktop Left
@@ -685,55 +683,6 @@ public static void UnpinApplication(IntPtr hWnd)
685683
DesktopManager.VirtualDesktopPinnedApps.UnpinAppID(appId);
686684
}
687685
}
688-
689-
// prepare callback function for window enumeration
690-
private delegate bool CallBackPtr(int hwnd, int lParam);
691-
private static CallBackPtr callBackPtr = Callback;
692-
// list of window informations
693-
private static List<WindowInformation> WindowInformationList = new List<WindowInformation>();
694-
695-
// enumerate windows
696-
[DllImport("User32.dll", SetLastError = true)]
697-
[return: MarshalAs(UnmanagedType.Bool)]
698-
private static extern bool EnumWindows(CallBackPtr lpEnumFunc, IntPtr lParam);
699-
700-
// get window title length
701-
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
702-
private static extern int GetWindowTextLength(IntPtr hWnd);
703-
704-
// get window title
705-
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
706-
private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
707-
708-
// callback function for window enumeration
709-
private static bool Callback(int hWnd, int lparam)
710-
{
711-
int length = GetWindowTextLength((IntPtr)hWnd);
712-
if (length > 0)
713-
{
714-
StringBuilder sb = new StringBuilder(length + 1);
715-
if (GetWindowText((IntPtr)hWnd, sb, sb.Capacity) > 0)
716-
{ WindowInformationList.Add(new WindowInformation {Handle = hWnd, Title = sb.ToString()}); }
717-
}
718-
return true;
719-
}
720-
721-
// get list of all windows with title
722-
public static List<WindowInformation> GetWindows()
723-
{
724-
WindowInformationList = new List<WindowInformation>();
725-
EnumWindows(callBackPtr, IntPtr.Zero);
726-
return WindowInformationList;
727-
}
728-
729-
// find first window with string in title
730-
public static WindowInformation FindWindow(string WindowTitle)
731-
{
732-
WindowInformationList = new List<WindowInformation>();
733-
EnumWindows(callBackPtr, IntPtr.Zero);
734-
WindowInformation result = WindowInformationList.Find(x => x.Title.IndexOf(WindowTitle, StringComparison.OrdinalIgnoreCase) >= 0);
735-
return result;
736-
}
737686
}
738687
#endregion
739688
}
@@ -743,6 +692,7 @@ namespace VDeskTool
743692
{
744693
static class Program
745694
{
695+
746696
static bool verbose = true;
747697
static bool breakonerror = true;
748698
static bool wrapdesktops = false;
@@ -2572,7 +2522,7 @@ private static void InsertDesktop(int InsertIndex1, int InsertIndex2)
25722522

25732523
static void HelpScreen()
25742524
{
2575-
Console.WriteLine("VirtualDesktop.exe\t\t\t\tMarkus Scholtes, 2024, v1.18\n");
2525+
Console.WriteLine("VirtualDesktop.exe\t\t\t\tMarkus Scholtes, 2024, v1.19\n");
25762526

25772527
Console.WriteLine("Command line tool to manage the virtual desktops of Windows 10.");
25782528
Console.WriteLine("Parameters can be given as a sequence of commands. The result - most of the");

‎VirtualDesktop11-24H2.cs

+14-65
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Author: Markus Scholtes, 2024
2-
// Version 1.18, 2024-06-16
2+
// Version 1.19, 2024-09-01
33
// Version for Windows 11 24H2 Insider
44
// Compile with:
55
// C:\Windows\Microsoft.NET\Framework\v4.0.30319\csc.exe VirtualDesktop11-24H2.cs
@@ -20,8 +20,8 @@
2020
[assembly:AssemblyCopyright("© Markus Scholtes 2024")]
2121
[assembly:AssemblyTrademark("")]
2222
[assembly:AssemblyCulture("")]
23-
[assembly:AssemblyVersion("1.18.0.0")]
24-
[assembly:AssemblyFileVersion("1.18.0.0")]
23+
[assembly:AssemblyVersion("1.19.0.0")]
24+
[assembly:AssemblyFileVersion("1.19.0.0")]
2525

2626
// Based on http://stackoverflow.com/a/32417530, Windows 10 SDK, github project Grabacr07/VirtualDesktop and own research
2727

@@ -296,14 +296,12 @@ internal static string GetAppId(IntPtr hWnd)
296296
#endregion
297297

298298
#region public interface
299-
public class WindowInformation
300-
{ // stores window informations
301-
public string Title { get; set; }
302-
public int Handle { get; set; }
303-
}
304-
305299
public class Desktop
306300
{
301+
// get window handle to class and window name
302+
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
303+
private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
304+
307305
// get process id to window handle
308306
[DllImport("user32.dll")]
309307
private static extern uint GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
@@ -488,7 +486,7 @@ public static void RemoveAll()
488486
{ // remove all desktops but visible
489487
int desktopcount = DesktopManager.VirtualDesktopManagerInternal.GetCount();
490488
int desktopcurrent = DesktopManager.GetDesktopIndex(DesktopManager.VirtualDesktopManagerInternal.GetCurrentDesktop());
491-
489+
492490
if (desktopcurrent < desktopcount-1)
493491
{ // remove all desktops "right" from current
494492
for (int i = desktopcount-1; i > desktopcurrent; i--)
@@ -530,27 +528,27 @@ public bool IsVisible
530528

531529
public void MakeVisible()
532530
{ // make this desktop visible
533-
WindowInformation wi = FindWindow("Program Manager");
531+
IntPtr hWnd = FindWindow("Progman", "Program Manager");
534532

535533
// activate desktop to prevent flashing icons in taskbar
536534
int dummy;
537-
uint DesktopThreadId = GetWindowThreadProcessId(new IntPtr(wi.Handle), out dummy);
535+
uint DesktopThreadId = GetWindowThreadProcessId(hWnd, out dummy);
538536
uint ForegroundThreadId = GetWindowThreadProcessId(GetForegroundWindow(), out dummy);
539537
uint CurrentThreadId = GetCurrentThreadId();
540538

541539
if ((DesktopThreadId != 0) && (ForegroundThreadId != 0) && (ForegroundThreadId != CurrentThreadId))
542540
{
543541
AttachThreadInput(DesktopThreadId, CurrentThreadId, true);
544542
AttachThreadInput(ForegroundThreadId, CurrentThreadId, true);
545-
SetForegroundWindow(new IntPtr(wi.Handle));
543+
SetForegroundWindow(hWnd);
546544
AttachThreadInput(ForegroundThreadId, CurrentThreadId, false);
547545
AttachThreadInput(DesktopThreadId, CurrentThreadId, false);
548546
}
549547

550-
DesktopManager.VirtualDesktopManagerInternal.SwitchDesktop(ivd);
548+
DesktopManager.VirtualDesktopManagerInternal.SwitchDesktopWithAnimation(ivd);
551549

552550
// direct desktop to give away focus
553-
ShowWindow(new IntPtr(wi.Handle), SW_MINIMIZE);
551+
ShowWindow(hWnd, SW_MINIMIZE);
554552
}
555553

556554
public Desktop Left
@@ -680,55 +678,6 @@ public static void UnpinApplication(IntPtr hWnd)
680678
DesktopManager.VirtualDesktopPinnedApps.UnpinAppID(appId);
681679
}
682680
}
683-
684-
// prepare callback function for window enumeration
685-
private delegate bool CallBackPtr(int hwnd, int lParam);
686-
private static CallBackPtr callBackPtr = Callback;
687-
// list of window informations
688-
private static List<WindowInformation> WindowInformationList = new List<WindowInformation>();
689-
690-
// enumerate windows
691-
[DllImport("User32.dll", SetLastError = true)]
692-
[return: MarshalAs(UnmanagedType.Bool)]
693-
private static extern bool EnumWindows(CallBackPtr lpEnumFunc, IntPtr lParam);
694-
695-
// get window title length
696-
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
697-
private static extern int GetWindowTextLength(IntPtr hWnd);
698-
699-
// get window title
700-
[DllImport("User32.dll", CharSet = CharSet.Auto, SetLastError = true)]
701-
private static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
702-
703-
// callback function for window enumeration
704-
private static bool Callback(int hWnd, int lparam)
705-
{
706-
int length = GetWindowTextLength((IntPtr)hWnd);
707-
if (length > 0)
708-
{
709-
StringBuilder sb = new StringBuilder(length + 1);
710-
if (GetWindowText((IntPtr)hWnd, sb, sb.Capacity) > 0)
711-
{ WindowInformationList.Add(new WindowInformation {Handle = hWnd, Title = sb.ToString()}); }
712-
}
713-
return true;
714-
}
715-
716-
// get list of all windows with title
717-
public static List<WindowInformation> GetWindows()
718-
{
719-
WindowInformationList = new List<WindowInformation>();
720-
EnumWindows(callBackPtr, IntPtr.Zero);
721-
return WindowInformationList;
722-
}
723-
724-
// find first window with string in title
725-
public static WindowInformation FindWindow(string WindowTitle)
726-
{
727-
WindowInformationList = new List<WindowInformation>();
728-
EnumWindows(callBackPtr, IntPtr.Zero);
729-
WindowInformation result = WindowInformationList.Find(x => x.Title.IndexOf(WindowTitle, StringComparison.OrdinalIgnoreCase) >= 0);
730-
return result;
731-
}
732681
}
733682
#endregion
734683
}
@@ -2542,7 +2491,7 @@ private static void SwapDesktops(int SwapIndex1, int SwapIndex2)
25422491

25432492
static void HelpScreen()
25442493
{
2545-
Console.WriteLine("VirtualDesktop.exe\t\t\t\tMarkus Scholtes, 2024, v1.18\n");
2494+
Console.WriteLine("VirtualDesktop.exe\t\t\t\tMarkus Scholtes, 2024, v1.19\n");
25462495

25472496
Console.WriteLine("Command line tool to manage the virtual desktops of Windows 11.");
25482497
Console.WriteLine("Parameters can be given as a sequence of commands. The result - most of the");

0 commit comments

Comments
 (0)