UI: Input - Added option to enable old SNES mouse movement

SourMesen · Jun 24, 2024 · 6d020e0 · 6d020e0
1 parent f429697
commit 6d020e0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 3 deletions.
diff --git a/Core/SNES/Input/SnesMouse.h b/Core/SNES/Input/SnesMouse.h
@@ -83,6 +83,12 @@ class SnesMouse : public BaseControlDevice
 		int32_t dx = mov.dx;
 		int32_t dy = mov.dy;
 
+		bool enableSmoothMouse = _emu->GetSettings()->GetInputConfig().EnableSmootherSnesMouse;
+		if(enableSmoothMouse) {
+			dx = mov.dx * (1 + _sensitivity);
+			dy = mov.dy * (1 + _sensitivity);
+		}
+
 		//These flags will maintain and report their last moved direction.
 		//It's a hardware quirk that the real mouse does. (unknown if any games rely on this)
 		if(dx != 0) { _leftFlag = dx < 0 ? 0x80 : 0; }
@@ -91,7 +97,7 @@ class SnesMouse : public BaseControlDevice
 		dx = std::min(std::abs(dx), 127);
 		dy = std::min(std::abs(dy), 127);
 
-		if(_sensitivity > 0) {
+		if(!enableSmoothMouse && _sensitivity > 0) {
 			dx = _sensitivityLut[_sensitivity - 1][std::min(7, dx)];
 			dy = _sensitivityLut[_sensitivity - 1][std::min(7, dy)];
 		}

diff --git a/Core/Shared/SettingTypes.h b/Core/Shared/SettingTypes.h
@@ -320,6 +320,7 @@ struct InputConfig
 {
 	uint32_t ControllerDeadzoneSize = 2;
 	uint32_t MouseSensitivity = 1;
+	bool EnableSmootherSnesMouse;
 
 	InputDisplayPosition DisplayInputPosition = InputDisplayPosition::TopLeft;
 	bool DisplayInputPort[8] = { };

diff --git a/UI/Config/InputConfig.cs b/UI/Config/InputConfig.cs
@@ -15,6 +15,7 @@ public class InputConfig : BaseConfig<InputConfig>
 	{
 		[Reactive] [MinMax(0, 4)] public UInt32 ControllerDeadzoneSize { get; set; } = 2;
 		[Reactive] [MinMax(0, 9)] public UInt32 MouseSensitivity { get; set; } = 5;
+		[Reactive] public bool EnableSmootherSnesMouse { get; set; } = false;
 		[Reactive] public bool HidePointerForLightGuns { get; set; } = false;
 
 		[Reactive] public InputDisplayPosition DisplayInputPosition { get; set; } = InputDisplayPosition.BottomRight;
@@ -37,6 +38,7 @@ public void ApplyConfig()
 			ConfigApi.SetInputConfig(new InteropInputConfig() {
 				ControllerDeadzoneSize = this.ControllerDeadzoneSize,
 				MouseSensitivity = this.MouseSensitivity,
+				EnableSmootherSnesMouse = this.EnableSmootherSnesMouse,
 				DisplayInputPosition = this.DisplayInputPosition,
 				DisplayInputPort1 = this.DisplayInputPort1,
 				DisplayInputPort2 = this.DisplayInputPort2,
@@ -221,6 +223,7 @@ public struct InteropInputConfig
 	{
 		public UInt32 ControllerDeadzoneSize;
 		public UInt32 MouseSensitivity;
+		[MarshalAs(UnmanagedType.I1)] public bool EnableSmootherSnesMouse;
 
 		public InputDisplayPosition DisplayInputPosition;
 		[MarshalAs(UnmanagedType.I1)] public bool DisplayInputPort1;

diff --git a/UI/Localization/resources.en.xml b/UI/Localization/resources.en.xml
@@ -112,7 +112,9 @@
 			<Control ID="lblDisplayPosition">Display position:</Control>
 			<Control ID="chkDisplayInputHorizontally">Horizontal display</Control>
 
+			<Control ID="tpgAdvanced">Advanced</Control>
 			<Control ID="chkHidePointerForLightGuns">Hide mouse pointer when using light guns</Control>
+			<Control ID="chkEnableSmootherSnesMouse">Enable smoother SNES mouse movement (not hardware-accurate)</Control>
 		</Form>
 		<Form ID="InputComboBox">
 			<Control ID="btnSetup">Setup</Control>

diff --git a/UI/Views/InputConfigView.axaml b/UI/Views/InputConfigView.axaml
@@ -63,8 +63,6 @@
 								<TextBlock Text="{l:Translate lblHigh}" Grid.Column="2" />
 							</Grid>
 						</Grid>
-
-						<c:CheckBoxWarning Margin="0 10 0 0" IsChecked="{Binding Config.HidePointerForLightGuns}" Text="{l:Translate chkHidePointerForLightGuns}" />
 					</c:OptionSection>
 				</StackPanel>
 			</ScrollViewer>
@@ -97,5 +95,13 @@
 				</Grid>
 			</ScrollViewer>
 		</TabItem>
+		<TabItem Header="{l:Translate tpgAdvanced}">
+			<ScrollViewer AllowAutoHide="False" HorizontalScrollBarVisibility="Auto" Padding="0 0 2 0">
+				<StackPanel>
+					<CheckBox Content="{l:Translate chkEnableSmootherSnesMouse}" IsChecked="{Binding Config.EnableSmootherSnesMouse}" />
+					<c:CheckBoxWarning IsChecked="{Binding Config.HidePointerForLightGuns}" Text="{l:Translate chkHidePointerForLightGuns}" />
+				</StackPanel>
+			</ScrollViewer>
+		</TabItem>
 	</TabControl>
 </UserControl>