more event plugin code

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1717 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-29 20:12:19 +00:00
parent e2bd162d1d
commit c20a54d65d
10 changed files with 152 additions and 432 deletions

View File

@ -1 +1,134 @@
#include "EventHandler.h" #include "EventHandler.h"
#include <wx/wx.h>
bool EventHandler::TestEvent (Keys k, sf::Event e)
{
//Mouse event
if (k.inputType==MouseInput && k.eventType==e.Type && k.mouseButton==e.MouseButton.Button)
{
return (true);
}
//Keyboard event
if (k.inputType==KeyboardInput && k.eventType==e.Type && k.keyCode==e.Key.Code)
{
return (true);
}
return (false);
}
// Taken from wxw source code
int wxCharCodeWXToX(int id)
{
int sfKey;
switch (id) {
//case WXK_CANCEL: sfKey = sf::Key::Cancel; break;
//case WXK_BACK: sfKey = sf::Key::BackSpace; break;
case WXK_TAB: sfKey = sf::Key::Tab; break;
//case WXK_CLEAR: sfKey = sf::Key::Clear; break;
case WXK_RETURN: sfKey = sf::Key::Return; break;
case WXK_SHIFT: sfKey = sf::Key::LShift; break;
case WXK_CONTROL: sfKey = sf::Key::LControl; break;
case WXK_ALT: sfKey = sf::Key::LAlt; break;
//case WXK_CAPITAL: sfKey = sf::Key::Caps_Lock; break;
case WXK_MENU : sfKey = sf::Key::Menu; break;
case WXK_PAUSE: sfKey = sf::Key::Pause; break;
case WXK_ESCAPE: sfKey = sf::Key::Escape; break;
case WXK_SPACE: sfKey = sf::Key::Space; break;
case WXK_PAGEUP: sfKey =sf::Key::PageUp; break;
case WXK_PAGEDOWN: sfKey =sf::Key::PageDown; break;
case WXK_END: sfKey =sf::Key::End; break;
case WXK_HOME : sfKey =sf::Key::Home; break;
case WXK_LEFT : sfKey =sf::Key::Left; break;
case WXK_UP: sfKey =sf::Key::Up; break;
case WXK_RIGHT: sfKey =sf::Key::Right; break;
case WXK_DOWN : sfKey =sf::Key::Down; break;
//case WXK_SELECT: sfKey =sf::Key::Select; break;
//case WXK_PRINT: sfKey =sf::Key::Print; break;
//case WXK_EXECUTE: sfKey =sf::Key::Execute; break;
case WXK_INSERT: sfKey =sf::Key::Insert; break;
case WXK_DELETE: sfKey =sf::Key::Delete; break;
//case WXK_HELP : sfKey =sf::Key::Help; break;
case WXK_NUMPAD0: sfKey =sf::Key::Numpad0; break;
case WXK_NUMPAD_INSERT: sfKey =sf::Key::Insert; break;
case WXK_NUMPAD1: sfKey =sf::Key::Numpad1; break;
case WXK_NUMPAD_END: sfKey =sf::Key::End; break;
case WXK_NUMPAD2: sfKey =sf::Key::Numpad2; break;
case WXK_NUMPAD_DOWN: sfKey =sf::Key::Down; break;
case WXK_NUMPAD3: sfKey =sf::Key::Numpad3; break;
case WXK_NUMPAD_PAGEDOWN: sfKey =sf::Key::PageDown; break;
case WXK_NUMPAD4: sfKey =sf::Key::Numpad4; break;
case WXK_NUMPAD_LEFT: sfKey =sf::Key::Left; break;
case WXK_NUMPAD5: sfKey =sf::Key::Numpad5; break;
case WXK_NUMPAD6: sfKey =sf::Key::Numpad6; break;
case WXK_NUMPAD_RIGHT: sfKey =sf::Key::Right; break;
case WXK_NUMPAD7: sfKey =sf::Key::Numpad7; break;
case WXK_NUMPAD_HOME: sfKey =sf::Key::Home; break;
case WXK_NUMPAD8: sfKey =sf::Key::Numpad8; break;
case WXK_NUMPAD_UP: sfKey =sf::Key::Up; break;
case WXK_NUMPAD9: sfKey =sf::Key::Numpad9; break;
case WXK_NUMPAD_PAGEUP: sfKey =sf::Key::PageUp; break;
//case WXK_NUMPAD_DECIMAL: sfKey =sf::Key::Decimal; break;
case WXK_NUMPAD_DELETE: sfKey =sf::Key::Delete; break;
case WXK_NUMPAD_MULTIPLY: sfKey =sf::Key::Multiply; break;
case WXK_NUMPAD_ADD: sfKey =sf::Key::Add; break;
case WXK_NUMPAD_SUBTRACT: sfKey =sf::Key::Subtract; break;
case WXK_NUMPAD_DIVIDE: sfKey =sf::Key::Divide; break;
case WXK_NUMPAD_ENTER: sfKey =sf::Key::Return; break;
//case WXK_NUMPAD_SEPARATOR: sfKey =sf::Key::Separator; break;
case WXK_F1: sfKey =sf::Key::F1; break;
case WXK_F2: sfKey =sf::Key::F2; break;
case WXK_F3: sfKey =sf::Key::F3; break;
case WXK_F4: sfKey =sf::Key::F4; break;
case WXK_F5: sfKey =sf::Key::F5; break;
case WXK_F6: sfKey =sf::Key::F6; break;
case WXK_F7: sfKey =sf::Key::F7; break;
case WXK_F8: sfKey =sf::Key::F8; break;
case WXK_F9: sfKey =sf::Key::F9; break;
case WXK_F10: sfKey =sf::Key::F10; break;
case WXK_F11: sfKey =sf::Key::F11; break;
case WXK_F12: sfKey =sf::Key::F12; break;
case WXK_F13: sfKey =sf::Key::F13; break;
case WXK_F14: sfKey =sf::Key::F14; break;
case WXK_F15: sfKey =sf::Key::F15; break;
//case WXK_NUMLOCK: sfKey =sf::Key::Num_Lock; break;
//case WXK_SCROLL: sfKey =sf::Key::Scroll_Lock; break;
default: sfKey = id <= 255 ? id : 0;
}
return sfKey;
}
void EventHandler::SFKeyToString(unsigned int keycode, char *keyStr) {
switch (keycode) {
case sf::Key::Return:
sprintf(keyStr, "RETURN");
break;
case sf::Key::Left:
sprintf(keyStr, "LEFT");
break;
case sf::Key::Up:
sprintf(keyStr, "UP");
break;
case sf::Key::Right:
sprintf(keyStr, "RIGHT");
break;
case sf::Key::Down:
sprintf(keyStr, "DOWN");
break;
case sf::Key::LShift:
case sf::Key::RShift:
sprintf(keyStr, "Shift");
break;
case sf::Key::LControl:
case sf::Key::RControl:
sprintf(keyStr, "Control");
case sf::Key::LAlt:
case sf::Key::RAlt:
sprintf(keyStr, "Alt");
break;
default:
sprintf(keyStr, "%c", toupper(keycode));
}
}

