Merge lp:~widelands-dev/widelands/log_messages into lp:widelands

[cghislai]

This is a rework of the use of chat messages to log informationnal messages.

- A new LogMessage struct was created appart of ChatMessage.
- The interactivegamebase is a NoteSender of LogMessage. His log_message() method will send the message to all receivers. The ChatOverlay has also moved in a protected field in this class. This was required so it is initialized before the toolbar box, so that chat messages are displayed below it.
- The ChatOverlay receives ChatMessage as well as LogMessage notes. It keeps the log message in a local vector. It displays both chat and logs mixed and in chronological order. It also uses the new renderer to display them.
- All send_local methods are removed, and it was quite a hack anyway. Several classes do not extend ChatProvider anymore.

Some things to review:
- bug 1206712 can be triggered quite easily using this branch.
- I didn't manage to draw a semi-transparent background below chat messages, it doesn't seem to work as expected?

[cghislai (charlyghislain)]

So I've added some code dealing with autosaving , the watch window and replays. Sorry for that, but I felt like rewriting the same things over and over.

The additional changes:
- Add a multiplayer field and getter in interactive gamebase
- Make Panel::die virtual and overwrite in Window to close it and in the save dialog to unpause the game
- Do not rely on interactive player in some place (watch window, save handler)
- Prevent autosaving in replay and prevent autopausing in multiplayer.

[SirVer (sirver)]

Changes sound nice, maybe I can get it some more code reviews tonight before bed and after work.

[SirVer (sirver)]

I'll definitely review this this week - I am then all caught up on reviews afaik.

[SirVer (sirver)]

Review done. Very little comments - looks very good to me. Makes the code much easier to understand and gets rid of a lot of redundancies. I wondered if it would not be possible to do much of what you've done with composition instead of inheritance though. The multiple inheritance we have all of the place there is really horrible.

One approach could also be boost::signals to install handlers for chat messages and then there are either set or not. What do you think about this?

Feel free to merge when you are happy with this though - I will not review much code in the next two weeks.

review: Needs Information

[cghislai (charlyghislain)]

I completely agree with using composition over inheritance. However, the inheritance you pointed here were not completely related to the log_message thing and it requires more refactoring than expected to change them.
So I think I will open a bug report so that I won't forget to check that later, and that I will merge this as it will allow me to get a bit further with the fh1 branch.

[SirVer (sirver)]

perfectly acceptable solution for now. This branch made the code nicer to look at and easier to understand for sure. Thanks for your work as always!

=== modified file 'src/chat.cc'
--- src/chat.cc	2013-07-26 05:57:03 +0000
+++ src/chat.cc	2013-08-21 08:32:15 +0000
@@ -23,7 +23,7 @@
 
 using namespace Widelands;
 
-std::string ChatMessage::toPrintable() const
+std::string ChatMessage::toOldRichText() const
 {
 	std::string message = "<p font-color=#33ff33 font-size=9>";
 
@@ -120,6 +120,105 @@
 	return message + "<br></p>";
 }
 
