From 4a351fd1826431eb445b7dbad75da9ba4b760a4e Mon Sep 17 00:00:00 2001
From: TimeServ <timeserv@users.sourceforge.net>
Date: Tue, 6 Jun 2006 00:25:09 +0000
Subject: [PATCH] support/fix for mice with a relative mousewheel under
 directinput, use m_forcewheel_threshold to adjust and m_forcewheel 2 to use
 relative wheel behavior

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2317 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/in_win.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/engine/client/in_win.c b/engine/client/in_win.c
index d90a82a59..d3a1cffea 100644
--- a/engine/client/in_win.c
+++ b/engine/client/in_win.c
@@ -55,6 +55,7 @@ HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
 cvar_t	m_filter = SCVAR("m_filter","0");
 cvar_t  m_accel = SCVAR("m_accel", "0");
 cvar_t	m_forcewheel = SCVAR("m_forcewheel", "1");
+cvar_t	m_forcewheel_threshold = SCVAR("m_forcewheel_threshold", "32");
 cvar_t	in_mwhook = SCVARF("in_mwhook","0", CVAR_ARCHIVE);
 cvar_t	in_dinput = SCVARF("in_dinput","0", CVAR_ARCHIVE);
 
@@ -908,7 +909,11 @@ unsigned long __stdcall IN_SerialMSIntelliRun(void *param)
 			mouse->delta[1] +=	(signed char)(((code[0] & 0x0C) << 4) | (code[2]/* & 0x3F*/));
 
 			if (m_forcewheel.value)
-				mouse->wheeldelta += (signed char)((code[3] & 0x0f)<<4)/16;
+			{
+				int wdv;
+				wdv = (signed char)((code[3] & 0x0f)<<4)/16;
+				mouse->wheeldelta += wdv * m_forcewheel_threshold.value;
+			}
 
 			total=0;
 		}
@@ -1215,6 +1220,7 @@ void IN_Init (void)
 	Cvar_Register (&m_filter, "Input Controls");
 	Cvar_Register (&m_accel, "Input Controls");
 	Cvar_Register (&m_forcewheel, "Input Controls");
+	Cvar_Register (&m_forcewheel_threshold, "Input Controls");
 	Cvar_Register (&in_mwhook, "Input Controls");
 
 	Cvar_Register (&in_dinput, "Input Controls");
@@ -1338,6 +1344,7 @@ static void ProcessMouse(mouse_t *mouse, usercmd_t *cmd, int pnum)
 
 	int mx, my;
 	double mouse_x, mouse_y, mouse_deltadist;
+	int mfwt;
 
 	int i;
 
@@ -1357,21 +1364,21 @@ static void ProcessMouse(mouse_t *mouse, usercmd_t *cmd, int pnum)
 		}
 	}
 	mouse->oldbuttons = mouse->buttons;
-	while(mouse->wheeldelta<0)
+	mfwt = (int)m_forcewheel_threshold.value;
+	while(mouse->wheeldelta <= -mfwt)
 	{
 		Key_Event (K_MWHEELUP, true);
 		Key_Event (K_MWHEELUP, false);
-		mouse->wheeldelta++;
+		mouse->wheeldelta += mfwt;
 	}
 
-	while(mouse->wheeldelta>0)
+	while(mouse->wheeldelta >= mfwt)
 	{
 		Key_Event (K_MWHEELDOWN, true);
 		Key_Event (K_MWHEELDOWN, false);
-		mouse->wheeldelta--;
+		mouse->wheeldelta -= mfwt;
 	}
 
-
 	mx = mouse->delta[0];
 	mouse->delta[0]=0;
 	my = mouse->delta[1];
@@ -1580,12 +1587,16 @@ void IN_MouseMove (usercmd_t *cmd, int pnum)
 					break;
 
 				case DIMOFS_Z:
-					if (m_forcewheel.value)
+					if (m_forcewheel.value >= 2)
+						sysmouse.wheeldelta -= (signed int)od.dwData;
+					else if (m_forcewheel.value)
 					{
-						if (od.dwData &	0x80)
-							sysmouse.wheeldelta++;
-						else
-							sysmouse.wheeldelta--;
+						int mfwt = (int)m_forcewheel_threshold.value;
+
+						if ((signed int)od.dwData > mfwt)
+							sysmouse.wheeldelta -= mfwt;
+						else if ((signed int)od.dwData < -mfwt)
+							sysmouse.wheeldelta += mfwt;
 					}
 					break;