Add disable option for Gliding Cursor feature

Co-authored-by: vanzue <69313318+vanzue@users.noreply.github.com>

.github/actions/spell-check/expect.txt

@@ -27,6 +27,7 @@ admx
 advancedpaste
 advancedpasteui
 advancedpasteuishortcut
+advapi
 advfirewall
 AFeature
 affordances

.github/workflows/automatic-issue-deduplication.yml

@@ -0,0 +1,19 @@
+name: Automatic New Issue Deduplication
+on:
+  issues:
+    types: [opened, reopened]
+permissions:
+  models: read
+  issues: write
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+  cancel-in-progress: true
+jobs:
+  deduplicate:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Run Deduplicate Action
+        uses: pelikhan/action-genai-issue-dedup@v0
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          label_as_duplicate: true

src/modules/MouseUtils/MousePointerCrosshairs/dllmain.cpp

@@ -33,6 +33,7 @@ namespace
     const wchar_t JSON_KEY_AUTO_ACTIVATE[] = L"auto_activate";
     const wchar_t JSON_KEY_GLIDE_TRAVEL_SPEED[] = L"gliding_travel_speed";
     const wchar_t JSON_KEY_GLIDE_DELAY_SPEED[] = L"gliding_delay_speed";
+    const wchar_t JSON_KEY_GLIDING_CURSOR_ENABLED[] = L"gliding_cursor_enabled";
 }
 
 extern "C" IMAGE_DOS_HEADER __ImageBase;
@@ -106,6 +107,9 @@ private:
     // Gliding cursor state machine
     std::atomic<int> m_glideState{ 0 }; // 0..4 like the AHK script
 
+    // Gliding cursor enabled state
+    bool m_glidingCursorEnabled = true;
+
     // Timer configuration: 10ms tick, speeds are defined per 200ms base window
     static constexpr int kTimerTickMs = 10;
     static constexpr int kBaseSpeedTickMs = 200; // mapping period for configured pixel counts
@@ -387,6 +391,11 @@ private:
 
     void HandleGlidingHotkey()
     {
+        if (!m_glidingCursorEnabled)
+        {
+            return;
+        }
+        
         auto s = m_state;
         if (!s)
         {
@@ -734,6 +743,17 @@ private:
                     m_state->slowVSpeed = 5;
                 }
             }
+            try
+            {
+                // Parse Gliding Cursor Enabled
+                auto jsonPropertiesObject = settingsObject.GetNamedObject(JSON_KEY_PROPERTIES).GetNamedObject(JSON_KEY_GLIDING_CURSOR_ENABLED);
+                m_glidingCursorEnabled = jsonPropertiesObject.GetNamedBoolean(JSON_KEY_VALUE);
+            }
+            catch (...)
+            {
+                Logger::info("Failed to initialize gliding cursor enabled from settings. Using default true.");
+                m_glidingCursorEnabled = true;
+            }
         }
         else
         {

src/modules/MouseWithoutBorders/App/Class/Common.InitAndCleanup.cs

@@ -1,284 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// The Microsoft Corporation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Security.Cryptography;
-using System.Threading;
-
-// <summary>
-//     Initialization and clean up.
-// </summary>
-// <history>
-//     2008 created by Truong Do (ductdo).
-//     2009-... modified by Truong Do (TruongDo).
-//     2023- Included in PowerToys.
-// </history>
-using Microsoft.Win32;
-using MouseWithoutBorders.Class;
-using MouseWithoutBorders.Core;
-using MouseWithoutBorders.Form;
-using Windows.UI.Input.Preview.Injection;
-
-using Thread = MouseWithoutBorders.Core.Thread;
-
-namespace MouseWithoutBorders
-{
-    internal partial class Common
-    {
-        private static bool initDone;
-        internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
-        internal static int REOPEN_WHEN_HOTKEY = -10055;
-        internal static int PleaseReopenSocket;
-        internal static bool ReopenSocketDueToReadError;
-
-        internal static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
-
-        internal static bool InitDone
-        {
-            get => Common.initDone;
-            set => Common.initDone = value;
-        }
-
-        internal static void UpdateMachineTimeAndID()
-        {
-            Common.MachineName = Common.MachineName.Trim();
-            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-        }
-
-        private static void InitializeMachinePoolFromSettings()
-        {
-            try
-            {
-                MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
-                for (int i = 0; i < info.Length; i++)
-                {
-                    info[i].Name = info[i].Name.Trim();
-                }
-
-                MachineStuff.MachinePool.Initialize(info);
-                MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
-            }
-            catch (Exception ex)
-            {
-                Logger.Log(ex);
-                MachineStuff.MachinePool.Clear();
-            }
-        }
-
-        internal static void SetupMachineNameAndID()
-        {
-            try
-            {
-                GetMachineName();
-                DesMachineID = MachineStuff.NewDesMachineID = MachineID;
-
-                // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
-                InitializeMachinePoolFromSettings();
-
-                Common.MachineName = Common.MachineName.Trim();
-                _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
-                _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
-
-                MachineStuff.UpdateMachinePoolStringSetting();
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-            }
-        }
-
-        internal static void Init()
-        {
-            _ = Helper.GetUserName();
-            Common.GeneratedKey = true;
-
-            try
-            {
-                Common.MyKey = Setting.Values.MyKey;
-                int tmp = Setting.Values.MyKeyDaysToExpire;
-            }
-            catch (FormatException e)
-            {
-                Common.KeyCorrupted = true;
-                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-                Logger.Log(e.Message);
-            }
-            catch (CryptographicException e)
-            {
-                Common.KeyCorrupted = true;
-                Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
-                Logger.Log(e.Message);
-            }
-
-            try
-            {
-                InputSimulation.Injector = InputInjector.TryCreate();
-                if (InputSimulation.Injector != null)
-                {
-                    InputSimulation.MoveMouseRelative(0, 0);
-                    NativeMethods.InjectMouseInputAvailable = true;
-                }
-            }
-            catch (EntryPointNotFoundException)
-            {
-                NativeMethods.InjectMouseInputAvailable = false;
-                Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
-            }
-
-            bool dummy = Setting.Values.DrawMouseEx;
-            Is64bitOS = IntPtr.Size == 8;
-            tcpPort = Setting.Values.TcpPort;
-            GetScreenConfig();
-            PackageSent = new PackageMonitor(0);
-            PackageReceived = new PackageMonitor(0);
-            SetupMachineNameAndID();
-            InitEncryption();
-            CreateHelperThreads();
-
-            SystemEvents.DisplaySettingsChanged += new EventHandler(SystemEvents_DisplaySettingsChanged);
-            NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
-            SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
-            PleaseReopenSocket = 9;
-            /* TODO: Telemetry for the matrix? */
-        }
-
-        private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
-        {
-            Helper.WndProcCounter++;
-
-            if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
-            {
-                Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
-                LastResumeSuspendTime = DateTime.UtcNow;
-                MachineStuff.SwitchToMultipleMode(false, true);
-            }
-        }
-
-        private static void CreateHelperThreads()
-        {
-            // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
-            /*
-            Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
-            watchDogThread.Priority = ThreadPriority.Highest;
-            watchDogThread.Start();
-            */
-
-            helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
-            helper.SetApartmentState(ApartmentState.STA);
-            helper.Start();
-        }
-
-        private static void AskHelperThreadsToExit(int waitTime)
-        {
-            Helper.signalHelperToExit = true;
-            Helper.signalWatchDogToExit = true;
-            _ = EvSwitch.Set();
-
-            int c = 0;
-            if (helper != null && c < waitTime)
-            {
-                while (Helper.signalHelperToExit)
-                {
-                    Thread.Sleep(1);
-                }
-
-                helper = null;
-            }
-        }
-
-        internal static void Cleanup()
-        {
-            try
-            {
-                SendByeBye();
-
-                // UnhookClipboard();
-                AskHelperThreadsToExit(500);
-                MainForm.NotifyIcon.Visible = false;
-                MainForm.NotifyIcon.Dispose();
-                CloseAllFormsAndHooks();
-
-                DoSomethingInUIThread(() =>
-                {
-                    Sk?.Close(true);
-                });
-            }
-            catch (Exception e)
-            {
-                Logger.Log(e);
-            }
-        }
-
-        private static long lastReleaseAllKeysCall;
-
-        internal static void ReleaseAllKeys()
-        {
-            if (Math.Abs(GetTick() - lastReleaseAllKeysCall) < 2000)
-            {
-                return;
-            }
-
-            lastReleaseAllKeysCall = GetTick();
-
-            KEYBDDATA kd;
-            kd.dwFlags = (int)LLKHF.UP;
-
-            VK[] keys = new VK[]
-            {
-                VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
-                VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
-            };
-
-            Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
-
-            foreach (VK vk in keys)
-            {
-                if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
-                {
-                    Logger.LogDebug(vk.ToString() + " is down, release it...");
-                    Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
-                    kd.wVk = (int)vk;
-                    InputSimulation.SendKey(kd);
-                    Hook?.ResetLastSwitchKeys();
-                }
-            }
-        }
-
-        private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
-        {
-            Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
-            Helper.WndProcCounter++;
-            ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
-        }
-
-        private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
-        {
-            if (closeSockets)
-            {
-                // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
-                // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
-                DoSomethingInUIThread(
-                    () =>
-                {
-                    SocketStuff s = Sk;
-                    Sk = null;
-                    s?.Close(false);
-                },
-                    true);
-            }
-
-            if (!Common.IsMyDesktopActive())
-            {
-                PleaseReopenSocket = 0;
-            }
-            else if (PleaseReopenSocket != 10)
-            {
-                PleaseReopenSocket = 10;
-            }
-        }
-    }
-}

src/modules/MouseWithoutBorders/App/Class/Common.WinAPI.cs

@@ -36,7 +36,7 @@ namespace MouseWithoutBorders
 
         internal static string ActiveDesktop => Common.activeDesktop;
 
-        private static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
+        internal static void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
         {
             GetScreenConfig();
         }
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders
                         Setting.Values.LastX = JUST_GOT_BACK_FROM_SCREEN_SAVER;
                         if (cleanupIfExit)
                         {
-                            Common.Cleanup();
+                            InitAndCleanup.Cleanup();
                         }
 
                         Process.GetCurrentProcess().KillProcess();

src/modules/MouseWithoutBorders/App/Class/Common.cs

@@ -33,6 +33,7 @@ using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
 using MouseWithoutBorders.Exceptions;
 
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 // Log is enough
@@ -90,8 +91,8 @@ namespace MouseWithoutBorders
         private static FrmMatrix matrixForm;
         private static FrmInputCallback inputCallbackForm;
         private static FrmAbout aboutForm;
-        private static Thread helper;
 #pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static Thread helper;
         internal static int screenWidth;
         internal static int screenHeight;
 #pragma warning restore SA1307
@@ -121,7 +122,9 @@ namespace MouseWithoutBorders
         internal static int switchCount;
 #pragma warning restore SA1307
         private static long lastReconnectByHotKeyTime;
-        private static int tcpPort;
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case names
+        internal static int tcpPort;
+#pragma warning restore SA1307
         private static bool secondOpenSocketTry;
         private static string binaryName;
 
@@ -210,7 +213,7 @@ namespace MouseWithoutBorders
 
         internal static bool Is64bitOS
         {
-            get; private set;
+            get; set;
 
             // set { Common.is64bitOS = value; }
         }
@@ -611,7 +614,7 @@ namespace MouseWithoutBorders
         }
          * */
 
-        private static void SendByeBye()
+        internal static void SendByeBye()
         {
             Logger.LogDebug($"{nameof(SendByeBye)}");
             SendPackage(ID.ALL, PackageType.ByeBye);
@@ -725,7 +728,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(string machine, string file)
         {
-            LastDragDropFile = file;
+            Clipboard.LastDragDropFile = file;
 
             // Send ClipboardCapture
             if (machine.Equals("All", StringComparison.OrdinalIgnoreCase))
@@ -744,7 +747,7 @@ namespace MouseWithoutBorders
 
         internal static void SendImage(ID src, string file)
         {
-            LastDragDropFile = file;
+            Clipboard.LastDragDropFile = file;
 
             // Send ClipboardCapture
             SendPackage(src, PackageType.ClipboardCapture);
@@ -1291,7 +1294,7 @@ namespace MouseWithoutBorders
             });
         }
 
-        private static string GetMyStorageDir()
+        internal static string GetMyStorageDir()
         {
             string st = string.Empty;
 

src/modules/MouseWithoutBorders/App/Class/IClipboardHelper.cs

@@ -28,6 +28,7 @@ using MouseWithoutBorders.Core;
 
 using SystemClipboard = System.Windows.Forms.Clipboard;
 #if !MM_HELPER
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 #endif
 
@@ -159,7 +160,7 @@ namespace MouseWithoutBorders
 
         public void SendClipboardData(ByteArrayOrString data, bool isFilePath)
         {
-            _ = Common.CheckClipboardEx(data, isFilePath);
+            _ = Clipboard.CheckClipboardEx(data, isFilePath);
         }
     }
 #endif

src/modules/MouseWithoutBorders/App/Class/InputHook.cs

@@ -579,7 +579,7 @@ namespace MouseWithoutBorders.Class
             {
                 Common.ShowToolTip("Reconnecting...", 2000);
                 Common.LastReconnectByHotKeyTime = Common.GetTick();
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
                 return false;
             }
 