+std::string ChatMessage::toPrintable() const
+{
+	std::string message = "<p><font color=33ff33 size=9>";
+
+	// Escape richtext characters
+	// The goal of this code is two-fold:
+	//  1. Assuming an honest game host, we want to prevent the ability of
+	//     clients to use richtext.
+	//  2. Assuming a malicious host or meta server, we want to reduce the
+	//     likelihood that a bug in the richtext renderer can be exploited,
+	//     by restricting the set of allowed richtext commands.
+	//     Most notably, images are not allowed in richtext at all.
+	//
+	// Note that we do want host and meta server to send some richtext code,
+	// as the ability to send formatted commands is nice for the usability
+	// of meta server and dedicated servers, so we're treading a bit of a
+	// fine line here.
+	std::string sanitized;
+	for (std::string::size_type pos = 0; pos < msg.size(); ++pos) {
+		if (msg[pos] == '<') {
+			if (playern < 0) {
+				static const std::string good1 = "</p><p";
+				static const std::string good2 = "<br>";
+				if (!msg.compare(pos, good1.size(), good1)) {
+					std::string::size_type nextclose = msg.find('>', pos + good1.size());
+					if
+						(nextclose != std::string::npos &&
+						(nextclose == pos + good1.size() || msg[pos + good1.size()] == ' '))
+					{
+						sanitized += good1;
+						pos += good1.size() - 1;
+						continue;
+					}
+				} else if (!msg.compare(pos, good2.size(), good2)) {
+					sanitized += good2;
+					pos += good2.size() - 1;
+					continue;
+				}
+			}
+
+			sanitized += "&lt;";
+		} else {
+			sanitized += msg[pos];
+		}
+	}
+
+	// time calculation
+	char ts[13];
+	strftime(ts, sizeof(ts), "[%H:%M] ", localtime(&time));
+	message += ts;
+
+	message += "</font><font size=14 face=DejaVuSerif color=";
+	message += color();
+
+	if (recipient.size() && sender.size()) {
+		// Personal message handling
+		if (sanitized.compare(0, 3, "/me")) {
+			message += " bold=1>";
+			message += sender;
+			message += " @ ";
+			message += recipient;
+			message += ":</font><font size=14 face=DejaVuSerif shadow=1 color=eeeeee> ";
+			message += sanitized;
+		} else {
+			message += ">@";
+			message += recipient;
+			message += " \\> </font><font size=14";
+			message += " face=DejaVuSerif color=";
+			message += color();
+			message += " italic=1 shadow=1> ";
+			message += sender;
+			message += sanitized.substr(3);
+		}
+	} else {
+		// Normal messages handling
+		if (not sanitized.compare(0, 3, "/me")) {
+			message += " italic=1>-\\> ";
+			if (sender.size())
+				message += sender;
+			else
+				message += "***";
+			message += sanitized.substr(3);
+		} else if (sender.size()) {
+			message += " bold=1>";
+			message += sender;
+			message += ":</font><font size=14 face=DejaVuSerif shadow=1 color=eeeeee> ";
+			message += sanitized;
+		} else {
+			message += " bold=1>*** ";
+			message += sanitized;
+		}
+	}
+
+	// return the formated message
+	return message + "</font><br></p>";
+}
+
+
+
 std::string ChatMessage::toPlainString() const
 {
 	return sender + ": " + msg;

=== modified file 'src/chat.h'
--- src/chat.h	2013-07-26 19:16:51 +0000
+++ src/chat.h	2013-08-21 08:32:15 +0000
@@ -73,6 +73,7 @@
 	 * \return a richtext string that can be displayed to the user.
 	 */
 	std::string toPrintable() const;
+	std::string toOldRichText() const;
 
 	/**
 	 * \return a plain string containing the sender + message.
@@ -106,12 +107,6 @@
 	virtual void send(const std::string &) = 0;
 
 	/**
-	 * Sends the given message to the local player only
-	 * This may be used to display useful log messages.
-	 */
-	virtual void send_local(const std::string &) = 0;
-
-	/**
 	 * \return a (chronological) list of received chat messages.
 	 * This list need not be stable or monotonic. In other words,
 	 * subsequent calls to this functions may return a smaller or

=== modified file 'src/debugconsole.cc'
--- src/debugconsole.cc	2013-07-26 19:16:51 +0000
+++ src/debugconsole.cc	2013-08-21 08:32:15 +0000
@@ -86,10 +86,6 @@
 		it->second(arg);
 	}
 
-	void send_local(const std::string& msg) {
-		send(msg);
-	}
-
 	const std::vector<ChatMessage> & getMessages() const
 	{
 		return messages;

=== modified file 'src/gamecontroller.cc'
--- src/gamecontroller.cc	2013-08-01 10:51:41 +0000
+++ src/gamecontroller.cc	2013-08-21 08:32:15 +0000
@@ -19,7 +19,6 @@
 
 #include "gamecontroller.h"
 
-#include "chat.h"
 #include "computer_player.h"
 #include "logic/game.h"
 #include "logic/player.h"
@@ -27,9 +26,8 @@
 #include "logic/playersmanager.h"
 #include "profile/profile.h"
 #include "wlapplication.h"
-#include "wui/interactive_player.h"
 
-struct SinglePlayerGameController : public GameController, public ChatProvider {
+struct SinglePlayerGameController : public GameController {
 	SinglePlayerGameController
 		(Widelands::Game &, bool useai, Widelands::Player_Number local);
 	~SinglePlayerGameController();
@@ -46,10 +44,6 @@
 	void setPaused(bool paused);
 	void report_result(uint8_t player, Widelands::PlayerEndResult result, const std::string & info);
 
-	// Chat provider implementation
-	void send(const std::string & msg);
-	void send_local(const std::string & msg);
-	const std::vector<ChatMessage> & getMessages() const;
 private:
 	Widelands::Game & m_game;
 	bool m_useai;
@@ -60,15 +54,13 @@
 	uint32_t m_player_cmdserial;
 	Widelands::Player_Number m_local;
 	std::vector<Computer_Player *> m_computerplayers;
-	std::vector<ChatMessage> m_chatmessages;
 };
 
 SinglePlayerGameController::SinglePlayerGameController
 	(Widelands::Game        &       game,
 	 bool                     const useai,
 	 Widelands::Player_Number const local)
-	: ChatProvider(),
-	m_game            (game),
+	: m_game          (game),
 	m_useai           (useai),
 	m_lastframe       (WLApplication::get()->get_time()),
 	m_time            (m_game.get_gametime()),
@@ -178,31 +170,11 @@
 	m_game.player_manager()->add_player_end_status(pes);
 }
 
-void SinglePlayerGameController::send_local(const std::string& msg)
-{
-	ChatMessage c;
-	c.msg = msg;
-	c.time = time(0);
-	m_chatmessages.push_back(c);
-	ChatProvider::send(c);
-}
-
-void SinglePlayerGameController::send(const std::string& /* msg */)
-{
-	log("SinglePlayerGameController:: Cannot send chat messages in single player game!");
-}
-
-const std::vector< ChatMessage >& SinglePlayerGameController::getMessages() const
-{
-	return m_chatmessages;
-}
-
 GameController * GameController::createSinglePlayer
 	(Widelands::Game        &       game,
 	 bool                     const cpls,
 	 Widelands::Player_Number const local)
 {
 	SinglePlayerGameController* spgc =  new SinglePlayerGameController(game, cpls, local);
-	game.get_ipl()->set_chat_provider(*spgc);
 	return spgc;
 }

=== modified file 'src/log.h'
--- src/log.h	2013-07-18 06:31:11 +0000
+++ src/log.h	2013-08-21 08:32:15 +0000
@@ -53,5 +53,4 @@
 
 extern bool g_verbose;
 
-
 #endif

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2013-08-13 19:43:52 +0000
+++ src/logic/game.cc	2013-08-21 08:32:15 +0000
@@ -472,8 +472,10 @@
  * \note loader_ui can be nullptr, if this is run as dedicated server.
  */
 bool Game::run
