From 8f5f1eb12068648537a1ea1204bd91c5bff89fa9 Mon Sep 17 00:00:00 2001
From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 15 Jul 2007 14:55:43 +0000
Subject: [PATCH] make -dinput support BUTTON4 and the wheel

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7489 d7cf8633-e32d-0410-b094-e92efae38249
---
 vid_wgl.c | 59 ++++++++++++++++++++++---------------------------------
 1 file changed, 23 insertions(+), 36 deletions(-)

diff --git a/vid_wgl.c b/vid_wgl.c
index 7c7a49e4..80c15891 100644
--- a/vid_wgl.c
+++ b/vid_wgl.c
@@ -214,39 +214,6 @@ static JOYINFOEX	ji;
 
 static HINSTANCE hInstDI;
 
-//static qboolean	dinput;
-
-typedef struct MYDATA {
-	LONG  lX;                   // X axis goes here
-	LONG  lY;                   // Y axis goes here
-	LONG  lZ;                   // Z axis goes here
-	BYTE  bButtonA;             // One button goes here
-	BYTE  bButtonB;             // Another button goes here
-	BYTE  bButtonC;             // Another button goes here
-	BYTE  bButtonD;             // Another button goes here
-} MYDATA;
-
-static DIOBJECTDATAFORMAT rgodf[] = {
-  { &GUID_XAxis,    FIELD_OFFSET(MYDATA, lX),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_YAxis,    FIELD_OFFSET(MYDATA, lY),       DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { &GUID_ZAxis,    FIELD_OFFSET(MYDATA, lZ),       0x80000000 | DIDFT_AXIS | DIDFT_ANYINSTANCE,   0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonA), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonB), DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonC), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-  { 0,              FIELD_OFFSET(MYDATA, bButtonD), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
-};
-
-#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
-
-static DIDATAFORMAT	df = {
-	sizeof(DIDATAFORMAT),       // this structure
-	sizeof(DIOBJECTDATAFORMAT), // size of object data format
-	DIDF_RELAXIS,               // absolute axis coordinates
-	sizeof(MYDATA),             // device data size
-	NUM_OBJECTS,                // number of objects
-	rgodf,                      // and here they are
-};
-
 // forward-referenced functions
 static void IN_StartupJoystick (void);
 static void Joy_AdvancedUpdate_f (void);
@@ -1147,7 +1114,7 @@ static qboolean IN_InitDInput (void)
 	}
 
 // set the data format to "mouse format".
-	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &df);
+	hr = IDirectInputDevice_SetDataFormat(g_pMouse, &c_dfDIMouse);
 
 	if (FAILED(hr))
 	{
@@ -1252,11 +1219,24 @@ static void IN_MouseMove (void)
 			switch (od.dwOfs)
 			{
 				case DIMOFS_X:
-					mx += od.dwData;
+					mx += (LONG) od.dwData;
 					break;
 
 				case DIMOFS_Y:
-					my += od.dwData;
+					my += (LONG) od.dwData;
+					break;
+
+				case DIMOFS_Z:
+					if((LONG) od.dwData < 0)
+					{
+						Key_Event (K_MWHEELDOWN, 0, true);
+						Key_Event (K_MWHEELDOWN, 0, false);
+					}
+					else if((LONG) od.dwData > 0)
+					{
+						Key_Event (K_MWHEELUP, 0, true);
+						Key_Event (K_MWHEELUP, 0, false);
+					}
 					break;
 
 				case DIMOFS_BUTTON0:
@@ -1279,6 +1259,13 @@ static void IN_MouseMove (void)
 					else
 						mstate_di &= ~(1<<2);
 					break;
+
+				case DIMOFS_BUTTON3:
+					if (od.dwData & 0x80)
+						mstate_di |= (1<<3);
+					else
+						mstate_di &= ~(1<<3);
+					break;
 			}
 		}
 
-- 
2.39.2