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

[cghislai]

I corrected the bug by handling mousein events in the Window class.
I also fixed two things found along in the way:
 1 text alignment was not honored in tables
 2 texts containing false tag such as '<parent>' to go up one directory, threw exception with the new font handler.

For 2, the parser will consider unallowed tags as normal text. Another way could be to escape all these correctly, but the solution here should be safe for translated strings as well. A warning is printed if such tag is detected and an exception should still be thrown for typos, as the closing tag will be parsed.

[cghislai (charlyghislain)]

I add I feel sorry for all regressions linked to my code. I will fixes them all asap. Those linked to opengl rendering may be tricky.

[SirVer (sirver)]

do not worry - you add code at a tremendous rate and WL has no test suite (well, only the Lua test suite which tests quite a bit of code actually. And the new rich text renderer). So regressions do happen.

I can have a look at the OpenGL ones too - it might be as trivial as clear() ing the surface before rendering onto it. Or maybe the width are wrongly reported or so.

I am not too sure about the solution you propose for the text renderer here. The problem I see is that legal tags could still be part of the filenames and look strange or even crash the game. The right solution seems to be to escape < and > when only the raw text is needed. The renderer supports \< and \> for that. Why did you not go for this?

Also pulling in #include "wui/mapview.h" into ui is not a good design. ui_basic is the buildingblocks of the ui and wui are the Widelands specific elements. Adding knowledge of a child class into this is code-smelly. Can you not reset the tooltip in panel if no one handles the mouse in?

review: Needs Fixing

[cghislai (charlyghislain)]

You are right, I was quite in a hurry to correct those bugs and the solutions I proposed here weren't by far the optimal ones.

I saw that escaping <> characters were supported. I first went for that then for some reason thought it would be best to handle that at the source directly. I thought about translators that might introduce false tags. I didn't even think about filenames, but still, the syntax exception crash the game with current code.

Concerning the tooltip, I totally agree about the design issue. I will try your suggestion, but Im afraid the tooltip behaviour will change too much with it, as every element seems to be a panel, and that mousein events occur all the time with statistics turned on for instance. A cast to Window may solve this. The other solution I first tried was to handle this case separately in every wui window. While it worked as intended, I thought it would be one more thing to implement on every window, and I looked for a more general solution, again.

review: Approve

[cghislai (charlyghislain)]

review: Abstain

[SirVer (sirver)]

About the tooltips: I think it should be another event. So, when the UI decides that it would like to show a tooltip, it calls "OnTooltip" or so on the current panels (very similar to how mousein behaves) and each of them can report with "true" to set the tooltip or false to pass on to the next panel one further down. That should solve the issues with a pattern that we use all over the UI code.

[cghislai (charlyghislain)]

Looks fine also using opengl now.

[cghislai (charlyghislain)]

A few comments concerning the opengl stuff:
- When an empty string, such as "<rt><font=SansSherif></font></rt>" is to be rendered using an opengl surface, a segfault occured. The solution implemented here prevents any gl call if width or height is <=0. The surface will still be created and cached.
- The repetition occured because the blit function scaled the texture space coord but still draw the whole rect passed in. I corrected that by ensuring the clipping rect is no larger than the texture in the Graphics blitrect function.
- I did experience the white backgrounds behaviour at some point during testing, but it seems that with these two fixes the problem is gone.

[SirVer (sirver)]

I think the new solution is really nice. A rt::escape method would have been nice - but since there is more work to kill the old renderer and make the new one the only one this will come eventually.

Merged.

review: Approve

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2013-02-25 17:00:19 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2013-07-19 13:51:29 +0000
@@ -41,6 +41,7 @@
 #include "ui_basic/textarea.h"
 
 #include <cstdio>
+#include <boost/format.hpp>
 
 using Widelands::WL_Map_Loader;
 
@@ -219,8 +220,10 @@
 #else
 		m_parentdir = m_curdir.substr(0, m_curdir.rfind('\\'));
 #endif
+		std::string parent_string =
+				(boost::format("\\<%s\\>") % _("parent")).str();
 		m_ls->add