-	(UI::ProgressWindow * loader_ui, Start_Game_Type const start_game_type)
+	(UI::ProgressWindow * loader_ui, Start_Game_Type const start_game_type,
+	 bool replay)
 {
+	m_replay = replay;
 	postload();
 
 	if (start_game_type != Loaded) {

=== modified file 'src/logic/game.h'
--- src/logic/game.h	2013-08-07 12:32:36 +0000
+++ src/logic/game.h	2013-08-21 08:32:15 +0000
@@ -105,7 +105,7 @@
 	bool run_splayer_scenario_direct(char const * mapname);
 	bool run_load_game (std::string filename);
 	enum Start_Game_Type {NewSPScenario, NewNonScenario, Loaded, NewMPScenario};
-	bool run(UI::ProgressWindow * loader_ui, Start_Game_Type);
+	bool run(UI::ProgressWindow * loader_ui, Start_Game_Type, bool replay = false);
 
 	virtual void postload();
 
@@ -190,6 +190,8 @@
 
 	const std::string & get_win_condition_displayname() {return m_win_condition_displayname;}
 
+	bool is_replay() const {return m_replay;};
+
 private:
 	void SyncReset();
 
@@ -254,6 +256,7 @@
 
 	/// For save games and statistics generation
 	std::string          m_win_condition_displayname;
+	bool                 m_replay;
 };
 
 inline Coords Game::random_location(Coords location, uint8_t radius) {

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2013-08-07 04:01:58 +0000
+++ src/logic/immovable.cc	2013-08-21 08:32:15 +0000
@@ -21,6 +21,7 @@
 
 #include <boost/format.hpp>
 #include <config.h>
+
 #include <cstdio>
 
 #include "container_iterate.h"

=== modified file 'src/logic/notification.h'
--- src/logic/notification.h	2013-08-10 16:57:13 +0000
+++ src/logic/notification.h	2013-08-21 08:32:15 +0000
@@ -54,8 +54,7 @@
 			(*m_links.rbegin())->disconnect(*this);
 	}
 
-protected:
-	void send(const T & note) {
+	void send(const T & note) const {
 		container_iterate_const(Links, m_links, i)
 			(*i.current)->receive(note);
 	}

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2013-08-17 08:39:21 +0000
+++ src/logic/player.cc	2013-08-21 08:32:15 +0000
@@ -115,7 +115,7 @@
 	assert(former_buildings && former_buildings->empty());
 	former_buildings->push_back(bi);
 
-	while (true) {
+	for (;;) {
 		Widelands::Building_Index oldest_idx = former_buildings->front();
 		const Widelands::Building_Descr * oldest = tribe_descr.get_building_descr(oldest_idx);
 		if (!oldest->is_enhanced()) {

=== added file 'src/logmessage.h'
--- src/logmessage.h	1970-01-01 00:00:00 +0000
+++ src/logmessage.h	2013-08-21 08:32:15 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2008-2011 by the Widelands Development Team
+ *
+ * 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 LOGMESSAGE_H
+#define LOGMESSAGE_H
+
+#include <string>
+
+
+/**
+ * Represents one log message.
+ */
+struct LogMessage {
+	/**
+	 * The (real-)time at which the message was received.
+	 */
+	time_t time;
+
+	/**
+	 * The actual chat message
+	 */
+	std::string msg;
+};
+
+#endif

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2013-07-29 18:41:11 +0000
+++ src/network/internet_gaming.cc	2013-08-21 08:32:15 +0000
@@ -768,15 +768,6 @@
 	s.send(m_sock);
 }
 
-void InternetGaming::send_local(const std::string& msg)
-{
-	ChatMessage c;
-	c.msg = msg;
-	c.time = time(0);
-	messages.push_back(c);
-	ChatProvider::send(c);
-}
-
 /**
  * \returns the boolean value of a string received from the metaserver.
  * If conversion fails, it throws a \ref warning

=== modified file 'src/network/internet_gaming.h'
--- src/network/internet_gaming.h	2013-07-26 20:19:36 +0000
+++ src/network/internet_gaming.h	2013-08-21 08:32:15 +0000
@@ -113,9 +113,6 @@
 	// ChatProvider: sends a message via the metaserver.
 	void send(const std::string &);
 
-	// ChatProvider: sends local messages
-	void send_local(const std::string &);
-
 	/// ChatProvider: adds the message to the message list and calls parent.
 	void receive(const ChatMessage & msg) {messages.push_back(msg); ChatProvider::send(msg);}
 

=== modified file 'src/network/netclient.cc'
--- src/network/netclient.cc	2013-08-01 10:51:41 +0000
+++ src/network/netclient.cc	2013-08-21 08:32:15 +0000
@@ -640,15 +640,6 @@
 	s.send(d->sock);
 }
 
-void NetClient::send_local(const std::string& msg)
-{
-	ChatMessage c;
-	c.msg = msg;
-	c.time = time(0);
-	d->chatmessages.push_back(c);
-	ChatProvider::send(c);
-}
-
 const std::vector<ChatMessage> & NetClient::getMessages() const
 {
 	return d->chatmessages;

=== modified file 'src/network/netclient.h'
--- src/network/netclient.h	2013-08-01 10:51:41 +0000
+++ src/network/netclient.h	2013-08-21 08:32:15 +0000
@@ -27,6 +27,7 @@
 
 struct NetClientImpl;
 
+//FIXME Use composition instead of inheritance
 /**
  * NetClient manages the lifetime of a network game in which this computer
  * participates as a client.
@@ -94,7 +95,6 @@
 
 	// ChatProvider interface
 	void send(const std::string & msg);
-	void send_local(const std::string & msg);
 	const std::vector<ChatMessage> & getMessages() const;
 
 private:

=== modified file 'src/network/nethost.cc'
--- src/network/nethost.cc	2013-08-06 10:40:54 +0000
+++ src/network/nethost.cc	2013-08-21 08:32:15 +0000
@@ -498,13 +498,6 @@
 		h->send(c);
 	}
 
-	void send_local(const std::string & msg) {
-		ChatMessage c;
-		c.time = time(0);
-		c.msg = msg;
-		receive(c);
-	}
-
 	const std::vector<ChatMessage> & getMessages() const {
 		return messages;
 	}

=== modified file 'src/save_handler.cc'
--- src/save_handler.cc	2013-08-01 10:51:41 +0000
+++ src/save_handler.cc	2013-08-21 08:32:15 +0000
@@ -25,9 +25,10 @@
 #include "log.h"
 #include "logic/game.h"
 #include "profile/profile.h"
+#include "upcast.h"
 #include "wexception.h"
 #include "wlapplication.h"
-#include "wui/interactive_player.h"
+#include "wui/interactive_base.h"
 
 using Widelands::Game_Saver;
 
@@ -41,6 +42,9 @@
 	if (!m_allow_saving) {
 		return;
 	}
+	if (game.is_replay()) {
+		return;
+	}
 
 	if (m_save_requested) {
 		if (!m_save_filename.empty()) {
@@ -68,10 +72,7 @@
 
 	// TODO: defer saving to next tick so that this message is shown
 	// before the actual save, or put the saving logic in another thread
-	if (game.get_igbase()) {
-		game.get_igbase()->get_chat_provider()->send_local
-			(_("Saving game..."));
-	}
+	game.get_ibase()->log_message(_("Saving game..."));
 
 	// save the game
 	const std::string complete_filename = create_file_name(get_base_dir(), filename);
@@ -90,8 +91,7 @@
 	std::string error;
 	if (!save_game(game, complete_filename, &error)) {
 		log("Autosave: ERROR! - %s\n", error.c_str());
-		game.get_ipl()->get_chat_provider()->send_local
-			(_("Saving failed!"));
+		game.get_ibase()->log_message(_("Saving failed!"));
 
 		// if backup file was created, move it back
 		if (backup_filename.length() > 0) {
@@ -110,10 +110,7 @@
 	}
 
 	log("Autosave: save took %d ms\n", m_last_saved_time - realtime);
-	if (game.get_igbase()) {
-		game.get_igbase()->get_chat_provider()->send_local
-			(_("Game saved"));
-	}
+	game.get_ibase()->log_message(_("Game saved"));
 }
 
 /**

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2013-08-02 18:36:03 +0000
+++ src/ui_basic/panel.h	2013-08-21 08:32:15 +0000
@@ -235,7 +235,7 @@
 	std::string ui_fn();
 
 protected:
-	void die();
+	virtual void die();
 	bool keyboard_free() {return !(_focus);}
 
 	virtual void update_desired_size();

=== modified file 'src/ui_basic/unique_window.cc'
--- src/ui_basic/unique_window.cc	2013-07-26 20:19:36 +0000
+++ src/ui_basic/unique_window.cc	2013-08-21 08:32:15 +0000
@@ -42,7 +42,7 @@
 */
 void UniqueWindow::Registry::destroy() {
 	if (window) {
-		delete window;
+		window->die();
 	}
 }
 
@@ -51,7 +51,7 @@
 */
 void UniqueWindow::Registry::toggle() {
 	if (window) {
-		delete window;
+		window->die();
 	} else {
 		constr();
 	}

=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2013-08-01 14:26:47 +0000
+++ src/ui_basic/window.cc	2013-08-21 08:32:15 +0000
@@ -453,12 +453,7 @@
 		grab_mouse(true);
 	} else if (btn == SDL_BUTTON_RIGHT) {
 		play_click();
-		if (is_modal())
-			end_modal(0);
-		else
-			delete this; //  is this 100% safe?
-		//  FIXME No, at least provide a flag for making a window unclosable and
-		//  FIXME provide a callback.
+		die();
 	}
 
 	return true;
@@ -490,6 +485,20 @@
 	return true;
 }
 
+/**
+ * Close the window. Overwrite this virtual method if you want
+ * to take some action before the window is destroyed, or to
+ * prevent it
+ */
+void Window::die()
+{
+	if (is_modal()) {
+		end_modal(0);
+	} else {
+		Panel::die();
+	}
+}
+
 
 void Window::restore() {
 	assert(_is_minimal);

=== modified file 'src/ui_basic/window.h'
--- src/ui_basic/window.h	2013-07-26 20:19:36 +0000
+++ src/ui_basic/window.h	2013-08-21 08:32:15 +0000
@@ -90,6 +90,7 @@
 	bool handle_tooltip();
 
 protected:
+	virtual void die();
 	virtual void layout();
 	virtual void update_desired_size();
 

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2013-08-02 10:45:32 +0000
+++ src/wlapplication.cc	2013-08-21 08:32:15 +0000
@@ -2226,7 +2226,9 @@
 		game.set_write_replay(false);
 		ReplayGameController rgc(game, m_filename);
 
-		game.run(&loaderUI, Widelands::Game::Loaded);
+		game.save_handler().set_allow_saving(false);
+
+		game.run(&loaderUI, Widelands::Game::Loaded, true);
 	} catch (const std::exception & e) {
 		log("Fatal Exception: %s\n", e.what());
 		emergency_save(game);

=== modified file 'src/wui/chatoverlay.cc'
--- src/wui/chatoverlay.cc	2013-07-26 20:19:36 +0000
+++ src/wui/chatoverlay.cc	2013-08-21 08:32:15 +0000
@@ -20,8 +20,9 @@
 #include "wui/chatoverlay.h"
 
 #include "chat.h"
+#include "graphic/font_handler1.h"
 #include "graphic/rendertarget.h"
-#include "graphic/richtext.h"
+#include "logmessage.h"
 #include "profile/profile.h"
 
 /**
@@ -30,7 +31,8 @@
 static const int32_t CHAT_DISPLAY_TIME = 10;
 static const uint32_t MARGIN = 2;
 
-struct ChatOverlay::Impl : Widelands::NoteReceiver<ChatMessage> {
+struct ChatOverlay::Impl : Widelands::NoteReceiver<ChatMessage>,
+	Widelands::NoteReceiver<LogMessage> {
 	bool transparent;
 	ChatProvider * chat;
 	bool havemessages;
@@ -39,12 +41,16 @@
 	time_t oldest;
 
 	/// Layouted message list
-	UI::RichText rt;
+	std::string all_text;
+
+	/// Log messages
+	std::vector<LogMessage> log_messages;
 
 	Impl() : transparent(false), chat(0), havemessages(false), oldest(0) {}
 
 	void recompute();
 	virtual void receive(const ChatMessage & note);
+	virtual void receive(const LogMessage & note);
 };
 
 ChatOverlay::ChatOverlay
@@ -56,8 +62,6 @@
 	m->transparent = s.get_bool("transparent_chat", true);
 
 	set_think(true);
-	m->rt.set_width(w - 2 * MARGIN);
-	m->rt.set_background_color(RGBColor(50, 50, 50));
 }
 
 ChatOverlay::~ChatOverlay()
@@ -67,10 +71,20 @@
 void ChatOverlay::setChatProvider(ChatProvider & chat)
 {
 	m->chat = &chat;
-	m->connect(chat);
+	Widelands::NoteReceiver<ChatMessage>* cmr
+		= dynamic_cast<Widelands::NoteReceiver<ChatMessage>*>(m.get());
+	cmr->connect(chat);
 	m->recompute();
 }
 
+void ChatOverlay::setLogProvider(Widelands::NoteSender<LogMessage>& log_sender)
+{
+	Widelands::NoteReceiver<LogMessage>* lmr
+		= dynamic_cast<Widelands::NoteReceiver<LogMessage>*>(m.get());
+	lmr->connect(log_sender);
+}
+
+
 /**
  * Check for message expiry.
  */
@@ -90,6 +104,13 @@
 	recompute();
 }
 
+void ChatOverlay::Impl::receive(const LogMessage& note)
+{
+	log_messages.push_back(note);
+	recompute();
+}
+
+
 /**
  * Recompute the chat message display.
  */
@@ -99,18 +120,54 @@
 
 	havemessages = false;
 
-	const std::vector<ChatMessage> & msgs = chat->getMessages();
-	uint32_t idx = msgs.size();
+	// Parse the chat message list as well as the log message list
+	// and display them in chronological order
+	int32_t chat_idx = chat != nullptr ? chat->getMessages().size() - 1 : -1;
+	int32_t log_idx = log_messages.empty() ? -1 : log_messages.size() - 1;
+	int32_t msg_time = now;
 	std::string richtext;
-	while (idx && now - msgs[idx - 1].time <= CHAT_DISPLAY_TIME) {
-		richtext = msgs[idx - 1].toPrintable() + richtext;
+
+	while ((chat_idx >= 0 || log_idx >= 0) && now - msg_time < CHAT_DISPLAY_TIME) {
+		if
+			(chat_idx < 0  ||
+				(log_idx >= 0 && chat->getMessages()[chat_idx].time < log_messages[log_idx].time))
+		{
+			// Log message is more recent
+			msg_time = log_messages[log_idx].time;
+			// Do some richtext formatting here
+			richtext = "<p><font face=DejaVuSerif size=14 color=dddddd bold=1>"
+				+ log_messages[log_idx].msg + "<br></font></p>" + richtext;
+			log_idx--;
+		} else if
+			(log_idx < 0 ||
+				(chat_idx >= 0 && chat->getMessages()[chat_idx].time >= log_messages[log_idx].time))
+		{
+			// Chat message is more recent
+			msg_time = chat->getMessages()[chat_idx].time;
+			richtext = chat->getMessages()[chat_idx].toPrintable()
+				+ richtext;
+			chat_idx--;
+		} else {
+			// Shoudn't happen
+			assert(false);
+		}
 		havemessages = true;
-		oldest = msgs[idx - 1].time;
-		idx--;
-	}
-
-	if (havemessages)
-		rt.parse("<rt>" + richtext + "</rt>");
+		oldest = msg_time;
+	}
+
+	// Parse log messages to clear old ones
+	while (!log_messages.empty()) {
+		msg_time = log_messages.front().time;
+		if (msg_time < now - CHAT_DISPLAY_TIME) {
+			log_messages.erase(log_messages.begin());
+		} else {
+			break;
+		}
+	}
+
+	if (havemessages) {
+		all_text = "<rt>" + richtext + "</rt>";
+	}
 }
 
 void ChatOverlay::draw(RenderTarget & dst)
@@ -118,8 +175,19 @@
 	if (!m->havemessages)
 		return;
 
-	int32_t height = m->rt.height();
+	const Image* im = UI::g_fh1->render(m->all_text, get_w());
+	// Background
+	int32_t height = im->height() > get_h() ? get_h() : im->height();
 	int32_t top = get_h() - height - 2 * MARGIN;
 
-	m->rt.draw(dst, Point(MARGIN, top + MARGIN), !m->transparent);
+	//FIXME: alpha channel not respected
+	if (!m->transparent) {
+		Rect rect(0, top, im->width(), height);
+		dst.fill_rect(rect, RGBAColor(50, 50, 50, 128));
+	}
+	int32_t topcrop = im->height() - height;
+	Rect cropRect(0, topcrop, im->width(), height);
+
+	Point pt(0, top);
+	dst.blitrect(pt, im, cropRect);
 }

=== modified file 'src/wui/chatoverlay.h'
--- src/wui/chatoverlay.h	2013-07-21 08:07:18 +0000
+++ src/wui/chatoverlay.h	2013-08-21 08:32:15 +0000
@@ -20,9 +20,11 @@
 #ifndef CHATOVERLAY_H
 #define CHATOVERLAY_H
 
+#include "logic/notification.h"
 #include "ui_basic/panel.h"
 
 struct ChatProvider;
+struct LogMessage;
 
 /**
  * The overlay that displays all new chat messages for some timeout on the main window.
@@ -34,6 +36,7 @@
 	~ChatOverlay();
 
 	void setChatProvider(ChatProvider &);
+	void setLogProvider(Widelands::NoteSender<LogMessage> &);
 	virtual void draw(RenderTarget &);
 	virtual void think();
 

=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2013-08-01 10:51:41 +0000
+++ src/wui/game_main_menu_save_game.cc	2013-08-21 08:32:15 +0000
@@ -35,7 +35,6 @@
 #include "profile/profile.h"
 #include "timestring.h"
 #include "wui/interactive_gamebase.h"
-#include "wui/interactive_player.h"
 
 using boost::format;
 
@@ -144,11 +143,7 @@
 	}
 
 	m_editbox->focus();
-	if (parent.game().get_ipl() && !parent.game().get_ipl()->is_multiplayer()) {
-		// Pause the game only if we are part of the game
-		// and not in multiplayer
-		parent.game().gameController()->setPaused(true);
-	}
+	pause_game(true);
 }
 
 
@@ -320,10 +315,8 @@
 
 void Game_Main_Menu_Save_Game::die()
 {
+	pause_game(false);
 	UI::UniqueWindow::die();
-	if (igbase().game().get_ipl() && !igbase().game().get_ipl()->is_multiplayer()) {
-		igbase().game().gameController()->setPaused(false);
-	}
 }
 
 
@@ -372,3 +365,12 @@
 	if (g_fs->FileExists(complete_filename))
 		new DeletionMessageBox(*this, complete_filename);
 }
+
+void Game_Main_Menu_Save_Game::pause_game(bool paused)
+{
+	if (igbase().is_multiplayer()) {
+		return;
+	}
+	igbase().game().gameController()->setPaused(paused);
+}
+

=== modified file 'src/wui/game_main_menu_save_game.h'
--- src/wui/game_main_menu_save_game.h	2013-07-26 19:16:51 +0000
+++ src/wui/game_main_menu_save_game.h	2013-08-21 08:32:15 +0000
@@ -39,9 +39,10 @@
 
 	void fill_list();
 	void select_by_name(std::string name);
+protected:
+	virtual void die();
 private:
 	Interactive_GameBase & igbase();
-	void die();
 	void selected      (uint32_t);
 	void double_clicked(uint32_t);
 	void edit_box_changed();
@@ -49,6 +50,7 @@
 	void delete_clicked();
 
 	bool save_game(std::string);
+	void pause_game(bool paused);
 
 	UI::Listselect<std::string> m_ls;
 	UI::EditBox * m_editbox;

=== modified file 'src/wui/gamechatpanel.cc'
--- src/wui/gamechatpanel.cc	2013-07-26 20:19:36 +0000
+++ src/wui/gamechatpanel.cc	2013-08-21 08:32:15 +0000
@@ -52,7 +52,8 @@
 
 	std::string str = "<rt>";
 	for (uint32_t i = 0; i < msgs.size(); ++i) {
-		str += msgs[i].toPrintable();
+		// FIXME use toPrintable() when old renderer is kicked out
+		str += msgs[i].toOldRichText();
 		str += '\n';
 	}
 	str += "</rt>";

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_base.cc	2013-08-21 08:32:15 +0000
@@ -93,6 +93,8 @@
 	m_road_buildhelp_overlay_jobid(Overlay_Manager::Job_Id::Null()),
 	m_buildroad                   (0),
 	m_road_build_player           (0),
+	// Initialize chatoveraly before the toolbar so it is below
+	m_chatOverlay                 (new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25)),
 	m_toolbar                     (this, 0, 0, UI::Box::Horizontal),
 	m_label_speed_shadow
 		(this, get_w() - 1, 0, std::string(), UI::Align_TopRight),
@@ -115,6 +117,8 @@
 	set_dock_windows_to_edges
 		(global_s.get_bool("dock_windows_to_edges", false));
 
+	m_chatOverlay->setLogProvider(m_log_sender);
+
 	//  Switch to the new graphics system now, if necessary.
 	WLApplication::get()->refresh_graphics();
 
@@ -761,6 +765,16 @@
 	return m_buildroad->get_end();
 }
 
+void Interactive_Base::log_message(const std::string& message) const
+{
+	// Send to linked receivers
+	LogMessage lm;
+	lm.msg = message;
+	lm.time = time(nullptr);
+	m_log_sender.send(lm);
+}
+
+
 
 /*
 ===============

=== modified file 'src/wui/interactive_base.h'
--- src/wui/interactive_base.h	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_base.h	2013-08-21 08:32:15 +0000
@@ -25,6 +25,9 @@
 #include "debugconsole.h"
 #include "logic/editor_game_base.h"
 #include "logic/map.h"
+#include "logic/notification.h"
+#include "logmessage.h"
+#include "wui/chatoverlay.h"
 #include "wui/mapview.h"
 #include "wui/overlay_manager.h"
 #include "ui_basic/box.h"
@@ -111,6 +114,13 @@
 
 	virtual void cleanup_for_load() {};
 
+	/**
+	 * Log a message to be displayed on screen
+	 */
+	void log_message(const std::string& message) const;
+	void log_message(const char* message) const {
+		log_message(std::string(message));
+	}
 private:
 	void roadb_add_overlay   ();
 	void roadb_remove_overlay();
@@ -169,6 +179,7 @@
 		m_toolbar.set_pos
 			(Point((get_inner_w() - m_toolbar.get_w()) >> 1, get_inner_h() - 34));
 	}
