diff options
| author | nakeee <nakeee@gmail.com> | 2009-01-06 08:30:31 +0000 |
|---|---|---|
| committer | nakeee <nakeee@gmail.com> | 2009-01-06 08:30:31 +0000 |
| commit | f95937bc2e2c0d3cd1cfb5fe4ffc2b12e43e966f (patch) | |
| tree | 8fd7ccff0ba9641a315d2db3342f5a3ede7b5b0c /Source/Core | |
| parent | ce2b4bead95a305353a02ee938ff14f4eafd11f2 (diff) | |
is properties the right way?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1808 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/InputCommon/Src/EventHandler.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/InputCommon/Src/InputCommon.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp index 9565e0bce6..9795740ec4 100644 --- a/Source/Core/InputCommon/Src/EventHandler.cpp +++ b/Source/Core/InputCommon/Src/EventHandler.cpp @@ -29,14 +29,14 @@ EventHandler *EventHandler::GetInstance() { void EventHandler::Destroy() { if (m_Instance) - delete m_Instance; + delete m_Instance; fprintf(stderr, "deleting instance %p\n", m_Instance); m_Instance = 0; } bool EventHandler::RegisterEventListener(listenFuncPtr func, Keys key) { if (key.inputType == KeyboardInput) { - fprintf(stderr, "Registering %d:%d %p\n", key.keyCode, key.mods, func); + fprintf(stderr, "Registering %d:%d %p %p \n", key.keyCode, key.mods, func, this); if (key.keyCode == sf::Key::Count || key.mods >= NUMMODS || key.keyCode >= NUMKEYS) return false; @@ -72,7 +72,7 @@ void EventHandler::Update() { for (unsigned int i = 0; i < eventQueue.size();i++) { sf::Event ev = eventQueue.front(); eventQueue.pop(); - fprintf(stderr, "Updating event type %d code %d mod %d func %p\n", ev.Type, ev.Key.Code, ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control, keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control]); + fprintf(stderr, "Updating event type %d code %d mod %d func %p %p\n", ev.Type, ev.Key.Code, ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control, keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control], this); if(keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control]) keys[ev.Key.Code][ev.Key.Alt+2*ev.Key.Shift+4*ev.Key.Control](ev); } @@ -80,7 +80,7 @@ void EventHandler::Update() { bool EventHandler::addEvent(sf::Event *ev) { eventQueue.push(*ev); - fprintf(stderr, "Got event type %d code %d\n", ev->Type, ev->Key.Code); + fprintf(stderr, "Got event type %d code %d %p\n", ev->Type, ev->Key.Code, this); return true; } @@ -313,6 +313,6 @@ class EventHandlerCleaner public: ~EventHandlerCleaner() { - EventHandler::Destroy(); + //EventHandler::Destroy(); } } EventHandlerCleanerInst; diff --git a/Source/Core/InputCommon/Src/InputCommon.cpp b/Source/Core/InputCommon/Src/InputCommon.cpp index fc908e8975..beed506f8e 100644 --- a/Source/Core/InputCommon/Src/InputCommon.cpp +++ b/Source/Core/InputCommon/Src/InputCommon.cpp @@ -6,7 +6,7 @@ namespace InputCommon { void Init() { // init the event handler - EventHandler::GetInstance(); + //EventHandler::GetInstance(); } void Shutdown() { |