Update 2212

Rename project to MouseSwitchER to avoid misunderstanding with switch game console
Added clip cursor to screen function

Author: developer-ken

AboutPage.Designer.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace MouseSwitch
+namespace MouseSwitcher
 {
     public partial class AboutPage : Form
     {

AboutPage.cs

@@ -8,15 +8,15 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace MouseSwitch
+namespace MouseSwitcher
 {
     public partial class Config : Form
     {
         static Config me;
         Form1 parent;
         public Config(Form1 f)
         {
-            if (me?.Visible==true) me.Close();
+            if (me?.Visible == true) me.Close();
             me = this;
             parent = f;
             InitializeComponent();
@@ -28,6 +28,10 @@ private void Config_Load(object sender, EventArgs e)
             PrevKeyBox.Text = HotKeys.GetKeyName(parent.previous);
             NextKeyBox.Text = HotKeys.GetKeyName(parent.next);
             shownotify.Checked = parent.shownotifi;
+            checkBox1.CheckState = parent.doclipcursor ?
+                (parent.enhancedclip ? CheckState.Checked : CheckState.Indeterminate)
+                :
+                CheckState.Unchecked;
         }
 
         private void PrevKeyBox_KeyDown(object sender, KeyEventArgs e)
@@ -99,5 +103,12 @@ private void shownotify_CheckedChanged(object sender, EventArgs e)
             parent.shownotifi = shownotify.Checked;
             parent.SaveConfig();
         }
+
+        private void checkBox1_CheckStateChanged(object sender, EventArgs e)
+        {
+            parent.enhancedclip = checkBox1.CheckState == CheckState.Checked;
+            parent.doclipcursor = parent.enhancedclip || checkBox1.CheckState == CheckState.Indeterminate;
+            parent.SaveConfig();
+        }
     }
 }

MouseSwitch/Config.Designer.cs Config.Designer.csMouseSwitch/Config.Designer.cs renamed to Config.Designer.cs

@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace MouseSwitch
+namespace MouseSwitcher
 {
     public partial class ErrorReport : Form
     {

MouseSwitch/Config.cs Config.csMouseSwitch/Config.cs renamed to Config.cs

@@ -6,9 +6,9 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using static MouseSwitch.HotKeys;
+using static MouseSwitcher.HotKeys;
 
-namespace MouseSwitch
+namespace MouseSwitcher
 {
     public class Form1 : Form
     {
@@ -33,6 +33,9 @@ public class Form1 : Form
         private ToolStripMenuItem 关于AToolStripMenuItem;
         private ToolStripMenuItem 退出QToolStripMenuItem;
         public bool shownotifi = false;
+        private Timer clipper;
+        public bool doclipcursor = false;
+        public bool enhancedclip = false;
 
         public Form1()
         {
@@ -105,6 +108,7 @@ private bool LoadConfig()
                 next = Keys.Right;
                 modifier = HotkeyModifiers.Alt;
                 shownotifi = true;
+                doclipcursor = false;
                 return true;
             }
             else
@@ -115,6 +119,12 @@ private bool LoadConfig()
                 next = (Keys)jb.Value<int>("next_screen");
                 modifier = (HotkeyModifiers)jb.Value<int>("modifier");
                 shownotifi = jb.Value<bool>("notify_when_boot");
+                if (jb["clip_cursor"] != null)
+                {
+                    var clip_cursor_str = jb.Value<string>("clip_cursor").ToLower();
+                    doclipcursor = clip_cursor_str.Equals("true") || clip_cursor_str.Equals("enhanced");
+                    enhancedclip = clip_cursor_str.Equals("enhanced");
+                }
                 return false;
             }
         }
@@ -129,13 +139,20 @@ public void SaveConfig()
                 jb.Add("next_screen", (int)next);
                 jb.Add("modifier", (int)modifier);
                 jb.Add("notify_when_boot", shownotifi);
+                jb.Add("clip_cursor", doclipcursor ? (enhancedclip ? "enhanced" : "true") : "false");
                 File.WriteAllText("config.json", jb.ToString());
             }
         }
 
         [DllImport("user32")]
         private static extern int SetCursorPos(int x, int y);
 
+        [DllImport("user32")]
+        private static extern bool ClipCursor(Rectangle lpRect);
+
+        [DllImport("user32")]
+        private static extern bool ClipCursor();
+
         public void MouseToPoint(Point p)
         {
             SetCursorPos(p.X, p.Y);
@@ -153,22 +170,16 @@ public void SetMouseAtCenterScreen(Screen screen)
 
         private int MouseGoto(int ScreenID = 1)
         {
-            int num = 0;
             Screen[] allScreens = Screen.AllScreens;
-            foreach (Screen screen in allScreens)
-            {
-                num++;
-                if (num == ScreenID)
-                {
-                    SetMouseAtCenterScreen(screen);
-                    number.Text = num.ToString();
-                    base.Left = screen.WorkingArea.X;
-                    base.Top = screen.WorkingArea.Y;
-                    base.Opacity = 0.75;
-                    autohide.Start();
-                    break;
-                }
-            }
+            Screen screen = allScreens[ScreenID - 1];
+            if (doclipcursor) ClipCursor();
+            SetMouseAtCenterScreen(screen);
+            number.Text = (ScreenID).ToString();
+            base.Left = screen.WorkingArea.X;
+            base.Top = screen.WorkingArea.Y;
+            base.Opacity = 0.75;
+            if (doclipcursor) ClipCursor(screen.Bounds);
+            autohide.Start();
             return allScreens.Count();
         }
 
@@ -263,6 +274,21 @@ private void 关于AToolStripMenuItem_Click(object sender, EventArgs e)
             new AboutPage().ShowDialog();
         }
 
+        private void clipper_Tick(object sender, EventArgs e)
+        {
+            if (enhancedclip)
+            {
+                Screen[] allScreens = Screen.AllScreens;
+                Screen screen = allScreens[NowAt - 1];
+                ClipCursor(screen.Bounds);
+            }
+        }
+
+        private void contextMenuStrip1_Opening(object sender, CancelEventArgs e)
+        {
+
+        }
+
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
@@ -276,6 +302,7 @@ private void InitializeComponent()
             this.设置SToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.关于AToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.退出QToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.clipper = new System.Windows.Forms.Timer(this.components);
             this.contextMenuStrip1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -326,6 +353,7 @@ private void InitializeComponent()
             this.退出QToolStripMenuItem});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
             this.contextMenuStrip1.Size = new System.Drawing.Size(181, 92);
+            this.contextMenuStrip1.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuStrip1_Opening);
             // 
             // 设置SToolStripMenuItem
             // 
@@ -348,6 +376,12 @@ private void InitializeComponent()
             this.退出QToolStripMenuItem.Text = "退出(&Q)";
             this.退出QToolStripMenuItem.Click += new System.EventHandler(this.退出QToolStripMenuItem_Click);
             // 
+            // clipper
+            // 
+            this.clipper.Enabled = true;
+            this.clipper.Interval = 500;
+            this.clipper.Tick += new System.EventHandler(this.clipper_Tick);
+            // 
             // Form1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);

MouseSwitch/Config.resx Config.resxMouseSwitch/Config.resx renamed to Config.resx

@@ -769,6 +769,9 @@
         //////////////////////////////////////////////////8=
 </value>
   </data>
+  <metadata name="clipper.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>584, 17</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAYGAAAAEAIAColAAAFgAAACgAAABgAAAAwAAAAAEAIAAAAAAAAJAAAAAAAAAAAAAAAAAAAAAA

ErrorReport.Designer.cs

@@ -3,7 +3,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace MouseSwitch
+namespace MouseSwitcher
 {
 	public class HotKeys
 	{