+	ChatOverlay     * m_chatOverlay;
 	UI::Box           m_toolbar;
 
 
@@ -181,6 +192,7 @@
 	UI::Textarea m_label_speed;
 
 	UI::UniqueWindow::Registry m_debugconsole;
+	Widelands::NoteSender<LogMessage> m_log_sender;
 };
 
 #define PIC2 g_gr->images().get("pics/but2.png")

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2013-08-01 10:51:41 +0000
+++ src/wui/interactive_gamebase.cc	2013-08-21 08:32:15 +0000
@@ -25,16 +25,14 @@
 #include "logic/ship.h"
 #include "profile/profile.h"
 #include "upcast.h"
-#include "wui/chatoverlay.h"
 #include "wui/game_summary.h"
 
 Interactive_GameBase::Interactive_GameBase
 	(Widelands::Game & _game, Section & global_s,
-	 PlayerType pt, bool const chatenabled)
+	 PlayerType pt, bool const chatenabled, bool const multiplayer)
 	:
 	Interactive_Base(_game, global_s),
 	m_chatProvider(0),
-	m_chatOverlay(0),
 	m_building_census_format
 		(global_s.get_string("building_census_format",       "%N")),
 	m_building_statistics_format
@@ -42,7 +40,8 @@
 	m_building_tooltip_format
 		(global_s.get_string("building_tooltip_format",      "%r")),
 	m_chatenabled(chatenabled),
