libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-02 16:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change DefaultEventManager to use EventDispatcher.

Browse Source 
svn-id: r42725
This commit is contained in:
Johannes Schickel 2009-07-25 01:00:37 +00:00
parent 38309da521
commit 141ded3063
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backends/events/default/default-events.cpp
View File

@ -93,14 +93,18 @@ void writeRecord(Common::OutSaveFile *outFile, uint32 diff, Common::Event &event
}
DefaultEventManager::DefaultEventManager(Common::EventSource *boss) :
_boss(boss),
_buttonState(0),
_modifierState(0),
_shouldQuit(false),
_shouldRTL(false),
_confirmExitDialogActive(false) {
assert(_boss);
assert(boss);
g_eventDispatcher.registerSource(boss, false);
g_eventDispatcher.registerSource(&_artificialEventSource, false);
g_eventDispatcher.registerObserver(this, 0, false);
_recordFile = NULL;
_recordTimeFile = NULL;
@ -378,12 +382,12 @@ void DefaultEventManager::processMillis(uint32 &millis) {
bool DefaultEventManager::pollEvent(Common::Event &event) {
uint32 time = g_system->getMillis();
bool result;
bool result = false;
if (_artificialEventSource.pollEvent(event)) {
g_eventDispatcher.dispatch();
if (!_eventQueue.empty()) {
event = _eventQueue.pop();
result = true;
} else {
result = _boss->pollEvent(event);
#ifdef ENABLE_KEYMAPPER
if (result) {

2
backends/events/default/default-events.h
View File

@ -42,8 +42,6 @@ namespace Common {
class DefaultEventManager : public Common::EventManager, Common::EventObserver {
Common::EventSource *_boss;
#ifdef ENABLE_VKEYBD
Common::VirtualKeyboard *_vk;
#endif