WIP - [Mouse Without Borders] - refactoring "Common" classes - Common.Log.cs, Common.Receiver.cs #35156

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

@@ -32,12 +32,17 @@
 using MouseWithoutBorders.Exceptions;
 
 using SystemClipboard = System.Windows.Forms.Clipboard;
+using Thread = MouseWithoutBorders.Core.Thread;
 
 namespace MouseWithoutBorders
 {
     internal partial class Common
     {
-        private const uint BIG_CLIPBOARD_DATA_TIMEOUT = 30000;
+        internal static readonly char[] Comma = new char[] { ',' };
+        internal static readonly char[] Star = new char[] { '*' };
+        internal static readonly char[] NullSeparator = new char[] { '\0' };
+
+        internal const uint BIG_CLIPBOARD_DATA_TIMEOUT = 30000;
         private const uint MAX_CLIPBOARD_DATA_SIZE_CAN_BE_SENT_INSTANTLY_TCP = 1024 * 1024; // 1MB
         private const uint MAX_CLIPBOARD_FILE_SIZE_CAN_BE_SENT = 100 * 1024 * 1024; // 100MB
         private const int TEXT_HEADER_SIZE = 12;
@@ -46,11 +51,9 @@ internal partial class Common
         private static long lastClipboardEventTime;
         private static string lastMachineWithClipboardData;
         private static string lastDragDropFile;
-        private static long clipboardCopiedTime;
-
-        internal static readonly char[] Comma = new char[] { ',' };
-        internal static readonly char[] Star = new char[] { '*' };
-        internal static readonly char[] NullSeparator = new char[] { '\0' };
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static long clipboardCopiedTime;
+#pragma warning restore SA1307
 
         internal static ID LastIDWithClipboardData { get; set; }
 
@@ -332,7 +335,7 @@ internal static void ReceiveClipboardDataUsingTCP(DATA data, bool image, TcpSk t
                             break;
 
                         default:
-                            ProcessPackage(data, tcp);
+                            Receiver.ProcessPackage(data, tcp);
                             if (++unexpectedCount > 100)
                             {
                                 Logger.Log("ReceiveClipboardDataUsingTCP: unexpectedCount > 100!");

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

@@ -22,6 +22,8 @@
 using MouseWithoutBorders.Class;
 using MouseWithoutBorders.Core;
 
+using Thread = MouseWithoutBorders.Core.Thread;
+
 namespace MouseWithoutBorders
 {
     /* Common.DragDrop.cs
@@ -238,7 +240,7 @@ internal static void DragDropStep06()
 
         internal static void DragDropStep08(DATA package)
         {
-            GetNameOfMachineWithClipboardData(package);
+            Receiver.GetNameOfMachineWithClipboardData(package);
             Logger.LogDebug("DragDropStep08: ClipboardDragDrop Received. machine with drag file was set");
         }
 

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

@@ -21,6 +21,8 @@
 using MouseWithoutBorders.Core;
 using MouseWithoutBorders.Form;
 
+using Thread = MouseWithoutBorders.Core.Thread;
+
 namespace MouseWithoutBorders
 {
     internal partial class Common
@@ -145,7 +147,7 @@ internal static void MouseEvent(MOUSEDATA e, int dx, int dy)
             }
         }
 
-        private static bool IsSwitchingByMouseEnabled()
+        internal static bool IsSwitchingByMouseEnabled()
         {
             return (EasyMouseOption)Setting.Values.EasyMouse == EasyMouseOption.Enable || InputHook.EasyMouseKeyDown;
         }

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

@@ -23,6 +23,8 @@
 using MouseWithoutBorders.Form;
 using Windows.UI.Input.Preview.Injection;
 
+using Thread = MouseWithoutBorders.Core.Thread;
+
 namespace MouseWithoutBorders
 {
     internal partial class Common

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

@@ -51,10 +51,14 @@ internal partial class Common
         private const int SKIP_PIXELS = 1;
         private const int JUMP_PIXELS = 2;
 
-        private static ID desMachineID;
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static ID desMachineID;
+#pragma warning restore SA1307
         internal static string DesMachineName = string.Empty;
         private static ID newDesMachineID;
-        private static ID newDesMachineIdEx;
+#pragma warning disable SA1307 // Accessible fields should begin with upper-case letter
+        internal static ID newDesMachineIdEx;
+#pragma warning restore SA1307
         private static ID dropMachineID;
 
         private static long lastJump = Common.GetTick();
@@ -720,7 +724,7 @@ internal static void RemoveDeadMachines()
             }
         }
 
-        private static string AddToMachinePool(DATA package)
+        internal static string AddToMachinePool(DATA package)
         {
             // Log("********** AddToMachinePool called: " + package.src.ToString(CultureInfo.InvariantCulture));