-	m_playertype(pt)
+	m_playertype(pt),
+	m_multiplayer(multiplayer)
 {}
 
 /// \return a pointer to the running \ref Game instance.

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2013-08-01 10:51:41 +0000
+++ src/wui/interactive_gamebase.h	2013-08-21 08:32:15 +0000
@@ -24,7 +24,6 @@
 #include "wui/interactive_base.h"
 #include "logic/game.h"
 
-struct ChatOverlay;
 struct ChatProvider;
 
 enum PlayerType {NONE, OBSERVER, PLAYING, VICTORIOUS, DEFEATED};
@@ -51,7 +50,8 @@
 		(Widelands::Game &,
 		 Section         & global_s,
 		 PlayerType        pt          = NONE,
-		 bool              chatenabled = false);
+		 bool              chatenabled = false,
+		 bool              multiplayer = false);
 	Widelands::Game * get_game() const;
 	Widelands::Game &     game() const;
 
@@ -78,17 +78,18 @@
 	void set_playertype(const PlayerType & pt) {m_playertype = pt;}
 
 	bool try_show_ship_window();
+	bool is_multiplayer() {return m_multiplayer;}
 
 	void show_game_summary();
 
 protected:
 	Game_Main_Menu_Windows m_mainm_windows;
 	ChatProvider           * m_chatProvider;