@@ -632,7 +632,7 @@ namespace MouseWithoutBorders.Class
                 {
                     // Common.DoSomethingInUIThread(delegate()
                     {
-                        Common.ReleaseAllKeys();
+                        InitAndCleanup.ReleaseAllKeys();
                     }
 
                     // );

src/modules/MouseWithoutBorders/App/Class/InputSimulation.cs

@@ -407,7 +407,7 @@ namespace MouseWithoutBorders.Class
                     {
                         ResetModifiersState(Setting.Values.HotKeyLockMachine);
                         eatKey = true;
-                        Common.ReleaseAllKeys();
+                        InitAndCleanup.ReleaseAllKeys();
                         _ = NativeMethods.LockWorkStation();
                     }
                 }
@@ -439,7 +439,7 @@ namespace MouseWithoutBorders.Class
                         {
                             ctrlDown = altDown = false;
                             eatKey = true;
-                            Common.ReleaseAllKeys();
+                            InitAndCleanup.ReleaseAllKeys();
                         }
 
                         break;
@@ -449,7 +449,7 @@ namespace MouseWithoutBorders.Class
                         {
                             winDown = false;
                             eatKey = true;
-                            Common.ReleaseAllKeys();
+                            InitAndCleanup.ReleaseAllKeys();
                             uint rv = NativeMethods.LockWorkStation();
                             Logger.LogDebug("LockWorkStation returned " + rv.ToString(CultureInfo.CurrentCulture));
                         }

src/modules/MouseWithoutBorders/App/Class/Program.cs

@@ -235,7 +235,7 @@ namespace MouseWithoutBorders.Class
                 _ = Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
                 Application.SetCompatibleTextRenderingDefault(false);
 
-                Common.Init();
+                InitAndCleanup.Init();
                 Core.Helper.WndProcCounter++;
 
                 var formScreen = new FrmScreen();
@@ -314,7 +314,7 @@ namespace MouseWithoutBorders.Class
                 MachineStuff.UpdateMachinePoolStringSetting();
 
                 SocketStuff.InvalidKeyFound = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
                 MachineStuff.SendMachineMatrix();
 
@@ -340,7 +340,7 @@ namespace MouseWithoutBorders.Class
             public void Reconnect()
             {
                 SocketStuff.InvalidKeyFound = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -397,7 +397,7 @@ namespace MouseWithoutBorders.Class
             using var asyncFlowControl = ExecutionContext.SuppressFlow();
 
             Common.InputCallbackThreadID = Thread.CurrentThread.ManagedThreadId;
-            while (!Common.InitDone)
+            while (!InitAndCleanup.InitDone)
             {
                 Thread.Sleep(100);
             }

src/modules/MouseWithoutBorders/App/Class/Setting.cs

@@ -118,7 +118,7 @@ namespace MouseWithoutBorders.Class
                         if (shouldReopenSockets)
                         {
                             SocketStuff.InvalidKeyFound = false;
-                            Common.ReopenSocketDueToReadError = true;
+                            InitAndCleanup.ReopenSocketDueToReadError = true;
                             Common.ReopenSockets(true);
                         }
 

src/modules/MouseWithoutBorders/App/Class/SocketStuff.cs

@@ -29,6 +29,7 @@ using MouseWithoutBorders.Core;
 // </history>
 using MouseWithoutBorders.Exceptions;
 
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Thread = MouseWithoutBorders.Core.Thread;
 
 [module: SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Scope = "member", Target = "MouseWithoutBorders.SocketStuff.#SendData(System.Byte[])", Justification = "Dotnet port with style preservation")]
@@ -281,7 +282,7 @@ namespace MouseWithoutBorders.Class
              * */
 
             Common.GetMachineName(); // IPs might have been changed
-            Common.UpdateMachineTimeAndID();
+            InitAndCleanup.UpdateMachineTimeAndID();
 
             Logger.LogDebug("Creating sockets...");
 
@@ -308,7 +309,7 @@ namespace MouseWithoutBorders.Class
                             {
                                 Logger.TelemetryLogTrace("Restarting the service dues to WSAEADDRINUSE.", SeverityLevel.Warning);
                                 Program.StartService();
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                             }
 
                             break;
@@ -1248,7 +1249,7 @@ namespace MouseWithoutBorders.Class
             // WSAECONNRESET
             if (e is ExpectedSocketException se && se.ShouldReconnect)
             {
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                 Logger.Log($"MainTCPRoutine: {nameof(FlagReopenSocketIfNeeded)}");
             }
         }
