From 5e81298ef0147bf36c4aaafa35accc2700777bd3 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 22 Jun 2010 23:45:56 +0000 Subject: boring svn:eol-style native again... git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5771 8ced0084-cf51-0410-be5f-012b33b47a6e --- .../DirectInput/DirectInputKeyboard.cpp | 374 ++++++++++----------- .../DirectInput/DirectInputKeyboard.h | 198 +++++------ .../DirectInput/DirectInputMouse.cpp | 350 +++++++++---------- .../DirectInput/DirectInputMouse.h | 166 ++++----- 4 files changed, 544 insertions(+), 544 deletions(-) (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DirectInput') diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.cpp index 6f39467deb..79ccde8028 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.cpp @@ -1,187 +1,187 @@ -#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& devices) -{ - LPDIRECTINPUTDEVICE8 kb_device; - - unsigned int kb_count = 0; - - std::list keyboards; - idi8->EnumDevices(DI8DEVCLASS_KEYBOARD, DIEnumDevicesCallback, (LPVOID)&keyboards, DIEDFL_ATTACHEDONLY); - - // add other keyboard devices - std::list::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 +#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& devices) +{ + LPDIRECTINPUTDEVICE8 kb_device; + + unsigned int kb_count = 0; + + std::list keyboards; + idi8->EnumDevices(DI8DEVCLASS_KEYBOARD, DIEnumDevicesCallback, (LPVOID)&keyboards, DIEDFL_ATTACHEDONLY); + + // add other keyboard devices + std::list::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 diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h index b51a38faa4..55f539fca8 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h @@ -1,99 +1,99 @@ -#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 -#include - -#include -#include - -namespace ciface -{ -namespace DirectInput -{ - -void InitKeyboard(IDirectInput8* const idi8, std::vector& 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 +#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 +#include + +#include +#include + +namespace ciface +{ +namespace DirectInput +{ + +void InitKeyboard(IDirectInput8* const idi8, std::vector& 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 diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.cpp b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.cpp index acf762386c..3464200349 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.cpp +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.cpp @@ -1,175 +1,175 @@ -#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& devices ) -{ - LPDIRECTINPUTDEVICE8 mo_device; - - unsigned int mo_count = 0; - - std::list mice; - idi8->EnumDevices(DI8DEVCLASS_POINTER, DIEnumDevicesCallback, (LPVOID)&mice, DIEDFL_ATTACHEDONLY); - - // add other keyboard devices - std::list::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 +#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& devices ) +{ + LPDIRECTINPUTDEVICE8 mo_device; + + unsigned int mo_count = 0; + + std::list mice; + idi8->EnumDevices(DI8DEVCLASS_POINTER, DIEnumDevicesCallback, (LPVOID)&mice, DIEDFL_ATTACHEDONLY); + + // add other keyboard devices + std::list::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 diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.h b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.h index c645d02727..57cc15ff5a 100644 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.h +++ b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputMouse.h @@ -1,83 +1,83 @@ -#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 -#include - -namespace ciface -{ -namespace DirectInput -{ - -void InitMouse(IDirectInput8* const idi8, std::vector& 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 +#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 +#include + +namespace ciface +{ +namespace DirectInput +{ + +void InitMouse(IDirectInput8* const idi8, std::vector& 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 -- cgit v1.2.3