-	ChatOverlay            * m_chatOverlay;
 	std::string              m_building_census_format;
 	std::string              m_building_statistics_format;
 	std::string              m_building_tooltip_format;
 	bool                     m_chatenabled;
+	bool                     m_multiplayer;
 
 	PlayerType m_playertype;
 	UI::UniqueWindow::Registry m_fieldaction;

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_player.cc	2013-08-21 08:32:15 +0000
@@ -46,7 +46,6 @@
 #include "ui_basic/unique_window.h"
 #include "upcast.h"
 #include "wui/building_statistics_menu.h"
-#include "wui/chatoverlay.h"
 #include "wui/encyclopedia_window.h"
 #include "wui/fieldaction.h"
 #include "wui/game_chat_menu.h"
@@ -83,10 +82,9 @@
 	 bool                     const scenario,
 	 bool                     const multiplayer)
 	:
-	Interactive_GameBase (_game, global_s),
+	Interactive_GameBase (_game, global_s, NONE, multiplayer, multiplayer),
 	m_auto_roadbuild_mode(global_s.get_bool("auto_roadbuild_mode", true)),
 	m_flag_to_connect(Widelands::Coords::Null()),
-	m_multiplayer(multiplayer),
 
 // Chat is different, as m_chatProvider needs to be checked when toggling
 // Buildhelp is different as it does not toggle a UniqueWindow