-			(_("<parent>"),
+			(parent_string.c_str(),
 			 m_parentdir.c_str(),
 			 g_gr->images().get("pics/ls_dir.png"));
 	}

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2013-03-04 21:09:29 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2013-07-19 13:51:29 +0000
@@ -42,6 +42,7 @@
 #include "upcast.h"
 
 #include <boost/scoped_ptr.hpp>
+#include <boost/format.hpp>
 
 #include <cstdio>
 #include <cstring>
@@ -254,9 +255,13 @@
 		m_nrplayers->set_text("");
 		m_size     ->set_text("");
 		if (g_fs->IsDirectory(name)) {
-			m_descr    ->set_text(_("<Directory>"));
+			std::string dir_string =
+				(boost::format("\\<%s\\>") % _("directory")).str();
+			m_descr    ->set_text(dir_string);
 		} else {
-			m_descr    ->set_text(_("<Not a map file>"));
+			std::string not_map_string =
+				(boost::format("\\<%s\\>") % _("Not a map file")).str();
+			m_descr    ->set_text(not_map_string);
 		}
 
 	}
@@ -292,8 +297,10 @@
 #else
 		m_parentdir = m_curdir.substr(0, m_curdir.rfind('\\'));
 #endif
+		std::string parent_string =
+				(boost::format("\\<%s\\>") % _("parent")).str();
 		m_ls->add
-			(_("<parent>"),
+			(parent_string.c_str(),
 			 m_parentdir.c_str(),
 			 g_gr->images().get("pics/ls_dir.png"));
 	}

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2013-07-09 06:00:11 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2013-07-19 13:51:29 +0000
@@ -34,6 +34,7 @@
 
 #include "editor_player_menu.h"
 
+#define UNDEFINED_TRIBE_NAME "<undefined>"
 
 Editor_Player_Menu::Editor_Player_Menu
 	(Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
@@ -158,7 +159,7 @@
 				(boost::bind(&Editor_Player_Menu::player_tribe_clicked, boost::ref(*this), p - 1));
 			posx += 140 + spacing;
 		}
-		if (map.get_scenario_player_tribe(p) != "<undefined>")
+		if (map.get_scenario_player_tribe(p) != UNDEFINED_TRIBE_NAME)
 			m_plr_set_tribes_buts[p - 1]->set_title
 				(map.get_scenario_player_tribe(p).c_str());
 		else {

=== modified file 'src/graphic/font_handler.cc'
--- src/graphic/font_handler.cc	2013-07-14 11:17:29 +0000
+++ src/graphic/font_handler.cc	2013-07-19 13:51:29 +0000
@@ -22,6 +22,7 @@
 #include <list>
 
 #include <SDL_ttf.h>
+#include <boost/algorithm/string.hpp>
 
 #include "graphic.h"
 #include "log.h"
@@ -212,15 +213,18 @@
 	 Align align,
 	 uint32_t caret)
 {
-	const LineCacheEntry & lce = d->get_line(style, text);
+	// Erase every backslash in front of brackets
+	std::string copytext = boost::replace_all_copy(text, "\\<", "<");
+	boost::replace_all(copytext, "\\>", ">");
+	const LineCacheEntry & lce = d->get_line(style, copytext);
 
 	UI::correct_for_align(align, lce.width + 2 * LINE_MARGIN, lce.height, &dstpoint);
 
 	if (lce.image)
 		dst.blit(Point(dstpoint.x + LINE_MARGIN, dstpoint.y), lce.image);
 
-	if (caret <= text.size())
-		draw_caret(dst, style, dstpoint, text, caret);
+	if (caret <= copytext.size())
+		draw_caret(dst, style, dstpoint, copytext, caret);
 }
 
 /**

=== modified file 'src/graphic/render/gl_surface_texture.cc'
--- src/graphic/render/gl_surface_texture.cc	2013-07-14 10:58:00 +0000
+++ src/graphic/render/gl_surface_texture.cc	2013-07-19 13:51:29 +0000
@@ -62,6 +62,9 @@
 {
 	init(w, h);
 
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	glTexImage2D
 		(GL_TEXTURE_2D, 0, GL_RGBA, m_tex_w, m_tex_h, 0, GL_RGBA,
 		 GL_UNSIGNED_BYTE, 0);
@@ -168,6 +171,9 @@
 	handle_glerror();
 	m_w = w;
 	m_h = h;
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 
 	if (g_gr->caps().gl.tex_power_of_two) {
 		m_tex_w = next_power_of_two(w);
@@ -194,6 +200,9 @@
 }
 
 void GLSurfaceTexture::lock(LockMode mode) {
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	assert(!m_pixels);
 
 	m_pixels.reset(new uint8_t[m_tex_w * m_tex_h * 4]);
@@ -205,6 +214,9 @@
 }
 
 void GLSurfaceTexture::unlock(UnlockMode mode) {
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	assert(m_pixels);
 
 	if (mode == Unlock_Update) {
@@ -223,6 +235,9 @@
 
 void GLSurfaceTexture::draw_rect(const Rect& rc, const RGBColor clr)
 {
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	setup_gl();
 	GLSurface::draw_rect(rc, clr);
 	reset_gl();
@@ -232,7 +247,11 @@
 /**
  * Draws a filled rectangle
  */
