summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/EventHandler.h
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-01-04 22:58:20 +0000
committernakeee <nakeee@gmail.com>2009-01-04 22:58:20 +0000
commit94fb0dc2207e2efa004e19a171013bf321a0a05a (patch)
tree2aad3fde49e6d6b95eda81ba0e00097cf8939cdb /Source/Core/InputCommon/Src/EventHandler.h
parentb2e96e1ca5b2a2e3b56e8d2a9eae665040ec05fb (diff)
Somethin'
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1777 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/EventHandler.h')
-rw-r--r--Source/Core/InputCommon/Src/EventHandler.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/Source/Core/InputCommon/Src/EventHandler.h b/Source/Core/InputCommon/Src/EventHandler.h
index b5a21788d5..d9b665df99 100644
--- a/Source/Core/InputCommon/Src/EventHandler.h
+++ b/Source/Core/InputCommon/Src/EventHandler.h
@@ -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
-{
+class EventHandler {
+
private:
- listenFuncPtr keys[sf::Key::Count][8];
- listenFuncPtr mouse[sf::Mouse::Count];
- listenFuncPtr joys[sf::Joy::Count];
+ 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:
+ public:
+ EventHandler();
bool RegisterEventListener(listenFuncPtr func, Keys key);
bool RemoveEventListener(Keys key);
void Update();