@@ -153,10 +151,6 @@
 	m_toolbar.add(&m_toggle_statistics_menu, UI::Box::AlignLeft);
 	m_toolbar.add(&m_toggle_minimap,         UI::Box::AlignLeft);
 	m_toolbar.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
-	// Limit chat width to half the screen, to limit the damage lamers can do
-	// by flooding chat messages
-	m_chatOverlay =
-		new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25);
 	if (multiplayer) {
 		m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
 		m_toggle_chat.set_visible(false);
@@ -284,7 +278,7 @@
 			m_flag_to_connect = Widelands::Coords::Null();
 		}
 	}
-	if (m_multiplayer) {
+	if (is_multiplayer()) {
 		m_toggle_chat.set_visible(m_chatenabled);
 		m_toggle_chat.set_enabled(m_chatenabled);
 	}
@@ -455,7 +449,7 @@
 
 		case SDLK_KP_ENTER:
 		case SDLK_RETURN:
-			if (!m_chatProvider | !m_chatenabled || !m_multiplayer)
+			if (!m_chatProvider | !m_chatenabled || !is_multiplayer())
 				break;
 
 			if (!m_chat.window)

=== modified file 'src/wui/interactive_player.h'
--- src/wui/interactive_player.h	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_player.h	2013-08-21 08:32:15 +0000
@@ -86,15 +86,12 @@
 
 	void popup_message(Widelands::Message_Id, const Widelands::Message &);
 
-	bool is_multiplayer() {return m_multiplayer;}
-
 private:
 	void cmdSwitchPlayer(const std::vector<std::string> & args);
 
 	Widelands::Player_Number m_player_number;
 	bool                     m_auto_roadbuild_mode;
 	Widelands::Coords        m_flag_to_connect;
-	bool                     m_multiplayer;
 
 	UI::Button m_toggle_chat;
 	UI::Button m_toggle_options_menu;

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2013-07-26 20:19:36 +0000
+++ src/wui/interactive_spectator.cc	2013-08-21 08:32:15 +0000
@@ -28,7 +28,6 @@
 #include "ui_basic/textarea.h"
 #include "ui_basic/unique_window.h"
 #include "upcast.h"
-#include "wui/chatoverlay.h"
 #include "wui/fieldaction.h"
 #include "wui/game_chat_menu.h"
 #include "wui/game_main_menu_save_game.h"
@@ -41,7 +40,7 @@
 Interactive_Spectator::Interactive_Spectator
 	(Widelands::Game & _game, Section & global_s, bool const multiplayer)
 	:
-	Interactive_GameBase(_game, global_s, OBSERVER, multiplayer),
+	Interactive_GameBase(_game, global_s, OBSERVER, multiplayer, multiplayer),
 
 #define INIT_BTN(picture, name, tooltip)                            \
  TOOLBAR_BUTTON_COMMON_PARAMETERS(name),                                      \
@@ -69,7 +68,7 @@
 	m_toggle_minimap.sigclicked.connect(boost::bind(&Interactive_Spectator::toggle_minimap, this));
 
 	m_toolbar.set_layout_toplevel(true);
-	if (!multiplayer) {
+	if (!is_multiplayer()) {
 		m_toolbar.add(&m_exit,                UI::Box::AlignLeft);
 		m_toolbar.add(&m_save,                UI::Box::AlignLeft);
 	} else
@@ -80,9 +79,7 @@
 
 	// TODO : instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI
-	if (multiplayer) {
-		m_chatOverlay =
-			new ChatOverlay(this, 10, 25, get_w() - 10, get_h() - 25);
+	if (is_multiplayer()) {
 		m_exit.set_visible(false);
 		m_exit.set_enabled(false);
 		m_save.set_visible(false);
@@ -172,28 +169,30 @@
 
 void Interactive_Spectator::exit_btn()
 {
-	if (m_chatenabled) //  == multiplayer
+	if (is_multiplayer()) {
 		return;
+	}
 	end_modal(0);
 }
 
 
 void Interactive_Spectator::save_btn()
 {
-	if (m_chatenabled) //  == multiplayer
+	if (is_multiplayer()) {
 		return;
+	}
 	if (m_mainm_windows.savegame.window)
 		delete m_mainm_windows.savegame.window;
 	else {
-		game().gameController()->setDesiredSpeed(0);
 		new Game_Main_Menu_Save_Game(*this, m_mainm_windows.savegame);
 	}
 }
 
 
 void Interactive_Spectator::toggle_options_menu() {
-	if (!m_chatenabled) //  == !multiplayer
+	if (!is_multiplayer()) {
 		return;
+	}
 	if (m_options.window)
 		delete m_options.window;
 	else
@@ -259,7 +258,6 @@
 
 		case SDLK_s:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL)) {
-				game().gameController()->setDesiredSpeed(0);
 				new Game_Main_Menu_Save_Game(*this, m_mainm_windows.savegame);
 			} else
 				set_display_flag

=== modified file 'src/wui/watchwindow.cc'
--- src/wui/watchwindow.cc	2013-08-02 18:36:03 +0000
+++ src/wui/watchwindow.cc	2013-08-21 08:32:15 +0000
@@ -256,12 +256,14 @@
 		pos = bob->calc_drawpos(game(), pos);
 
 		Widelands::Map & map = game().map();
-		if (1 < game().get_ipl()->player().vision(map.get_index(bob->get_position(), map.get_width()))) {
+		// Drop the tracking if it leaves our vision range
+		Interactive_Player* ipl = game().get_ipl();
+		if (ipl && 1 >= ipl->player().vision(map.get_index(bob->get_position(), map.get_width()))) {
+			// Not in sight
+			views[cur_index].tracking = 0;
+		} else {
 			mapview.set_viewpoint
 				(pos - Point(mapview.get_w() / 2, mapview.get_h() / 2), false);
-		} else {
-			// stop tracking
-			views[cur_index].tracking = 0;
 		}
 	}
 
@@ -327,9 +329,10 @@
 			p = bob->calc_drawpos(g, p);
 			int32_t const dist =
 				MapviewPixelFunctions::calc_pix_distance(map, p, pos);
+			Interactive_Player* ipl = game().get_ipl();
 			if
 				((!closest || closest_dist > dist)
-				 && (1 < game().get_ipl()->player().vision(map.get_index(bob->get_position(), map.get_width()))))
+				 && (!ipl || 1 < ipl->player().vision(map.get_index(bob->get_position(), map.get_width()))))
 			{
 				closest = bob;
 				closest_dist = dist;