-void GLSurfaceTexture::fill_rect(const Rect& rc, const RGBAColor clr) {
+void GLSurfaceTexture::fill_rect(const Rect& rc, const RGBAColor clr)
+{
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	setup_gl();
 	GLSurface::fill_rect(rc, clr);
 	reset_gl();
@@ -243,21 +262,31 @@
  */
 void GLSurfaceTexture::brighten_rect(const Rect& rc, const int32_t factor)
 {
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	setup_gl();
 	GLSurface::brighten_rect(rc, factor);
 	reset_gl();
 }
 
 void GLSurfaceTexture::draw_line
-		(int32_t x1, int32_t y1, int32_t x2, int32_t y2, const RGBColor& color, uint8_t gwidth)
+	(int32_t x1, int32_t y1, int32_t x2, int32_t y2, const RGBColor& color, uint8_t gwidth)
 {
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	setup_gl();
 	GLSurface::draw_line(x1, y1, x2, y2, color, gwidth);
 	reset_gl();
 }
 
 void GLSurfaceTexture::blit
-	(const Point& dst, const Surface* src, const Rect& srcrc, Composite cm) {
+	(const Point& dst, const Surface* src, const Rect& srcrc, Composite cm)
+{
+	if (m_w <= 0 || m_h <= 0) {
+		return;
+	}
 	setup_gl();
 	GLSurface::blit(dst, src, srcrc, cm);
 	reset_gl();

=== modified file 'src/graphic/rendertarget.cc'
--- src/graphic/rendertarget.cc	2013-04-22 20:15:00 +0000
+++ src/graphic/rendertarget.cc	2013-07-19 13:51:29 +0000
@@ -442,6 +442,15 @@
 		srcrc.h = m_rect.h - dst.y;
 	}
 
+	// Also ensure srcrc is not bigger than src
+	// so opengl blits correctly
+	if (src->width() < srcrc.x + srcrc.w) {
+		srcrc.w = src->width() - srcrc.x;
+	}
+	if (src->height() < srcrc.y + srcrc.h) {
+		srcrc.h = src->height() - srcrc.y;
+	}
+
 	dst += m_rect;
 
 	m_surface->blit(dst, src->surface(), srcrc, cm);

=== modified file 'src/io/dedicated_log.cc'
--- src/io/dedicated_log.cc	2013-04-20 20:20:34 +0000
+++ src/io/dedicated_log.cc	2013-07-19 13:51:29 +0000
@@ -20,6 +20,7 @@
 #include "dedicated_log.h"
 #include "filesystem/layered_filesystem.h"
 #include "log.h"
+#include "i18n.h"
 
 #include <boost/format.hpp>
 
@@ -50,7 +51,6 @@
 m_info_file_path(""),
 m_log_file_path(""),
 d_name(""),
-d_ip("<unkown>"),
 d_motd(""),
 d_start(""),
 d_logins(0),
@@ -62,6 +62,7 @@
 	time_t currenttime = time(0);
 	strftime(ts, sizeof(ts), "%a %Y/%m/%d, %H:%M:%S", localtime(&currenttime));
 	d_start = ts;
+	d_ip = (boost::format("\\<%s\\>") % _("unknown")).str();
 }
 
 

=== modified file 'src/logic/bob.cc'
--- src/logic/bob.cc	2013-07-14 10:38:26 +0000
+++ src/logic/bob.cc	2013-07-19 13:51:29 +0000
@@ -1017,7 +1017,7 @@
 	molog("ActScheduled: %s\n", m_actscheduled ? "true" : "false");
 	molog
 		("Animation: %s\n",
-		 m_anim ? descr().get_animation_name(m_anim).c_str() : "<none>");
+		 m_anim ? descr().get_animation_name(m_anim).c_str() : "\\<none\\>");
 
 	molog("AnimStart: %i\n", m_animstart);
 	molog("WalkingDir: %i\n", m_walking);

=== modified file 'src/network/internet_gaming.cc'
--- src/network/internet_gaming.cc	2013-07-16 13:26:14 +0000
+++ src/network/internet_gaming.cc	2013-07-19 13:51:29 +0000
@@ -799,8 +799,14 @@
 /// formates a chat message and adds it to the list of chat messages
 void InternetGaming::formatAndAddChat(std::string from, std::string to, bool system, std::string msg) {
 	ChatMessage c;
+	if (!system && from.empty()) {
+		std::string unkown_string =
+			(boost::format("\\<%s\\>") % _("unknown")).str();
+		c.sender = unkown_string;
+	} else {
+		c.sender = from;
+	}
 	c.time      = time(0);
-	c.sender    = !system && from.empty() ? _("<unknown>") : from;
 	c.playern   = system ? -1 : to.size() ? 3 : 7;
 	c.msg       = msg;
 	c.recipient = to;

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2013-07-14 11:17:29 +0000
+++ src/ui_basic/panel.cc	2013-07-19 13:51:29 +0000
@@ -214,11 +214,7 @@
 				 	s_default_cursor_click :
 					s_default_cursor);
 
-			if (Panel * lowest = _mousein) {
-				while (Panel * const mousein = lowest->_mousein)
-					lowest = mousein;
-				draw_tooltip(rt, lowest->tooltip());
-			}
+			forefather->do_tooltip();
 
 			g_gr->refresh();
 		}