View File

@ -4,6 +4,20 @@
#include "Event.hpp" #include "Event.hpp"
typedef bool (*listenFuncPtr) (sf::Event *); typedef bool (*listenFuncPtr) (sf::Event *);
enum InputType
{
KeyboardInput,
MouseInput,
JoystickInput
};
struct Keys
{
InputType inputType;
sf::Event::EventType eventType;
sf::Key::Code keyCode;
sf::Mouse::Button mouseButton;
};
class EventHandler { class EventHandler {
@ -11,12 +25,14 @@ private:
listenFuncPtr keys[100][6]; listenFuncPtr keys[100][6];
listenFuncPtr mouse[6]; listenFuncPtr mouse[6];
listenFuncPtr joys[10]; listenFuncPtr joys[10];
std::queue<sf::Event> eventQueue; std::queue<Keys> eventQueue;
public: public:
bool RegisterEventListener(listenFuncPtr func, int event, int type); bool RegisterEventListener(listenFuncPtr func, int event, int type);
void Update(); void Update();
bool addEvent(sf::Event *); bool addEvent(sf::Event *);
static bool TestEvent (Keys k, sf::Event e);
static int wxCharCodeWXToX(int id);
static void SFKeyToString(unsigned int keycode, char *keyStr);
}; };
#endif #endif

View File

