From 8bd292d8d5702085a03a5316a9d6c6116fb1c121 Mon Sep 17 00:00:00 2001
From: Sour <mesenemu@gmail.com>
Date: Sat, 22 Dec 2018 16:05:12 -0500
Subject: [PATCH] Input: Added option to hide mouse cursor when a zapper is
 connected (e.g for the aimtrak light gun)

---
 Docs/content/apireference/_index.md           |   2 +-
 Docs/content/configuration/Input.md           |   5 ++-
 Docs/static/images/InputOptions_Advanced.png  | Bin 5510 -> 6724 bytes
 GUI.NET/Config/InputInfo.cs                   |   2 ++
 GUI.NET/CursorManager.cs                      |  30 +++++++++++-------
 GUI.NET/Dependencies/resources.ca.xml         |   1 +
 GUI.NET/Dependencies/resources.en.xml         |   1 +
 GUI.NET/Dependencies/resources.es.xml         |   1 +
 GUI.NET/Dependencies/resources.fr.xml         |   1 +
 GUI.NET/Dependencies/resources.ja.xml         |   1 +
 GUI.NET/Dependencies/resources.pt.xml         |   1 +
 GUI.NET/Dependencies/resources.ru.xml         |   1 +
 GUI.NET/Dependencies/resources.uk.xml         |   1 +
 GUI.NET/Dependencies/resources.zh.xml         |   1 +
 .../Forms/Config/frmInputConfig.Designer.cs   |  20 ++++++++++--
 GUI.NET/Forms/Config/frmInputConfig.cs        |   1 +
 16 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/Docs/content/apireference/_index.md b/Docs/content/apireference/_index.md
index d88993fd..fbddbf3c 100644
--- a/Docs/content/apireference/_index.md
+++ b/Docs/content/apireference/_index.md
@@ -9,7 +9,7 @@ This section documents the Mesen-specific Lua API that is available in scripts v
 
 ## Changelog ##
 
-The Lua is still a recent feature and not completely stable yet. To get a list of the major changes between different versions of Mesen, take a look at the [Changelog](/apireference/changelog.html).
+Lua scripting is still a relatively recent feature and the API is not quite stable yet. To get a list of the major changes between different versions of Mesen, take a look at the [Changelog](/apireference/changelog.html).
 
 ## API References ##
 
