SDL: Fix erratic analog pointer + control options

Fixes erratic speeds in analog pointer motion
Implemented option to set analog/keyboard pointer speed
and control the analog joystick deadzone. The deadzone option appears
only if the build supports analog joystick (via JOY_ANALOG define)

7 files changed, 148 insertions, 16 deletions

diff --git a/gui/themes/default.inc b/gui/themes/default.inc
index d8baae8d0e..f967067adc 100644
--- a/gui/themes/default.inc
+++ b/gui/themes/default.inc
@@ -813,17 +813,39 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='8'>"
-"<widget name='grOnScreenCheckbox' "
-"type='Checkbox' "
+"<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>"
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>"
+"<widget name = 'grOnScreenCheckbox' "
+"type = 'Checkbox' "
 "/>"
-"<widget name='grTouchpadCheckbox' "
-"type='Checkbox' "
+"<widget name = 'grTouchpadCheckbox' "
+"type = 'Checkbox' "
 "/>"
-"<widget name='grSwapMenuAndBackBtnsCheckbox' "
-"type='Checkbox' "
+"<widget name = 'grSwapMenuAndBackBtnsCheckbox' "
+"type = 'Checkbox' "
+"/>"
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>"
+"<widget name = 'grKbdMouseSpeedDesc' "
+"type = 'OptionsLabel' "
+"/>"
+"<widget name = 'grKbdMouseSpeedSlider' "
+"type = 'Slider' "
 "/>"
+"<widget name = 'grKbdMouseSpeedLabel' "
+"type = 'SmallLabel' "
+"/>"
+"</layout>"
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>"
+"<widget name = 'grJoystickDeadzoneDesc' "
+"type = 'OptionsLabel' "
+"/>"
+"<widget name = 'grJoystickDeadzoneSlider' "
+"type = 'Slider' "
+"/>"
+"<widget name = 'grJoystickDeadzoneLabel' "
+"type = 'SmallLabel' "
+"/>"
+"</layout>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
@@ -2368,17 +2390,39 @@ const char *defaultXML1 = "<?xml version = '1.0'?>"
 "</layout>"
 "</layout>"
 "</dialog>"
-"<dialog name='GlobalOptions_Control' overlays='Dialog.GlobalOptions.TabWidget'>"
-"<layout type='vertical' padding='16,16,16,16' spacing='6'>"
-"<widget name='grOnScreenCheckbox' "
-"type='Checkbox' "
+"<dialog name = 'GlobalOptions_Control' overlays = 'Dialog.GlobalOptions.TabWidget'>"
+"<layout type = 'vertical' padding = '16, 16, 16, 16' spacing = '8'>"
+"<widget name = 'grOnScreenCheckbox' "
+"type = 'Checkbox' "
 "/>"
-"<widget name='grTouchpadCheckbox' "
-"type='Checkbox' "
+"<widget name = 'grTouchpadCheckbox' "
+"type = 'Checkbox' "
 "/>"
-"<widget name='grSwapMenuAndBackBtnsCheckbox' "
-"type='Checkbox' "
+"<widget name = 'grSwapMenuAndBackBtnsCheckbox' "
+"type = 'Checkbox' "
+"/>"
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>"
+"<widget name = 'grKbdMouseSpeedDesc' "
+"type = 'OptionsLabel' "
+"/>"
+"<widget name = 'grKbdMouseSpeedSlider' "
+"type = 'Slider' "
 "/>"
+"<widget name = 'grKbdMouseSpeedLabel' "
+"type = 'SmallLabel' "
+"/>"
+"</layout>"
+"<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>"
+"<widget name = 'grJoystickDeadzoneDesc' "
+"type = 'OptionsLabel' "
+"/>"
+"<widget name = 'grJoystickDeadzoneSlider' "
+"type = 'Slider' "
+"/>"
+"<widget name = 'grJoystickDeadzoneLabel' "
+"type = 'SmallLabel' "
+"/>"
+"</layout>"
 "</layout>"
 "</dialog>"
 "<dialog name='GlobalOptions_Graphics' overlays='Dialog.GlobalOptions.TabWidget'>"
diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index d90289a4be..e84768b497 100644
--- a/gui/themes/scummclassic.zip
+++ b/gui/themes/scummclassic.zip
diff --git a/gui/themes/scummclassic/classic_layout.stx b/gui/themes/scummclassic/classic_layout.stx
index aa91cdb35f..75ffee20cd 100644
--- a/gui/themes/scummclassic/classic_layout.stx
+++ b/gui/themes/scummclassic/classic_layout.stx
@@ -249,6 +249,28 @@
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
+				<widget name = 'grKbdMouseSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grKbdMouseSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grKbdMouseSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grJoystickDeadzoneDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grJoystickDeadzoneSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grJoystickDeadzoneLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummclassic/classic_layout_lowres.stx b/gui/themes/scummclassic/classic_layout_lowres.stx
index c925a39d18..e46db3e94b 100644
--- a/gui/themes/scummclassic/classic_layout_lowres.stx
+++ b/gui/themes/scummclassic/classic_layout_lowres.stx
@@ -246,6 +246,28 @@
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
+				<widget name = 'grKbdMouseSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grKbdMouseSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grKbdMouseSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grJoystickDeadzoneDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grJoystickDeadzoneSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grJoystickDeadzoneLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index f10102503e..ed1e3c0c58 100644
--- a/gui/themes/scummmodern.zip
+++ b/gui/themes/scummmodern.zip
diff --git a/gui/themes/scummmodern/scummmodern_layout.stx b/gui/themes/scummmodern/scummmodern_layout.stx
index 80b913a3a4..754bc251d9 100644
--- a/gui/themes/scummmodern/scummmodern_layout.stx
+++ b/gui/themes/scummmodern/scummmodern_layout.stx
@@ -263,6 +263,28 @@
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
+				<widget name = 'grKbdMouseSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grKbdMouseSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grKbdMouseSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grJoystickDeadzoneDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grJoystickDeadzoneSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grJoystickDeadzoneLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
 		</layout>
 	</dialog>
 
diff --git a/gui/themes/scummmodern/scummmodern_layout_lowres.stx b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
index 308ba44b7e..eadb305414 100644
--- a/gui/themes/scummmodern/scummmodern_layout_lowres.stx
+++ b/gui/themes/scummmodern/scummmodern_layout_lowres.stx
@@ -244,6 +244,28 @@
 			<widget name = 'grSwapMenuAndBackBtnsCheckbox'
 					type = 'Checkbox'
 			/>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10'>
+				<widget name = 'grKbdMouseSpeedDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grKbdMouseSpeedSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grKbdMouseSpeedLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
+			<layout type = 'horizontal' padding = '0, 0, 0, 0' spacing = '10' center = 'true'>
+				<widget name = 'grJoystickDeadzoneDesc'
+						type = 'OptionsLabel'
+				/>
+				<widget name = 'grJoystickDeadzoneSlider'
+						type = 'Slider'
+				/>
+				<widget name = 'grJoystickDeadzoneLabel'
+						type = 'SmallLabel'
+				/>
+			</layout>
 		</layout>
 	</dialog>