@@ -681,6 +677,18 @@
 }
 
 /**
+ * Called whenever a tooltip could be drawn.
+ * Return true if the tooltip has been drawn,
+ * false otherwise.
+ */
+bool Panel::handle_tooltip()
+{
+	RenderTarget & rt = *g_gr->get_render_target();
+	return draw_tooltip(rt, tooltip());
+}
+
+
+/**
  * Called whenever the user presses a mouse button in the panel while pressing the alt-key.
  * This function is called first on the parent panels.
  * It should be only overwritten by the UI::Window class.
@@ -982,6 +990,7 @@
 				return true;
 	return handle_mouserelease(btn, x, y);
 }
+
 bool Panel::do_mousemove
 	(Uint8 const state,
 	 int32_t x, int32_t y, int32_t const xdiff, int32_t const ydiff)
@@ -991,15 +1000,20 @@
 
 	x -= _lborder;
 	y -= _tborder;
-	if (_g_mousegrab != this)
+	if (_g_mousegrab != this) {
 		for
 			(Panel * child = _fchild;
 			 (child = child_at_mouse_cursor(x, y, child));
 			 child = child->_next)
+		{
 			if
 				(child->do_mousemove
 				 	(state, x - child->_x, y - child->_y, xdiff, ydiff))
+			{
 				return true;
+			}
+		}
+	}
 	return handle_mousemove(state, x, y, xdiff, ydiff);
 }
 
@@ -1020,6 +1034,13 @@
 	return handle_key(down, code);
 }
 
+bool Panel::do_tooltip()
+{
+	if (_mousein && _mousein->do_tooltip()) {
+		return true;
+	}
+	return handle_tooltip();
+}
 
 /**
  * \return \c true if the given key is currently pressed, or \c false otherwise
@@ -1130,12 +1151,12 @@
 }
 
 /**
- * Draw the tooltip.
+ * Draw the tooltip. Return true on success
  */
