diff options
author | Stephen Kennedy | 2008-07-09 13:33:36 +0000 |
---|---|---|
committer | Stephen Kennedy | 2008-07-09 13:33:36 +0000 |
commit | 1f0b3ceb3633c75cd40f1eaacddeb73b5b8ec555 (patch) | |
tree | fdf661d07db016bf181a4c4b9ef65011842349f9 /common | |
parent | b035101732407ae7595d80162346f995242654f2 (diff) | |
download | scummvm-rg350-1f0b3ceb3633c75cd40f1eaacddeb73b5b8ec555.tar.gz scummvm-rg350-1f0b3ceb3633c75cd40f1eaacddeb73b5b8ec555.tar.bz2 scummvm-rg350-1f0b3ceb3633c75cd40f1eaacddeb73b5b8ec555.zip |
Added pushEvent to EventManager (from cpage88's branch) and changed VirtualKeyboard so that it uses this method to feed key presses its resulting key press events.
svn-id: r32977
Diffstat (limited to 'common')
-rw-r--r-- | common/events.h | 5 | ||||
-rw-r--r-- | common/list.h | 5 | ||||
-rw-r--r-- | common/queue.h | 71 |
3 files changed, 81 insertions, 0 deletions
diff --git a/common/events.h b/common/events.h index d0cb740692..3e77824110 100644 --- a/common/events.h +++ b/common/events.h @@ -142,6 +142,11 @@ public: */ virtual bool pollEvent(Common::Event &event) = 0; + /** + * Pushes a "fake" event into the event queue + */ + virtual void pushEvent(Common::Event event) = 0; + /** Register random source so it can be serialized in game test purposes **/ virtual void registerRandomSource(Common::RandomSource &rnd, const char *name) = 0; diff --git a/common/list.h b/common/list.h index c4e7b47644..0372d217b7 100644 --- a/common/list.h +++ b/common/list.h @@ -209,6 +209,11 @@ public: ++i; } + void pop_front() { + iterator i = begin(); + i = erase(i); + } + List<t_T> &operator=(const List<t_T> &list) { if (this != &list) { diff --git a/common/queue.h b/common/queue.h new file mode 100644 index 0000000000..cb29c59058 --- /dev/null +++ b/common/queue.h @@ -0,0 +1,71 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $URL$ + * $Id$ + */ + +#ifndef COMMON_QUEUE_H +#define COMMON_QUEUE_H + +#include "common/scummsys.h" +#include "common/list.h" + +namespace Common { + +/** + * Variable size Queue class, implemented using our Array class. + */ +template<class T> +class Queue { +protected: + List<T> _queue; +public: + Queue<T>() {} + Queue<T>(const List<T> &queueContent) : _queue(queueContent) {} + + bool empty() const { + return _queue.empty(); + } + void clear() { + _queue.clear(); + } + void push(const T &x) { + _queue.push_back(x); + } + T back() const { + return _queue.reverse_begin().operator*(); + } + T front() const { + return _queue.begin().operator*(); + } + T pop() { + T tmp = front(); + _queue.pop_front(); + return tmp; + } + int size() const { + return _queue.size(); + } +}; + +} // End of namespace Common + +#endif |