@@ -1306,7 +1307,7 @@ namespace MouseWithoutBorders.Class
             }
             catch (ObjectDisposedException e)
             {
-                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
+                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
                 UpdateTcpSockets(currentTcp, SocketStatus.ForceClosed);
                 currentSocket.Close();
                 Logger.Log($"{nameof(MainTCPRoutine)}: The socket could have been closed/disposed by other threads: {e.Message}");
@@ -1353,10 +1354,10 @@ namespace MouseWithoutBorders.Class
                              * In this case, we should give ONE try to reconnect.
                              */
 
-                            if (Common.ReopenSocketDueToReadError)
+                            if (InitAndCleanup.ReopenSocketDueToReadError)
                             {
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_WSAECONNRESET;
-                                Common.ReopenSocketDueToReadError = false;
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_WSAECONNRESET;
+                                InitAndCleanup.ReopenSocketDueToReadError = false;
                             }
 
                             break;
@@ -1641,7 +1642,7 @@ namespace MouseWithoutBorders.Class
 
                 bool clientPushData = true;
                 ClipboardPostAction postAction = ClipboardPostAction.Other;
-                bool handShaken = Common.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
+                bool handShaken = Clipboard.ShakeHand(ref remoteEndPoint, s, out Stream enStream, out Stream deStream, ref clientPushData, ref postAction);
 
                 if (!handShaken)
                 {
@@ -1656,7 +1657,7 @@ namespace MouseWithoutBorders.Class
 
                 if (clientPushData)
                 {
-                    Common.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
+                    Clipboard.ReceiveAndProcessClipboardData(remoteEndPoint, s, enStream, deStream, $"{postAction}");
                 }
                 else
                 {
@@ -1680,23 +1681,23 @@ namespace MouseWithoutBorders.Class
             const int CLOSE_TIMEOUT = 10;
             byte[] header = new byte[1024];
             string headerString = string.Empty;
-            if (Common.LastDragDropFile != null)
+            if (Clipboard.LastDragDropFile != null)
             {
                 string fileName = null;
 
                 if (!Launch.ImpersonateLoggedOnUserAndDoSomething(() =>
                 {
-                    if (!File.Exists(Common.LastDragDropFile))
+                    if (!File.Exists(Clipboard.LastDragDropFile))
                     {
-                        headerString = Directory.Exists(Common.LastDragDropFile)
-                            ? $"{0}*{Common.LastDragDropFile} - Folder is not supported, zip it first!"
-                            : Common.LastDragDropFile.Contains("- File too big")
-                                ? $"{0}*{Common.LastDragDropFile}"
-                                : $"{0}*{Common.LastDragDropFile} not found!";
+                        headerString = Directory.Exists(Clipboard.LastDragDropFile)
+                            ? $"{0}*{Clipboard.LastDragDropFile} - Folder is not supported, zip it first!"
+                            : Clipboard.LastDragDropFile.Contains("- File too big")
+                                ? $"{0}*{Clipboard.LastDragDropFile}"
+                                : $"{0}*{Clipboard.LastDragDropFile} not found!";
                     }
                     else
                     {
-                        fileName = Common.LastDragDropFile;
+                        fileName = Clipboard.LastDragDropFile;
                         headerString = $"{new FileInfo(fileName).Length}*{fileName}";
                     }
                 }))
@@ -1739,11 +1740,11 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (!Common.IsClipboardDataImage && Common.LastClipboardData != null)
+            else if (!Clipboard.IsClipboardDataImage && Clipboard.LastClipboardData != null)
             {
                 try
                 {
-                    byte[] data = Common.LastClipboardData;
+                    byte[] data = Clipboard.LastClipboardData;
 
                     headerString = $"{data.Length}*{"text"}";
                     Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1773,9 +1774,9 @@ namespace MouseWithoutBorders.Class
                     Logger.Log(log);
                 }
             }
-            else if (Common.LastClipboardData != null && Common.LastClipboardData.Length > 0)
+            else if (Clipboard.LastClipboardData != null && Clipboard.LastClipboardData.Length > 0)
             {
-                byte[] data = Common.LastClipboardData;
+                byte[] data = Clipboard.LastClipboardData;
 
                 headerString = $"{data.Length}*{"image"}";
                 Common.GetBytesU(headerString).CopyTo(header, 0);
@@ -1984,8 +1985,8 @@ namespace MouseWithoutBorders.Class
                             {
                                 tcp = null;
                                 Setting.Values.MachineId = Common.Ran.Next();
-                                Common.UpdateMachineTimeAndID();
-                                Common.PleaseReopenSocket = Common.REOPEN_WHEN_HOTKEY;
+                                InitAndCleanup.UpdateMachineTimeAndID();
+                                InitAndCleanup.PleaseReopenSocket = InitAndCleanup.REOPEN_WHEN_HOTKEY;
 
                                 Logger.TelemetryLogTrace("MachineID conflict.", SeverityLevel.Information);
                             }

src/modules/MouseWithoutBorders/App/Core/DragDrop.cs

@@ -83,7 +83,7 @@ internal static class DragDrop
         if (wParam == Common.WM_RBUTTONUP && IsDropping)
         {
             IsDropping = false;
-            Common.LastIDWithClipboardData = ID.NONE;
+            Clipboard.LastIDWithClipboardData = ID.NONE;
         }
     }
 
@@ -193,7 +193,7 @@ internal static class DragDrop
             {
                 if (!string.IsNullOrEmpty(dragFileName) && (File.Exists(dragFileName) || Directory.Exists(dragFileName)))
                 {
-                    Common.LastDragDropFile = dragFileName;
+                    Clipboard.LastDragDropFile = dragFileName;
                     /*
                      * possibleDropMachineID is used as desID sent in DragDropStep06();
                      * */
@@ -270,7 +270,7 @@ internal static class DragDrop
             else
             {
                 IsDragging = false;
-                Common.LastIDWithClipboardData = ID.NONE;
+                Clipboard.LastIDWithClipboardData = ID.NONE;
             }
         }
     }
@@ -280,7 +280,7 @@ internal static class DragDrop
         Logger.LogDebug("DragDropStep10: Hide the form and get data...");
         IsDropping = false;
         IsDragging = false;
-        Common.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {
@@ -288,7 +288,7 @@ internal static class DragDrop
         });
 
         PowerToysTelemetry.Log.WriteEvent(new MouseWithoutBorders.Telemetry.MouseWithoutBordersDragAndDropEvent());
-        Common.GetRemoteClipboard("desktop");
+        Clipboard.GetRemoteClipboard("desktop");
     }
 
     internal static void DragDropStep11()
@@ -298,8 +298,8 @@ internal static class DragDrop
         IsDropping = false;
         IsDragging = false;
         DragMachine = (ID)1;
-        Common.LastIDWithClipboardData = ID.NONE;
-        Common.LastDragDropFile = null;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastDragDropFile = null;
         MouseDown = false;
     }
 
@@ -307,7 +307,7 @@ internal static class DragDrop
     {
         Logger.LogDebug("DragDropStep12: ClipboardDragDropEnd received");
         IsDropping = false;
-        Common.LastIDWithClipboardData = ID.NONE;
+        Clipboard.LastIDWithClipboardData = ID.NONE;
 
         Common.DoSomethingInUIThread(() =>
         {

src/modules/MouseWithoutBorders/App/Core/Event.cs

@@ -78,7 +78,7 @@ internal static class Event
                 // if they are, check that there is no application running in fullscreen mode before switching.
                 if (!p.IsEmpty && Common.IsEasyMouseSwitchAllowed())
                 {
-                    Common.HasSwitchedMachineSinceLastCopy = true;
+                    Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
                     Logger.LogDebug(string.Format(
                         CultureInfo.CurrentCulture,
@@ -218,10 +218,10 @@ internal static class Event
 
                 if (MachineStuff.desMachineID == Common.MachineID)
                 {
-                    if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT)
+                    if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT)
                     {
-                        Common.clipboardCopiedTime = 0;
-                        Common.GetRemoteClipboard("PrepareToSwitchToMachine");
+                        Clipboard.clipboardCopiedTime = 0;
+                        Clipboard.GetRemoteClipboard("PrepareToSwitchToMachine");
                     }
                 }
                 else

src/modules/MouseWithoutBorders/App/Core/Helper.cs

@@ -119,7 +119,7 @@ internal static class Helper
 
                 if (MachineStuff.NewDesMachineID == Common.MachineID)
                 {
-                    Common.ReleaseAllKeys();
+                    InitAndCleanup.ReleaseAllKeys();
                 }
             }
         }
@@ -317,7 +317,7 @@ internal static class Helper
                 Common.GetInputDesktop(),
                 0);
 
-            Common.HasSwitchedMachineSinceLastCopy = true;
+            Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
             // Common.CreateLowIntegrityProcess("\"" + Path.GetDirectoryName(Application.ExecutablePath) + "\\MouseWithoutBordersHelper.exe\"", string.Empty, 0, false, 0);
             var processes = Process.GetProcessesByName(HelperProcessName);

src/modules/MouseWithoutBorders/App/Core/InitAndCleanup.cs

@@ -0,0 +1,278 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Globalization;
+using System.Net.NetworkInformation;
+using System.Security.Cryptography;
+using System.Threading;
+
+using Microsoft.Win32;
+using MouseWithoutBorders.Class;
+using Windows.UI.Input.Preview.Injection;
+
+// <summary>
+//     Initialization and clean up.
+// </summary>
+// <history>
+//     2008 created by Truong Do (ductdo).
+//     2009-... modified by Truong Do (TruongDo).
+//     2023- Included in PowerToys.
+// </history>
+namespace MouseWithoutBorders.Core;
+
+internal static class InitAndCleanup
+{
+    private static bool initDone;
+    internal static int REOPEN_WHEN_WSAECONNRESET = -10054;
+    internal static int REOPEN_WHEN_HOTKEY = -10055;
+    internal static int PleaseReopenSocket;
+    internal static bool ReopenSocketDueToReadError;
+
+    private static DateTime LastResumeSuspendTime { get; set; } = DateTime.UtcNow;
+
+    internal static bool InitDone
+    {
+        get => InitAndCleanup.initDone;
+        set => InitAndCleanup.initDone = value;
+    }
+
+    internal static void UpdateMachineTimeAndID()
+    {
+        Common.MachineName = Common.MachineName.Trim();
+        _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+    }
+
+    private static void InitializeMachinePoolFromSettings()
+    {
+        try
+        {
+            MachineInf[] info = MachinePoolHelpers.LoadMachineInfoFromMachinePoolStringSetting(Setting.Values.MachinePoolString);
+            for (int i = 0; i < info.Length; i++)
+            {
+                info[i].Name = info[i].Name.Trim();
+            }
+
+            MachineStuff.MachinePool.Initialize(info);
+            MachineStuff.MachinePool.ResetIPAddressesForDeadMachines(true);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log(ex);
+            MachineStuff.MachinePool.Clear();
+        }
+    }
+
+    private static void SetupMachineNameAndID()
+    {
+        try
+        {
+            Common.GetMachineName();
+            Common.DesMachineID = MachineStuff.NewDesMachineID = Common.MachineID;
+
+            // MessageBox.Show(machineID.ToString(CultureInfo.CurrentCulture)); // For test
+            InitializeMachinePoolFromSettings();
+
+            Common.MachineName = Common.MachineName.Trim();
+            _ = MachineStuff.MachinePool.LearnMachine(Common.MachineName);
+            _ = MachineStuff.MachinePool.TryUpdateMachineID(Common.MachineName, Common.MachineID, true);
+
+            MachineStuff.UpdateMachinePoolStringSetting();
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+        }
+    }
+
+    internal static void Init()
+    {
+        _ = Helper.GetUserName();
+        Common.GeneratedKey = true;
+
+        try
+        {
+            Common.MyKey = Setting.Values.MyKey;
+            int tmp = Setting.Values.MyKeyDaysToExpire;
+        }
+        catch (FormatException e)
+        {
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+            Logger.Log(e.Message);
+        }
+        catch (CryptographicException e)
+        {
+            Common.KeyCorrupted = true;
+            Setting.Values.MyKey = Common.MyKey = Common.CreateRandomKey();
+            Logger.Log(e.Message);
+        }
+
+        try
+        {
+            InputSimulation.Injector = InputInjector.TryCreate();
+            if (InputSimulation.Injector != null)
+            {
+                InputSimulation.MoveMouseRelative(0, 0);
+                NativeMethods.InjectMouseInputAvailable = true;
+            }
+        }
+        catch (EntryPointNotFoundException)
+        {
+            NativeMethods.InjectMouseInputAvailable = false;
+            Logger.Log($"{nameof(NativeMethods.InjectMouseInputAvailable)} = false");
+        }
+
+        bool dummy = Setting.Values.DrawMouseEx;
+        Common.Is64bitOS = IntPtr.Size == 8;
+        Common.tcpPort = Setting.Values.TcpPort;
+        Common.GetScreenConfig();
+        Common.PackageSent = new PackageMonitor(0);
+        Common.PackageReceived = new PackageMonitor(0);
+        SetupMachineNameAndID();
+        Common.InitEncryption();
+        CreateHelperThreads();
+
+        SystemEvents.DisplaySettingsChanged += new EventHandler(Common.SystemEvents_DisplaySettingsChanged);
+        NetworkChange.NetworkAvailabilityChanged += new NetworkAvailabilityChangedEventHandler(NetworkChange_NetworkAvailabilityChanged);
+        SystemEvents.PowerModeChanged += new PowerModeChangedEventHandler(SystemEvents_PowerModeChanged);
+        PleaseReopenSocket = 9;
+        /* TODO: Telemetry for the matrix? */
+    }
+
+    private static void SystemEvents_PowerModeChanged(object sender, PowerModeChangedEventArgs e)
+    {
+        Helper.WndProcCounter++;
+
+        if (e.Mode is PowerModes.Resume or PowerModes.Suspend)
+        {
+            Logger.TelemetryLogTrace($"{nameof(SystemEvents_PowerModeChanged)}: {e.Mode}", SeverityLevel.Information);
+            LastResumeSuspendTime = DateTime.UtcNow;
+            MachineStuff.SwitchToMultipleMode(false, true);
+        }
+    }
+
+    private static void CreateHelperThreads()
+    {
+        // NOTE(@yuyoyuppe): service crashes while trying to obtain this info, disabling.
+        /*
+        Thread watchDogThread = new(new ThreadStart(WatchDogThread), nameof(WatchDogThread));
+        watchDogThread.Priority = ThreadPriority.Highest;
+        watchDogThread.Start();
+        */
+
+        Common.helper = new Thread(new ThreadStart(Helper.HelperThread), "Helper Thread");
+        Common.helper.SetApartmentState(ApartmentState.STA);
+        Common.helper.Start();
+    }
+
+    private static void AskHelperThreadsToExit(int waitTime)
+    {
+        Helper.signalHelperToExit = true;
+        Helper.signalWatchDogToExit = true;
+        _ = Common.EvSwitch.Set();
+
+        int c = 0;
+        if (Common.helper != null && c < waitTime)
+        {
+            while (Helper.signalHelperToExit)
+            {
+                Thread.Sleep(1);
+            }
+
+            Common.helper = null;
+        }
+    }
+
+    internal static void Cleanup()
+    {
+        try
+        {
+            Common.SendByeBye();
+
+            // UnhookClipboard();
+            AskHelperThreadsToExit(500);
+            Common.MainForm.NotifyIcon.Visible = false;
+            Common.MainForm.NotifyIcon.Dispose();
+            Common.CloseAllFormsAndHooks();
+
+            Common.DoSomethingInUIThread(() =>
+            {
+                Common.Sk?.Close(true);
+            });
+        }
+        catch (Exception e)
+        {
+            Logger.Log(e);
+        }
+    }
+
+    private static long lastReleaseAllKeysCall;
+
+    internal static void ReleaseAllKeys()
+    {
+        if (Math.Abs(Common.GetTick() - lastReleaseAllKeysCall) < 2000)
+        {
+            return;
+        }
+
+        lastReleaseAllKeysCall = Common.GetTick();
+
+        KEYBDDATA kd;
+        kd.dwFlags = (int)Common.LLKHF.UP;
+
+        VK[] keys = new VK[]
+        {
+            VK.LSHIFT, VK.LCONTROL, VK.LMENU, VK.LWIN, VK.RSHIFT,
+            VK.RCONTROL, VK.RMENU, VK.RWIN, VK.SHIFT, VK.MENU, VK.CONTROL,
+        };
+
+        Logger.LogDebug("***** ReleaseAllKeys has been called! *****:");
+
+        foreach (VK vk in keys)
+        {
+            if ((NativeMethods.GetAsyncKeyState((IntPtr)vk) & 0x8000) != 0)
+            {
+                Logger.LogDebug(vk.ToString() + " is down, release it...");
+                Common.Hook?.ResetLastSwitchKeys(); // Sticky key can turn ALL PC mode on (CtrlCtrlCtrl)
+                kd.wVk = (int)vk;
+                InputSimulation.SendKey(kd);
+                Common.Hook?.ResetLastSwitchKeys();
+            }
+        }
+    }
+
+    private static void NetworkChange_NetworkAvailabilityChanged(object sender, NetworkAvailabilityEventArgs e)
+    {
+        Logger.LogDebug("NetworkAvailabilityEventArgs.IsAvailable: " + e.IsAvailable.ToString(CultureInfo.InvariantCulture));
+        Helper.WndProcCounter++;
+        ScheduleReopenSocketsDueToNetworkChanges(!e.IsAvailable);
+    }
+
+    private static void ScheduleReopenSocketsDueToNetworkChanges(bool closeSockets = true)
+    {
+        if (closeSockets)
+        {
+            // Slept/hibernated machine may still have the sockets' status as Connected:( (unchanged) so it would not re-connect after a timeout when waking up.
+            // Closing the sockets when it is going to sleep/hibernate will trigger the reconnection faster when it wakes up.
+            Common.DoSomethingInUIThread(
+                () =>
+            {
+                SocketStuff s = Common.Sk;
+                Common.Sk = null;
+                s?.Close(false);
+            },
+                true);
+        }
+
+        if (!Common.IsMyDesktopActive())
+        {
+            PleaseReopenSocket = 0;
+        }
+        else if (PleaseReopenSocket != 10)
+        {
+            PleaseReopenSocket = 10;
+        }
+    }
+}

src/modules/MouseWithoutBorders/App/Core/Logger.cs

@@ -247,22 +247,24 @@ internal static class Logger
 
     internal static void DumpStaticTypes(StringBuilder sb, int level)
     {
-        sb.AppendLine($"[{nameof(DragDrop)}]\r\n===============");
-        Logger.DumpType(sb, typeof(DragDrop), 0, level);
-        sb.AppendLine($"[{nameof(Event)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Event), 0, level);
-        sb.AppendLine($"[{nameof(Helper)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Helper), 0, level);
-        sb.AppendLine($"[{nameof(Launch)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Launch), 0, level);
-        sb.AppendLine($"[{nameof(Logger)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Logger), 0, level);
-        sb.AppendLine($"[{nameof(MachineStuff)}]\r\n===============");
-        Logger.DumpType(sb, typeof(MachineStuff), 0, level);
-        sb.AppendLine($"[{nameof(Receiver)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Receiver), 0, level);
-        sb.AppendLine($"[{nameof(Service)}]\r\n===============");
-        Logger.DumpType(sb, typeof(Service), 0, level);
+        var staticTypes = new List<Type>
+        {
+            typeof(Clipboard),
+            typeof(DragDrop),
+            typeof(Event),
+            typeof(InitAndCleanup),
+            typeof(Helper),
+            typeof(Launch),
+            typeof(Logger),
+            typeof(MachineStuff),
+            typeof(Receiver),
+            typeof(Service),
+        };
+        foreach (var staticType in staticTypes)
+        {
+            sb.AppendLine(CultureInfo.InvariantCulture, $"[{staticType.Name}]\r\n===============");
+            Logger.DumpType(sb, staticType, 0, level);
+        }
     }
 
     internal static bool PrivateDump(StringBuilder sb, object obj, string objName, int level, int maxLevel, bool stop)

src/modules/MouseWithoutBorders/App/Core/MachineStuff.cs

@@ -992,7 +992,7 @@ internal static class MachineStuff
                 Setting.Values.MatrixOneRow = !((package.Type & PackageType.MatrixTwoRowFlag) == PackageType.MatrixTwoRowFlag);
                 MachineMatrix = MachineMatrix; // Save
 
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
 
                 UpdateClientSockets("UpdateMachineMatrix");
 
@@ -1044,7 +1044,7 @@ internal static class MachineStuff
             Common.MoveMouseToCenter();
         }
 
-        Common.ReleaseAllKeys();
+        InitAndCleanup.ReleaseAllKeys();
 
         Common.UpdateMultipleModeIconAndMenu();
     }

src/modules/MouseWithoutBorders/App/Core/Receiver.cs

@@ -157,7 +157,7 @@ internal static class Receiver
 
                             if (!p.IsEmpty)
                             {
-                                Common.HasSwitchedMachineSinceLastCopy = true;
+                                Clipboard.HasSwitchedMachineSinceLastCopy = true;
 
                                 Logger.LogDebug(string.Format(
                                     CultureInfo.CurrentCulture,
@@ -274,7 +274,7 @@ internal static class Receiver
                 Common.PackageReceived.Clipboard++;
                 if (!Common.RunOnLogonDesktop && !Common.RunOnScrSaverDesktop)
                 {
-                    Common.clipboardCopiedTime = Common.GetTick();
+                    Clipboard.clipboardCopiedTime = Common.GetTick();
                     GetNameOfMachineWithClipboardData(package);
                     SignalBigClipboardData();
                 }
@@ -282,10 +282,10 @@ internal static class Receiver
                 break;
 
             case PackageType.MachineSwitched:
-                if (Common.GetTick() - Common.clipboardCopiedTime < Common.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
+                if (Common.GetTick() - Clipboard.clipboardCopiedTime < Clipboard.BIG_CLIPBOARD_DATA_TIMEOUT && (package.Des == Common.MachineID))
                 {
-                    Common.clipboardCopiedTime = 0;
-                    Common.GetRemoteClipboard("PackageType.MachineSwitched");
+                    Clipboard.clipboardCopiedTime = 0;
+                    Clipboard.GetRemoteClipboard("PackageType.MachineSwitched");
                 }
 
                 break;
@@ -297,7 +297,7 @@ internal static class Receiver
                     if (package.Des == Common.MachineID || package.Des == ID.ALL)
                     {
                         GetNameOfMachineWithClipboardData(package);
-                        Common.GetRemoteClipboard("mspaint," + Common.LastMachineWithClipboardData);
+                        Clipboard.GetRemoteClipboard("mspaint," + Clipboard.LastMachineWithClipboardData);
                     }
                 }
 
@@ -326,10 +326,10 @@ internal static class Receiver
                             Thread.UpdateThreads(thread);
 
                             string remoteMachine = package.MachineName;
-                            System.Net.Sockets.TcpClient client = Common.ConnectToRemoteClipboardSocket(remoteMachine);
+                            System.Net.Sockets.TcpClient client = Clipboard.ConnectToRemoteClipboardSocket(remoteMachine);
                             bool clientPushData = true;
 
-                            if (Common.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
+                            if (Clipboard.ShakeHand(ref remoteMachine, client.Client, out Stream enStream, out Stream deStream, ref clientPushData, ref package.PostAction))
                             {
                                 SocketStuff.SendClipboardData(client.Client, enStream);
                             }
@@ -360,7 +360,7 @@ internal static class Receiver
 
             case PackageType.ClipboardText:
             case PackageType.ClipboardImage:
-                Common.clipboardCopiedTime = 0;
+                Clipboard.clipboardCopiedTime = 0;
                 if (package.Type == PackageType.ClipboardImage)
                 {
                     Common.PackageReceived.ClipboardImage++;
@@ -372,7 +372,7 @@ internal static class Receiver
 
                 if (tcp != null)
                 {
-                    Common.ReceiveClipboardDataUsingTCP(
+                    Clipboard.ReceiveClipboardDataUsingTCP(
                         package,
                         package.Type == PackageType.ClipboardImage,
                         tcp);
@@ -381,10 +381,10 @@ internal static class Receiver
                 break;
 
             case PackageType.HideMouse:
-                Common.HasSwitchedMachineSinceLastCopy = true;
+                Clipboard.HasSwitchedMachineSinceLastCopy = true;
                 Common.HideMouseCursor(true);
                 Helper.MainFormDotEx(false);
-                Common.ReleaseAllKeys();
+                InitAndCleanup.ReleaseAllKeys();
                 break;
 
             default:
@@ -405,11 +405,11 @@ internal static class Receiver
 
     internal static void GetNameOfMachineWithClipboardData(DATA package)
     {
-        Common.LastIDWithClipboardData = package.Src;
-        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Common.LastIDWithClipboardData);
+        Clipboard.LastIDWithClipboardData = package.Src;
+        List<MachineInf> matchingMachines = MachineStuff.MachinePool.TryFindMachineByID(Clipboard.LastIDWithClipboardData);
         if (matchingMachines.Count >= 1)
         {
-            Common.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
+            Clipboard.LastMachineWithClipboardData = matchingMachines[0].Name.Trim();
         }
 
         /*

src/modules/MouseWithoutBorders/App/Form/Settings/SetupPage3a.cs

@@ -84,7 +84,7 @@ namespace MouseWithoutBorders
                 if ((connectedClientSocket = Common.GetConnectedClientSocket()) != null)
                 {
                     ShowStatus($"Connected from local IP Address: {connectedClientSocket.Address}.");
-                    Common.UpdateMachineTimeAndID();
+                    InitAndCleanup.UpdateMachineTimeAndID();
 
                     Common.MMSleep(1);
                     connected = true;

src/modules/MouseWithoutBorders/App/Form/frmMatrix.cs

@@ -22,6 +22,8 @@ using Microsoft.PowerToys.Telemetry;
 // </history>
 using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
+
+using Clipboard = MouseWithoutBorders.Core.Clipboard;
 using Timer = System.Windows.Forms.Timer;
 
 [module: SuppressMessage("Microsoft.Globalization", "CA1300:SpecifyMessageBoxOptions", Scope = "member", Target = "MouseWithoutBorders.frmMatrix.#buttonOK_Click(System.Object,System.EventArgs)", Justification = "Dotnet port with style preservation")]
@@ -110,7 +112,7 @@ namespace MouseWithoutBorders
             {
                 SocketStuff.InvalidKeyFound = false;
                 showInvalidKeyMessage = false;
-                Common.ReopenSocketDueToReadError = true;
+                InitAndCleanup.ReopenSocketDueToReadError = true;
                 Common.ReopenSockets(true);
 
                 for (int i = 0; i < 10; i++)
@@ -780,7 +782,7 @@ namespace MouseWithoutBorders
 
             ShowUpdateMessage();
 
-            Common.HasSwitchedMachineSinceLastCopy = true;
+            Clipboard.HasSwitchedMachineSinceLastCopy = true;
         }
 
         private void CheckBoxDisableCAD_CheckedChanged(object sender, EventArgs e)

src/modules/MouseWithoutBorders/App/Form/frmScreen.cs

@@ -139,13 +139,13 @@ namespace MouseWithoutBorders
             {
                 if (cleanup)
                 {
-                    Common.Cleanup();
+                    InitAndCleanup.Cleanup();
                 }
 
                 Helper.WndProcCounter++;
                 if (!Common.RunOnScrSaverDesktop)
                 {
-                    Common.ReleaseAllKeys();
+                    InitAndCleanup.ReleaseAllKeys();
                 }
 
                 Helper.RunDDHelper(true);
@@ -412,7 +412,7 @@ namespace MouseWithoutBorders
 
                         count = 0;
 
-                        Common.InitDone = true;
+                        InitAndCleanup.InitDone = true;
 #if SHOW_ON_WINLOGON
                         if (Common.RunOnLogonDesktop)
                         {
@@ -423,39 +423,39 @@ namespace MouseWithoutBorders
 
                     if ((count % 2) == 0)
                     {
-                        if (Common.PleaseReopenSocket == 10 || (Common.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
+                        if (InitAndCleanup.PleaseReopenSocket == 10 || (InitAndCleanup.PleaseReopenSocket > 0 && count > 0 && count % 300 == 0))
                         {
-                            if (!Common.AtLeastOneSocketEstablished() || Common.PleaseReopenSocket == 10)
+                            if (!Common.AtLeastOneSocketEstablished() || InitAndCleanup.PleaseReopenSocket == 10)
                             {
                                 Thread.Sleep(1000);
-                                if (Common.PleaseReopenSocket > 0)
+                                if (InitAndCleanup.PleaseReopenSocket > 0)
                                 {
-                                    Common.PleaseReopenSocket--;
+                                    InitAndCleanup.PleaseReopenSocket--;
                                 }
 
                                 // Double check.
                                 if (!Common.AtLeastOneSocketEstablished())
                                 {
                                     Common.GetMachineName();
-                                    Logger.LogDebug("Common.pleaseReopenSocket: " + Common.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
+                                    Logger.LogDebug("Common.pleaseReopenSocket: " + InitAndCleanup.PleaseReopenSocket.ToString(CultureInfo.InvariantCulture));
                                     Common.ReopenSockets(false);
                                     MachineStuff.NewDesMachineID = Common.DesMachineID = Common.MachineID;
                                 }
                             }
                             else
                             {
-                                Common.PleaseReopenSocket = 0;
+                                InitAndCleanup.PleaseReopenSocket = 0;
                             }
                         }
 
-                        if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_HOTKEY)
+                        if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_HOTKEY)
                         {
-                            Common.PleaseReopenSocket = 0;
+                            InitAndCleanup.PleaseReopenSocket = 0;
                             Common.ReopenSockets(true);
                         }
-                        else if (Common.PleaseReopenSocket == Common.REOPEN_WHEN_WSAECONNRESET)
+                        else if (InitAndCleanup.PleaseReopenSocket == InitAndCleanup.REOPEN_WHEN_WSAECONNRESET)
                         {
-                            Common.PleaseReopenSocket = 0;
+                            InitAndCleanup.PleaseReopenSocket = 0;
                             Thread.Sleep(1000);
                             MachineStuff.UpdateClientSockets("REOPEN_WHEN_WSAECONNRESET");
                         }

src/modules/MouseWithoutBorders/MouseWithoutBorders.UnitTests/Core/Logger.PrivateDump.expected.txt

@@ -4,28 +4,6 @@
 [Other Logs]
 ===============
  = MouseWithoutBorders.Common
-Comma = System.Char[]
---System.Char[] = System.Char[]: N/A
-Star = System.Char[]
---System.Char[] = System.Char[]: N/A
-NullSeparator = System.Char[]
---System.Char[] = System.Char[]: N/A
-lastClipboardEventTime = 0
-clipboardCopiedTime = 0
-<LastIDWithClipboardData>k__BackingField = NONE
-<NextClipboardViewer>k__BackingField = 0
-<IsClipboardDataImage>k__BackingField = False
-lastClipboardObject = 
-<HasSwitchedMachineSinceLastCopy>k__BackingField = False
-ClipboardThreadOldLock = Lock
---_owningThreadId = 0
---_state = 0
---_recursionCount = 0
---_spinCount = 22
---_waiterStartTimeMs = 0
---s_contentionCount = 0
---s_maxSpinCount = 22
---s_minSpinCountForAdaptiveSpin = -100
 screenWidth = 0
 screenHeight = 0
 lastX = 0
@@ -99,17 +77,6 @@ LegalKeyDictionary = Concurrent.ConcurrentDictionary`2[System.String,System.Byte
 --_budget = ????????????
 --_growLockArray = True
 --_comparerIsDefaultForClasses = False
-initDone = False
-REOPEN_WHEN_WSAECONNRESET = -10054
-REOPEN_WHEN_HOTKEY = -10055
-PleaseReopenSocket = 0
-ReopenSocketDueToReadError = False
-<LastResumeSuspendTime>k__BackingField = ????????????
---_dateData = ????????????
---MinValue = 01/01/0001 00:00:00
---MaxValue = 31/12/9999 23:59:59
---UnixEpoch = 01/01/1970 00:00:00
-lastReleaseAllKeysCall = 0
 PackageSent = MouseWithoutBorders.PackageMonitor
 --Keyboard = 0
 --Mouse = 0
@@ -153,12 +120,6 @@ p = {X=0,Y=0}
 --y = 0
 --Empty = {X=0,Y=0}
 <IpcChannelCreated>k__BackingField = False
-BIG_CLIPBOARD_DATA_TIMEOUT = 30000
-MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
-MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
-TEXT_HEADER_SIZE = 12
-DATA_SIZE = 48
-TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 TOGGLE_ICONS_SIZE = 4
 ICON_ONE = 0
 ICON_ALL = 1
@@ -195,6 +156,36 @@ WM_KEYDOWN = 256
 WM_KEYUP = 257
 WM_SYSKEYDOWN = 260
 WM_SYSKEYUP = 261
+[Clipboard]
+===============
+Comma = System.Char[]
+--System.Char[] = System.Char[]: N/A
+Star = System.Char[]
+--System.Char[] = System.Char[]: N/A
+NullSeparator = System.Char[]
+--System.Char[] = System.Char[]: N/A
+lastClipboardEventTime = 0
+clipboardCopiedTime = 0
+<LastIDWithClipboardData>k__BackingField = NONE
+<NextClipboardViewer>k__BackingField = 0
+<IsClipboardDataImage>k__BackingField = False
+lastClipboardObject = 
+<HasSwitchedMachineSinceLastCopy>k__BackingField = False
+ClipboardThreadOldLock = Lock
+--_owningThreadId = 0
+--_state = 0
+--_recursionCount = 0
+--_spinCount = 22
+--_waiterStartTimeMs = 0
+--s_contentionCount = 0
+--s_maxSpinCount = 22
+--s_minSpinCountForAdaptiveSpin = -100
+BIG_CLIPBOARD_DATA_TIMEOUT = 30000
+MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1048576
+MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 104857600
+TEXT_HEADER_SIZE = 12
+DATA_SIZE = 48
+TEXT_TYPE_SEP = {4CFF57F7-BEDD-43d5-AE8F-27A61E886F2F}
 [DragDrop]
 ===============
 isDragging = False
@@ -249,6 +240,19 @@ actualLastPos = {X=0,Y=0}
 --Empty = {X=0,Y=0}
 myLastX = 0
 myLastY = 0
+[InitAndCleanup]
+===============
+initDone = False
+REOPEN_WHEN_WSAECONNRESET = -10054
+REOPEN_WHEN_HOTKEY = -10055
+PleaseReopenSocket = 0
+ReopenSocketDueToReadError = False
+<LastResumeSuspendTime>k__BackingField = ????????????
+--_dateData = ????????????
+--MinValue = 01/01/0001 00:00:00
+--MaxValue = 31/12/9999 23:59:59
+--UnixEpoch = 01/01/1970 00:00:00
+lastReleaseAllKeysCall = 0
 [Helper]
 ===============
 signalHelperToExit = False

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconMarginConverter.cs

@@ -7,7 +7,7 @@ using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.CmdPal.UI.Controls;
 
-public sealed class IconMarginConverter : IValueConverter
+public sealed partial class IconMarginConverter : IValueConverter
 {
     public object Convert(object value, Type targetType, object parameter, string language)
     {

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V16.5C16 17.3284 15.3284 18 14.5 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H14.5C14.7761 17 15 16.7761 15 16.5V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V16.5C16 17.3284 15.3284 18 14.5 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H14.5C14.7761 17 15 16.7761 15 16.5V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V9H15V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.03544C9.08595 17.3531 9.18915 17.6891 9.33682 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM10 12.5C10 11.1193 11.1193 10 12.5 10H16.5C17.8807 10 19 11.1193 19 12.5V16.5C19 17.0095 18.8476 17.4835 18.5858 17.8787L15.5607 14.8536C14.9749 14.2678 14.0251 14.2678 13.4393 14.8536L10.4142 17.8787C10.1524 17.4835 10 17.0095 10 16.5V12.5ZM17 12.75C17 12.3358 16.6642 12 16.25 12C15.8358 12 15.5 12.3358 15.5 12.75C15.5 13.1642 15.8358 13.5 16.25 13.5C16.6642 13.5 17 13.1642 17 12.75ZM11.1213 18.5858C11.5165 18.8476 11.9905 19 12.5 19H16.5C17.0095 19 17.4835 18.8476 17.8787 18.5858L14.8536 15.5607C14.6583 15.3654 14.3417 15.3654 14.1464 15.5607L11.1213 18.5858Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_image_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V9H15V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.03544C9.08595 17.3531 9.18915 17.6891 9.33682 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM10 12.5C10 11.1193 11.1193 10 12.5 10H16.5C17.8807 10 19 11.1193 19 12.5V16.5C19 17.0095 18.8476 17.4835 18.5858 17.8787L15.5607 14.8536C14.9749 14.2678 14.0251 14.2678 13.4393 14.8536L10.4142 17.8787C10.1524 17.4835 10 17.0095 10 16.5V12.5ZM17 12.75C17 12.3358 16.6642 12 16.25 12C15.8358 12 15.5 12.3358 15.5 12.75C15.5 13.1642 15.8358 13.5 16.25 13.5C16.6642 13.5 17 13.1642 17 12.75ZM11.1213 18.5858C11.5165 18.8476 11.9905 19 12.5 19H16.5C17.0095 19 17.4835 18.8476 17.8787 18.5858L14.8536 15.5607C14.6583 15.3654 14.3417 15.3654 14.1464 15.5607L11.1213 18.5858Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V10.337L15.3698 8.89819C15.2826 8.69904 15.1554 8.52562 15 8.38568V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.08561C8.9672 17.3338 8.97447 17.6857 9.08567 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM14.4538 9.2994C14.3741 9.11744 14.1942 8.99992 13.9956 9C13.797 9.00008 13.6172 9.11776 13.5376 9.29979L10.0417 17.2998C9.93114 17.5528 10.0466 17.8476 10.2997 17.9582C10.5527 18.0687 10.8475 17.9533 10.958 17.7002L12.138 15H15.859L17.0419 17.7006C17.1527 17.9535 17.4475 18.0688 17.7005 17.958C17.9534 17.8472 18.0687 17.5523 17.9579 17.2994L14.4538 9.2994ZM15.421 14H12.575L13.9963 10.7474L15.421 14Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_clipboard_letter_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.08535 3C7.29127 2.4174 7.84689 2 8.5 2H11.5C12.1531 2 12.7087 2.4174 12.9146 3H14.5C15.3284 3 16 3.67157 16 4.5V10.337L15.3698 8.89819C15.2826 8.69904 15.1554 8.52562 15 8.38568V4.5C15 4.22386 14.7761 4 14.5 4H12.9146C12.7087 4.5826 12.1531 5 11.5 5H8.5C7.84689 5 7.29127 4.5826 7.08535 4H5.5C5.22386 4 5 4.22386 5 4.5V16.5C5 16.7761 5.22386 17 5.5 17H9.08561C8.9672 17.3338 8.97447 17.6857 9.08567 18H5.5C4.67157 18 4 17.3284 4 16.5V4.5C4 3.67157 4.67157 3 5.5 3H7.08535ZM8.5 3C8.22386 3 8 3.22386 8 3.5C8 3.77614 8.22386 4 8.5 4H11.5C11.7761 4 12 3.77614 12 3.5C12 3.22386 11.7761 3 11.5 3H8.5ZM14.4538 9.2994C14.3741 9.11744 14.1942 8.99992 13.9956 9C13.797 9.00008 13.6172 9.11776 13.5376 9.29979L10.0417 17.2998C9.93114 17.5528 10.0466 17.8476 10.2997 17.9582C10.5527 18.0687 10.8475 17.9533 10.958 17.7002L12.138 15H15.859L17.0419 17.7006C17.1527 17.9535 17.4475 18.0688 17.7005 17.958C17.9534 17.8472 18.0687 17.5523 17.9579 17.2994L14.4538 9.2994ZM15.421 14H12.575L13.9963 10.7474L15.421 14Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H14C15.1046 16 16 15.1046 16 14V4C16 2.89543 15.1046 2 14 2H8ZM7 4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H8C7.44772 15 7 14.5523 7 14V4ZM4 6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17H13.7324C13.3866 17.5978 12.7403 18 12 18H7.5C5.567 18 4 16.433 4 14.5V6.00001Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_copy_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8 2C6.89543 2 6 2.89543 6 4V14C6 15.1046 6.89543 16 8 16H14C15.1046 16 16 15.1046 16 14V4C16 2.89543 15.1046 2 14 2H8ZM7 4C7 3.44772 7.44772 3 8 3H14C14.5523 3 15 3.44772 15 4V14C15 14.5523 14.5523 15 14 15H8C7.44772 15 7 14.5523 7 14V4ZM4 6.00001C4 5.25973 4.4022 4.61339 5 4.26758V14.5C5 15.8807 6.11929 17 7.5 17H13.7324C13.3866 17.5978 12.7403 18 12 18H7.5C5.567 18 4 16.433 4 14.5V6.00001Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 4C6 2.89543 6.89543 2 8 2H11.5858C11.9836 2 12.3651 2.15804 12.6464 2.43934L16.5607 6.35355C16.842 6.63486 17 7.01639 17 7.41421V14C17 15.1046 16.1046 16 15 16H8C6.89543 16 6 15.1046 6 14V4ZM8 3C7.44772 3 7 3.44772 7 4V14C7 14.5523 7.44772 15 8 15H15C15.5523 15 16 14.5523 16 14V8H12.5C11.6716 8 11 7.32843 11 6.5V3H8ZM12 3.20711V6.5C12 6.77614 12.2239 7 12.5 7H15.7929L12 3.20711ZM4 5C4 4.44772 4.44772 4 5 4V14C5 15.6569 6.34315 17 8 17L15 17C15 17.5523 14.5523 18 14 18H7.93939C5.76373 18 4 16.2363 4 14.0606V5Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_document_copy_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6 4C6 2.89543 6.89543 2 8 2H11.5858C11.9836 2 12.3651 2.15804 12.6464 2.43934L16.5607 6.35355C16.842 6.63486 17 7.01639 17 7.41421V14C17 15.1046 16.1046 16 15 16H8C6.89543 16 6 15.1046 6 14V4ZM8 3C7.44772 3 7 3.44772 7 4V14C7 14.5523 7.44772 15 8 15H15C15.5523 15 16 14.5523 16 14V8H12.5C11.6716 8 11 7.32843 11 6.5V3H8ZM12 3.20711V6.5C12 6.77614 12.2239 7 12.5 7H15.7929L12 3.20711ZM4 5C4 4.44772 4.44772 4 5 4V14C5 15.6569 6.34315 17 8 17L15 17C15 17.5523 14.5523 18 14 18H7.93939C5.76373 18 4 16.2363 4 14.0606V5Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.dark.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49751 7.4966C9.04842 7.4966 9.49502 7.05 9.49502 6.4991C9.49502 5.94819 9.04842 5.50159 8.49751 5.50159C7.9466 5.50159 7.5 5.94819 7.5 6.4991C7.5 7.05 7.9466 7.4966 8.49751 7.4966ZM5 6C5 4.34315 6.34315 3 8 3H14C15.6569 3 17 4.34315 17 6V12C17 13.6569 15.6569 15 14 15H8C6.34315 15 5 13.6569 5 12V6ZM8 4C6.89543 4 6 4.89543 6 6V12C6 12.3709 6.10097 12.7182 6.27692 13.016L9.79085 9.50207C10.4586 8.83427 11.5414 8.83427 12.2092 9.50207L15.7231 13.016C15.899 12.7182 16 12.3709 16 12V6C16 4.89543 15.1046 4 14 4H8ZM15.016 13.7231L11.502 10.2092C11.2248 9.9319 10.7752 9.9319 10.498 10.2092L6.98403 13.7231C7.28178 13.899 7.6291 14 8 14H14C14.3709 14 14.7182 13.899 15.016 13.7231ZM12 17C12.8885 17 13.6868 16.6138 14.2361 16H7.5C5.68782 16 4.1973 14.6228 4.01807 12.8579C4.00612 12.7402 4 12.6208 4 12.5V5.76392C3.38625 6.31324 3 7.11152 3 8.00002V12.5C3 14.9853 5.01472 17 7.5 17H12Z" fill="#D0D0D0"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Assets/Icons/ic_fluent_image_copy_20_regular.light.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.49751 7.4966C9.04842 7.4966 9.49502 7.05 9.49502 6.4991C9.49502 5.94819 9.04842 5.50159 8.49751 5.50159C7.9466 5.50159 7.5 5.94819 7.5 6.4991C7.5 7.05 7.9466 7.4966 8.49751 7.4966ZM5 6C5 4.34315 6.34315 3 8 3H14C15.6569 3 17 4.34315 17 6V12C17 13.6569 15.6569 15 14 15H8C6.34315 15 5 13.6569 5 12V6ZM8 4C6.89543 4 6 4.89543 6 6V12C6 12.3709 6.10097 12.7182 6.27692 13.016L9.79085 9.50207C10.4586 8.83427 11.5414 8.83427 12.2092 9.50207L15.7231 13.016C15.899 12.7182 16 12.3709 16 12V6C16 4.89543 15.1046 4 14 4H8ZM15.016 13.7231L11.502 10.2092C11.2248 9.9319 10.7752 9.9319 10.498 10.2092L6.98403 13.7231C7.28178 13.899 7.6291 14 8 14H14C14.3709 14 14.7182 13.899 15.016 13.7231ZM12 17C12.8885 17 13.6868 16.6138 14.2361 16H7.5C5.68782 16 4.1973 14.6228 4.01807 12.8579C4.00612 12.7402 4 12.6208 4 12.5V5.76392C3.38625 6.31324 3 7.11152 3 8.00002V12.5C3 14.9853 5.01472 17 7.5 17H12Z" fill="#212121"/>
+</svg>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/PrimaryAction.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+
+internal enum PrimaryAction
+{
+    Default,
+    Paste,
+    Copy,
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Helpers/SettingsManager.cs

@@ -2,6 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using System;
 using System.IO;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Properties;
 using Microsoft.CommandPalette.Extensions.Toolkit;
@@ -26,10 +27,22 @@ internal sealed class SettingsManager : JsonSettingsManager, ISettingOptions
         Resources.settings_confirm_delete_description!,
         true);
 
+    private readonly ChoiceSetSetting _primaryAction = new(
+        Namespaced(nameof(PrimaryAction)),
+        Resources.settings_primary_action_title!,
+        Resources.settings_primary_action_description!,
+        [
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_default!, PrimaryAction.Default.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_paste!, PrimaryAction.Paste.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.settings_primary_action_copy!, PrimaryAction.Copy.ToString("G"))
+        ]);
+
     public bool KeepAfterPaste => _keepAfterPaste.Value;
 
     public bool DeleteFromHistoryRequiresConfirmation => _confirmDelete.Value;
 
+    public PrimaryAction PrimaryAction => Enum.TryParse<PrimaryAction>(_primaryAction.Value, out var action) ? action : PrimaryAction.Default;
+
     private static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
@@ -45,6 +58,7 @@ internal sealed class SettingsManager : JsonSettingsManager, ISettingOptions
 
         Settings.Add(_keepAfterPaste);
         Settings.Add(_confirmDelete);
+        Settings.Add(_primaryAction);
 
         // Load settings from file upon initialization
         LoadSettings();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Icons.cs

@@ -6,7 +6,7 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.ClipboardHistory;
 
-internal sealed class Icons
+internal static class Icons
 {
     internal static IconInfo CopyIcon { get; } = new("\xE8C8");
 
@@ -17,4 +17,21 @@ internal sealed class Icons
     internal static IconInfo DeleteIcon { get; } = new("\uE74D");
 
     internal static IconInfo ClipboardListIcon { get; } = IconHelpers.FromRelativePath("Assets\\ClipboardHistory.svg");
+
+    internal static IconInfo Clipboard { get; } = Create("ic_fluent_clipboard_20_regular");
+
+    internal static IconInfo ClipboardImage { get; } = Create("ic_fluent_clipboard_image_20_regular");
+
+    internal static IconInfo ClipboardLetter { get; } = Create("ic_fluent_clipboard_letter_20_regular");
+
+    internal static IconInfo Copy { get; } = Create("   ic_fluent_copy_20_regular");
+
+    internal static IconInfo DocumentCopy { get; } = Create("ic_fluent_document_copy_20_regular");
+
+    internal static IconInfo ImageCopy { get; } = Create("ic_fluent_image_copy_20_regular");
+
+    private static IconInfo Create(string name)
+    {
+        return IconHelpers.FromRelativePaths($"Assets\\Icons\\{name}.light.svg", $"Assets\\Icons\\{name}.dark.svg");
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Microsoft.CmdPal.Ext.ClipboardHistory.csproj

@@ -39,5 +39,41 @@
     <Content Update="Assets\ClipboardHistory.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_image_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_image_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_letter_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_clipboard_letter_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_document_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_document_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_image_copy_20_regular.dark.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\Icons\ic_fluent_image_copy_20_regular.light.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 </Project>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Models/ClipboardItem.cs

@@ -3,14 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Linq;
-using Microsoft.CmdPal.Common.Commands;
-using Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
 using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
-using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.ApplicationModel.DataTransfer;
 using Windows.Storage.Streams;
 
@@ -41,126 +35,8 @@ public class ClipboardItem
     }
 
     [MemberNotNullWhen(true, nameof(ImageData))]
-    private bool IsImage => ImageData is not null;
+    internal bool IsImage => ImageData is not null;
 
     [MemberNotNullWhen(true, nameof(Content))]
-    private bool IsText => !string.IsNullOrEmpty(Content);
-
-    public static List<string> ShiftLinesLeft(List<string> lines)
-    {
-        // Determine the minimum leading whitespace
-        var minLeadingWhitespace = lines
-            .Where(line => !string.IsNullOrWhiteSpace(line))
-            .Min(line => line.TakeWhile(char.IsWhiteSpace).Count());
-
-        // Check if all lines have at least that much leading whitespace
-        if (lines.Any(line => line.TakeWhile(char.IsWhiteSpace).Count() < minLeadingWhitespace))
-        {
-            return lines; // Return the original lines if any line doesn't have enough leading whitespace
-        }
-
-        // Remove the minimum leading whitespace from each line
-        var shiftedLines = lines.Select(line => line.Substring(minLeadingWhitespace)).ToList();
-
-        return shiftedLines;
-    }
-
-    public static List<string> StripLeadingWhitespace(List<string> lines)
-    {
-        // Determine the minimum leading whitespace
-        var minLeadingWhitespace = lines
-            .Min(line => line.TakeWhile(char.IsWhiteSpace).Count());
-
-        // Remove the minimum leading whitespace from each line
-        var shiftedLines = lines.Select(line =>
-            line.Length >= minLeadingWhitespace
-            ? line.Substring(minLeadingWhitespace)
-            : line).ToList();
-
-        return shiftedLines;
-    }
-
-    public ListItem ToListItem()
-    {
-        ListItem listItem;
-
-        List<DetailsElement> metadata = [];
-        metadata.Add(new DetailsElement()
-        {
-            Key = "Copied on",
-            Data = new DetailsLink(Item.Timestamp.DateTime.ToString(DateTimeFormatInfo.CurrentInfo)),
-        });
-
-        var deleteConfirmationCommand = new ConfirmableCommand()
-        {
-            Command = new DeleteItemCommand(this),
-            ConfirmationTitle = Properties.Resources.delete_confirmation_title!,
-            ConfirmationMessage = Properties.Resources.delete_confirmation_message!,
-            IsConfirmationRequired = () => Settings.DeleteFromHistoryRequiresConfirmation,
-        };
-        var deleteContextMenuItem = new CommandContextItem(deleteConfirmationCommand)
-        {
-            IsCritical = true,
-            RequestedShortcut = KeyChords.DeleteEntry,
-        };
-
-        if (IsImage)
-        {
-            var iconData = new IconData(ImageData);
-            var heroImage = new IconInfo(iconData, iconData);
-            listItem = new(new CopyCommand(this, ClipboardFormat.Image))
-            {
-                // Placeholder subtitle as there’s no BitmapImage dimensions to retrieve
-                Title = "Image Data",
-                Details = new Details()
-                {
-                    HeroImage = heroImage,
-                    Title = GetDataType(),
-                    Body = Timestamp.ToString(CultureInfo.InvariantCulture),
-                    Metadata = metadata.ToArray(),
-                },
-                MoreCommands = [
-                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Image, Settings)),
-                    new Separator(),
-                    deleteContextMenuItem,
-                ],
-            };
-        }
-        else if (IsText)
-        {
-            var splitContent = Content.Split("\n");
-            var head = splitContent.AsSpan(0, Math.Min(3, splitContent.Length)).ToArray().ToList();
-            var preview2 = string.Join(
-                "\n",
-                StripLeadingWhitespace(head));
-
-            listItem = new(new CopyCommand(this, ClipboardFormat.Text))
-            {
-                Title = preview2,
-
-                Details = new Details
-                {
-                    Title = GetDataType(),
-                    Body = $"```text\n{Content}\n```",
-                    Metadata = metadata.ToArray(),
-                },
-                MoreCommands = [
-                    new CommandContextItem(new PasteCommand(this, ClipboardFormat.Text, Settings)),
-                    new Separator(),
-                    deleteContextMenuItem,
-                ],
-            };
-        }
-        else
-        {
-            listItem = new(new NoOpCommand())
-            {
-                Title = "Unknown",
-                Subtitle = GetDataType(),
-                Details = new Details { Title = GetDataType() },
-            };
-        }
-
-        return listItem;
-    }
+    internal bool IsText => !string.IsNullOrEmpty(Content);
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardHistoryListPage.cs

@@ -148,7 +148,7 @@ internal sealed partial class ClipboardHistoryListPage : ListPage
             var item = clipboardHistory[i];
             if (item is not null)
             {
-                listItems.Add(item.ToListItem());
+                listItems.Add(new ClipboardListItem(item, _settingsManager));
             }
         }
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Pages/ClipboardListItem.cs

@@ -0,0 +1,201 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using Microsoft.CmdPal.Common.Commands;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Commands;
+using Microsoft.CmdPal.Ext.ClipboardHistory.Helpers;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+
+namespace Microsoft.CmdPal.Ext.ClipboardHistory.Models;
+
+internal sealed partial class ClipboardListItem : ListItem
+{
+    private readonly SettingsManager _settingsManager;
+    private readonly ClipboardItem _item;
+
+    private readonly CommandContextItem _deleteContextMenuItem;
+    private readonly CommandContextItem? _pasteCommand;
+    private readonly CommandContextItem? _copyCommand;
+    private readonly Lazy<Details> _lazyDetails;
+
+    public override IDetails? Details
+    {
+        get => _lazyDetails.Value;
+        set
+        {
+        }
+    }
+
+    public ClipboardListItem(ClipboardItem item, SettingsManager settingsManager)
+    {
+        _item = item;
+        _settingsManager = settingsManager;
+        _settingsManager.Settings.SettingsChanged += SettingsOnSettingsChanged;
+
+        _lazyDetails = new(() => CreateDetails());
+
+        var deleteConfirmationCommand = new ConfirmableCommand
+        {
+            Command = new DeleteItemCommand(_item),
+            ConfirmationTitle = Properties.Resources.delete_confirmation_title!,
+            ConfirmationMessage = Properties.Resources.delete_confirmation_message!,
+            IsConfirmationRequired = () => _settingsManager.DeleteFromHistoryRequiresConfirmation,
+        };
+        _deleteContextMenuItem = new CommandContextItem(deleteConfirmationCommand)
+        {
+            IsCritical = true,
+            RequestedShortcut = KeyChords.DeleteEntry,
+        };
+
+        if (item.IsImage)
+        {
+            Title = "Image";
+
+            _pasteCommand = new CommandContextItem(new PasteCommand(_item, ClipboardFormat.Image, _settingsManager));
+            _copyCommand = new CommandContextItem(new CopyCommand(_item, ClipboardFormat.Image));
+        }
+        else if (item.IsText)
+        {
+            var splitContent = _item.Content?.Split("\n") ?? [];
+            var head = splitContent.Take(3);
+            var preview2 = string.Join(
+                "\n",
+                StripLeadingWhitespace(head));
+
+            Title = preview2;
+
+            _pasteCommand = new CommandContextItem(new PasteCommand(_item, ClipboardFormat.Text, _settingsManager));
+            _copyCommand = new CommandContextItem(new CopyCommand(_item, ClipboardFormat.Text));
+        }
+        else
+        {
+            _pasteCommand = null;
+            _copyCommand = null;
+        }
+
+        RefreshCommands();
+    }
+
+    private void SettingsOnSettingsChanged(object sender, Settings args)
+    {
+        RefreshCommands();
+    }
+
+    private void RefreshCommands()
+    {
+        if (_item is { IsText: false, IsImage: false })
+        {
+            MoreCommands = [_deleteContextMenuItem];
+            Icon = _settingsManager.PrimaryAction == PrimaryAction.Paste ? Icons.Clipboard : Icons.Copy;
+        }
+
+        switch (_settingsManager.PrimaryAction)
+        {
+            case PrimaryAction.Paste:
+                Command = _pasteCommand?.Command;
+                MoreCommands =
+                [
+                    _copyCommand!,
+                    new Separator(),
+                    _deleteContextMenuItem,
+                ];
+
+                if (_item.IsText)
+                {
+                    Icon = Icons.ClipboardLetter;
+                }
+                else if (_item.IsImage)
+                {
+                    Icon = Icons.ClipboardImage;
+                }
+                else
+                {
+                    Icon = Icons.ClipboardImage;
+                }
+
+                break;
+            case PrimaryAction.Default:
+            case PrimaryAction.Copy:
+            default:
+                Command = _copyCommand?.Command;
+                MoreCommands =
+                [
+                    _pasteCommand!,
+                    new Separator(),
+                    _deleteContextMenuItem,
+                ];
+
+                if (_item.IsText)
+                {
+                    Icon = Icons.DocumentCopy;
+                }
+                else if (_item.IsImage)
+                {
+                    Icon = Icons.ImageCopy;
+                }
+                else
+                {
+                    Icon = Icons.Copy;
+                }
+
+                break;
+        }
+    }
+
+    private Details CreateDetails()
+    {
+        IDetailsElement[] metadata =
+        [
+            new DetailsElement
+            {
+                Key = "Copied on",
+                Data = new DetailsLink(_item.Timestamp.DateTime.ToString(DateTimeFormatInfo.CurrentInfo)),
+            }
+        ];
+
+        if (_item.IsImage)
+        {
+            var iconData = new IconData(_item.ImageData);
+            var heroImage = new IconInfo(iconData);
+            return new Details
+            {
+                Title = _item.GetDataType(),
+                HeroImage = heroImage,
+                Metadata = metadata,
+            };
+        }
+
+        if (_item.IsText)
+        {
+            return new Details
+            {
+                Title = _item.GetDataType(),
+                Body = $"```text\n{_item.Content}\n```",
+                Metadata = metadata,
+            };
+        }
+
+        return new Details { Title = _item.GetDataType() };
+    }
+
+    private static List<string> StripLeadingWhitespace(IEnumerable<string> lines)
+    {
+        // Determine the minimum leading whitespace
+        var minLeadingWhitespace = lines
+            .Min(static line => line.TakeWhile(char.IsWhiteSpace).Count());
+
+        // Remove the minimum leading whitespace from each line
+        var shiftedLines = lines.Select(line =>
+            line.Length >= minLeadingWhitespace
+                ? line[minLeadingWhitespace..]
+                : line).ToList();
+
+        return shiftedLines;
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs

@@ -212,5 +212,50 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties {
                 return ResourceManager.GetString("settings_keep_after_paste_title", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Copy to Clipboard.
+        /// </summary>
+        public static string settings_primary_action_copy {
+            get {
+                return ResourceManager.GetString("settings_primary_action_copy", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default (Copy to Clipboard).
+        /// </summary>
+        public static string settings_primary_action_default {
+            get {
+                return ResourceManager.GetString("settings_primary_action_default", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Primary action (Enter key).
+        /// </summary>
+        public static string settings_primary_action_description {
+            get {
+                return ResourceManager.GetString("settings_primary_action_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Paste.
+        /// </summary>
+        public static string settings_primary_action_paste {
+            get {
+                return ResourceManager.GetString("settings_primary_action_paste", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Primary action.
+        /// </summary>
+        public static string settings_primary_action_title {
+            get {
+                return ResourceManager.GetString("settings_primary_action_title", resourceCulture);
+            }
+        }
     }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx

@@ -168,4 +168,19 @@
   <data name="delete_confirmation_message" xml:space="preserve">
     <value>Are you sure you want to delete this item from clipboard history? This action cannot be undone.</value>
   </data>
+  <data name="settings_primary_action_title" xml:space="preserve">
+    <value>Primary action</value>
+  </data>
+  <data name="settings_primary_action_description" xml:space="preserve">
+    <value>Primary action (Enter key)</value>
+  </data>
+  <data name="settings_primary_action_default" xml:space="preserve">
+    <value>Default (Copy to Clipboard)</value>
+  </data>
+  <data name="settings_primary_action_paste" xml:space="preserve">
+    <value>Paste</value>
+  </data>
+  <data name="settings_primary_action_copy" xml:space="preserve">
+    <value>Copy to Clipboard</value>
+  </data>
 </root>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/ContextMenuHelper.cs

@@ -30,7 +30,7 @@ internal sealed class ContextMenuHelper
 
         // Hide menu if Explorer.exe is the shell process or the process name is ApplicationFrameHost.exe
         // In the first case we would crash the windows ui and in the second case we would kill the generic process for uwp apps.
-        if (!windowData.Process.IsShellProcess && !(windowData.Process.IsUwpApp && string.Equals(windowData.Process.Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
+        if (!windowData.Process.IsShellProcess && !(windowData.Process.IsUwpAppFrameHost && string.Equals(windowData.Process.Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase))
             && !(windowData.Process.IsFullAccessDenied && SettingsManager.Instance.HideKillProcessOnElevatedProcesses))
         {
             contextMenu.Add(new CommandContextItem(new EndTaskCommand(windowData))

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Components/WindowProcess.cs

@@ -23,7 +23,7 @@ internal sealed class WindowProcess
     /// <summary>
     /// An indicator if the window belongs to an 'Universal Windows Platform (UWP)' process
     /// </summary>
-    private readonly bool _isUwpApp;
+    private readonly bool _isUwpAppFrameHost;
 
     /// <summary>
     /// Gets the id of the process
@@ -42,7 +42,8 @@ internal sealed class WindowProcess
         {
             try
             {
-                return Process.GetProcessById((int)ProcessID).Responding;
+                // Process.Responding doesn't work on UWP apps
+                return ProcessType.Kind == ProcessPackagingKind.UwpApp || Process.GetProcessById((int)ProcessID).Responding;
             }
             catch (InvalidOperationException)
             {
@@ -76,7 +77,7 @@ internal sealed class WindowProcess
     /// <summary>
     /// Gets a value indicating whether the window belongs to an 'Universal Windows Platform (UWP)' process
     /// </summary>
-    internal bool IsUwpApp => _isUwpApp;
+    public bool IsUwpAppFrameHost => _isUwpAppFrameHost;
 
     /// <summary>
     /// Gets a value indicating whether this is the shell process or not
@@ -134,9 +135,12 @@ internal sealed class WindowProcess
     internal WindowProcess(uint pid, uint tid, string name)
     {
         UpdateProcessInfo(pid, tid, name);
-        _isUwpApp = string.Equals(Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase);
+        ProcessType = ProcessPackagingInspector.Inspect((int)pid);
+        _isUwpAppFrameHost = string.Equals(Name, "ApplicationFrameHost.exe", StringComparison.OrdinalIgnoreCase);
     }
 
+    public ProcessPackagingInfo ProcessType { get; private set; }
+
     /// <summary>
     /// Updates the process information of the <see cref="WindowProcess"/> instance.
     /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/NativeMethods.cs

@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 using System.Text;
-
+using Microsoft.Win32.SafeHandles;
 using SuppressMessageAttribute = System.Diagnostics.CodeAnalysis.SuppressMessageAttribute;
 
 #pragma warning disable SA1649, CA1051, CA1707, CA1028, CA1714, CA1069, SA1402
@@ -98,6 +98,25 @@ public static partial class NativeMethods
     [DllImport("kernel32.dll")]
     [return: MarshalAs(UnmanagedType.Bool)]
     public static extern bool GetFirmwareType(ref FirmwareType FirmwareType);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool OpenProcessToken(SafeProcessHandle processHandle, TokenAccess desiredAccess, out SafeAccessTokenHandle tokenHandle);
+
+    [DllImport("advapi32.dll", SetLastError = true)]
+    [return: MarshalAs(UnmanagedType.Bool)]
+    internal static extern bool GetTokenInformation(
+        SafeAccessTokenHandle tokenHandle,
+        TOKEN_INFORMATION_CLASS tokenInformationClass,
+        out int tokenInformation,
+        int tokenInformationLength,
+        out int returnLength);
+
+    [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true, EntryPoint = "GetPackageFullName")]
+    internal static extern int GetPackageFullName(
+        SafeProcessHandle hProcess,
+        ref uint packageFullNameLength,
+        StringBuilder? packageFullName);
 }
 
 [SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "These are the names used by win32.")]
@@ -383,7 +402,7 @@ public enum ShowWindowCommand
 
     /// <summary>
     /// Displays a window in its most recent size and position. This value
-    /// is similar to <see cref="Win32.ShowWindowCommand.Normal"/>, except
+    /// is similar to <see cref="ShowWindowCommand.Normal"/>, except
     /// the window is not activated.
     /// </summary>
     ShowNoActivate = 4,
@@ -401,14 +420,14 @@ public enum ShowWindowCommand
 
     /// <summary>
     /// Displays the window as a minimized window. This value is similar to
-    /// <see cref="Win32.ShowWindowCommand.ShowMinimized"/>, except the
+    /// <see cref="ShowWindowCommand.ShowMinimized"/>, except the
     /// window is not activated.
     /// </summary>
     ShowMinNoActive = 7,
 
     /// <summary>
     /// Displays the window in its current size and position. This value is
-    /// similar to <see cref="Win32.ShowWindowCommand.Show"/>, except the
+    /// similar to <see cref="ShowWindowCommand.Show"/>, except the
     /// window is not activated.
     /// </summary>
     ShowNA = 8,
@@ -1100,3 +1119,14 @@ public enum SIGDN : uint
     FILESYSPATH = 0x80058000,
     URL = 0x80068000,
 }
+
+internal enum TOKEN_INFORMATION_CLASS
+{
+    TokenIsAppContainer = 29,
+}
+
+[Flags]
+internal enum TokenAccess : uint
+{
+    TOKEN_QUERY = 0x0008,
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInfo.cs

@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal sealed record ProcessPackagingInfo(
+    int Pid,
+    ProcessPackagingKind Kind,
+    bool HasPackageIdentity,
+    bool IsAppContainer,
+    string? PackageFullName,
+    int? LastError
+);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingInspector.cs

@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using Microsoft.Win32.SafeHandles;
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal static class ProcessPackagingInspector
+{
+#pragma warning disable SA1310 // Field names should not contain underscore
+    private const int ERROR_INSUFFICIENT_BUFFER = 122;
+    private const int APPMODEL_ERROR_NO_PACKAGE = 15700;
+#pragma warning restore SA1310 // Field names should not contain underscore
+
+    /// <summary>
+    /// Inspect a process by PID and classify its packaging.
+    /// </summary>
+    public static ProcessPackagingInfo Inspect(int pid)
+    {
+        var hProcess = NativeMethods.OpenProcess(ProcessAccessFlags.QueryLimitedInformation, false, pid);
+        using var process = new SafeProcessHandle(hProcess, true);
+        if (process.IsInvalid)
+        {
+            return new ProcessPackagingInfo(
+                pid,
+                ProcessPackagingKind.Unknown,
+                HasPackageIdentity: false,
+                IsAppContainer: false,
+                PackageFullName: null,
+                LastError: Marshal.GetLastPInvokeError());
+        }
+
+        // 1) Check package identity
+        var hasPackage = TryGetPackageFullName(process, out var packageFullName, out _);
+
+        // 2) If packaged, check AppContainer -> strict UWP
+        var isAppContainer = false;
+        int? tokenErr = null;
+        if (hasPackage)
+        {
+            isAppContainer = TryIsAppContainer(process, out tokenErr);
+        }
+
+        var kind =
+            !hasPackage ? ProcessPackagingKind.UnpackagedWin32 :
+            isAppContainer ? ProcessPackagingKind.UwpApp :
+            ProcessPackagingKind.PackagedWin32;
+
+        return new ProcessPackagingInfo(
+            pid,
+            kind,
+            HasPackageIdentity: hasPackage,
+            IsAppContainer: isAppContainer,
+            PackageFullName: packageFullName,
+            LastError: null);
+    }
+
+    private static bool TryGetPackageFullName(SafeProcessHandle hProcess, out string? packageFullName, out int? lastError)
+    {
+        packageFullName = null;
+        lastError = null;
+
+        uint len = 0;
+        var rc = NativeMethods.GetPackageFullName(hProcess, ref len, null);
+        if (rc == APPMODEL_ERROR_NO_PACKAGE)
+        {
+            return false; // no package identity
+        }
+
+        if (rc != ERROR_INSUFFICIENT_BUFFER && rc != 0)
+        {
+            lastError = rc;
+            return false; // unexpected error
+        }
+
+        if (len == 0)
+        {
+            return false;
+        }
+
+        var sb = new StringBuilder((int)len);
+        rc = NativeMethods.GetPackageFullName(hProcess, ref len, sb);
+        if (rc == 0)
+        {
+            packageFullName = sb.ToString();
+            return true;
+        }
+
+        lastError = rc;
+        return false;
+    }
+
+    private static bool TryIsAppContainer(SafeProcessHandle hProcess, out int? lastError)
+    {
+        lastError = null;
+
+        if (!NativeMethods.OpenProcessToken(hProcess, TokenAccess.TOKEN_QUERY, out var token))
+        {
+            lastError = Marshal.GetLastPInvokeError();
+            return false; // can't decide; treat as not-UWP for classification
+        }
+
+        using (token)
+        {
+            if (!NativeMethods.GetTokenInformation(
+                    token,
+                    TOKEN_INFORMATION_CLASS.TokenIsAppContainer,
+                    out var val,
+                    sizeof(int),
+                    out _))
+            {
+                lastError = Marshal.GetLastPInvokeError();
+                return false;
+            }
+
+            return val != 0; // true => AppContainer (UWP)
+        }
+    }
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowWalker/Helpers/ProcessPackagingKind.cs

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CmdPal.Ext.WindowWalker.Helpers;
+
+internal enum ProcessPackagingKind
+{
+    Unknown = 0,
+    UnpackagedWin32,
+    PackagedWin32,
+    UwpApp,
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileAsAdminCommand.cs

@@ -20,13 +20,15 @@ internal sealed partial class LaunchProfileAsAdminCommand : InvokableCommand
     private readonly string _profile;
     private readonly bool _openNewTab;
     private readonly bool _openQuake;
+    private readonly AppSettingsManager _appSettingsManager;
 
-    internal LaunchProfileAsAdminCommand(string id, string profile, bool openNewTab, bool openQuake)
+    internal LaunchProfileAsAdminCommand(string id, string profile, bool openNewTab, bool openQuake, AppSettingsManager appSettingsManager)
     {
         this._id = id;
         this._profile = profile;
         this._openNewTab = openNewTab;
         this._openQuake = openQuake;
+        this._appSettingsManager = appSettingsManager;
 
         this.Name = Resources.launch_profile_as_admin;
         this.Icon = Icons.AdminIcon;
@@ -59,6 +61,17 @@ internal sealed partial class LaunchProfileAsAdminCommand : InvokableCommand
             //_context.API.ShowMsg(name, message, string.Empty);
             Logger.LogError($"Failed to open Windows Terminal: {ex.Message}");
         }
+
+        try
+        {
+            _appSettingsManager.Current.AddRecentlyUsedProfile(id, profile);
+            _appSettingsManager.Save();
+        }
+        catch (Exception ex)
+        {
+            // We don't want to fail the whole operation if we can't save the recently used profile
+            Logger.LogError($"Failed to save recently used profile: {ex.Message}");
+        }
     }
 #pragma warning restore IDE0059, CS0168, SA1005
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Commands/LaunchProfileCommand.cs

@@ -20,13 +20,15 @@ internal sealed partial class LaunchProfileCommand : InvokableCommand
     private readonly string _profile;
     private readonly bool _openNewTab;
     private readonly bool _openQuake;
+    private readonly AppSettingsManager _appSettingsManager;
 
-    internal LaunchProfileCommand(string id, string profile, string iconPath, bool openNewTab, bool openQuake)
+    internal LaunchProfileCommand(string id, string profile, string iconPath, bool openNewTab, bool openQuake, AppSettingsManager appSettingsManager)
     {
         this._id = id;
         this._profile = profile;
         this._openNewTab = openNewTab;
         this._openQuake = openQuake;
+        this._appSettingsManager = appSettingsManager;
 
         this.Name = Resources.launch_profile;
         this.Icon = new IconInfo(iconPath);
@@ -62,6 +64,17 @@ internal sealed partial class LaunchProfileCommand : InvokableCommand
             // _context.API.ShowMsg(name, message, string.Empty);
             Logger.LogError($"Failed to open Windows Terminal: {ex.Message}");
         }
+
+        try
+        {
+            _appSettingsManager.Current.AddRecentlyUsedProfile(id, profile);
+            _appSettingsManager.Save();
+        }
+        catch (Exception ex)
+        {
+            // We don't want to fail the whole operation if we can't save the recently used profile
+            Logger.LogError($"Failed to save recently used profile: {ex.Message}");
+        }
     }
 #pragma warning restore IDE0059, CS0168
 

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettings.cs

@@ -4,7 +4,9 @@
 
 #nullable enable
 
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
+using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 
@@ -15,10 +17,30 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 /// </summary>
 public sealed class AppSettings
 {
+    private const int MaxRecentProfilesCount = 64;
+
     /// <summary>
     /// Gets or sets the last selected channel identifier for the Windows Terminal extension.
     /// Empty string when no channel has been selected yet.
     /// </summary>
     [JsonPropertyName("lastSelectedChannel")]
     public string LastSelectedChannel { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets the list of recently used profile identifiers.
+    /// </summary>
+    [JsonPropertyName("recentlyUsedProfiles")]
+    public List<TerminalProfileKey> RecentlyUsedProfiles { get; init; } = [];
+
+    public void AddRecentlyUsedProfile(string appId, string profileName)
+    {
+        var key = new TerminalProfileKey(appId, profileName);
+        RecentlyUsedProfiles.Remove(key);
+        RecentlyUsedProfiles.Insert(0, key);
+
+        if (RecentlyUsedProfiles.Count > MaxRecentProfilesCount)
+        {
+            RecentlyUsedProfiles.RemoveRange(MaxRecentProfilesCount, RecentlyUsedProfiles.Count - MaxRecentProfilesCount);
+        }
+    }
 }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsJsonContext.cs

@@ -10,6 +10,4 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
 [JsonSerializable(typeof(AppSettings))]
-internal sealed partial class AppSettingsJsonContext : JsonSerializerContext
-{
-}
+internal sealed partial class AppSettingsJsonContext : JsonSerializerContext;

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/AppSettingsManager.cs

@@ -12,8 +12,6 @@ using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
 
-#nullable enable
-
 public sealed class AppSettingsManager
 {
     private const string FileName = "appsettings.json";
@@ -42,7 +40,7 @@ public sealed class AppSettingsManager
             if (File.Exists(_filePath))
             {
                 var json = File.ReadAllText(_filePath);
-                var loaded = JsonSerializer.Deserialize(json, AppSettingsJsonContext.Default.AppSettings);
+                var loaded = JsonSerializer.Deserialize(json, AppSettingsJsonContext.Default.AppSettings!);
                 if (loaded is not null)
                 {
                     Current = loaded;
@@ -60,7 +58,7 @@ public sealed class AppSettingsManager
     {
         try
         {
-            var json = JsonSerializer.Serialize(Current, AppSettingsJsonContext.Default.AppSettings);
+            var json = JsonSerializer.Serialize(Current, AppSettingsJsonContext.Default.AppSettings!);
             File.WriteAllText(_filePath, json);
         }
         catch (Exception ex)

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/ProfileSortOrder.cs

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public enum ProfileSortOrder
+{
+    Default = 0,
+    Alphabetical = 1,
+    MostRecentlyUsed = 2,
+}

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/SettingsManager.cs

@@ -40,6 +40,16 @@ public class SettingsManager : JsonSettingsManager
         Resources.save_last_selected_channel_description!,
         false);
 
+    private readonly ChoiceSetSetting _profileSortOrder = new(
+        Namespaced(nameof(ProfileSortOrder)),
+        Resources.profile_sort_order!,
+        Resources.profile_sort_order_description!,
+        [
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_default!, ProfileSortOrder.Default.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_alphabetical!, ProfileSortOrder.Alphabetical.ToString("G")),
+            new ChoiceSetSetting.Choice(Resources.profile_sort_order_item_mru!, ProfileSortOrder.MostRecentlyUsed.ToString("G")),
+        ]);
+
     public bool ShowHiddenProfiles => _showHiddenProfiles.Value;
 
     public bool OpenNewTab => _openNewTab.Value;
@@ -48,6 +58,8 @@ public class SettingsManager : JsonSettingsManager
 
     public bool SaveLastSelectedChannel => _saveLastSelectedChannel.Value;
 
+    public ProfileSortOrder ProfileSortOrder => System.Enum.TryParse<ProfileSortOrder>(_profileSortOrder.Value, out var result) ? result : ProfileSortOrder.Default;
+
     private static string SettingsJsonPath()
     {
         var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
@@ -65,6 +77,7 @@ public class SettingsManager : JsonSettingsManager
         Settings.Add(_openNewTab);
         Settings.Add(_openQuake);
         Settings.Add(_saveLastSelectedChannel);
+        Settings.Add(_profileSortOrder);
 
         // Load settings from file upon initialization
         LoadSettings();

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalProfileKey.cs

@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#nullable enable
+namespace Microsoft.CmdPal.Ext.WindowsTerminal.Helpers;
+
+public sealed record TerminalProfileKey(string AppId, string ProfileName);

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Helpers/TerminalQuery.cs

@@ -58,7 +58,7 @@ public class TerminalQuery : ITerminalQuery
             profiles.AddRange(TerminalHelper.ParseSettings(terminal, settingsJson));
         }
 
-        return profiles.OrderBy(p => p.Name);
+        return profiles;
     }
 
     public IEnumerable<TerminalPackage> GetTerminals()

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Pages/ProfilesListPage.cs

@@ -51,9 +51,16 @@ internal sealed partial class ProfilesListPage : ListPage, INotifyItemsChanged
         Icon = Icons.TerminalIcon;
         Name = Resources.profiles_list_page_name;
         _terminalSettings = terminalSettings;
+        _terminalSettings.Settings.SettingsChanged += Settings_SettingsChanged;
         _appSettingsManager = appSettingsManager;
     }
 
+    private void Settings_SettingsChanged(object sender, Settings args)
+    {
+        EnsureInitialized();
+        RaiseItemsChanged();
+    }
+
     private List<ListItem> Query()
     {
         EnsureInitialized();
@@ -62,7 +69,27 @@ internal sealed partial class ProfilesListPage : ListPage, INotifyItemsChanged
         openNewTab = _terminalSettings.OpenNewTab;
         openQuake = _terminalSettings.OpenQuake;
 
-        var profiles = _terminalQuery.GetProfiles();
+        var profiles = _terminalQuery.GetProfiles()!;
+
+        switch (_terminalSettings.ProfileSortOrder)
+        {
+            case ProfileSortOrder.MostRecentlyUsed:
+                var mru = _appSettingsManager.Current.RecentlyUsedProfiles ?? [];
+                profiles = profiles.OrderBy(p =>
+                    {
+                        var key = new TerminalProfileKey(p.Terminal?.AppUserModelId ?? string.Empty, p.Name ?? string.Empty);
+                        var index = mru.IndexOf(key);
+                        return index == -1 ? int.MaxValue : index;
+                    })
+                    .ThenBy(static p => p.Name, StringComparer.CurrentCultureIgnoreCase)
+                    .ToList();
+                break;
+            case ProfileSortOrder.Default:
+            case ProfileSortOrder.Alphabetical:
+            default:
+                profiles = profiles.OrderBy(static p => p.Name, StringComparer.CurrentCultureIgnoreCase);
+                break;
+        }
 
         if (terminalFilters?.IsAllSelected == false)
         {
@@ -78,12 +105,12 @@ internal sealed partial class ProfilesListPage : ListPage, INotifyItemsChanged
                 continue;
             }
 
-            result.Add(new ListItem(new LaunchProfileCommand(profile.Terminal.AppUserModelId, profile.Name, profile.Terminal.LogoPath, openNewTab, openQuake))
+            result.Add(new ListItem(new LaunchProfileCommand(profile.Terminal.AppUserModelId, profile.Name, profile.Terminal.LogoPath, openNewTab, openQuake, _appSettingsManager))
             {
                 Title = profile.Name,
                 Subtitle = profile.Terminal.DisplayName,
                 MoreCommands = [
-                    new CommandContextItem(new LaunchProfileAsAdminCommand(profile.Terminal.AppUserModelId, profile.Name, openNewTab, openQuake)),
+                    new CommandContextItem(new LaunchProfileAsAdminCommand(profile.Terminal.AppUserModelId, profile.Name, openNewTab, openQuake, _appSettingsManager)),
                 ],
             });
         }

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.Designer.cs

@@ -159,6 +159,60 @@ namespace Microsoft.CmdPal.Ext.WindowsTerminal.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Profiles order.
+        /// </summary>
+        internal static string profile_sort_order {
+            get {
+                return ResourceManager.GetString("profile_sort_order", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Profiles order.
+        /// </summary>
+        internal static string profile_sort_order_description {
+            get {
+                return ResourceManager.GetString("profile_sort_order_description", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Alphabetical.
+        /// </summary>
+        internal static string profile_sort_order_item_alphabetical {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_alphabetical", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to As defined in Terminal.
+        /// </summary>
+        internal static string profile_sort_order_item_as_in_terminal {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_as_in_terminal", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Default (alphabetical).
+        /// </summary>
+        internal static string profile_sort_order_item_default {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_default", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Most recently used.
+        /// </summary>
+        internal static string profile_sort_order_item_mru {
+            get {
+                return ResourceManager.GetString("profile_sort_order_item_mru", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Windows Terminal Profiles.
         /// </summary>

src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WindowsTerminal/Properties/Resources.resx

@@ -173,4 +173,22 @@
   <data name="save_last_selected_channel_description" xml:space="preserve">
     <value>Remember the last selected channel instead of resetting to All Channels.</value>
   </data>
+  <data name="profile_sort_order" xml:space="preserve">
+    <value>Profiles order</value>
+  </data>
+  <data name="profile_sort_order_description" xml:space="preserve">
+    <value>Profiles order</value>
+  </data>
+  <data name="profile_sort_order_item_default" xml:space="preserve">
+    <value>Default (alphabetical)</value>
+  </data>
+  <data name="profile_sort_order_item_mru" xml:space="preserve">
+    <value>Most recently used</value>
+  </data>
+  <data name="profile_sort_order_item_as_in_terminal" xml:space="preserve">
+    <value>As defined in Terminal</value>
+  </data>
+  <data name="profile_sort_order_item_alphabetical" xml:space="preserve">
+    <value>Alphabetical</value>
+  </data>
 </root>

src/settings-ui/Settings.UI.Library/MousePointerCrosshairsProperties.cs

@@ -58,6 +58,9 @@ namespace Microsoft.PowerToys.Settings.UI.Library
         [JsonPropertyName("gliding_delay_speed")]
         public IntProperty GlidingDelaySpeed { get; set; }
 
+        [JsonPropertyName("gliding_cursor_enabled")]
+        public BoolProperty GlidingCursorEnabled { get; set; }
+
         public MousePointerCrosshairsProperties()
         {
             ActivationShortcut = DefaultActivationShortcut;
@@ -74,6 +77,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library
             AutoActivate = new BoolProperty(false);
             GlidingTravelSpeed = new IntProperty(25);
             GlidingDelaySpeed = new IntProperty(5);
+            GlidingCursorEnabled = new BoolProperty(true);
         }
     }
 }

src/settings-ui/Settings.UI/SettingsXAML/Views/MouseUtilsPage.xaml

@@ -389,15 +389,26 @@
                         x:Uid="MouseUtils_GlidingCursor"
                         HeaderIcon="{ui:FontIcon Glyph=}"
                         IsEnabled="{x:Bind ViewModel.IsMousePointerCrosshairsEnabled, Mode=OneWay}">
-                        <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.GlidingCursorActivationShortcut, Mode=TwoWay}" />
+                        <ToggleSwitch
+                            x:Uid="ToggleSwitch"
+                            IsOn="{x:Bind ViewModel.GlidingCursorEnabled, Mode=TwoWay}" />
                         <tkcontrols:SettingsExpander.Items>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_GlidingCursor_InitialSpeed">
+                            <tkcontrols:SettingsCard
+                                x:Uid="MouseUtils_GlidingCursor_Shortcut"
+                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
+                                <controls:ShortcutControl MinWidth="{StaticResource SettingActionControlMinWidth}" HotkeySettings="{x:Bind Path=ViewModel.GlidingCursorActivationShortcut, Mode=TwoWay}" />
+                            </tkcontrols:SettingsCard>
+                            <tkcontrols:SettingsCard 
+                                x:Uid="MouseUtils_GlidingCursor_InitialSpeed"
+                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
                                 <Slider
                                     Maximum="60"
                                     Minimum="5"
                                     Value="{x:Bind ViewModel.GlidingCursorTravelSpeed, Mode=TwoWay}" />
                             </tkcontrols:SettingsCard>
-                            <tkcontrols:SettingsCard x:Uid="MouseUtils_GlidingCursor_DelaySpeed">
+                            <tkcontrols:SettingsCard 
+                                x:Uid="MouseUtils_GlidingCursor_DelaySpeed"
+                                IsEnabled="{x:Bind ViewModel.GlidingCursorEnabled, Mode=OneWay}">
                                 <Slider
                                     Maximum="60"
                                     Minimum="5"

src/settings-ui/Settings.UI/Strings/en-us/Resources.resw

@@ -2914,6 +2914,12 @@ Right-click to remove the key combination, thereby deactivating the shortcut.</v
   <data name="MouseUtils_GlidingCursor_DelaySpeed.Description" xml:space="preserve">
     <value>Speed after slowing down the line with a second shortcut press</value>
   </data>
+  <data name="MouseUtils_GlidingCursor_Shortcut.Header" xml:space="preserve">
+    <value>Activation shortcut</value>
+  </data>
+  <data name="MouseUtils_GlidingCursor_Shortcut.Description" xml:space="preserve">
+    <value>Shortcut to activate gliding cursor</value>
+  </data>
   <data name="FancyZones_Radio_Custom_Colors.Content" xml:space="preserve">
     <value>Custom colors</value>
   </data>

src/settings-ui/Settings.UI/ViewModels/MouseUtilsViewModel.cs

@@ -102,6 +102,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             _mousePointerCrosshairsIsFixedLengthEnabled = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsIsFixedLengthEnabled.Value;
             _mousePointerCrosshairsFixedLength = MousePointerCrosshairsSettingsConfig.Properties.CrosshairsFixedLength.Value;
             _mousePointerCrosshairsAutoActivate = MousePointerCrosshairsSettingsConfig.Properties.AutoActivate.Value;
+            _glidingCursorEnabled = MousePointerCrosshairsSettingsConfig.Properties.GlidingCursorEnabled.Value;
 
             int isEnabled = 0;
 
@@ -949,6 +950,24 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
             }
         }
 
+        public bool GlidingCursorEnabled
+        {
+            get
+            {
+                return _glidingCursorEnabled;
+            }
+
+            set
+            {
+                if (value != _glidingCursorEnabled)
+                {
+                    _glidingCursorEnabled = value;
+                    MousePointerCrosshairsSettingsConfig.Properties.GlidingCursorEnabled.Value = value;
+                    NotifyMousePointerCrosshairsPropertyChanged();
+                }
+            }
+        }
+
         public void NotifyMousePointerCrosshairsPropertyChanged([CallerMemberName] string propertyName = null)
         {
             OnPropertyChanged(propertyName);
@@ -1012,6 +1031,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
         private bool _mousePointerCrosshairsIsFixedLengthEnabled;
         private int _mousePointerCrosshairsFixedLength;
         private bool _mousePointerCrosshairsAutoActivate;
+        private bool _glidingCursorEnabled;
         private bool _isAnimationEnabledBySystem;
     }
 }