@ -1,189 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "stdafx.h"
#include "DirectInputBase.h"
DInput::DInput()
: g_pDI(NULL),
g_pKeyboard(NULL)
{}
DInput::~DInput()
{
Free();
}
void DInput::DIKToString(unsigned int keycode, char *keyStr)
{
switch(keycode) {
case DIK_RETURN:
sprintf(keyStr, "Enter");
break;
case DIK_UP:
sprintf(keyStr, "Up");
break;
case DIK_DOWN:
sprintf(keyStr, "Down");
break;
case DIK_LEFT:
sprintf(keyStr, "Left");
break;
case DIK_RIGHT:
sprintf(keyStr, "Right");
break;
case DIK_HOME:
strcpy(keyStr, "Home");
break;
case DIK_END:
strcpy(keyStr, "End");
break;
case DIK_INSERT:
strcpy(keyStr, "Ins");
break;
case DIK_DELETE:
strcpy(keyStr, "Del");
break;
case DIK_PGUP:
strcpy(keyStr, "PgUp");
break;
case DIK_PGDN:
strcpy(keyStr, "PgDn");
break;
case DIK_NUMPAD0:
strcpy(keyStr, "Num 0");
break;
case DIK_NUMPAD1:
strcpy(keyStr, "Num 1");
break;
case DIK_NUMPAD2:
strcpy(keyStr, "Num 2");
break;
case DIK_NUMPAD3:
strcpy(keyStr, "Num 3");
break;
case DIK_NUMPAD4:
strcpy(keyStr, "Num 4");
break;
case DIK_NUMPAD5:
strcpy(keyStr, "Num 5");
break;
case DIK_NUMPAD6:
strcpy(keyStr, "Num 6");
break;
case DIK_NUMPAD7:
strcpy(keyStr, "Num 7");
break;
case DIK_NUMPAD8:
strcpy(keyStr, "Num 8");
break;
case DIK_NUMPAD9:
strcpy(keyStr, "Num 9");
break;
case DIK_NUMPADSLASH:
strcpy(keyStr, "Num /");
break;
default:
GetKeyNameText(keycode << 16, keyStr, 64);
break;
}
}
HRESULT DInput::Init(HWND hWnd)
{
HRESULT hr;
DWORD dwCoopFlags;
dwCoopFlags = DISCL_FOREGROUND | DISCL_NOWINKEY;
// Create a DInput object
if (FAILED(hr = DirectInput8Create(GetModuleHandle(NULL), DIRECTINPUT_VERSION,
IID_IDirectInput8, (VOID* *)&g_pDI, NULL)))
{
MessageBox(0, "Direct Input Create Failed", 0, MB_ICONERROR);
return(hr);
}
if (FAILED(hr = g_pDI->CreateDevice(GUID_SysKeyboard, &g_pKeyboard, NULL)))
{
MessageBox(0, "Couldn't access keyboard", 0, MB_ICONERROR);
Free();
return(hr);
}
g_pKeyboard->SetDataFormat(&c_dfDIKeyboard);
g_pKeyboard->SetCooperativeLevel(hWnd, dwCoopFlags);
g_pKeyboard->Acquire();
return(S_OK);
}
void DInput::Free()
{
if (g_pKeyboard)
{
g_pKeyboard->Unacquire();
g_pKeyboard->Release();
g_pKeyboard = 0;
}
if (g_pDI)
{
g_pDI->Release();
g_pDI = 0;
}
}
// Desc: Read the input device's state when in immediate mode and display it.
HRESULT DInput::Read()
{
HRESULT hr;
if (NULL == g_pKeyboard)
{
return(S_OK);
}
// Get the input's device state, and put the state in dims
ZeroMemory(diks, sizeof(diks));
hr = g_pKeyboard->GetDeviceState(sizeof(diks), diks);
//for (int i=0; i<256; i++)
// if (diks[i])MessageBox(0,"DSFJDKSF|",0,0);
if (FAILED(hr))
{
// DirectInput may be telling us that the input stream has been
// interrupted. We aren't tracking any state between polls, so
// we don't have any special reset that needs to be done.
// We just re-acquire and try again.
// If input is lost then acquire and keep trying
hr = g_pKeyboard->Acquire();
while (hr == DIERR_INPUTLOST)
{
hr = g_pKeyboard->Acquire();
}
// hr may be DIERR_OTHERAPPHASPRIO or other errors. This
// may occur when the app is minimized or in the process of
// switching, so just try again later
return(S_OK);
}
return(S_OK);
}

