ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

XBController

This commit is contained in:
Aaron Robinson 2003-04-18 05:55:30 +00:00
parent 769dd298fc
commit 5373ad0775
5 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cxbx.dsp
View File

@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Application" 0x0101
CFG=Cxbx - Win32 Debug
CFG=Cxbx - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@ -13,7 +13,7 @@ CFG=Cxbx - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Cxbx.mak" CFG="Cxbx - Win32 Debug"
!MESSAGE NMAKE /f "Cxbx.mak" CFG="Cxbx - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE

4
CxbxKrnl.dsp
View File

@ -4,7 +4,7 @@
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=CxbxKrnl - Win32 Debug
CFG=CxbxKrnl - Win32 Release
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
@ -13,7 +13,7 @@ CFG=CxbxKrnl - Win32 Debug
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "CxbxKrnl.mak" CFG="CxbxKrnl - Win32 Debug"
!MESSAGE NMAKE /f "CxbxKrnl.mak" CFG="CxbxKrnl - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE

2
Include/Cxbx.h
View File

@ -66,7 +66,7 @@ typedef signed long sint32;
// ******************************************************************
// * Define this to trace intercepted function calls
// ******************************************************************
#define _DEBUG_TRACE
//#define _DEBUG_TRACE
// ******************************************************************
// * Round up dwValue to nearest multiple of dwMult

24
Include/Win32/XBController.h
View File

@ -93,16 +93,6 @@ enum XBCtrlObject
XBCTRL_OBJECT_COUNT
};
// ******************************************************************
// * DirectInput Enumeration Types
// ******************************************************************
enum XBCtrlState
{
XBCTRL_STATE_NONE = 0,
XBCTRL_STATE_CONFIG,
XBCTRL_STATE_LISTEN
};
// ******************************************************************
// * Maximum number of devices allowed
// ******************************************************************
@ -215,14 +205,14 @@ class XBController : public Error
struct InputDevice
{
LPDIRECTINPUTDEVICE8 m_Device;
DWORD m_Flags;
int m_Flags;
}
m_InputDevice[XBCTRL_MAX_DEVICES];
// ******************************************************************
// * Current State
// ******************************************************************
XBCtrlState m_CurrentState;
enum XBCtrlState m_CurrentState;
// ******************************************************************
// * Config State Variables
@ -260,4 +250,14 @@ class XBController : public Error
#define DETECT_SENSITIVITY_MOUSE 10
#define DETECT_SENSITIVITY_POV 50000
// ******************************************************************
// * DirectInput Enumeration Types
// ******************************************************************
enum XBCtrlState
{
XBCTRL_STATE_NONE = 0,
XBCTRL_STATE_CONFIG,
XBCTRL_STATE_LISTEN
};
#endif

76
Source/Win32/XBController.cpp
View File

