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

[cghislai]

This contains a bunch of improvements not all related to construction sites
- Colored string for production efficiency and trends
- Anchored selection for ware selection in warehouses/economy settings
- Range of building shown for construction sites
- Building name shown in construction site windows
- Building window opened when construction site window was open and construction ended

[SirVer (sirver)]

I'll try to have a look at this during this week - I will be a bit busy though, so no promises. If anybody else can review this, go ahead of course :).

[SirVer (sirver)]

Okay, a bunch of minor comments. I did not understand what the anchoring does - I would love to see some comments about this someplace.

review: Needs Fixing

[SirVer (sirver)]

And I forgot to mention: I much appreciate you adding {} in more places while going over the code :). I find this so much more readable.

[cghislai (charlyghislain)]

I loaclly merged the bug657285 branch in order to test this under opengl without crashing.
Everything works as intended.

[SirVer (sirver)]

Lgtm. I fixed very small nits and merged this.

review: Approve

[SirVer (sirver)]

Charly, could you go over the bugs and mark them fixed as appropriate?

=== modified file 'src/constants.h'
--- src/constants.h	2013-07-16 00:37:26 +0000
+++ src/constants.h	2013-07-21 14:41:26 +0000
@@ -80,9 +80,11 @@
 #define PROSA_FONT_CLR_FG    RGBColor(255, 255,   0)
 
 /// Colors for good/ok/bad
-#define UI_FONT_CLR_BAD_HEX   "ff0000"
-#define UI_FONT_CLR_OK_HEX   "ffff00"
-#define UI_FONT_CLR_GOOD_HEX   "325b1f"
+#define UI_FONT_CLR_BRIGHT_HEX    "fffaaa"
+#define UI_FONT_CLR_DARK_HEX      "a39013"
+#define UI_FONT_CLR_BAD_HEX       "bb0000"
+#define UI_FONT_CLR_OK_HEX        "ffe11e"
+#define UI_FONT_CLR_GOOD_HEX      "00bb00"
 //@}
 
 /** \name Text colors
 
=== modified file 'src/logic/building.h'
--- src/logic/building.h	2013-07-16 10:17:53 +0000
+++ src/logic/building.h	2013-07-21 14:41:26 +0000
@@ -184,7 +184,7 @@
 	virtual bool burn_on_destroy();
 	virtual void destroy(Editor_Game_Base &);
 
-	void show_options(Interactive_GameBase &, bool avoid_fastclick = false);
+	void show_options(Interactive_GameBase &, bool avoid_fastclick = false, Point pos = Point(- 1, - 1));
 	void hide_options();
 	void refresh_options(Interactive_GameBase &);
 
 
=== modified file 'src/logic/constructionsite.cc'
--- src/logic/constructionsite.cc	2013-07-18 06:31:11 +0000
+++ src/logic/constructionsite.cc	2013-07-21 14:41:26 +0000
@@ -25,12 +25,14 @@
 #include "upcast.h"
 #include "wexception.h"
 
-#include "graphic/animation.h"
 #include "economy/wares_queue.h"
 #include "game.h"
+#include "graphic/animation.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "sound/sound_handler.h"
+#include "ui_basic/window.h"
+#include "wui/interactive_gamebase.h"
 #include "tribe.h"
 #include "worker.h"
 
@@ -86,14 +88,9 @@
 std::string ConstructionSite::get_statistics_string()
 {
 	unsigned int percent = (get_built_per64k() * 100) >> 16;
-
-	std::string clr = UI_FONT_CLR_OK_HEX;
-	if (percent <= 25) clr = UI_FONT_CLR_BAD_HEX;
-	else if (percent >= 75) clr = UI_FONT_CLR_GOOD_HEX;
-
-	std::string perc_s = (boost::format("<font color=%s>%i</font>") % clr % percent).str();
-
-	return (boost::format(_("%s%% built")) % perc_s.c_str()).str();
+	std::string perc_s =
+		(boost::format("<font color=%1$s>%2$i%% built</font>") % UI_FONT_CLR_DARK_HEX % percent).str();
+	return perc_s;
 }
 
 /*
@@ -102,9 +99,11 @@
 =======
 */
 WaresQueue & ConstructionSite::waresqueue(Ware_Index const wi) {
-	container_iterate_const(Wares, m_wares, i)
-		if ((*i.current)->get_ware() == wi)
+	container_iterate_const(Wares, m_wares, i) {
+		if ((*i.current)->get_ware() == wi) {
 			return **i.current;
+		}
+	}
 	throw wexception
 		("%s (%u) (building %s) has no WaresQueue for %u",
 		 name().c_str(), serial(), m_building->name().c_str(), wi.value());
@@ -183,6 +182,14 @@
 			builder->reset_tasks(ref_cast<Game, Editor_Game_Base>(egbase));
 			builder->set_location(&b);
 		}
