mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 22:59:47 -06:00
New Wiimote Plugin: Added real wiimote support.(only tested on Windows, still a few probs: after refresh alt+F{5..8} x2 is needed) New Wiimote/GCPad: Re-merged Keyboard+Mouse for easier kb+mouse configuration, like before.(DirectInput doesn't support individual kb/mice anymore like I thought it did) Fixed some bugs and maybe leaks in GUI.(got rid of evil dynamic_cast) Renamed stuff from DirectInput to DInput, cause it's shorter and rhymes with XInput, I guess. (I remembered eol-style native, shuffle lost his job :P)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5822 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Jordan Woyak
@ -3,8 +3,8 @@
|
||||
#ifdef CIFACE_USE_XINPUT
|
||||
#include "XInput/XInput.h"
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT
|
||||
#include "DirectInput/DirectInput.h"
|
||||
#ifdef CIFACE_USE_DINPUT
|
||||
#include "DInput/DInput.h"
|
||||
#endif
|
||||
#ifdef CIFACE_USE_XLIB
|
||||
#include "Xlib/Xlib.h"
|
||||
@ -30,8 +30,8 @@ void ControllerInterface::Init()
|
||||
if ( m_is_init )
|
||||
return;
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT
|
||||
ciface::DirectInput::Init(m_devices);
|
||||
#ifdef CIFACE_USE_DINPUT
|
||||
ciface::DInput::Init(m_devices);
|
||||
#endif
|
||||
#ifdef CIFACE_USE_XINPUT
|
||||
ciface::XInput::Init(m_devices);
|
||||
@ -88,7 +88,7 @@ void ControllerInterface::DeInit(const bool hacks_no_sdl_quit)
|
||||
#ifdef CIFACE_USE_XINPUT
|
||||
// nothing needed
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT
|
||||
#ifdef CIFACE_USE_DINPUT
|
||||
// nothing needed
|
||||
#endif
|
||||
#ifdef CIFACE_USE_XLIB
|
||||
@ -364,7 +364,7 @@ void ControllerInterface::UpdateReference(ControllerInterface::ControlReference*
|
||||
// adding | to parse the last item, silly
|
||||
std::istringstream ss(ref->expression + '|');
|
||||
|
||||
const std::string mode_chars("|&!#");
|
||||
const std::string mode_chars("|&!^");
|
||||
|
||||
ControlReference::DeviceControl devc;
|
||||
|
||||
@ -530,6 +530,7 @@ ControllerInterface::Device::Control* ControllerInterface::OutputReference::Dete
|
||||
// this loop is to make stuff like flashing keyboard LEDs work
|
||||
while (ms > (slept += 10))
|
||||
{
|
||||
// TODO: improve this to update more than just the default device's output
|
||||
device->UpdateOutput();
|
||||
Common::SleepCurrentThread(10);
|
||||
}
|
||||
|
||||
@ -11,11 +11,9 @@
|
||||
// enable disable sources
|
||||
#ifdef _WIN32
|
||||
#define CIFACE_USE_XINPUT
|
||||
#define CIFACE_USE_DIRECTINPUT_JOYSTICK
|
||||
#define CIFACE_USE_DIRECTINPUT_KEYBOARD
|
||||
#define CIFACE_USE_DIRECTINPUT_MOUSE
|
||||
#define CIFACE_USE_DIRECTINPUT
|
||||
#define DINPUT_SOURCE_NAME "DInput"
|
||||
#define CIFACE_USE_DINPUT_JOYSTICK
|
||||
#define CIFACE_USE_DINPUT_KBM
|
||||
#define CIFACE_USE_DINPUT
|
||||
#endif
|
||||
#if defined(HAVE_X11) && HAVE_X11
|
||||
#define CIFACE_USE_XLIB
|
||||
|
||||
@ -1,19 +1,16 @@
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT
|
||||
#ifdef CIFACE_USE_DINPUT
|
||||
|
||||
#include "DirectInput.h"
|
||||
#include "DInput.h"
|
||||
|
||||
#include <StringUtil.h>
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_JOYSTICK
|
||||
#include "DirectInputJoystick.h"
|
||||
#ifdef CIFACE_USE_DINPUT_JOYSTICK
|
||||
#include "DInputJoystick.h"
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_KEYBOARD
|
||||
#include "DirectInputKeyboard.h"
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_MOUSE
|
||||
#include "DirectInputMouse.h"
|
||||
#ifdef CIFACE_USE_DINPUT_KBM
|
||||
#include "DInputKeyboardMouse.h"
|
||||
#endif
|
||||
|
||||
#pragma comment(lib, "Dinput8.lib")
|
||||
@ -21,7 +18,7 @@
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef)
|
||||
@ -70,13 +67,10 @@ void Init( std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ )
|
||||
if (FAILED(DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION, IID_IDirectInput8, (LPVOID*)&idi8, NULL)))
|
||||
return;
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_KEYBOARD
|
||||
InitKeyboard(idi8, devices);
|
||||
#ifdef CIFACE_USE_DINPUT_KBM
|
||||
InitKeyboardMouse(idi8, devices);
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_MOUSE
|
||||
InitMouse(idi8, devices);
|
||||
#endif
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_JOYSTICK
|
||||
#ifdef CIFACE_USE_DINPUT_JOYSTICK
|
||||
InitJoystick(idi8, devices/*, hwnd*/);
|
||||
#endif
|
||||
|
||||
@ -1,8 +1,10 @@
|
||||
#ifndef _CIFACE_DIRECTINPUT_H_
|
||||
#define _CIFACE_DIRECTINPUT_H_
|
||||
#ifndef _CIFACE_DINPUT_H_
|
||||
#define _CIFACE_DINPUT_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#define DINPUT_SOURCE_NAME "DInput"
|
||||
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
@ -13,7 +15,7 @@
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
//BOOL CALLBACK DIEnumEffectsCallback(LPCDIEFFECTINFO pdei, LPVOID pvRef);
|
||||
@ -1,9 +1,9 @@
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_JOYSTICK
|
||||
#ifdef CIFACE_USE_DINPUT_JOYSTICK
|
||||
|
||||
#include "DirectInputJoystick.h"
|
||||
#include "DirectInput.h"
|
||||
#include "DInputJoystick.h"
|
||||
#include "DInput.h"
|
||||
|
||||
inline bool operator<(const GUID & lhs, const GUID & rhs)
|
||||
{
|
||||
@ -12,7 +12,7 @@ inline bool operator<(const GUID & lhs, const GUID & rhs)
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
#define DATA_BUFFER_SIZE 32
|
||||
@ -1,5 +1,5 @@
|
||||
#ifndef _CIFACE_DIRECTINPUT_JOYSTICK_H_
|
||||
#define _CIFACE_DIRECTINPUT_JOYSTICK_H_
|
||||
#ifndef _CIFACE_DINPUT_JOYSTICK_H_
|
||||
#define _CIFACE_DINPUT_JOYSTICK_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
void InitJoystick( IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices/*, HWND hwnd*/ );
|
||||
@ -0,0 +1,272 @@
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#ifdef CIFACE_USE_DINPUT_KBM
|
||||
|
||||
#include "DInputKeyboardMouse.h"
|
||||
#include "DInput.h"
|
||||
|
||||
// (lower would be more sensitive) user can lower sensitivity by setting range
|
||||
// seems decent here ( at 8 ), I dont think anyone would need more sensitive than this
|
||||
// and user can lower it much farther than they would want to with the range
|
||||
#define MOUSE_AXIS_SENSITIVITY 8
|
||||
|
||||
// if input hasn't been received for this many ms, mouse input will be skipped
|
||||
// otherwise it is just some crazy value
|
||||
#define DROP_INPUT_TIME 250
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
struct
|
||||
{
|
||||
const BYTE code;
|
||||
const char* const name;
|
||||
} named_keys[] =
|
||||
{
|
||||
#include "NamedKeys.h"
|
||||
};
|
||||
|
||||
struct
|
||||
{
|
||||
const BYTE code;
|
||||
const char* const name;
|
||||
} named_lights[] =
|
||||
{
|
||||
{ VK_NUMLOCK, "NUM LOCK" },
|
||||
{ VK_CAPITAL, "CAPS LOCK" },
|
||||
{ VK_SCROLL, "SCROLL LOCK" }
|
||||
};
|
||||
|
||||
void InitKeyboardMouse( IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices )
|
||||
{
|
||||
// mouse and keyboard are a combined device, to allow shift+click and stuff
|
||||
// if thats dumb, i will make a VirtualDevice class that just uses ranges of inputs/outputs from other devices
|
||||
// so there can be a separated Keyboard and mouse, as well as combined KeyboardMouse
|
||||
|
||||
LPDIRECTINPUTDEVICE8 kb_device = NULL;
|
||||
LPDIRECTINPUTDEVICE8 mo_device = NULL;
|
||||
|
||||
if (SUCCEEDED(idi8->CreateDevice( GUID_SysKeyboard, &kb_device, NULL)))
|
||||
{
|
||||
if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
|
||||
if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
|
||||
{
|
||||
if (SUCCEEDED(idi8->CreateDevice( GUID_SysMouse, &mo_device, NULL )))
|
||||
{
|
||||
if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
|
||||
if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
|
||||
{
|
||||
devices.push_back(new KeyboardMouse(kb_device, mo_device));
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (kb_device)
|
||||
kb_device->Release();
|
||||
if (mo_device)
|
||||
mo_device->Release();
|
||||
}
|
||||
|
||||
KeyboardMouse::~KeyboardMouse()
|
||||
{
|
||||
// kb
|
||||
m_kb_device->Unacquire();
|
||||
m_kb_device->Release();
|
||||
// mouse
|
||||
m_mo_device->Unacquire();
|
||||
m_mo_device->Release();
|
||||
}
|
||||
|
||||
KeyboardMouse::KeyboardMouse( const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device )
|
||||
: m_kb_device(kb_device)
|
||||
, m_mo_device(mo_device)
|
||||
{
|
||||
m_kb_device->Acquire();
|
||||
m_mo_device->Acquire();
|
||||
|
||||
m_last_update = GetTickCount();
|
||||
|
||||
ZeroMemory( &m_state_in, sizeof(m_state_in) );
|
||||
ZeroMemory( m_state_out, sizeof(m_state_out) );
|
||||
ZeroMemory( &m_current_state_out, sizeof(m_current_state_out) );
|
||||
|
||||
// KEYBOARD
|
||||
// add keys
|
||||
for ( unsigned int i = 0; i < sizeof(named_keys)/sizeof(*named_keys); ++i )
|
||||
AddInput(new Key(i));
|
||||
// add lights
|
||||
for ( unsigned int i = 0; i < sizeof(named_lights)/sizeof(*named_lights); ++i )
|
||||
AddOutput(new Light(i));
|
||||
|
||||
// MOUSE
|
||||
// get caps
|
||||
DIDEVCAPS mouse_caps;
|
||||
ZeroMemory( &mouse_caps, sizeof(mouse_caps) );
|
||||
mouse_caps.dwSize = sizeof(mouse_caps);
|
||||
m_mo_device->GetCapabilities(&mouse_caps);
|
||||
// mouse buttons
|
||||
for ( unsigned int i = 0; i < mouse_caps.dwButtons; ++i )
|
||||
AddInput(new Button(i));
|
||||
// mouse axes
|
||||
for ( unsigned int i = 0; i < mouse_caps.dwAxes; ++i )
|
||||
{
|
||||
// each axis gets a negative and a positive input instance associated with it
|
||||
AddInput(new Axis(i, (2==i) ? -1 : -MOUSE_AXIS_SENSITIVITY));
|
||||
AddInput(new Axis(i, -(2==i) ? 1 : MOUSE_AXIS_SENSITIVITY));
|
||||
}
|
||||
}
|
||||
|
||||
bool KeyboardMouse::UpdateInput()
|
||||
{
|
||||
DIMOUSESTATE2 tmp_mouse;
|
||||
|
||||
// if mouse position hasn't been updated in a short while, skip a dev state
|
||||
DWORD cur_time = GetTickCount();
|
||||
if (cur_time - m_last_update > DROP_INPUT_TIME)
|
||||
{
|
||||
// set axes to zero
|
||||
ZeroMemory(&m_state_in.mouse, sizeof(m_state_in.mouse));
|
||||
// skip this input state
|
||||
m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
|
||||
}
|
||||
|
||||
m_last_update = cur_time;
|
||||
|
||||
HRESULT kb_hr = m_kb_device->GetDeviceState(sizeof(m_state_in.keyboard), &m_state_in.keyboard);
|
||||
HRESULT mo_hr = m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
|
||||
|
||||
if (DIERR_INPUTLOST == kb_hr || DIERR_NOTACQUIRED == kb_hr)
|
||||
m_kb_device->Acquire();
|
||||
|
||||
if (DIERR_INPUTLOST == mo_hr || DIERR_NOTACQUIRED == mo_hr)
|
||||
m_mo_device->Acquire();
|
||||
|
||||
if (SUCCEEDED(kb_hr) && SUCCEEDED(mo_hr))
|
||||
{
|
||||
// need to smooth out the axes, otherwise it doesnt work for shit
|
||||
for ( unsigned int i = 0; i < 3; ++i )
|
||||
((&m_state_in.mouse.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
|
||||
|
||||
// copy over the buttons
|
||||
memcpy( m_state_in.mouse.rgbButtons, tmp_mouse.rgbButtons, sizeof(m_state_in.mouse.rgbButtons) );
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool KeyboardMouse::UpdateOutput()
|
||||
{
|
||||
class KInput : public INPUT
|
||||
{
|
||||
public:
|
||||
KInput( const unsigned char key, const bool up = false )
|
||||
{
|
||||
memset( this, 0, sizeof(*this) );
|
||||
type = INPUT_KEYBOARD;
|
||||
ki.wVk = key;
|
||||
if (up) ki.dwFlags = KEYEVENTF_KEYUP;
|
||||
}
|
||||
};
|
||||
|
||||
std::vector< KInput > kbinputs;
|
||||
for ( unsigned int i = 0; i < sizeof(m_state_out)/sizeof(*m_state_out); ++i )
|
||||
{
|
||||
bool want_on = false;
|
||||
if ( m_state_out[i] )
|
||||
want_on = m_state_out[i] > GetTickCount() % 255 ; // light should flash when output is 0.5
|
||||
|
||||
// lights are set to their original state when output is zero
|
||||
if ( want_on ^ m_current_state_out[i] )
|
||||
{
|
||||
kbinputs.push_back( KInput( named_lights[i].code ) ); // press
|
||||
kbinputs.push_back( KInput( named_lights[i].code, true ) ); // release
|
||||
|
||||
m_current_state_out[i] ^= 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (kbinputs.size())
|
||||
return ( kbinputs.size() == SendInput( (UINT)kbinputs.size(), &kbinputs[0], sizeof( kbinputs[0] ) ) );
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string KeyboardMouse::GetName() const
|
||||
{
|
||||
return "Keyboard Mouse";
|
||||
}
|
||||
|
||||
int KeyboardMouse::GetId() const
|
||||
{
|
||||
// should this be -1, idk
|
||||
return 0;
|
||||
}
|
||||
|
||||
std::string KeyboardMouse::GetSource() const
|
||||
{
|
||||
return DINPUT_SOURCE_NAME;
|
||||
}
|
||||
|
||||
ControlState KeyboardMouse::GetInputState(const ControllerInterface::Device::Input* const input) const
|
||||
{
|
||||
return ( ((Input*)input)->GetState( &m_state_in ) );
|
||||
}
|
||||
|
||||
void KeyboardMouse::SetOutputState(const ControllerInterface::Device::Output* const output, const ControlState state)
|
||||
{
|
||||
((Output*)output)->SetState( state, m_state_out );
|
||||
}
|
||||
|
||||
// names
|
||||
std::string KeyboardMouse::Key::GetName() const
|
||||
{
|
||||
return named_keys[m_index].name;
|
||||
}
|
||||
|
||||
std::string KeyboardMouse::Button::GetName() const
|
||||
{
|
||||
return std::string("Button ") + char('0'+m_index);
|
||||
}
|
||||
|
||||
std::string KeyboardMouse::Axis::GetName() const
|
||||
{
|
||||
std::string tmpstr("Axis ");
|
||||
tmpstr += "XYZ"[m_index]; tmpstr += ( m_range>0 ? '+' : '-' );
|
||||
return tmpstr;
|
||||
}
|
||||
|
||||
std::string KeyboardMouse::Light::GetName() const
|
||||
{
|
||||
return named_lights[ m_index ].name;
|
||||
}
|
||||
|
||||
// get/set state
|
||||
ControlState KeyboardMouse::Key::GetState(const State* const state) const
|
||||
{
|
||||
return ( state->keyboard[named_keys[m_index].code] > 0 );
|
||||
}
|
||||
|
||||
ControlState KeyboardMouse::Button::GetState(const State* const state) const
|
||||
{
|
||||
return ( state->mouse.rgbButtons[m_index] > 0 );
|
||||
}
|
||||
|
||||
ControlState KeyboardMouse::Axis::GetState(const State* const state) const
|
||||
{
|
||||
return std::max( 0.0f, ControlState((&state->mouse.lX)[m_index]) / m_range );
|
||||
}
|
||||
|
||||
void KeyboardMouse::Light::SetState(const ControlState state, unsigned char* const state_out)
|
||||
{
|
||||
state_out[m_index] = (unsigned char)(state * 255);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -0,0 +1,122 @@
|
||||
#ifndef _CIFACE_DINPUT_KBM_H_
|
||||
#define _CIFACE_DINPUT_KBM_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#include <dinput.h>
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DInput
|
||||
{
|
||||
|
||||
void InitKeyboardMouse( IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices );
|
||||
|
||||
class KeyboardMouse : public ControllerInterface::Device
|
||||
{
|
||||
friend class ControllerInterface;
|
||||
friend class ControllerInterface::ControlReference;
|
||||
|
||||
protected:
|
||||
|
||||
struct State
|
||||
{
|
||||
BYTE keyboard[256];
|
||||
DIMOUSESTATE2 mouse;
|
||||
};
|
||||
|
||||
class Input : public ControllerInterface::Device::Input
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
protected:
|
||||
virtual ControlState GetState(const State* const boardstate) const = 0;
|
||||
};
|
||||
|
||||
class Output : public ControllerInterface::Device::Output
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
protected:
|
||||
virtual void SetState(const ControlState state, unsigned char* const state_out) = 0;
|
||||
};
|
||||
|
||||
class Key : public Input
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Key( const unsigned int index ) : m_index(index) {}
|
||||
ControlState GetState(const State* const state) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
class Button : public Input
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Button( const unsigned int index ) : m_index(index) {}
|
||||
ControlState GetState(const State* const state) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
class Axis : public Input
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Axis( const unsigned int index, const LONG range ) : m_index(index), m_range(range) {}
|
||||
ControlState GetState(const State* const state) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
const LONG m_range;
|
||||
};
|
||||
|
||||
class Light : public Output
|
||||
{
|
||||
friend class KeyboardMouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Light( const unsigned int index ) : m_index(index) {}
|
||||
void SetState( const ControlState state, unsigned char* const state_out );
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
bool UpdateInput();
|
||||
bool UpdateOutput();
|
||||
|
||||
ControlState GetInputState( const ControllerInterface::Device::Input* const input ) const;
|
||||
void SetOutputState( const ControllerInterface::Device::Output* const input, const ControlState state );
|
||||
|
||||
public:
|
||||
KeyboardMouse(const LPDIRECTINPUTDEVICE8 kb_device, const LPDIRECTINPUTDEVICE8 mo_device);
|
||||
~KeyboardMouse();
|
||||
|
||||
std::string GetName() const;
|
||||
int GetId() const;
|
||||
std::string GetSource() const;
|
||||
|
||||
private:
|
||||
const LPDIRECTINPUTDEVICE8 m_kb_device;
|
||||
const LPDIRECTINPUTDEVICE8 m_mo_device;
|
||||
|
||||
DWORD m_last_update;
|
||||
State m_state_in;
|
||||
unsigned char m_state_out[3]; // NUM CAPS SCROLL
|
||||
bool m_current_state_out[3]; // NUM CAPS SCROLL
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,187 +0,0 @@
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_KEYBOARD
|
||||
|
||||
#include "DirectInputKeyboard.h"
|
||||
#include "DirectInput.h"
|
||||
|
||||
// TODO: maybe add a ClearInputState function to this device
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
{
|
||||
|
||||
struct
|
||||
{
|
||||
const BYTE code;
|
||||
const char* const name;
|
||||
} named_keys[] =
|
||||
{
|
||||
#include "NamedKeys.h"
|
||||
};
|
||||
|
||||
struct
|
||||
{
|
||||
const BYTE code;
|
||||
const char* const name;
|
||||
} named_lights[] =
|
||||
{
|
||||
{ VK_NUMLOCK, "NUM LOCK" },
|
||||
{ VK_CAPITAL, "CAPS LOCK" },
|
||||
{ VK_SCROLL, "SCROLL LOCK" }
|
||||
};
|
||||
|
||||
void InitKeyboard(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices)
|
||||
{
|
||||
LPDIRECTINPUTDEVICE8 kb_device;
|
||||
|
||||
unsigned int kb_count = 0;
|
||||
|
||||
std::list<DIDEVICEINSTANCE> keyboards;
|
||||
idi8->EnumDevices(DI8DEVCLASS_KEYBOARD, DIEnumDevicesCallback, (LPVOID)&keyboards, DIEDFL_ATTACHEDONLY);
|
||||
|
||||
// add other keyboard devices
|
||||
std::list<DIDEVICEINSTANCE>::iterator
|
||||
i = keyboards.begin(),
|
||||
e = keyboards.end();
|
||||
for (; i!=e; ++i)
|
||||
{
|
||||
if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &kb_device, NULL)))
|
||||
{
|
||||
if (SUCCEEDED(kb_device->SetDataFormat(&c_dfDIKeyboard)))
|
||||
if (SUCCEEDED(kb_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
|
||||
{
|
||||
devices.push_back(new Keyboard(kb_device, kb_count++));
|
||||
return;
|
||||
}
|
||||
}
|
||||
kb_device->Release();
|
||||
}
|
||||
}
|
||||
|
||||
Keyboard::~Keyboard()
|
||||
{
|
||||
// kb
|
||||
m_kb_device->Unacquire();
|
||||
m_kb_device->Release();
|
||||
|
||||
}
|
||||
|
||||
Keyboard::Keyboard(const LPDIRECTINPUTDEVICE8 kb_device, const int index)
|
||||
: m_kb_device(kb_device)
|
||||
, m_index(index)
|
||||
{
|
||||
m_kb_device->Acquire();
|
||||
|
||||
ZeroMemory(&m_state_in, sizeof(m_state_in));
|
||||
ZeroMemory(m_state_out, sizeof(m_state_out));
|
||||
ZeroMemory(&m_current_state_out, sizeof(m_current_state_out));
|
||||
|
||||
// KEYBOARD
|
||||
// add keys
|
||||
for (unsigned int i = 0; i < sizeof(named_keys)/sizeof(*named_keys); ++i)
|
||||
AddInput(new Key(i));
|
||||
// add lights
|
||||
for (unsigned int i = 0; i < sizeof(named_lights)/sizeof(*named_lights); ++i)
|
||||
AddOutput(new Light(i));
|
||||
}
|
||||
|
||||
bool Keyboard::UpdateInput()
|
||||
{
|
||||
HRESULT hr = m_kb_device->GetDeviceState(sizeof(m_state_in), m_state_in);
|
||||
|
||||
if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
|
||||
m_kb_device->Acquire();
|
||||
|
||||
return SUCCEEDED(hr);
|
||||
}
|
||||
|
||||
bool Keyboard::UpdateOutput()
|
||||
{
|
||||
class KInput : public INPUT
|
||||
{
|
||||
public:
|
||||
KInput( const unsigned char key, const bool up = false )
|
||||
{
|
||||
memset( this, 0, sizeof(*this) );
|
||||
type = INPUT_KEYBOARD;
|
||||
ki.wVk = key;
|
||||
if (up) ki.dwFlags = KEYEVENTF_KEYUP;
|
||||
}
|
||||
};
|
||||
|
||||
std::vector< KInput > kbinputs;
|
||||
for ( unsigned int i = 0; i < sizeof(m_state_out)/sizeof(*m_state_out); ++i )
|
||||
{
|
||||
bool want_on = false;
|
||||
if ( m_state_out[i] )
|
||||
want_on = m_state_out[i] > wxGetLocalTimeMillis() % 255 ; // light should flash when output is 0.5
|
||||
|
||||
// lights are set to their original state when output is zero
|
||||
if ( want_on ^ m_current_state_out[i] )
|
||||
{
|
||||
kbinputs.push_back( KInput( named_lights[i].code ) ); // press
|
||||
kbinputs.push_back( KInput( named_lights[i].code, true ) ); // release
|
||||
|
||||
m_current_state_out[i] ^= 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (kbinputs.size())
|
||||
return ( kbinputs.size() == SendInput( (UINT)kbinputs.size(), &kbinputs[0], sizeof( kbinputs[0] ) ) );
|
||||
else
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string Keyboard::GetName() const
|
||||
{
|
||||
return "Keyboard";
|
||||
}
|
||||
|
||||
int Keyboard::GetId() const
|
||||
{
|
||||
return m_index;
|
||||
}
|
||||
|
||||
std::string Keyboard::GetSource() const
|
||||
{
|
||||
return DINPUT_SOURCE_NAME;
|
||||
}
|
||||
|
||||
ControlState Keyboard::GetInputState(const ControllerInterface::Device::Input* const input) const
|
||||
{
|
||||
return (((Input*)input)->GetState(m_state_in));
|
||||
}
|
||||
|
||||
void Keyboard::SetOutputState(const ControllerInterface::Device::Output* const output, const ControlState state)
|
||||
{
|
||||
((Output*)output)->SetState(state, m_state_out);
|
||||
}
|
||||
|
||||
// names
|
||||
std::string Keyboard::Key::GetName() const
|
||||
{
|
||||
return named_keys[m_index].name;
|
||||
}
|
||||
|
||||
std::string Keyboard::Light::GetName() const
|
||||
{
|
||||
return named_lights[ m_index ].name;
|
||||
}
|
||||
|
||||
// get/set state
|
||||
ControlState Keyboard::Key::GetState(const BYTE keys[]) const
|
||||
{
|
||||
return (keys[named_keys[m_index].code] != 0);
|
||||
}
|
||||
|
||||
void Keyboard::Light::SetState( const ControlState state, unsigned char* const state_out )
|
||||
{
|
||||
state_out[m_index] = state * 255;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,99 +0,0 @@
|
||||
#ifndef _CIFACE_DIRECTINPUT_KEYBOARD_H_
|
||||
#define _CIFACE_DIRECTINPUT_KEYBOARD_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#include <dinput.h>
|
||||
|
||||
#include <wx/stopwatch.h>
|
||||
#include <wx/utils.h>
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
{
|
||||
|
||||
void InitKeyboard(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices);
|
||||
|
||||
class Keyboard : public ControllerInterface::Device
|
||||
{
|
||||
friend class ControllerInterface;
|
||||
friend class ControllerInterface::ControlReference;
|
||||
|
||||
protected:
|
||||
|
||||
struct State
|
||||
{
|
||||
|
||||
};
|
||||
|
||||
class Input : public ControllerInterface::Device::Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
protected:
|
||||
virtual ControlState GetState(const BYTE keys[]) const = 0;
|
||||
};
|
||||
|
||||
class Output : public ControllerInterface::Device::Output
|
||||
{
|
||||
friend class Keyboard;
|
||||
protected:
|
||||
virtual void SetState(const ControlState state, unsigned char* const state_out) = 0;
|
||||
};
|
||||
|
||||
class Key : public Input
|
||||
{
|
||||
friend class Keyboard;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Key(const unsigned int index) : m_index(index) {}
|
||||
ControlState GetState(const BYTE keys[]) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
class Light : public Output
|
||||
{
|
||||
friend class Keyboard;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Light(const unsigned int index) : m_index(index) {}
|
||||
void SetState(const ControlState state, unsigned char* const state_out);
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
bool UpdateInput();
|
||||
bool UpdateOutput();
|
||||
|
||||
ControlState GetInputState( const ControllerInterface::Device::Input* const input ) const;
|
||||
void SetOutputState( const ControllerInterface::Device::Output* const input, const ControlState state );
|
||||
|
||||
public:
|
||||
Keyboard(const LPDIRECTINPUTDEVICE8 kb_device, const int index);
|
||||
~Keyboard();
|
||||
|
||||
std::string GetName() const;
|
||||
int GetId() const;
|
||||
std::string GetSource() const;
|
||||
|
||||
private:
|
||||
const LPDIRECTINPUTDEVICE8 m_kb_device;
|
||||
const int m_index;
|
||||
|
||||
wxLongLong m_last_update;
|
||||
BYTE m_state_in[256];
|
||||
unsigned char m_state_out[3]; // NUM CAPS SCROLL
|
||||
bool m_current_state_out[3]; // NUM CAPS SCROLL
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,175 +0,0 @@
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#ifdef CIFACE_USE_DIRECTINPUT_MOUSE
|
||||
|
||||
#include "DirectInputMouse.h"
|
||||
#include "DirectInput.h"
|
||||
|
||||
// TODO: maybe add a ClearInputState function to this device
|
||||
|
||||
// (lower would be more sensitive) user can lower sensitivity by setting range
|
||||
// seems decent here ( at 8 ), I dont think anyone would need more sensitive than this
|
||||
// and user can lower it much farther than they would want to with the range
|
||||
#define MOUSE_AXIS_SENSITIVITY 8
|
||||
|
||||
// if input hasn't been received for this many ms, mouse input will be skipped
|
||||
// otherwise it is just some crazy value
|
||||
#define DROP_INPUT_TIME 250
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
{
|
||||
|
||||
void InitMouse( IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices )
|
||||
{
|
||||
LPDIRECTINPUTDEVICE8 mo_device;
|
||||
|
||||
unsigned int mo_count = 0;
|
||||
|
||||
std::list<DIDEVICEINSTANCE> mice;
|
||||
idi8->EnumDevices(DI8DEVCLASS_POINTER, DIEnumDevicesCallback, (LPVOID)&mice, DIEDFL_ATTACHEDONLY);
|
||||
|
||||
// add other keyboard devices
|
||||
std::list<DIDEVICEINSTANCE>::iterator
|
||||
i = mice.begin(),
|
||||
e = mice.end();
|
||||
for (; i!=e; ++i)
|
||||
{
|
||||
if (SUCCEEDED(idi8->CreateDevice(i->guidInstance, &mo_device, NULL)))
|
||||
{
|
||||
if (SUCCEEDED(mo_device->SetDataFormat(&c_dfDIMouse2)))
|
||||
if (SUCCEEDED(mo_device->SetCooperativeLevel(NULL, DISCL_BACKGROUND | DISCL_NONEXCLUSIVE)))
|
||||
{
|
||||
devices.push_back(new Mouse(mo_device, mo_count++));
|
||||
return;
|
||||
}
|
||||
}
|
||||
mo_device->Release();
|
||||
}
|
||||
}
|
||||
|
||||
Mouse::~Mouse()
|
||||
{
|
||||
// mouse
|
||||
m_mo_device->Unacquire();
|
||||
m_mo_device->Release();
|
||||
}
|
||||
|
||||
Mouse::Mouse(const LPDIRECTINPUTDEVICE8 mo_device, const int index)
|
||||
: m_mo_device(mo_device)
|
||||
, m_index(index)
|
||||
{
|
||||
m_mo_device->Acquire();
|
||||
|
||||
m_last_update = GetTickCount();
|
||||
ZeroMemory(&m_state_in, sizeof(m_state_in));
|
||||
|
||||
// MOUSE
|
||||
// get caps
|
||||
DIDEVCAPS mouse_caps;
|
||||
ZeroMemory( &mouse_caps, sizeof(mouse_caps) );
|
||||
mouse_caps.dwSize = sizeof(mouse_caps);
|
||||
m_mo_device->GetCapabilities(&mouse_caps);
|
||||
// mouse buttons
|
||||
for (unsigned int i = 0; i < mouse_caps.dwButtons; ++i)
|
||||
AddInput(new Button(i));
|
||||
// mouse axes
|
||||
for (unsigned int i = 0; i < mouse_caps.dwAxes; ++i)
|
||||
{
|
||||
// each axis gets a negative and a positive input instance associated with it
|
||||
AddInput(new Axis(i, (2==i) ? -1 : -MOUSE_AXIS_SENSITIVITY));
|
||||
AddInput(new Axis(i, -(2==i) ? 1 : MOUSE_AXIS_SENSITIVITY));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool Mouse::UpdateInput()
|
||||
{
|
||||
DIMOUSESTATE2 tmp_mouse;
|
||||
HRESULT hr = m_mo_device->GetDeviceState(sizeof(tmp_mouse), &tmp_mouse);
|
||||
|
||||
// if mouse position hasn't been updated in a short while, skip a dev state
|
||||
const DWORD cur_time = GetTickCount();
|
||||
if (cur_time - m_last_update > DROP_INPUT_TIME)
|
||||
{
|
||||
// set buttons/axes to zero
|
||||
// skip this input state
|
||||
ZeroMemory(&m_state_in, sizeof(m_state_in));
|
||||
}
|
||||
else if (SUCCEEDED(hr))
|
||||
{
|
||||
// need to smooth out the axes, otherwise it doesnt work for shit
|
||||
for (unsigned int i = 0; i < 3; ++i)
|
||||
((&m_state_in.lX)[i] += (&tmp_mouse.lX)[i]) /= 2;
|
||||
|
||||
// copy over the buttons
|
||||
memcpy(m_state_in.rgbButtons, tmp_mouse.rgbButtons, sizeof(m_state_in.rgbButtons));
|
||||
}
|
||||
|
||||
m_last_update = cur_time;
|
||||
|
||||
if (DIERR_INPUTLOST == hr || DIERR_NOTACQUIRED == hr)
|
||||
m_mo_device->Acquire();
|
||||
|
||||
return SUCCEEDED(hr);
|
||||
}
|
||||
|
||||
bool Mouse::UpdateOutput()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string Mouse::GetName() const
|
||||
{
|
||||
return "Mouse";
|
||||
}
|
||||
|
||||
int Mouse::GetId() const
|
||||
{
|
||||
return m_index;
|
||||
}
|
||||
|
||||
std::string Mouse::GetSource() const
|
||||
{
|
||||
return DINPUT_SOURCE_NAME;
|
||||
}
|
||||
|
||||
ControlState Mouse::GetInputState( const ControllerInterface::Device::Input* const input ) const
|
||||
{
|
||||
return (((Input*)input)->GetState(&m_state_in));
|
||||
}
|
||||
|
||||
void Mouse::SetOutputState(const ControllerInterface::Device::Output* const output, const ControlState state)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// names
|
||||
std::string Mouse::Button::GetName() const
|
||||
{
|
||||
return std::string("Button ") + char('0'+m_index);
|
||||
}
|
||||
|
||||
std::string Mouse::Axis::GetName() const
|
||||
{
|
||||
std::string tmpstr("Axis ");
|
||||
tmpstr += "XYZ"[m_index]; tmpstr += ( m_range>0 ? '+' : '-' );
|
||||
return tmpstr;
|
||||
}
|
||||
|
||||
// get/set state
|
||||
ControlState Mouse::Button::GetState(const DIMOUSESTATE2* const state) const
|
||||
{
|
||||
return (state->rgbButtons[m_index] != 0);
|
||||
}
|
||||
|
||||
ControlState Mouse::Axis::GetState(const DIMOUSESTATE2* const state) const
|
||||
{
|
||||
return std::max(0.0f, ControlState((&state->lX)[m_index]) / m_range);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -1,83 +0,0 @@
|
||||
#ifndef _CIFACE_DIRECTINPUT_MOUSE_H_
|
||||
#define _CIFACE_DIRECTINPUT_MOUSE_H_
|
||||
|
||||
#include "../ControllerInterface.h"
|
||||
|
||||
#define DIRECTINPUT_VERSION 0x0800
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#define NOMINMAX
|
||||
#include <Windows.h>
|
||||
#include <dinput.h>
|
||||
|
||||
namespace ciface
|
||||
{
|
||||
namespace DirectInput
|
||||
{
|
||||
|
||||
void InitMouse(IDirectInput8* const idi8, std::vector<ControllerInterface::Device*>& devices);
|
||||
|
||||
class Mouse : public ControllerInterface::Device
|
||||
{
|
||||
friend class ControllerInterface;
|
||||
friend class ControllerInterface::ControlReference;
|
||||
|
||||
protected:
|
||||
|
||||
class Input : public ControllerInterface::Device::Input
|
||||
{
|
||||
friend class Mouse;
|
||||
protected:
|
||||
virtual ControlState GetState(const DIMOUSESTATE2* const boardstate) const = 0;
|
||||
};
|
||||
|
||||
class Button : public Input
|
||||
{
|
||||
friend class Mouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Button(const unsigned int index) : m_index(index) {}
|
||||
ControlState GetState(const DIMOUSESTATE2* const state) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
};
|
||||
|
||||
class Axis : public Input
|
||||
{
|
||||
friend class Mouse;
|
||||
public:
|
||||
std::string GetName() const;
|
||||
protected:
|
||||
Axis(const unsigned int index, const LONG range) : m_index(index), m_range(range) {}
|
||||
ControlState GetState(const DIMOUSESTATE2* const state) const;
|
||||
private:
|
||||
const unsigned int m_index;
|
||||
const LONG m_range;
|
||||
};
|
||||
|
||||
bool UpdateInput();
|
||||
bool UpdateOutput();
|
||||
|
||||
ControlState GetInputState( const ControllerInterface::Device::Input* const input ) const;
|
||||
void SetOutputState( const ControllerInterface::Device::Output* const input, const ControlState state );
|
||||
|
||||
public:
|
||||
Mouse(const LPDIRECTINPUTDEVICE8 mo_device, const int index);
|
||||
~Mouse();
|
||||
|
||||
std::string GetName() const;
|
||||
int GetId() const;
|
||||
std::string GetSource() const;
|
||||
|
||||
private:
|
||||
const LPDIRECTINPUTDEVICE8 m_mo_device;
|
||||
const int m_index;
|
||||
|
||||
DWORD m_last_update;
|
||||
DIMOUSESTATE2 m_state_in;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user