diff --git a/Docs/content/configuration/Input.md b/Docs/content/configuration/Input.md
index 98c6307d..6dbb026c 100644
--- a/Docs/content/configuration/Input.md
+++ b/Docs/content/configuration/Input.md
@@ -51,9 +51,12 @@ You can also configure that controller's turbo buttons' speed with the `Turbo Sp
 	<span>Advanced Options</span>
 </div></div>
 
+**Hide mouse pointer when using zapper**: Hides the mouse pointer completely when a Zapper is connected. This is useful when using light guns (for PCs) that simulate a mouse.
+
 ### Display Controller Input ###
 
 Use these options to display the controller input on the screen.  
 {{% notice warning %}}
 This will be recorded by the [Video Recorder](/tools.html#video-recorder) - so make sure you turn it off if you do not want it to appear on the video.
-{{% /notice %}}
\ No newline at end of file
+{{% /notice %}}
+
diff --git a/Docs/static/images/InputOptions_Advanced.png b/Docs/static/images/InputOptions_Advanced.png
index 5f53cd95999de528c386cd169a5f0374044e7b61..aee9e486ae28f924ff68a88d2e3807e302936fff 100644
GIT binary patch
literal 6724
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

literal 5510
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
Hx7dFJv~ZF%

diff --git a/GUI.NET/Config/InputInfo.cs b/GUI.NET/Config/InputInfo.cs
index 7937dc56..01f8a173 100644
--- a/GUI.NET/Config/InputInfo.cs
+++ b/GUI.NET/Config/InputInfo.cs
@@ -137,6 +137,8 @@ namespace Mesen.GUI.Config
 		public InteropEmu.InputDisplayPosition DisplayInputPosition = InteropEmu.InputDisplayPosition.BottomRight;
 		public bool DisplayInputHorizontally = true;
 
+		public bool HideMousePointerForZapper = true;
+
 		[XmlElement(ElementName = "InputDevice")]
 		public List<ControllerInfo> Controllers = new List<ControllerInfo>();
 		public ZapperInfo Zapper = new ZapperInfo();
diff --git a/GUI.NET/CursorManager.cs b/GUI.NET/CursorManager.cs
index fa1cd34e..97451d4f 100644
--- a/GUI.NET/CursorManager.cs
+++ b/GUI.NET/CursorManager.cs
@@ -35,8 +35,15 @@ namespace Mesen.GUI
 			//Have not been able to find a reliable way to reproduce it yet
 			//This is a patch to prevent that bug from having any negative impact
 			if(!_mouseCaptured && _lastPosition != Cursor.Position) {
-				ShowMouse();
 				_lastPosition = Cursor.Position;
+
+				bool running = InteropEmu.IsRunning() && !InteropEmu.IsPaused();
+				if(running && ConfigManager.Config.InputInfo.HideMousePointerForZapper && CursorManager.IsLightGun) {
+					//Keep mouse hidden when using zapper if option to hide mouse is enabled
+					return;
+				}
+
+				ShowMouse();
 			}
 		}
 
@@ -67,19 +74,14 @@ namespace Mesen.GUI
 			}
 		}
 
+		private static bool IsLightGun
+		{
+			get { return InteropEmu.HasZapper() || InteropEmu.GetExpansionDevice() == InteropEmu.ExpansionPortDevice.BandaiHyperShot; }
+		}
+
 		public static bool NeedMouseIcon
 		{
-			get {
-				switch(InteropEmu.GetExpansionDevice()) {
-					case InteropEmu.ExpansionPortDevice.OekaKidsTablet:
-					case InteropEmu.ExpansionPortDevice.BandaiHyperShot:
-						return true;
-				}
-				if(InteropEmu.HasZapper()) {
-					return true;
-				}
-				return false;
-			}
+			get { return CursorManager.IsLightGun || InteropEmu.GetExpansionDevice() == InteropEmu.ExpansionPortDevice.OekaKidsTablet; }
 		}
 
 		public static void OnMouseMove(Control ctrl)
@@ -99,6 +101,10 @@ namespace Mesen.GUI
 
 				if(!InteropEmu.IsRunning() || InteropEmu.IsPaused()) {
 					ShowMouse();
+				} else if(ConfigManager.Config.InputInfo.HideMousePointerForZapper && CursorManager.IsLightGun) {
+					//Keep mouse hidden when using zapper if option to hide mouse is enabled
+					HideMouse();
+					return;
 				}
 
 				_tmrHideMouse.Stop();
diff --git a/GUI.NET/Dependencies/resources.ca.xml b/GUI.NET/Dependencies/resources.ca.xml
index 69930211..e77acdf2 100644
--- a/GUI.NET/Dependencies/resources.ca.xml
+++ b/GUI.NET/Dependencies/resources.ca.xml
@@ -217,6 +217,7 @@
 			<Control ID="chkDisplayPort4">Jugador 4</Control>
 			<Control ID="lblDisplayPosition">Posició de pantalla:</Control>
 			<Control ID="chkDisplayInputHorizontally">Mostra horitzontalment</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Advertència: La vostra configuració actual conté assignacions conflictives - algunes tecles del vostre teclat o botons del comandament han estat assignats a múltiples botons al comandament de la NES. Si això no ha estat intencionat, us preguem que reviseu i corregiu les vostres assignacions.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.en.xml b/GUI.NET/Dependencies/resources.en.xml
index 456ec51c..983962e7 100644
--- a/GUI.NET/Dependencies/resources.en.xml
+++ b/GUI.NET/Dependencies/resources.en.xml
@@ -217,6 +217,7 @@
 			<Control ID="chkDisplayPort4">Port 4</Control>
 			<Control ID="lblDisplayPosition">Display Position:</Control>
 			<Control ID="chkDisplayInputHorizontally">Display horizontally</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Warning: Your current configuration contains conflicting key bindings - some physical buttons on your keyboard or gamepad are mapped to multiple buttons on the NES controller. If this is not intentional, please review and correct your key bindings.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.es.xml b/GUI.NET/Dependencies/resources.es.xml
index d026380e..20cfd5c6 100644
--- a/GUI.NET/Dependencies/resources.es.xml
+++ b/GUI.NET/Dependencies/resources.es.xml
@@ -216,6 +216,7 @@
 			<Control ID="chkDisplayPort4">Jugador 4</Control>
 			<Control ID="lblDisplayPosition">Posición de pantalla:</Control>
 			<Control ID="chkDisplayInputHorizontally">Mostrar horizontalmente</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Advertencia: su configuración actual contiene asignaciones conflictivas - algunas teclas de su teclado o botones del mando se han asignado a varios botones del mando de la NES. Si esto no es intencionado, revise y corrija las asignaciones.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.fr.xml b/GUI.NET/Dependencies/resources.fr.xml
index e992312d..5a98e751 100644
--- a/GUI.NET/Dependencies/resources.fr.xml
+++ b/GUI.NET/Dependencies/resources.fr.xml
@@ -217,6 +217,7 @@
 			<Control ID="chkDisplayPort4">Joueur 4</Control>
 			<Control ID="lblDisplayPosition">Position d'affichage :</Control>
 			<Control ID="chkDisplayInputHorizontally">Afficher horizontalement</Control>
+			<Control ID="chkHideMousePointerForZapper">Cacher la souris lorsqu'un zapper est connecté</Control>
 
 			<Control ID="lblKeyBinding">Attention: Votre configuration actuelle contient des conflits - certaines touches sur votre clavier ou manette sont mappées à plusieurs boutons sur la console. Veuillez réviser votre configuration et la corriger au besoin.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.ja.xml b/GUI.NET/Dependencies/resources.ja.xml
index da57695f..52780d64 100644
--- a/GUI.NET/Dependencies/resources.ja.xml
+++ b/GUI.NET/Dependencies/resources.ja.xml
@@ -218,6 +218,7 @@
 			<Control ID="chkDisplayPort4">プレーヤー4</Control>
 			<Control ID="lblDisplayPosition">表示位置：</Control>
 			<Control ID="chkDisplayInputHorizontally">水平表示</Control>
+			<Control ID="chkHideMousePointerForZapper">ガンが接続されている時にマウスポインターを隠す</Control>
 
 			<Control ID="lblKeyBinding">注意：　使っている設定の中には同じキーが複数のボタン―にマッピングされています。　間違いでこの設定にした場合は、設定を確認して直してください。</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.pt.xml b/GUI.NET/Dependencies/resources.pt.xml
index 3532a94c..371edec6 100644
--- a/GUI.NET/Dependencies/resources.pt.xml
+++ b/GUI.NET/Dependencies/resources.pt.xml
@@ -217,6 +217,7 @@
 			<Control ID="chkDisplayPort4">Jogador 4</Control>
 			<Control ID="lblDisplayPosition">Posição da tela</Control>
 			<Control ID="chkDisplayInputHorizontally">Mostrar horizontalmente</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Aviso: a configuração atual contém atribuições conflitantes - alguns botões físicos em seu teclado ou gamepad são mapeados para vários botões no controle NES. Se isso não for intencional, reveja e corrija suas atribuições.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.ru.xml b/GUI.NET/Dependencies/resources.ru.xml
index 766778c9..02023b3c 100644
--- a/GUI.NET/Dependencies/resources.ru.xml
+++ b/GUI.NET/Dependencies/resources.ru.xml
@@ -216,6 +216,7 @@
 			<Control ID="chkDisplayPort4">Порт 4</Control>
 			<Control ID="lblDisplayPosition">Позиция :</Control>
 			<Control ID="chkDisplayInputHorizontally">Отображать горизонтально</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Warning: Your current configuration contains conflicting key bindings - some physical buttons on your keyboard or gamepad are mapped to multiple buttons on the NES controller. If this is not intentional, please review and correct your key bindings.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.uk.xml b/GUI.NET/Dependencies/resources.uk.xml
index fc8cdc5c..35b37c56 100644
--- a/GUI.NET/Dependencies/resources.uk.xml
+++ b/GUI.NET/Dependencies/resources.uk.xml
@@ -216,6 +216,7 @@
 			<Control ID="chkDisplayPort4">Порт 4</Control>
 			<Control ID="lblDisplayPosition">Позиція :</Control>
 			<Control ID="chkDisplayInputHorizontally">Відображати горизонтально</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">Увага: Ваша поточна конфігурація містить конфліктуючі поєднання клавіш - деякі фізичні кнопки на вашому ключовому словнику або геймпадi відображаються на кількох кнопках на контролері NES. Якщо це не навмисне, перегляньте та виправте ключi.</Control>
 		</Form>
diff --git a/GUI.NET/Dependencies/resources.zh.xml b/GUI.NET/Dependencies/resources.zh.xml
index 3e24298c..fc8b59e1 100644
--- a/GUI.NET/Dependencies/resources.zh.xml
+++ b/GUI.NET/Dependencies/resources.zh.xml
@@ -220,6 +220,7 @@
 			<Control ID="chkDisplayPort4">玩家 4</Control>
 			<Control ID="lblDisplayPosition">显示位置:</Control>
 			<Control ID="chkDisplayInputHorizontally">横向</Control>
+			<Control ID="chkHideMousePointerForZapper">Hide mouse pointer when using zapper</Control>
 
 			<Control ID="lblKeyBinding">警告：您当前的配置包含冲突的键绑定 - 键盘或游戏手柄上的某些物理按钮映射到NES控制器上的多个按钮.如果这不是故意的，请查看并更正您的按键绑定.</Control>
 		</Form>
diff --git a/GUI.NET/Forms/Config/frmInputConfig.Designer.cs b/GUI.NET/Forms/Config/frmInputConfig.Designer.cs
index a21ea0f2..8ba56212 100644
--- a/GUI.NET/Forms/Config/frmInputConfig.Designer.cs
+++ b/GUI.NET/Forms/Config/frmInputConfig.Designer.cs
@@ -70,6 +70,7 @@
 			this.flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
 			this.lblDisplayPosition = new System.Windows.Forms.Label();
 			this.cboDisplayInputPosition = new System.Windows.Forms.ComboBox();
+			this.chkHideMousePointerForZapper = new Mesen.GUI.Controls.ctrlRiskyOption();
 			this.tabMain.SuspendLayout();
 			this.tpgControllers.SuspendLayout();
 			this.tlpControllers.SuspendLayout();
@@ -442,7 +443,7 @@
 			this.tpgAdvanced.Controls.Add(this.tableLayoutPanel2);
 			this.tpgAdvanced.Location = new System.Drawing.Point(4, 22);
 			this.tpgAdvanced.Name = "tpgAdvanced";
-			this.tpgAdvanced.Size = new System.Drawing.Size(362, 313);
+			this.tpgAdvanced.Size = new System.Drawing.Size(362, 216);
 			this.tpgAdvanced.TabIndex = 5;
 			this.tpgAdvanced.Text = "Advanced";
 			this.tpgAdvanced.UseVisualStyleBackColor = true;
@@ -452,13 +453,15 @@
 			this.tableLayoutPanel2.ColumnCount = 1;
 			this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
 			this.tableLayoutPanel2.Controls.Add(this.grpDisplayInput, 0, 0);
+			this.tableLayoutPanel2.Controls.Add(this.chkHideMousePointerForZapper, 0, 1);
 			this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
 			this.tableLayoutPanel2.Name = "tableLayoutPanel2";
-			this.tableLayoutPanel2.RowCount = 2;
+			this.tableLayoutPanel2.RowCount = 3;
+			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
 			this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-			this.tableLayoutPanel2.Size = new System.Drawing.Size(362, 313);
+			this.tableLayoutPanel2.Size = new System.Drawing.Size(362, 216);
 			this.tableLayoutPanel2.TabIndex = 0;
 			// 
 			// grpDisplayInput
@@ -583,6 +586,16 @@
 			this.cboDisplayInputPosition.Size = new System.Drawing.Size(121, 21);
 			this.cboDisplayInputPosition.TabIndex = 1;
 			// 
+			// chkHideMousePointerForZapper
+			// 
+			this.chkHideMousePointerForZapper.Checked = false;
+			this.chkHideMousePointerForZapper.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.chkHideMousePointerForZapper.Location = new System.Drawing.Point(0, 96);
+			this.chkHideMousePointerForZapper.Name = "chkHideMousePointerForZapper";
+			this.chkHideMousePointerForZapper.Size = new System.Drawing.Size(362, 23);
+			this.chkHideMousePointerForZapper.TabIndex = 2;
+			this.chkHideMousePointerForZapper.Text = "Hide mouse pointer when using zapper";
+			// 
 			// frmInputConfig
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -663,5 +676,6 @@
 		private System.Windows.Forms.Label lblCartridge;
 		private System.Windows.Forms.ComboBox cboCartridge;
 		private System.Windows.Forms.Button btnSetupCartridge;
+		private Controls.ctrlRiskyOption chkHideMousePointerForZapper;
 	}
 }
\ No newline at end of file
diff --git a/GUI.NET/Forms/Config/frmInputConfig.cs b/GUI.NET/Forms/Config/frmInputConfig.cs
index d212dac9..8dd1fba6 100644
--- a/GUI.NET/Forms/Config/frmInputConfig.cs
+++ b/GUI.NET/Forms/Config/frmInputConfig.cs
@@ -43,6 +43,7 @@ namespace Mesen.GUI.Forms.Config
 			AddBinding("DisplayInputPort4", chkDisplayPort4);
 			AddBinding("DisplayInputPosition", cboDisplayInputPosition);
 			AddBinding("DisplayInputHorizontally", chkDisplayInputHorizontally);
+			AddBinding("HideMousePointerForZapper", chkHideMousePointerForZapper);
 
 			//Sort expansion port dropdown alphabetically, but keep the "None" option at the top
 			SortDropdown(cboExpansionPort, ResourceHelper.GetEnumText(InteropEmu.ExpansionPortDevice.None));