piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Somethin'

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1777 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-01-04 22:58:20 +00:00
parent b2e96e1ca5
commit 94fb0dc220
5 changed files with 193 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Source/Core/InputCommon/Src/EventHandler.cpp
View File

@ -4,54 +4,51 @@
#include <wx/wx.h>
#endif
bool EventHandler::RegisterEventListener(listenFuncPtr func, Keys key)
{
if (key.inputType == KeyboardInput)
{
if (keys[key.keyCode][key.mods])
return false;
keys[key.keyCode][key.mods] = func;
}
else if (key.inputType == MouseInput)
{
if (mouse[key.mouseButton])
return false;
mouse[key.mouseButton] = func;
}
EventHandler::EventHandler() {
memset(keys, sizeof(listenFuncPtr) * (sf::Key::Escape+1)*8, 0);
memset(mouse, sizeof(listenFuncPtr) * (sf::Mouse::Count+1), 0);
memset(joys, sizeof(listenFuncPtr) * (sf::Joy::Count+1), 0);
}
bool EventHandler::RegisterEventListener(listenFuncPtr func, Keys key) {
if (key.inputType == KeyboardInput) {
fprintf(stderr, "Registering %d\n", key.keyCode);
if (key.keyCode == sf::Key::Count ||
key.keyCode >= sf::Key::Escape || keys[key.keyCode][key.mods])
return false;
keys[key.keyCode][key.mods] = func;
} else if (key.inputType == MouseInput) {
if (mouse[key.mouseButton])
return false;
mouse[key.mouseButton] = func;
}
return true;
}
bool EventHandler::RemoveEventListener(Keys key)
{
if (key.inputType == KeyboardInput)
{
if (! keys[key.keyCode][key.mods])
return false;
keys[key.keyCode][key.mods] = NULL;
bool EventHandler::RemoveEventListener(Keys key) {
if (key.inputType == KeyboardInput) {
if ((key.keyCode == sf::Key::Count || key.keyCode >= sf::Key::Escape) && ! keys[key.keyCode][key.mods])
return false;
keys[key.keyCode][key.mods] = NULL;
} else if (key.inputType == MouseInput) {
if (! mouse[key.mouseButton])
return false;
mouse[key.mouseButton] = NULL;
}
else if (key.inputType == MouseInput)
{
if (! mouse[key.mouseButton])
return false;
mouse[key.mouseButton] = NULL;
}
return true;
}
void EventHandler::Update()
{
for (unsigned int i = 0; i < eventQueue.size();i++)
{
sf::Event ev = eventQueue.front();
eventQueue.pop();
keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control](ev);
void EventHandler::Update() {
for (unsigned int i = 0; i < eventQueue.size();i++) {
sf::Event ev = eventQueue.front();
eventQueue.pop();
keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control](ev);
}
}
bool EventHandler::addEvent(sf::Event *ev)
{
bool EventHandler::addEvent(sf::Event *ev) {
eventQueue.push(*ev);
return true;
}
@ -162,8 +159,7 @@ sf::Key::Code EventHandler::wxCharCodeToSF(int id)
}
#endif
void EventHandler::SFKeyToString(sf::Key::Code keycode, char *keyStr)
{
void EventHandler::SFKeyToString(sf::Key::Code keycode, char *keyStr) {
switch (keycode) {
/* case sf::Key::A = 'a': sprintf(keyStr, "UP"); break;
case sf::Key::B = 'b': sprintf(keyStr, "UP"); break;
@ -266,6 +262,11 @@ void EventHandler::SFKeyToString(sf::Key::Code keycode, char *keyStr)
case sf::Key::F14: sprintf(keyStr, "F14"); break;
case sf::Key::F15: sprintf(keyStr, "F15"); break;
case sf::Key::Pause: sprintf(keyStr, "Paues"); break;
default: sprintf(keyStr, "%c", keycode);
default:
if (keycode > sf::Key::Escape)
sprintf(keyStr, "Invalid Key");
else
sprintf(keyStr, "%c", keycode);
break;
}
}

19
Source/Core/InputCommon/Src/EventHandler.h
View File

@ -12,8 +12,7 @@ enum InputType
JoystickInput
};
enum Modifiers
{
enum Modifiers {
UseAlt = 1,
UseShift = 2,
UseCtrl = 4
@ -28,15 +27,15 @@ struct Keys
sf::Mouse::Button mouseButton;
};
class EventHandler
{
private:
listenFuncPtr keys[sf::Key::Count][8];
listenFuncPtr mouse[sf::Mouse::Count];
listenFuncPtr joys[sf::Joy::Count];
std::queue<sf::Event> eventQueue;
class EventHandler {
public:
private:
listenFuncPtr keys[sf::Key::Escape+1][8];
listenFuncPtr mouse[sf::Mouse::Count+1];
listenFuncPtr joys[sf::Joy::Count+1];
std::queue<sf::Event> eventQueue;
public:
EventHandler();
bool RegisterEventListener(listenFuncPtr func, Keys key);
bool RemoveEventListener(Keys key);
void Update();

22
Source/Core/InputCommon/Src/InputCommon.cpp
View File

@ -4,17 +4,13 @@ EventHandler *eventHandler = NULL;
namespace InputCommon
{
void Init()
{
#if defined GLTEST && GLTEST
// init the event handler
eventHandler = new EventHandler();
#endif
}
void Shutdown()
{
if (eventHandler)
delete eventHandler;
}
void Init() {
// init the event handler
eventHandler = new EventHandler();
}
void Shutdown() {
if (eventHandler)
delete eventHandler;
}
}