View File

@ -1,44 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifndef _DIRECTINPUTBASE_H
#define _DIRECTINPUTBASE_H
class DInput
{
public:
DInput();
~DInput();
static void DInput::DIKToString(unsigned int keycode, char *keyStr);
HRESULT Init(HWND hWnd);
void Free();
HRESULT Read();
BYTE diks[256]; // DirectInput keyboard state buffer
private:
LPDIRECTINPUT8 g_pDI; // The DirectInput object
LPDIRECTINPUTDEVICE8 g_pKeyboard; // The keyboard device
};
#endif

View File

@ -29,10 +29,6 @@
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/gbsizer.h> #include <wx/gbsizer.h>
#ifndef _WIN32
#include "../XInputBase.h"
#endif
class ConfigDialog : public wxDialog class ConfigDialog : public wxDialog
{ {

View File

@ -16,7 +16,7 @@ padeenv = env.Clone()
if padeenv['HAVE_WX']: if padeenv['HAVE_WX']:
files += [ files += [
"GUI/ConfigDlg.cpp", # "GUI/ConfigDlg.cpp",
] ]
padeenv.Append(LIBS = [ 'common' ]) padeenv.Append(LIBS = [ 'common' ])

View File

@ -1,128 +0,0 @@
#include "XInputBase.h"
// Taken from wxw source code
KeySym wxCharCodeWXToX(int id)
{
KeySym keySym;
switch (id)
{
case WXK_CANCEL: keySym = XK_Cancel; break;
case WXK_BACK: keySym = XK_BackSpace; break;
case WXK_TAB: keySym = XK_Tab; break;
case WXK_CLEAR: keySym = XK_Clear; break;
case WXK_RETURN: keySym = XK_Return; break;
case WXK_SHIFT: keySym = XK_Shift_L; break;
case WXK_CONTROL: keySym = XK_Control_L; break;
case WXK_ALT: keySym = XK_Meta_L; break;
case WXK_CAPITAL: keySym = XK_Caps_Lock; break;
case WXK_MENU : keySym = XK_Menu; break;
case WXK_PAUSE: keySym = XK_Pause; break;
case WXK_ESCAPE: keySym = XK_Escape; break;
case WXK_SPACE: keySym = ' '; break;
case WXK_PAGEUP: keySym = XK_Prior; break;
case WXK_PAGEDOWN: keySym = XK_Next; break;
case WXK_END: keySym = XK_End; break;
case WXK_HOME : keySym = XK_Home; break;
case WXK_LEFT : keySym = XK_Left; break;
case WXK_UP: keySym = XK_Up; break;
case WXK_RIGHT: keySym = XK_Right; break;
case WXK_DOWN : keySym = XK_Down; break;
case WXK_SELECT: keySym = XK_Select; break;
case WXK_PRINT: keySym = XK_Print; break;
case WXK_EXECUTE: keySym = XK_Execute; break;
case WXK_INSERT: keySym = XK_Insert; break;
case WXK_DELETE: keySym = XK_Delete; break;
case WXK_HELP : keySym = XK_Help; break;
case WXK_NUMPAD0: keySym = XK_KP_0; break; case WXK_NUMPAD_INSERT: keySym = XK_KP_Insert; break;
case WXK_NUMPAD1: keySym = XK_KP_1; break; case WXK_NUMPAD_END: keySym = XK_KP_End; break;
case WXK_NUMPAD2: keySym = XK_KP_2; break; case WXK_NUMPAD_DOWN: keySym = XK_KP_Down; break;
case WXK_NUMPAD3: keySym = XK_KP_3; break; case WXK_NUMPAD_PAGEDOWN: keySym = XK_KP_Page_Down; break;
case WXK_NUMPAD4: keySym = XK_KP_4; break; case WXK_NUMPAD_LEFT: keySym = XK_KP_Left; break;
case WXK_NUMPAD5: keySym = XK_KP_5; break;
case WXK_NUMPAD6: keySym = XK_KP_6; break; case WXK_NUMPAD_RIGHT: keySym = XK_KP_Right; break;
case WXK_NUMPAD7: keySym = XK_KP_7; break; case WXK_NUMPAD_HOME: keySym = XK_KP_Home; break;
case WXK_NUMPAD8: keySym = XK_KP_8; break; case WXK_NUMPAD_UP: keySym = XK_KP_Up; break;
case WXK_NUMPAD9: keySym = XK_KP_9; break; case WXK_NUMPAD_PAGEUP: keySym = XK_KP_Page_Up; break;
case WXK_NUMPAD_DECIMAL: keySym = XK_KP_Decimal; break; case WXK_NUMPAD_DELETE: keySym = XK_KP_Delete; break;
case WXK_NUMPAD_MULTIPLY: keySym = XK_KP_Multiply; break;
case WXK_NUMPAD_ADD: keySym = XK_KP_Add; break;
case WXK_NUMPAD_SUBTRACT: keySym = XK_KP_Subtract; break;
case WXK_NUMPAD_DIVIDE: keySym = XK_KP_Divide; break;
case WXK_NUMPAD_ENTER: keySym = XK_KP_Enter; break;
case WXK_NUMPAD_SEPARATOR: keySym = XK_KP_Separator; break;
case WXK_F1: keySym = XK_F1; break;
case WXK_F2: keySym = XK_F2; break;
case WXK_F3: keySym = XK_F3; break;
case WXK_F4: keySym = XK_F4; break;
case WXK_F5: keySym = XK_F5; break;
case WXK_F6: keySym = XK_F6; break;
case WXK_F7: keySym = XK_F7; break;
case WXK_F8: keySym = XK_F8; break;
case WXK_F9: keySym = XK_F9; break;
case WXK_F10: keySym = XK_F10; break;
case WXK_F11: keySym = XK_F11; break;
case WXK_F12: keySym = XK_F12; break;
case WXK_F13: keySym = XK_F13; break;
case WXK_F14: keySym = XK_F14; break;
case WXK_F15: keySym = XK_F15; break;
case WXK_F16: keySym = XK_F16; break;
case WXK_F17: keySym = XK_F17; break;
case WXK_F18: keySym = XK_F18; break;
case WXK_F19: keySym = XK_F19; break;
case WXK_F20: keySym = XK_F20; break;
case WXK_F21: keySym = XK_F21; break;
case WXK_F22: keySym = XK_F22; break;
case WXK_F23: keySym = XK_F23; break;
case WXK_F24: keySym = XK_F24; break;
case WXK_NUMLOCK: keySym = XK_Num_Lock; break;
case WXK_SCROLL: keySym = XK_Scroll_Lock; break;
default: keySym = id <= 255 ? (KeySym)id : 0;
}
return keySym;
}
void XKeyToString(unsigned int keycode, char *keyStr) {
switch (keycode) {
case XK_Left:
sprintf(keyStr, "LEFT");
break;
case XK_Up:
sprintf(keyStr, "UP");
break;
case XK_Right:
sprintf(keyStr, "RIGHT");
break;
case XK_Down:
sprintf(keyStr, "DOWN");
break;
case XK_Return:
sprintf(keyStr, "RETURN");
break;
case XK_KP_Enter:
sprintf(keyStr, "KP ENTER");
break;
case XK_KP_Left:
sprintf(keyStr, "KP LEFT");
break;
case XK_KP_Up:
sprintf(keyStr, "KP UP");
break;
case XK_KP_Right:
sprintf(keyStr, "KP RIGHT");
break;
case XK_KP_Down:
sprintf(keyStr, "KP DOWN");
break;
case XK_Shift_L:
sprintf(keyStr, "LShift");
break;
case XK_Control_L:
sprintf(keyStr, "LControl");
break;
default:
sprintf(keyStr, "%c", toupper(keycode));
}
}

View File

@ -1,12 +0,0 @@
#ifndef XINPUTBASE_H
#define XINPUTBASE_H
#include <X11/X.h>
#include <X11/keysym.h>
#include <wx/wx.h>
KeySym wxCharCodeWXToX(int id);
void XKeyToString(unsigned int keycode, char *keyStr);
#endif

View File

@ -1,18 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#include "stdafx.h"

View File

@ -1,34 +0,0 @@
// Copyright (C) 2003-2008 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#pragma once
// Insert your headers here
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#define _CRT_SECURE_NO_DEPRECATE 1
#include <windows.h>
#include <stdio.h>
#include <tchar.h>
#include <vector>
#include <xstring>
// DInput
#define DIRECTINPUT_VERSION 0x0800
#include <dinput.h>