+		// Open the new building window if needed
+		if (m_optionswindow) {
+			Point window_position = m_optionswindow->get_pos();
+			hide_options();
+			Interactive_GameBase & igbase =
+				ref_cast<Interactive_GameBase, Interactive_Base>(*egbase.get_ibase());
+			b.show_options(igbase, false, window_position);
+		}
 	}
 }
 
 
=== modified file 'src/logic/item_ware_descr.h'
--- src/logic/item_ware_descr.h	2013-02-10 19:36:24 +0000
+++ src/logic/item_ware_descr.h	2013-07-21 14:41:26 +0000
@@ -36,6 +36,8 @@
 
 #define WARE_MENU_PIC_WIDTH   24  //< Default width for ware's menu icons
 #define WARE_MENU_PIC_HEIGHT  24  //< Default height for ware's menu icons
+#define WARE_MENU_PIC_PAD_X    3  //< Default padding between menu icons
+#define WARE_MENU_PIC_PAD_Y    4  //< Default padding between menu icons
 
 namespace Widelands {
 
 
=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2013-07-18 16:47:56 +0000
+++ src/logic/productionsite.cc	2013-07-21 14:41:26 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <libintl.h>
+#include <boost/format.hpp>
 
 #include "helper.h"
 #include "i18n.h"
@@ -242,21 +243,23 @@
 	uint32_t       nr_workers           = 0;
 	for (uint32_t i = nr_working_positions; i;)
 		nr_workers += m_working_positions[--i].worker ? 1 : 0;
-	if (!nr_workers)
-		return _("(not occupied)");
-	else if (uint32_t const nr_requests = nr_working_positions - nr_workers) {
-		char buffer[1000];
-		snprintf
-			(buffer, sizeof(buffer), "%s",
-			 ngettext("Worker missing", "Workers missing", nr_requests));
-		return buffer;
+	if (!nr_workers) {
+		 return
+			(boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BAD_HEX % _("(not occupied)")).str();
+	} else if (uint32_t const nr_requests = nr_working_positions - nr_workers) {
+		return
+			(boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BAD_HEX %
+				ngettext(_("Worker missing"), _("Workers missing"), nr_requests))
+			.str();
 	}
 
-	if (m_statistics_changed)
+	if (m_statistics_changed) {
 		calc_statistics();
+	}
 
-	if (m_is_stopped)
-		return _("(stopped)");
+	if (m_is_stopped) {
+		return (boost::format("<font color=%s>%s</font>") % UI_FONT_CLR_BRIGHT_HEX % _("(stopped)")).str();
+	}
 
 	return m_statistics_buffer;
 }
@@ -315,21 +318,43 @@
 				++lastOk;
 		}
 	}
-	uint8_t const percOk = (ok * 100) / STATISTICS_VECTOR_LENGTH;
-	uint8_t const lastPercOk = (lastOk * 100) / (STATISTICS_VECTOR_LENGTH / 2);
-
-	const std::string trend =
-		lastPercOk > percOk ? "+" : lastPercOk < percOk ? "-" : "=";
-
-	if (0 < percOk and percOk < 100)
-		snprintf
-			(m_statistics_buffer, sizeof(m_statistics_buffer),
-			 "%d%% %s", percOk, trend.c_str());
+	// Somehow boost::format doesn't handle correctly uint8_t in this case
+	unsigned int percOk = (ok * 100) / STATISTICS_VECTOR_LENGTH;
+	unsigned int lastPercOk = (lastOk * 100) / (STATISTICS_VECTOR_LENGTH / 2);
+
+	std::string color;
+	if (percOk < 33)
+		color = UI_FONT_CLR_BAD_HEX;
+	else if (percOk < 66)
+		color = UI_FONT_CLR_OK_HEX;
 	else