-void Panel::draw_tooltip(RenderTarget & dst, const std::string & text)
+bool Panel::draw_tooltip(RenderTarget & dst, const std::string & text)
 {
 	if (text.empty())
-		return;
+		return false;
 
 	std::string text_to_render = text;
 	if (!is_richtext(text_to_render)) {
@@ -1145,7 +1166,7 @@
 	static const uint32_t TIP_WIDTH_MAX = 360;
 	const Image* rendered_text = g_fh1->render(text_to_render, TIP_WIDTH_MAX);
 	if (!rendered_text)
-		return;
+		return false;
 
 	uint16_t tip_width = rendered_text->width() + 4;
 	uint16_t tip_height = rendered_text->height() + 4;
@@ -1163,6 +1184,7 @@
 	dst.fill_rect(r, RGBColor(63, 52, 34));
 	dst.draw_rect(r, RGBColor(0, 0, 0));
 	dst.blit(r + Point(2, 2), rendered_text);
+	return true;
 }
 
 std::string Panel::ui_fn() {

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2013-03-09 07:56:31 +0000
+++ src/ui_basic/panel.h	2013-07-19 13:51:29 +0000
@@ -189,6 +189,7 @@
 		(Uint8 state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
 	virtual bool handle_key(bool down, SDL_keysym code);
 	virtual bool handle_alt_drag(int32_t x, int32_t y);
+	virtual bool handle_tooltip();
 
 	/// \returns whether a certain given is currently down.
 	///
@@ -242,7 +243,7 @@
 
 	static void play_click();
 
-	static void draw_tooltip(RenderTarget &, const std::string & text);
+	static bool draw_tooltip(RenderTarget &, const std::string & text);
 
 private:
 	void check_child_death();
@@ -259,6 +260,7 @@
 	bool do_mousemove
 		(const Uint8 state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
 	bool do_key(bool down, SDL_keysym code);
+	bool do_tooltip();
 
 	static Panel * ui_trackmouse(int32_t & x, int32_t & y);
 	static void ui_mousepress  (const Uint8 button, int32_t x, int32_t y);

=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2013-07-16 17:30:22 +0000
+++ src/ui_basic/table.cc	2013-07-19 13:51:29 +0000
@@ -294,10 +294,15 @@
 			}
 
 			const Image* entry_text_im = UI::g_fh1->render(as_uifont(entry_string, m_fontsize));
+			uint16_t text_width = entry_text_im->width();
+			if (alignment & Align_Right) {
+				point.x += curw - picw;
+			} else if (alignment & Align_HCenter) {
+				point.x += (curw - picw) / 2;
+			}
+			UI::correct_for_align(alignment, text_width, entry_text_im->height(), &point);
 			// Crop to column width
-			UI::correct_for_align(alignment, entry_text_im->width(), entry_text_im->height(), &point);
 			dst.blitrect(point, entry_text_im, Rect(0, 0, curw - picw, lineheight));
-
 			curx += curw;
 		}
 

=== modified file 'src/ui_basic/window.cc'
--- src/ui_basic/window.cc	2013-02-10 19:36:24 +0000
+++ src/ui_basic/window.cc	2013-07-19 13:51:29 +0000
@@ -486,6 +486,15 @@
 	return true;
 }
 
+// Always consume the tooltip event to prevent tooltips from
+// our parent to be rendered
+bool Window::handle_tooltip()
+{
+	UI::Panel::handle_tooltip();
+	return true;
+}
+
+
 void Window::restore() {
 	assert(_is_minimal);
 	_is_minimal = false;

=== modified file 'src/ui_basic/window.h'
--- src/ui_basic/window.h	2013-02-09 23:18:23 +0000
+++ src/ui_basic/window.h	2013-07-19 13:51:29 +0000
@@ -87,6 +87,7 @@
 	bool handle_mousemove
 		(Uint8 state, int32_t mx, int32_t my, int32_t xdiff, int32_t ydiff);
 	bool handle_alt_drag (int32_t mx, int32_t my);
+	bool handle_tooltip();
 
 protected:
 	virtual void layout();

=== modified file 'src/ui_fsmenu/editor_mapselect.cc'
--- src/ui_fsmenu/editor_mapselect.cc	2013-02-10 19:36:24 +0000
+++ src/ui_fsmenu/editor_mapselect.cc	2013-07-19 13:51:29 +0000
@@ -32,6 +32,7 @@
 #include "log.h"
 
 #include <cstdio>
+#include <boost/format.hpp>
 
 using Widelands::WL_Map_Loader;
 
@@ -225,8 +226,10 @@
 #else
 		m_parentdir = m_curdir.substr(0, m_curdir.rfind('\\'));
 #endif
+		std::string parent_string =
+				(boost::format("\\<%s\\>") % _("parent")).str();
 		m_list.add
-			(_("<parent>"),
+			(parent_string.c_str(),
 			 m_parentdir.c_str(),
 			 g_gr->images().get("pics/ls_dir.png"));
 	}

=== modified file 'src/ui_fsmenu/launchMPG.cc'
--- src/ui_fsmenu/launchMPG.cc	2013-06-23 19:37:41 +0000
+++ src/ui_fsmenu/launchMPG.cc	2013-07-19 13:51:29 +0000
@@ -564,8 +564,10 @@
 		snprintf(buf, sizeof(buf), _("Player %u"), i);
 		infotext += buf;
 		if (player_save_tribe[i - 1].empty()) {
+			std::string closed_string =
+				(boost::format("\\<%s\\>") % _("closed")).str();
 			infotext += ":\n    ";
-			infotext += _("<closed>");
+			infotext += closed_string;
 			// Close the player
 			m_settings->setPlayerState(i - 1, PlayerSettings::stateClosed);
 			continue; // if tribe is empty, the player does not exist

=== modified file 'src/ui_fsmenu/mapselect.cc'
--- src/ui_fsmenu/mapselect.cc	2013-07-16 00:52:36 +0000
+++ src/ui_fsmenu/mapselect.cc	2013-07-19 13:51:29 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <cstdio>
+#include <boost/format.hpp>
 
 #include "i18n.h"
 #include "wexception.h"
@@ -340,9 +341,11 @@
 				m_table.add(m_maps_data.size() - 1);
 
 			te.set_string(0, "");
+			std::string parent_string =
+				(boost::format("\\<%s\\>") % _("parent")).str();
 			te.set_picture
 				(1,  g_gr->images().get("pics/ls_dir.png"),
-				_("<parent>"));
+				parent_string);
 
 			++ndirs;
 		}

=== modified file 'src/wui/building_ui.cc'
--- src/wui/building_ui.cc	2013-07-16 10:17:53 +0000
+++ src/wui/building_ui.cc	2013-07-19 13:51:29 +0000
@@ -32,8 +32,6 @@
  */
 void Building::show_options(Interactive_GameBase & igbase, bool avoid_fastclick)
 {
-	// Reset tooltip before opening the window
-	igbase.set_tooltip("");
 	if (m_optionswindow) {
 		if (m_optionswindow->is_minimal())
 			m_optionswindow->restore();

=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2013-07-12 17:32:38 +0000
+++ src/wui/mapview.cc	2013-07-19 13:51:29 +0000
@@ -113,7 +113,6 @@
 	}
 
 	m_complete_redraw_needed = false;
-	draw_tooltip(dst, tooltip());
 }
 
 void Map_View::set_changeview(const Map_View::ChangeViewFn & fn)

=== modified file 'src/wui/multiplayersetupgroup.cc'
--- src/wui/multiplayersetupgroup.cc	2013-03-05 00:41:24 +0000
+++ src/wui/multiplayersetupgroup.cc	2013-07-19 13:51:29 +0000
@@ -35,6 +35,8 @@
 #include "ui_basic/scrollbar.h"
 #include "ui_basic/textarea.h"
 
+#include <boost/format.hpp>
+
 struct MultiPlayerClientGroup : public UI::Box {
 	MultiPlayerClientGroup
 		(UI::Panel            * const parent, uint8_t id,
@@ -99,7 +101,10 @@
 	void refresh() {
 		UserSettings us = s->settings().users.at(m_id);
 		if (us.position == UserSettings::notConnected()) {
-			name->set_text(_("<free>"));
+			std::string free_i18n = _("free");
+			std::string free_text =
+				(boost::format("\\<%s\\>") % free_i18n).str();
+			name->set_text(free_text);
 			if (type)
 				type->set_visible(false);
 			else