6 files changed, 158 insertions, 1 deletions
diff --git a/common/json.cpp b/common/json.cpp
index f7a54d23b2..792d1967e9 100644
--- a/common/json.cpp
+++ b/common/json.cpp
@@ -980,7 +980,7 @@ String JSONValue::stringifyImpl(size_t const indentDepth) const {
 			ret_string = "null";
 		else {
 			char str[80];
-			sprintf(str, "%lg", _numberValue);
+			sprintf(str, "%g", _numberValue);
 			ret_string = str;
 		}
 		break;
diff --git a/common/module.mk b/common/module.mk
index 54aa16f557..6742fef3e8 100644
--- a/common/module.mk
+++ b/common/module.mk
@@ -23,6 +23,7 @@ MODULE_OBJS := \
 	memorypool.o \
 	md5.o \
 	mutex.o \
+	osd_message_queue.o \
 	platform.o \
 	quicktime.o \
 	random.o \
diff --git a/common/osd_message_queue.cpp b/common/osd_message_queue.cpp
new file mode 100644
index 0000000000..b8abf18bb5
--- /dev/null
+++ b/common/osd_message_queue.cpp
@@ -0,0 +1,62 @@
+/* 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.
+ *
+ */
+
+#include "common/osd_message_queue.h"
+#include "common/system.h"
+
+namespace Common {
+
+DECLARE_SINGLETON(OSDMessageQueue);
+	
+OSDMessageQueue::OSDMessageQueue() : _lastUpdate(0) {
+}
+
+OSDMessageQueue::~OSDMessageQueue() {
+	g_system->getEventManager()->getEventDispatcher()->unregisterSource(this);
+}
+	
+void OSDMessageQueue::registerEventSource() {
+	g_system->getEventManager()->getEventDispatcher()->registerSource(this, false);
+}
+	
+void OSDMessageQueue::addMessage(const char *msg) {
+	_mutex.lock();
+	_messages.push(msg);
+	_mutex.unlock();
+}
+
+bool OSDMessageQueue::pollEvent(Common::Event &event) {
+	_mutex.lock();
+	if (!_messages.empty()) {
+		uint t = g_system->getMillis();
+		if (t - _lastUpdate >= kMinimumDelay) {
+			_lastUpdate = t;
+			String msg = _messages.pop();
+			g_system->displayMessageOnOSD(msg.c_str());
+		}
+	}
+	_mutex.unlock();
+
+	return false;
+}
+
+} // End of namespace Common
diff --git a/common/osd_message_queue.h b/common/osd_message_queue.h
new file mode 100644
index 0000000000..7aa7cf4792
--- /dev/null
+++ b/common/osd_message_queue.h
@@ -0,0 +1,72 @@
+/* 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.
+ *
+ */
+
+#ifndef COMMON_OSD_MESSAGE_QUEUE_H
+#define COMMON_OSD_MESSAGE_QUEUE_H
+
+#include "common/events.h"
+#include "common/singleton.h"
+#include "common/str.h"
+#include "common/queue.h"
+#include "common/mutex.h"
+
+namespace Common {
+
+/**
+ * Queue OSD messages from any thread to be displayed by the graphic thread.
+ */
+class OSDMessageQueue : public Singleton<OSDMessageQueue>, public EventSource {
+public:
+	OSDMessageQueue();
+	~OSDMessageQueue();
+	
+	void registerEventSource();
+	
+	enum {
+		kMinimumDelay = 1000 /** < Minimum delay between two OSD messages (in milliseconds) */
+	};
+
+	/**
+	 * Add a message to the OSD message queue.
+	 */
+	void addMessage(const char *msg);
+	
+	/**
+	 * Common::EventSource interface
+	 *
+	 * The OSDMessageQueue registers itself as an event source even if it does not
+	 * actually produce events as a mean to be polled periodically by the GUI or
+	 * engine code.
+	 *
+	 * The periodical polling is used to update the OSD messages.
+	 */
+	virtual bool pollEvent(Common::Event &event) override;
+
+private:
+	Mutex _mutex;
+	Queue<String> _messages;
+	uint32 _lastUpdate;
+};
+
+} // End of namespace Common
+
+#endif
diff --git a/common/stream.cpp b/common/stream.cpp
index a8446a9086..08774312fd 100644
--- a/common/stream.cpp
+++ b/common/stream.cpp
@@ -247,6 +247,19 @@ uint32 SafeSeekableSubReadStream::read(void *dataPtr, uint32 dataSize) {
 	return SeekableSubReadStream::read(dataPtr, dataSize);
 }
 
+void SeekableReadStream::hexdump(int len, int bytesPerLine, int startOffset) {
+	uint pos_ = pos();
+	uint size_ = size();
+	uint toRead = MIN<uint>(len + startOffset, size_ - pos_);
+	byte *data = (byte *)calloc(toRead, 1);
+
+	read(data, toRead);
+	Common::hexdump(data, toRead, bytesPerLine, startOffset);
+
+	free(data);
+
+	seek(pos_);
+}
 
 #pragma mark -
 
diff --git a/common/stream.h b/common/stream.h
index e0ffc47d7f..30107720dc 100644
--- a/common/stream.h
+++ b/common/stream.h
@@ -514,6 +514,15 @@ public:
 	 * err() or eos() to determine whether an exception occurred.
 	 */
 	virtual String readLine();
+
+	/**
+	 * Print a hexdump of the stream while maintaing position. The number
+	 * of bytes per line is customizable.
+	 * @param len	the length of that data
+	 * @param bytesPerLine	number of bytes to print per line (default: 16)
+	 * @param startOffset	shift the shown offsets by the starting offset (default: 0)
+	 */
+	void hexdump(int len, int bytesPerLine = 16, int startOffset = 0);
 };
 
 /**