[Scummvm-cvs-logs] SF.net SVN: scummvm:[42723] scummvm/trunk/backends/events/default
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Sat Jul 25 03:00:13 CEST 2009
Revision: 42723
http://scummvm.svn.sourceforge.net/scummvm/?rev=42723&view=rev
Author: lordhoto
Date: 2009-07-25 01:00:12 +0000 (Sat, 25 Jul 2009)
Log Message:
-----------
Made DefaultEventManager a subclass of EventObserver.
Modified Paths:
--------------
scummvm/trunk/backends/events/default/default-events.cpp
scummvm/trunk/backends/events/default/default-events.h
Modified: scummvm/trunk/backends/events/default/default-events.cpp
===================================================================
--- scummvm/trunk/backends/events/default/default-events.cpp 2009-07-25 00:59:53 UTC (rev 42722)
+++ scummvm/trunk/backends/events/default/default-events.cpp 2009-07-25 01:00:12 UTC (rev 42723)
@@ -594,7 +594,6 @@
}
void DefaultEventManager::pushEvent(const Common::Event &event) {
-
// If already received an EVENT_QUIT, don't add another one
if (event.type == Common::EVENT_QUIT) {
if (!_shouldQuit)
Modified: scummvm/trunk/backends/events/default/default-events.h
===================================================================
--- scummvm/trunk/backends/events/default/default-events.h 2009-07-25 00:59:53 UTC (rev 42722)
+++ scummvm/trunk/backends/events/default/default-events.h 2009-07-25 01:00:12 UTC (rev 42723)
@@ -41,7 +41,7 @@
}
-class DefaultEventManager : public Common::EventManager {
+class DefaultEventManager : public Common::EventManager, Common::EventObserver {
Common::EventSource *_boss;
#ifdef ENABLE_VKEYBD
@@ -74,6 +74,12 @@
bool allowMapping() const { return false; }
} _artificialEventSource;
+ Common::Queue<Common::Event> _eventQueue;
+ bool notifyEvent(const Common::Event &ev) {
+ _eventQueue.push(ev);
+ return true;
+ }
+
Common::Point _mousePos;
int _buttonState;
int _modifierState;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list