@ -274,7 +274,7 @@ bool XBController::ConfigPoll(char *szStatus)
// ******************************************************************
if(m_InputDevice[v].m_Flags & DEVICE_FLAG_JOYSTICK)
{
DIJOYSTATE JoyState;
DIJOYSTATE JoyState;
// ******************************************************************
// * Get Joystick State
@ -332,24 +332,24 @@ bool XBController::ConfigPoll(char *szStatus)
dwHow = FIELD_OFFSET(DIJOYSTATE, rgbButtons[b]);
// ******************************************************************
// * Retrieve Object Info
// ******************************************************************
if(dwHow != -1)
{
// * Retrieve Object Info
// ******************************************************************
if(dwHow != -1)
{
char *szDirection = (dwFlags & DEVICE_FLAG_AXIS) ? (dwFlags & DEVICE_FLAG_POSITIVE) ? "Positive " : "Negative " : "";
m_InputDevice[v].m_Device->GetDeviceInfo(&DeviceInstance);
m_InputDevice[v].m_Device->GetObjectInfo(&ObjectInstance, dwHow, DIPH_BYOFFSET);
m_InputDevice[v].m_Device->GetObjectInfo(&ObjectInstance, dwHow, DIPH_BYOFFSET);
Map(CurConfigObject, DeviceInstance.tszInstanceName, dwHow, dwFlags);
printf("Cxbx: Detected %s %s on %s\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType);
printf("Cxbx: Detected %s %s on %s\n", szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName, ObjectInstance.dwType);
sprintf(szStatus, "Success: %s Mapped to '%s%s' on '%s'!", m_DeviceNameLookup[CurConfigObject], szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName);
sprintf(szStatus, "Success: %s Mapped to '%s%s' on '%s'!", m_DeviceNameLookup[CurConfigObject], szDirection, ObjectInstance.tszName, DeviceInstance.tszInstanceName);
return true;
}
}
}
// ******************************************************************
// * Detect Keyboard Input
@ -527,6 +527,8 @@ void XBController::ConfigEnd()
// ******************************************************************
void XBController::ListenBegin(HWND hwnd)
{
int v=0;
if(m_CurrentState != XBCTRL_STATE_NONE)
{
SetError("Invalid State", false);
@ -537,9 +539,18 @@ void XBController::ListenBegin(HWND hwnd)
DInputInit(hwnd);
for(int v=XBCTRL_MAX_DEVICES-1;v>=m_dwInputDeviceCount;v--)
for(v=XBCTRL_MAX_DEVICES-1;v>=m_dwInputDeviceCount;v--)
m_DeviceName[v][0] = '\0';
for(v=0;v<XBCTRL_OBJECT_COUNT;v++)
{
if(m_ObjectConfig[v].dwDevice > m_dwInputDeviceCount)
{
printf("Warning: Device Mapped to %s was not found!\n", m_DeviceNameLookup[v]);
m_ObjectConfig[v].dwDevice = -1;
}
}
return;
}
@ -558,12 +569,13 @@ void XBController::ListenPoll(xapi::XINPUT_STATE *Controller)
for(int v=0;v<XBCTRL_OBJECT_COUNT;v++)
{
int dwDevice = m_ObjectConfig[v].dwDevice;
int dwFlags = m_ObjectConfig[v].dwFlags;
int dwInfo = m_ObjectConfig[v].dwInfo;
if(dwDevice == -1)
continue;
pDevice = m_InputDevice[dwDevice].m_Device;
dwFlags = m_InputDevice[dwDevice].m_Flags;
hRet = pDevice->Poll();
@ -575,11 +587,33 @@ void XBController::ListenPoll(xapi::XINPUT_STATE *Controller)
hRet = pDevice->Acquire();
}
WORD wValue = 0;
// ******************************************************************
// * Map Joystick Input
// * Interpret PC Joystick Input
// ******************************************************************
if(dwFlags & DEVICE_FLAG_JOYSTICK)
{
DIJOYSTATE JoyState;
pDevice->GetDeviceState(sizeof(JoyState), &JoyState);
if(dwFlags & DEVICE_FLAG_AXIS)
{
DWORD *pdwAxis = (DWORD*)((uint32)&JoyState + dwInfo);
wValue = (WORD)*pdwAxis;
}
}
// ******************************************************************
// * Map Xbox Joystick Input
// ******************************************************************
if(v >= XBCTRL_OBJECT_LTHUMBPOSX && v <= XBCTRL_OBJECT_RTHUMBNEGY)
{
// Map value to controller
WORD *pwAxis = (WORD*)((uint32)&Controller->Gamepad.sThumbLX + (v/2)*2);
*pwAxis = wValue;
}
}
@ -664,11 +698,11 @@ void XBController::DInputInit(HWND hwnd)
hRet = m_pDirectInput8->CreateDevice(GUID_SysKeyboard, &m_InputDevice[m_dwInputDeviceCount].m_Device, NULL);
if(!FAILED(hRet))
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_KEYBOARD;
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_KEYBOARD;
m_InputDevice[m_dwInputDeviceCount++].m_Device->SetDataFormat(&c_dfDIKeyboard);
}
}
ReorderObjects("SysKeyboard", m_dwInputDeviceCount - 1);
}
@ -678,11 +712,11 @@ void XBController::DInputInit(HWND hwnd)
hRet = m_pDirectInput8->CreateDevice(GUID_SysMouse, &m_InputDevice[m_dwInputDeviceCount].m_Device, NULL);
if(!FAILED(hRet))
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_MOUSE;
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_MOUSE;
m_InputDevice[m_dwInputDeviceCount++].m_Device->SetDataFormat(&c_dfDIMouse2);
}
}
ReorderObjects("SysMouse", m_dwInputDeviceCount - 1);
}
@ -826,8 +860,8 @@ BOOL XBController::EnumGameCtrlCallback(LPCDIDEVICEINSTANCE lpddi)
HRESULT hRet = m_pDirectInput8->CreateDevice(lpddi->guidInstance, &m_InputDevice[m_dwInputDeviceCount].m_Device, NULL);
if(!FAILED(hRet))
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_JOYSTICK;
{
m_InputDevice[m_dwInputDeviceCount].m_Flags = DEVICE_FLAG_JOYSTICK;
m_InputDevice[m_dwInputDeviceCount++].m_Device->SetDataFormat(&c_dfDIJoystick);
@ -835,7 +869,7 @@ BOOL XBController::EnumGameCtrlCallback(LPCDIDEVICEINSTANCE lpddi)
ReorderObjects(lpddi->tszInstanceName, m_dwInputDeviceCount - 1);
printf("Emu: Monitoring Device %s\n", lpddi->tszInstanceName);
}
}
return DIENUM_CONTINUE;
}