team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Q3 UI IS NOW BROKEN - 

mouse5/6/7/8 attempt (rid #1217412)
DX3/DX7 dual compatibility (hopefully, needs testing)


git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1098 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-06-18 22:30:57 +00:00
parent 741126d966
commit e5b76314ac
6 changed files with 280 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/client/in_sdl.c
View File

@ -264,8 +264,8 @@ void Sys_SendKeyEvents(void)
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP:
//Hmm. SDL allows for 255 buttons...
if (event.button.button > 6)
event.button.button = 6;
if (event.button.button > 10)
event.button.button = 10;
Key_Event(K_MOUSE1+event.button.button-1, event.button.state);
break;

275
engine/client/in_win.c
View File

@ -43,6 +43,9 @@ HRESULT (WINAPI *pDirectInputCreate)(HINSTANCE hinst, DWORD dwVersion,
#endif
#define DINPUT_VERSION_DX3 0x0300
#define DINPUT_VERSION_DX7 0x0700
// mouse variables
cvar_t m_filter = {"m_filter","0"};
cvar_t m_forcewheel = {"m_forcewheel", "1"};
@ -151,12 +154,14 @@ DWORD joy_flags;
DWORD joy_numbuttons;
#ifndef NODIRECTX
static LPDIRECTINPUT g_pdi;
static LPDIRECTINPUTDEVICE g_pMouse;
// devices
LPDIRECTINPUT g_pdi;
LPDIRECTINPUTDEVICE g_pMouse;
static HINSTANCE hInstDI;
static qboolean dinput;
// current DirectInput version in use, 0 means using no DirectInput
static int dinput;
typedef struct MYDATA {
LONG lX; // X axis goes here
@ -166,6 +171,12 @@ typedef struct MYDATA {
BYTE bButtonB; // Another button goes here
BYTE bButtonC; // Another button goes here
BYTE bButtonD; // Another button goes here
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
BYTE bButtonE; // DX7 buttons
BYTE bButtonF;
BYTE bButtonG;
BYTE bButtonH;
#endif
} MYDATA;
static DIOBJECTDATAFORMAT rgodf[] = {
@ -176,6 +187,12 @@ static DIOBJECTDATAFORMAT rgodf[] = {
{ 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,},
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
{ 0, FIELD_OFFSET(MYDATA, bButtonE), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
{ 0, FIELD_OFFSET(MYDATA, bButtonF), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
{ 0, FIELD_OFFSET(MYDATA, bButtonG), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
{ 0, FIELD_OFFSET(MYDATA, bButtonH), 0x80000000 | DIDFT_BUTTON | DIDFT_ANYINSTANCE, 0,},
#endif
};
#define NUM_OBJECTS (sizeof(rgodf) / sizeof(rgodf[0]))
@ -188,6 +205,19 @@ static DIDATAFORMAT df = {
NUM_OBJECTS, // number of objects
rgodf, // and here they are
};
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
// DX7 devices
LPDIRECTINPUT7 g_pdi7;
LPDIRECTINPUTDEVICE7 g_pMouse7;
// DX7 specific calls
#define iDirectInputCreateEx(a,b,c,d,e) pDirectInputCreateEx(a,b,c,d,e)
static HRESULT (WINAPI *pDirectInputCreateEx)(HINSTANCE hinst,
DWORD dwVersion, REFIID riidltf, LPVOID *ppvOut, LPUNKNOWN punkOuter);
#endif
#else
#define dinput 0
#endif
@ -199,7 +229,6 @@ void IN_StartupJoystick (void);
void Joy_AdvancedUpdate_f (void);
void IN_JoyMove (usercmd_t *cmd, int pnum);
/*
===========
Force_CenterView_f
@ -210,14 +239,6 @@ void Force_CenterView_f (void)
cl.viewangles[0][PITCH] = 0;
}
typedef void (*MW_DllFunc1)(void);
typedef int (*MW_DllFunc2)(HWND);
@ -307,9 +328,6 @@ void MW_Hook_Message (long buttons)
old_buttons = buttons;
}
/*
===========
IN_UpdateClipCursor
@ -370,6 +388,24 @@ void IN_ActivateMouse (void)
if (mouseinitialized)
{
#ifndef NODIRECTX
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
if (dinput >= DINPUT_VERSION_DX7)
{
if (g_pMouse7)
{
if (!dinput_acquired)
{
IDirectInputDevice7_Acquire(g_pMouse7);
dinput_acquired = true;
}
}
else
{
return;
}
}
else
#endif
if (dinput)
{
if (g_pMouse)
@ -430,6 +466,24 @@ void IN_DeactivateMouse (void)
if (mouseinitialized)
{
#ifndef NODIRECTX
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
if (dinput >= DINPUT_VERSION_DX7)
{
if (g_pMouse7)
{
if (dinput_acquired)
{
IDirectInputDevice_Unacquire(g_pMouse7);
dinput_acquired = false;
}
}
else
{
return;
}
}
else
#endif
if (dinput)
{
if (g_pMouse)
@ -487,7 +541,7 @@ BOOL (FAR PASCAL IN_EnumerateDevices)(LPCDIDEVICEINSTANCE inst, LPVOID parm)
IN_InitDInput
===========
*/
qboolean IN_InitDInput (void)
int IN_InitDInput (void)
{
HRESULT hr;
DIPROPDWORD dipdw = {
@ -507,27 +561,79 @@ qboolean IN_InitDInput (void)
if (hInstDI == NULL)
{
Con_SafePrintf ("Couldn't load dinput.dll\n");
return false;
return 0;
}
}
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
if (!pDirectInputCreateEx)
pDirectInputCreateEx = (void *)GetProcAddress(hInstDI,"DirectInputCreateEx");
if (pDirectInputCreateEx) // use DirectInput 7
{
// register with DirectInput and get an IDirectInput to play with.
hr = iDirectInputCreateEx(global_hInstance, DINPUT_VERSION_DX7, &IID_IDirectInput7, &g_pdi7, NULL);
if (FAILED(hr))
return 0;
IDirectInput7_EnumDevices(g_pdi7, 0, &IN_EnumerateDevices, NULL, 0);
// obtain an interface to the system mouse device.
hr = IDirectInput7_CreateDeviceEx(g_pdi7, &GUID_SysMouse, &IID_IDirectInputDevice7, &g_pMouse7, NULL);
if (FAILED(hr)) {
Con_SafePrintf ("Couldn't open DI7 mouse device\n");
return 0;
}
// set the data format to "mouse format".
hr = IDirectInputDevice7_SetDataFormat(g_pMouse7, &df);
if (FAILED(hr)) {
Con_SafePrintf ("Couldn't set DI7 mouse format\n");
return 0;
}
// set the cooperativity level.
hr = IDirectInputDevice7_SetCooperativeLevel(g_pMouse7, mainwindow,
DISCL_EXCLUSIVE | DISCL_FOREGROUND);
if (FAILED(hr)) {
Con_SafePrintf ("Couldn't set DI7 coop level\n");
return 0;
}
// set the buffer size to DINPUT_BUFFERSIZE elements.
// the buffer size is a DWORD property associated with the device
hr = IDirectInputDevice7_SetProperty(g_pMouse7, DIPROP_BUFFERSIZE, &dipdw.diph);
if (FAILED(hr)) {
Con_SafePrintf ("Couldn't set DI7 buffersize\n");
return 0;
}
return DINPUT_VERSION_DX7;
}
#endif
if (!pDirectInputCreate)
{
pDirectInputCreate = (void *)GetProcAddress(hInstDI,"DirectInputCreateA");
if (!pDirectInputCreate)
{
Con_SafePrintf ("Couldn't get DI proc addr\n");
return false;
Con_SafePrintf ("Couldn't get DI3 proc addr\n");
return 0;
}
}
// register with DirectInput and get an IDirectInput to play with.
hr = iDirectInputCreate(global_hInstance, DIRECTINPUT_VERSION, &g_pdi, NULL);
hr = iDirectInputCreate(global_hInstance, DINPUT_VERSION_DX3, &g_pdi, NULL);
if (FAILED(hr))
{
return false;
return 0;
}
IDirectInput_EnumDevices(g_pdi, 0, &IN_EnumerateDevices, NULL, 0);
@ -536,8 +642,8 @@ qboolean IN_InitDInput (void)
if (FAILED(hr))
{
Con_SafePrintf ("Couldn't open DI mouse device\n");
return false;
Con_SafePrintf ("Couldn't open DI3 mouse device\n");
return 0;
}
// set the data format to "mouse format".
@ -545,8 +651,8 @@ qboolean IN_InitDInput (void)
if (FAILED(hr))
{
Con_SafePrintf ("Couldn't set DI mouse format\n");
return false;
Con_SafePrintf ("Couldn't set DI3 mouse format\n");
return 0;
}
// set the cooperativity level.
@ -555,8 +661,8 @@ qboolean IN_InitDInput (void)
if (FAILED(hr))
{
Con_SafePrintf ("Couldn't set DI coop level\n");
return false;
Con_SafePrintf ("Couldn't set DI3 coop level\n");
return 0;
}
@ -566,15 +672,31 @@ qboolean IN_InitDInput (void)
if (FAILED(hr))
{
Con_SafePrintf ("Couldn't set DI buffersize\n");
return false;
Con_SafePrintf ("Couldn't set DI3 buffersize\n");
return 0;
}
return true;
return DINPUT_VERSION_DX3;
}
void IN_CloseDInput (void)
{
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
if (g_pMouse7)
{
if (dinput_acquired)
IDirectInputDevice7_Unacquire(g_pMouse7);
dinput_acquired = false;
IDirectInputDevice7_Release(g_pMouse7);
g_pMouse7 = NULL;
}
if (g_pdi7)
{
IDirectInput7_Release(g_pdi7);
g_pdi7 = NULL;
}
#endif
if (g_pMouse)
{
if (dinput_acquired)
@ -729,7 +851,7 @@ void IN_StartupMouse (void)
if (dinput)
{
Con_SafePrintf ("DirectInput initialized\n");
Con_SafePrintf ("DirectInput initialized, version %i\n", (dinput >> 8 & 0xFF));
}
else
{
@ -737,7 +859,7 @@ void IN_StartupMouse (void)
}
}
else
dinput = false;
dinput = 0;
if (!dinput)
#endif
@ -1098,14 +1220,31 @@ void IN_MouseMove (usercmd_t *cmd, int pnum)
{
dwElements = 1;
hr = IDirectInputDevice_GetDeviceData(g_pMouse,
sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
if (dinput >= DINPUT_VERSION_DX7)
{
dinput_acquired = true;
IDirectInputDevice_Acquire(g_pMouse);
break;
hr = IDirectInputDevice7_GetDeviceData(g_pMouse7,
sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
{
dinput_acquired = true;
IDirectInputDevice7_Acquire(g_pMouse7);
break;
}
}
else
#endif
{
hr = IDirectInputDevice_GetDeviceData(g_pMouse,
sizeof(DIDEVICEOBJECTDATA), &od, &dwElements, 0);
if ((hr == DIERR_INPUTLOST) || (hr == DIERR_NOTACQUIRED))
{
dinput_acquired = true;
IDirectInputDevice_Acquire(g_pMouse);
break;
}
}
/* Unable to read data or no data available */
@ -1136,57 +1275,61 @@ void IN_MouseMove (usercmd_t *cmd, int pnum)
}
break;
case DIMOFS_BUTTON0:
if (od.dwData & 0x80)
sysmouse.buttons |= 1;
else
sysmouse.buttons &= ~1;
sysmouse.buttons |= 1;
else
sysmouse.buttons &= ~1;
break;
case DIMOFS_BUTTON1:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<1);
else
sysmouse.buttons &= ~(1<<1);
sysmouse.buttons |= (1 << 1);
else
sysmouse.buttons &= ~(1 << 1);
break;
case DIMOFS_BUTTON2:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<2);
else
sysmouse.buttons &= ~(1<<2);
sysmouse.buttons |= (1 << 2);
else
sysmouse.buttons &= ~(1 << 2);
break;
case DIMOFS_BUTTON3:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<3);
else
sysmouse.buttons &= ~(1<<3);
sysmouse.buttons |= (1 << 3);
else
sysmouse.buttons &= ~(1 << 3);
break;
#if (DIRECTINPUT_VERSION >= 0x0700)
#if (DIRECTINPUT_VERSION >= DINPUT_VERSION_DX7)
case DIMOFS_BUTTON4:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<4);
else
sysmouse.buttons &= ~(1<<4);
sysmouse.buttons |= (1 << 4);
else
sysmouse.buttons &= ~(1 << 4);
break;
case DIMOFS_BUTTON5:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<5);
else
sysmouse.buttons &= ~(1<<5);
sysmouse.buttons |= (1 << 5);
else
sysmouse.buttons &= ~(1 << 5);
break;
case DIMOFS_BUTTON6:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<6);
else
sysmouse.buttons &= ~(1<<6);
sysmouse.buttons |= (1 << 6);
else
sysmouse.buttons &= ~(1 << 6);
break;
case DIMOFS_BUTTON7:
if (od.dwData & 0x80)
sysmouse.buttons |= (1<<7);
else
sysmouse.buttons &= ~(1<<7);
sysmouse.buttons |= (1 << 7);
else
sysmouse.buttons &= ~(1 << 7);
break;
#endif
}

2
engine/client/keys.c
View File

@ -149,6 +149,8 @@ keyname_t keynames[] =
{"MOUSE6", K_MOUSE6},
{"MOUSE7", K_MOUSE7},
{"MOUSE8", K_MOUSE8},
{"MOUSE9", K_MOUSE9},
{"MOUSE10", K_MOUSE10},
{"LWIN", K_LWIN},
{"RWIN", K_RWIN},

11
engine/client/keys.h
View File

@ -95,14 +95,15 @@ K_MOUSE2,
K_MOUSE3,
K_MOUSE4,
K_MOUSE5,
#define K_MOUSE6 K_AUX1
#define K_MOUSE7 K_AUX2
#define K_MOUSE8 K_AUX3
K_MOUSE6,
K_MOUSE7,
K_MOUSE8,
K_MOUSE9,
K_MOUSE10,
// JACK: Intellimouse(c) Mouse Wheel Support
K_MWHEELUP,
K_MWHEELDOWN,
K_MWHEELDOWN, // 189
//
// joystick buttons

22
engine/gl/gl_vidnt.c
View File

@ -31,7 +31,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CDS_FULLSCREEN 4
#endif
#ifndef WM_XBUTTONDOWN
#define WM_XBUTTONDOWN 0x020B
#define WM_XBUTTONUP 0x020C
@ -39,6 +38,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef MK_XBUTTON1
#define MK_XBUTTON1 0x0020
#define MK_XBUTTON2 0x0040
// copied from DarkPlaces in an attempt to grab more buttons
#define MK_XBUTTON3 0x0080
#define MK_XBUTTON4 0x0100
#define MK_XBUTTON5 0x0200
#define MK_XBUTTON6 0x0400
#define MK_XBUTTON7 0x0800
#endif
@ -1189,6 +1194,21 @@ LONG WINAPI GLMainWndProc (
if (wParam & MK_XBUTTON2)
temp |= 16;
if (wParam & MK_XBUTTON3)
temp |= 32;
if (wParam & MK_XBUTTON4)
temp |= 64;
if (wParam & MK_XBUTTON5)
temp |= 128;
if (wParam & MK_XBUTTON6)
temp |= 256;
if (wParam & MK_XBUTTON7)
temp |= 512;
if (!vid_initializing)
IN_MouseEvent (temp);

80
engine/sw/vid_win2.c
View File

@ -29,11 +29,6 @@ extern qboolean vid_isfullscreen;
static qbyte *vid_surfcache;
static int vid_surfcachesize;
void SWimp_AppActivate( qboolean active );
void SWimp_Shutdown( void );
@ -47,9 +42,24 @@ void DDRAW_SwapBuffers (void);
void DDRAW_Shutdown(void);
void DDRAW_SetPalette( const unsigned char *pal );
extern int r_flushcache;
// extra button defines
#ifndef WM_XBUTTONDOWN
#define WM_XBUTTONDOWN 0x020B
#define WM_XBUTTONUP 0x020C
#endif
#ifndef MK_XBUTTON1
#define MK_XBUTTON1 0x0020
#define MK_XBUTTON2 0x0040
// copied from DarkPlaces in an attempt to grab more buttons
#define MK_XBUTTON3 0x0080
#define MK_XBUTTON4 0x0100
#define MK_XBUTTON5 0x0200
#define MK_XBUTTON6 0x0400
#define MK_XBUTTON7 0x0800
#endif
void R_GammaCorrectAndSetPalette(const unsigned char *pal)
{
int i;
@ -180,7 +190,6 @@ LONG WINAPI MainWndProc (
wParam <<= 16;
}
switch (uMsg)
{
case WM_CREATE:
@ -364,6 +373,8 @@ LONG WINAPI MainWndProc (
case WM_MBUTTONDOWN:
case WM_MBUTTONUP:
case WM_MOUSEMOVE:
case WM_XBUTTONDOWN:
case WM_XBUTTONUP:
if (!vid_initializing)
{
temp = 0;
@ -377,6 +388,28 @@ LONG WINAPI MainWndProc (
if (wParam & MK_MBUTTON)
temp |= 4;
// extra buttons
if (wParam & MK_XBUTTON1)
temp |= 8;
if (wParam & MK_XBUTTON2)
temp |= 16;
if (wParam & MK_XBUTTON3)
temp |= 32;
if (wParam & MK_XBUTTON4)
temp |= 64;
if (wParam & MK_XBUTTON5)
temp |= 128;
if (wParam & MK_XBUTTON6)
temp |= 256;
if (wParam & MK_XBUTTON7)
temp |= 512;
IN_MouseEvent (temp);
}
break;
@ -829,36 +862,7 @@ void SWimp_Shutdown( void )
}
}
//===============================================================================
qboolean SWVID_Init (rendererstate_t *info, unsigned char *palette)
{
#ifdef MGL
@ -1014,7 +1018,6 @@ void SWD_EndDirectRect (int x, int y, int width, int height)
#endif
}
void SWVID_ForceLockState (int lk)
{
#ifdef MGL
@ -1036,9 +1039,6 @@ int SWVID_ForceUnlockedAndReturnState (void)
return 0;
}
void SWVID_SetPalette (unsigned char *palette)
{
#ifdef MGL