-		snprintf
-			(m_statistics_buffer, sizeof(m_statistics_buffer),
-			 "%d%%",    percOk);
-
+		color = UI_FONT_CLR_GOOD_HEX;
+	const std::string perc_str =
+		(boost::format("<font color=%1$s>%2$i%%</font>") % color % percOk).str();
+
+	std::string trend;
+	if (lastPercOk > percOk) {
+		color = UI_FONT_CLR_GOOD_HEX;
+		trend = "+";
+	} else if (lastPercOk < percOk) {
+		color = UI_FONT_CLR_BAD_HEX;
+		trend = "-";
+	} else {
+		color = UI_FONT_CLR_BRIGHT_HEX;
+		trend = "=";
+	}
+	const std::string trend_str =
+		(boost::format("<font color=%s>%s</font>") % color % trend).str();
+
+	if (0 < percOk and percOk < 100) {
+		snprintf
+			(m_statistics_buffer, sizeof(m_statistics_buffer),
+			 "%s %s", perc_str.c_str(), trend_str.c_str());
+	} else {
+		snprintf
+			(m_statistics_buffer, sizeof(m_statistics_buffer),
+			 "%s", perc_str.c_str());
+	}
 	m_last_stat_percent = percOk;
 
 	m_statistics_changed = false;
 
=== modified file 'src/logic/productionsite.h'
--- src/logic/productionsite.h	2013-04-22 20:15:00 +0000
+++ src/logic/productionsite.h	2013-07-21 14:41:26 +0000
@@ -256,7 +256,7 @@
 	Input_Queues m_input_queues; ///< input queues for all inputs
 	std::vector<bool>        m_statistics;
 	bool                     m_statistics_changed;
-	char                     m_statistics_buffer[40];
+	char                     m_statistics_buffer[128];
 	char                     m_result_buffer   [213];
 	uint8_t                  m_last_stat_percent;
 	bool                     m_is_stopped;
 
=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2013-07-21 08:25:22 +0000
+++ src/ui_basic/table.cc	2013-07-21 14:41:26 +0000
@@ -293,6 +293,10 @@
 				point.x += picw;
 			}
 
