From 0bf3dfda036f1da0cb26e1f266ea500fbe74f872 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 3 Jul 2010 08:04:10 +0000 Subject: 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 --- .../DirectInput/DirectInputKeyboard.h | 99 ---------------------- 1 file changed, 99 deletions(-) delete mode 100644 Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h (limited to 'Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h') diff --git a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h b/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h deleted file mode 100644 index 55f539fca8..0000000000 --- a/Source/Core/InputCommon/Src/ControllerInterface/DirectInput/DirectInputKeyboard.h +++ /dev/null @@ -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 -#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 -- cgit v1.2.3