+			if (entry_string.empty()) {
+				curx += curw;
+				continue;
+			}
 			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) {
 
=== modified file 'src/wui/building_ui.cc'
--- src/wui/building_ui.cc	2013-07-21 08:25:22 +0000
+++ src/wui/building_ui.cc	2013-07-21 14:41:26 +0000
@@ -30,7 +30,7 @@
  * Create the building's options window if necessary and bring it to
  * the top to be seen by the player.
  */
-void Building::show_options(Interactive_GameBase & igbase, bool avoid_fastclick)
+void Building::show_options(Interactive_GameBase & igbase, bool avoid_fastclick, Point pos)
 {
 	if (m_optionswindow) {
 		if (m_optionswindow->is_minimal())
@@ -45,6 +45,9 @@
 		// get properly initialized
 		m_optionswindow->think();
 	}
+	if (pos.x >= 0 && pos.y >= 0) {
+		m_optionswindow->set_pos(pos);
+	}
 }
 
 /**
 
=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2013-07-21 08:25:22 +0000
+++ src/wui/buildingwindow.cc	2013-07-21 14:41:26 +0000
@@ -23,6 +23,7 @@
 #include "graphic/image.h"
 #include "graphic/rendertarget.h"
 #include "interactive_player.h"
+#include "logic/constructionsite.h"
 #include "logic/dismantlesite.h"
 #include "logic/maphollowregion.h"
 #include "logic/militarysite.h"
@@ -35,8 +36,9 @@
 #include "upcast.h"
 #include "waresqueuedisplay.h"
 
+#include <boost/format.hpp>
+
 #include "buildingwindow.h"
-#include "logic/militarysite.h"
 
 static const char * pic_bulldoze           = "pics/menu_bld_bulldoze.png";
 static const char * pic_dismantle          = "pics/menu_bld_dismantle.png";
@@ -78,10 +80,16 @@
 
 	set_center_panel(vbox);
 	set_think(true);
+	set_fastclick_panel(this);
 
 	show_workarea();
 
-	set_fastclick_panel(this);
+	// Title for construction site
+	if (upcast(Widelands::ConstructionSite, csite, &m_building)) {
+		// Show name in parenthesis as it may take all width already
+		const std::string title = (boost::format("(%s)") % csite->building().descname()).str();
+		set_title(title);
+	}
 }
 
 
 
=== modified file 'src/wui/waresdisplay.cc'
--- src/wui/waresdisplay.cc	2013-03-01 23:12:08 +0000
+++ src/wui/waresdisplay.cc	2013-07-21 14:41:26 +0000
@@ -63,12 +63,16 @@
 	m_hidden
 		(m_type == Widelands::wwWORKER ? m_tribe.get_nrworkers()
 	                          : m_tribe.get_nrwares(), false),
+	m_in_selection
+		(m_type == Widelands::wwWORKER ? m_tribe.get_nrworkers()
+	                          : m_tribe.get_nrwares(), false),
 	m_selectable(selectable),
 	m_horizontal(horizontal),
+	m_selection_anchor(Widelands::Ware_Index::Null()),
 	m_callback_function(callback_function)
 {
 	//resize the configuration of our wares if they won't fit in the current window
-	int number = (g_gr->get_yres() - 160) / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + 3);
+	int number = (g_gr->get_yres() - 160) / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + WARE_MENU_PIC_PAD_Y);
 	const_cast<Widelands::Tribe_Descr &>(m_tribe).resize_ware_orders(number);
 
 	// Find out geometry from icons_order
@@ -85,13 +89,13 @@
 
 	// 25 is height of m_curware text
 	set_desired_size
-		(columns * (WARE_MENU_PIC_WIDTH  + 3) + 1,
-		 rows * (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + 3) + 1 + 25);
+		(columns * (WARE_MENU_PIC_WIDTH  + WARE_MENU_PIC_PAD_X) + 1,
+		 rows * (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + WARE_MENU_PIC_PAD_Y) + 1 + 25);
 }
 
 
 bool AbstractWaresDisplay::handle_mousemove
-	(uint8_t, int32_t x, int32_t y, int32_t, int32_t)
+	(uint8_t state, int32_t x, int32_t y, int32_t, int32_t)
 {
 	const Widelands::Ware_Index index = ware_at_point(x, y);
 
@@ -104,6 +108,17 @@
 		 .c_str()
 		 :
 		 "");
+	if (m_selection_anchor) {
+		// Ensure mouse button is still pressed as some
+		// mouse release events do not reach us
+		if (state ^ SDL_BUTTON_LMASK) {
+			// FIXME: We should call another function that will not pass that events
+			// to our Panel superclass
+			handle_mouserelease(SDL_BUTTON_LEFT, x, y);
+			return true;
+		}
+		update_anchor_selection(x, y);
+	}
 	return true;
 }
 
@@ -112,11 +127,19 @@
 {
 	if (btn == SDL_BUTTON_LEFT) {
 		Widelands::Ware_Index ware = ware_at_point(x, y);
-		if (!ware)
+		if (!ware) {
 			return false;
-
-		if (m_selectable) {
-			toggle_ware(ware);
+		}
+		if (!m_selectable) {
+			return true;
+		}
+		if (!m_selection_anchor) {
+			// Create the selection anchor to be able to select
+			// multiple ware by dragging.
+			m_selection_anchor = ware;
+			m_in_selection[ware] = true;
+		} else {
+			// A mouse release has been missed
 		}
 		return true;
 	}
@@ -124,6 +147,35 @@
 	return UI::Panel::handle_mousepress(btn, x, y);
 }
 
+bool AbstractWaresDisplay::handle_mouserelease(Uint8 btn, int32_t x, int32_t y)
+{
+	if (btn != SDL_BUTTON_LEFT || !m_selection_anchor) {
+		return UI::Panel::handle_mouserelease(btn, x, y);
+	}
+
+	Widelands::Ware_Index const number =
+		m_type == Widelands::wwWORKER ? m_tribe.get_nrworkers() : m_tribe.get_nrwares();
+
+	bool to_be_selected = !ware_selected(m_selection_anchor);
+	for (Widelands::Ware_Index i = Widelands::Ware_Index::First(); i < number; ++i)
+	{
+		if (!m_in_selection[i]) {
+			continue;
+		}
+		if (to_be_selected) {
+			select_ware(i);
+		} else {
+			unselect_ware(i);
+		}
+	}
+
+	// Release anchor, empty selection
+	m_selection_anchor = Widelands::Ware_Index::Null();
+	std::fill(m_in_selection.begin(), m_in_selection.end(), false);
+	return true;
+}
+
+
 /**
  * Returns the index of the ware under the given coordinates, or
  * WareIndex::Null() if the given point is outside the range.
@@ -134,8 +186,8 @@
 		return Widelands::Ware_Index::Null();
 
 
-	unsigned int i = x / (WARE_MENU_PIC_WIDTH + 4);
-	unsigned int j = y / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + 3);
+	unsigned int i = x / (WARE_MENU_PIC_WIDTH + WARE_MENU_PIC_PAD_X);
+	unsigned int j = y / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + WARE_MENU_PIC_PAD_Y);
 	if (m_horizontal) {
 		unsigned int s = i;
 		i = j;
@@ -151,6 +203,68 @@
 	return Widelands::Ware_Index::Null();
 }
 
+// Update the anchored selection. An anchor has been created by mouse
+// press. Mouse move call this function with the current mouse position.
+// This function will temporary store all wares in the rectangle between anchor
+// and current pos to allow their selection on mouse release
+void AbstractWaresDisplay::update_anchor_selection(int32_t x, int32_t y)
+{
+	if (!m_selection_anchor || x < 0 || y < 0) {
+		return;
+	}
+
+	std::fill(m_in_selection.begin(), m_in_selection.end(), false);
+	Point anchor_pos = ware_position(m_selection_anchor);
+	// Add an offset to make sure the anchor line and column will be
+	// selected when selecting in topleft direction
+	int32_t anchor_x = anchor_pos.x + WARE_MENU_PIC_WIDTH / 2;
+	int32_t anchor_y = anchor_pos.y + WARE_MENU_PIC_HEIGHT / 2;
+
+	unsigned int left_ware_idx = anchor_x / (WARE_MENU_PIC_WIDTH + WARE_MENU_PIC_PAD_X);
+	unsigned int top_ware_idx = anchor_y / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + WARE_MENU_PIC_PAD_Y);
+	unsigned int right_ware_idx = x / (WARE_MENU_PIC_WIDTH + WARE_MENU_PIC_PAD_X);
+	unsigned int bottom_ware_idx = y / (WARE_MENU_PIC_HEIGHT + WARE_MENU_INFO_SIZE + WARE_MENU_PIC_PAD_Y);
+	unsigned int tmp;
+
+	// Reverse col/row and anchor/endpoint if needed
+	if (m_horizontal) {
+		tmp = left_ware_idx;
+		left_ware_idx = top_ware_idx;
+		top_ware_idx = tmp;
+		tmp = right_ware_idx;
+		right_ware_idx = bottom_ware_idx;
+		bottom_ware_idx = tmp;
+	}
+	if (left_ware_idx > right_ware_idx) {
+		tmp = left_ware_idx;
+		left_ware_idx = right_ware_idx;
+		right_ware_idx = tmp;
+	}
+	if (top_ware_idx > bottom_ware_idx) {
+		tmp = top_ware_idx;
+		top_ware_idx = bottom_ware_idx;
+		bottom_ware_idx = tmp;
+	}
+
+	for (unsigned int cur_ware_x = left_ware_idx; cur_ware_x <= right_ware_idx; cur_ware_x++) {
+		if (cur_ware_x >= icons_order().size()) {
+			continue;
+		}
+		for (unsigned cur_ware_y = top_ware_idx; cur_ware_y <= bottom_ware_idx; cur_ware_y++) {
+			if (cur_ware_y >= icons_order()[cur_ware_x].size()) {
+				continue;
+			}
+			Widelands::Ware_Index ware = icons_order()[cur_ware_x][cur_ware_y];
+			if (m_hidden[ware]) {
+				continue;
+			}
+			m_in_selection[ware] = true;
+		}
+	}
+	update();
+}
+
+
 
 void AbstractWaresDisplay::layout()
 {
@@ -219,11 +333,15 @@
 {
 	Point p(2, 2);
 	if (m_horizontal) {
-		p.x += icons_order_coords()[id].second  * (WARE_MENU_PIC_WIDTH + 3);
-		p.y += icons_order_coords()[id].first * (WARE_MENU_PIC_HEIGHT + 3 + WARE_MENU_INFO_SIZE);
+		p.x += icons_order_coords()[id].second  *
+			(WARE_MENU_PIC_WIDTH + WARE_MENU_PIC_PAD_X);
+		p.y += icons_order_coords()[id].first *
+			(WARE_MENU_PIC_HEIGHT + WARE_MENU_PIC_PAD_Y + WARE_MENU_INFO_SIZE);
 	} else {
-		p.x += icons_order_coords()[id].first  * (WARE_MENU_PIC_WIDTH + 3);
-		p.y += icons_order_coords()[id].second * (WARE_MENU_PIC_HEIGHT + 3 + WARE_MENU_INFO_SIZE);
+		p.x += icons_order_coords()[id].first  *
+			(WARE_MENU_PIC_WIDTH + WARE_MENU_PIC_PAD_X);
+		p.y += icons_order_coords()[id].second *
+			(WARE_MENU_PIC_HEIGHT + WARE_MENU_PIC_PAD_Y + WARE_MENU_INFO_SIZE);
 	}
 	return p;
 }
@@ -241,9 +359,21 @@
 {
 	Point p = ware_position(id);
 
+	bool draw_selected = m_selected[id];
+	if (m_selection_anchor) {
+		// Draw the temporary selected wares as if they were
+		// selected.
+		// TODO: Use another pic for the temporary selection
+		if (!ware_selected(m_selection_anchor)) {
+			draw_selected |= m_in_selection[id];
+		} else {
+			draw_selected &= !m_in_selection[id];
+		}
+	}
+
 	//  draw a background
 	const Image* bgpic =
-		g_gr->images().get(ware_selected(id) ?  "pics/ware_list_bg_selected.png" :  "pics/ware_list_bg.png");
+		g_gr->images().get(draw_selected ?  "pics/ware_list_bg_selected.png" :  "pics/ware_list_bg.png");
 	uint16_t w = bgpic->width();
 
 	dst.blit(p, bgpic);
@@ -378,3 +508,4 @@
 			}
 	return ret;
 }
+
 
=== modified file 'src/wui/waresdisplay.h'
--- src/wui/waresdisplay.h	2013-07-21 08:25:22 +0000
+++ src/wui/waresdisplay.h	2013-07-21 14:41:26 +0000
@@ -56,9 +56,8 @@
 
 	bool handle_mousemove
 		(uint8_t state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
-
 	bool handle_mousepress(uint8_t btn, int32_t x, int32_t y);
-
+	bool handle_mouserelease(Uint8 btn, int32_t x, int32_t y);
 
 	// Wares may be selected (highlighted)
 	void select_ware(Widelands::Ware_Index);
@@ -100,13 +99,31 @@
 	typedef std::vector<const Widelands::WareList *> vector_type;
 	typedef std::vector<bool> selection_type;
 
+	/**
+	 * Update the anchored selection. When first mouse button is
+	 * pressed on a ware, it is stored in @ref m_selection_anchor.
+	 * Mouse moves trigger this function to select all wares items
+	 * in the rectangle between the anchor and the mouse position.
+	 * They are temporary stored in @ref m_in_selection.
+	 * Releasing the mouse button will performs the selection.
+	 * This allows selection of multiple wares by dragging.
+	 */
+	void update_anchor_selection(int32_t x, int32_t y);
+
 	const Widelands::Tribe_Descr & m_tribe;
 	Widelands::WareWorker m_type;
 	UI::Textarea        m_curware;
 	selection_type      m_selected;
 	selection_type      m_hidden;
+	selection_type      m_in_selection;  //Wares in temporary anchored selection
 	bool                m_selectable;
 	bool                m_horizontal;
+
+	/**
+	 * The ware on which the mouse press has been performed.
+	 * It is not selected directly, but will be on mouse release.
+	 */
+	Widelands::Ware_Index m_selection_anchor;
 	boost::function<void(Widelands::Ware_Index, bool)> m_callback_function;
 };