openttd-ottdgrfs: comparison src/graph

equal deleted inserted replaced

-:6c4314786d68
+:8cbdb511a674
 /* Bitmasks of player and cargo indices that shouldn't be drawn. */
 static uint _legend_excluded_players;
 static uint _legend_excluded_cargo;
-/************************/
-/* GENERIC GRAPH DRAWER */
-/************************/
-enum {
-	GRAPH_MAX_DATASETS = 32,
-	GRAPH_AXIS_LABEL_COLOUR = TC_BLACK,
-	GRAPH_AXIS_LINE_COLOUR  = 215,
-	GRAPH_X_POSITION_BEGINNING  = 44,  ///< Start the graph 44 pixels from gw->left
-	GRAPH_X_POSITION_SEPARATION = 22,  ///< There are 22 pixels between each X value
-	GRAPH_NUM_LINES_Y = 9, ///< How many horizontal lines to draw.
-	/* 9 is convenient as that means the distance between them is the height of the graph / 8,
-	 * which is the same
-	 * as height >> 3. */
-};
 /* Apparently these don't play well with enums. */
 static const OverflowSafeInt64 INVALID_DATAPOINT(INT64_MAX); // Value used for a datapoint that shouldn't be drawn.
 static const uint INVALID_DATAPOINT_POS = UINT_MAX;  // Used to determine if the previous point was drawn.
-struct GraphDrawer {
-	uint excluded_data; ///< bitmask of the datasets that shouldn't be displayed.
-	byte num_dataset;
-	byte num_on_x_axis;
-	bool has_negative_values;
-	byte num_vert_lines;
-	/* The starting month and year that values are plotted against. If month is
-	 * 0xFF, use x_values_start and x_values_increment below instead. */
-	byte month;
-	Year year;
-	/* These values are used if the graph is being plotted against values
-	 * rather than the dates specified by month and year. */
-	uint16 x_values_start;
-	uint16 x_values_increment;
-	int left, top;  ///< Where to start drawing the graph, in pixels.
-	uint height;    ///< The height of the graph in pixels.
-	StringID format_str_y_axis;
-	byte colors[GRAPH_MAX_DATASETS];
-	OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][24]; ///< last 2 years
-};
-static void DrawGraph(const GraphDrawer *gw)
-{
-	uint x, y;                       ///< Reused whenever x and y coordinates are needed.
-	OverflowSafeInt64 highest_value; ///< Highest value to be drawn.
-	int x_axis_offset;               ///< Distance from the top of the graph to the x axis.
-	/* the colors and cost array of GraphDrawer must accomodate
-	 * both values for cargo and players. So if any are higher, quit */
-	assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_PLAYERS);
-	assert(gw->num_vert_lines > 0);
-	byte grid_colour = _colour_gradient[14][4];
-	/* The coordinates of the opposite edges of the graph. */
-	int bottom = gw->top + gw->height - 1;
-	int right  = gw->left + GRAPH_X_POSITION_BEGINNING + gw->num_vert_lines * GRAPH_X_POSITION_SEPARATION - 1;
-	/* Draw the vertical grid lines. */
-	/* Don't draw the first line, as that's where the axis will be. */
-	x = gw->left + GRAPH_X_POSITION_BEGINNING + GRAPH_X_POSITION_SEPARATION;
-	for (int i = 0; i < gw->num_vert_lines; i++) {
-		GfxFillRect(x, gw->top, x, bottom, grid_colour);
-		x += GRAPH_X_POSITION_SEPARATION;
-	}
-	/* Draw the horizontal grid lines. */
-	x = gw->left + GRAPH_X_POSITION_BEGINNING;
-	y = gw->height + gw->top;
-	for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
-		GfxFillRect(x, y, right, y, grid_colour);
-		y -= (gw->height / (GRAPH_NUM_LINES_Y - 1));
-	}
-	/* Draw the y axis. */
-	GfxFillRect(x, gw->top, x, bottom, GRAPH_AXIS_LINE_COLOUR);
-	/* Find the distance from the top of the graph to the x axis. */
-	x_axis_offset = gw->height;
-	/* The graph is currently symmetrical about the x axis. */
-	if (gw->has_negative_values) x_axis_offset /= 2;
-	/* Draw the x axis. */
-	y = x_axis_offset + gw->top;
-	GfxFillRect(x, y, right, y, GRAPH_AXIS_LINE_COLOUR);
-	/* Find the largest value that will be drawn. */
-	if (gw->num_on_x_axis == 0)
-		return;
-	assert(gw->num_on_x_axis > 0);
-	assert(gw->num_dataset > 0);
-	/* Start of with a value of twice the height of the graph in pixels. It's a
-	 * bit arbitrary, but it makes the cargo payment graph look a little nicer,
-	 * and prevents division by zero when calculating where the datapoint
-	 * should be drawn. */
-	highest_value = x_axis_offset * 2;
-	for (int i = 0; i < gw->num_dataset; i++) {
-		if (!HasBit(gw->excluded_data, i)) {
-			for (int j = 0; j < gw->num_on_x_axis; j++) {
-				OverflowSafeInt64 datapoint = gw->cost[i][j];
-				if (datapoint != INVALID_DATAPOINT) {
-					/* For now, if the graph has negative values the scaling is
-					 * symmetrical about the x axis, so take the absolute value
-					 * of each data point. */
-					highest_value = max(highest_value, abs(datapoint));
-				}
-			}
-		}
-	}
-	/* Round up highest_value so that it will divide cleanly into the number of
-	 * axis labels used. */
-	int round_val = highest_value % (GRAPH_NUM_LINES_Y - 1);
-	if (round_val != 0) highest_value += (GRAPH_NUM_LINES_Y - 1 - round_val);
-	/* draw text strings on the y axis */
-	int64 y_label = highest_value;
-	int64 y_label_separation = highest_value / (GRAPH_NUM_LINES_Y - 1);
-	/* If there are negative values, the graph goes from highest_value to
-	 * -highest_value, not highest_value to 0. */
-	if (gw->has_negative_values) y_label_separation *= 2;
-	x = gw->left + GRAPH_X_POSITION_BEGINNING + 1;
-	y = gw->top - 3;
-	for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
-		SetDParam(0, gw->format_str_y_axis);
-		SetDParam(1, y_label);
-		DrawStringRightAligned(x, y, STR_0170, GRAPH_AXIS_LABEL_COLOUR);
-		y_label -= y_label_separation;
-		y += (gw->height / (GRAPH_NUM_LINES_Y - 1));
-	}
-	/* draw strings on the x axis */
-	if (gw->month != 0xFF) {
-		x = gw->left + GRAPH_X_POSITION_BEGINNING;
-		y = gw->top + gw->height + 1;
-		byte month = gw->month;
-		Year year  = gw->year;
-		for (int i = 0; i < gw->num_on_x_axis; i++) {
-			SetDParam(0, month + STR_0162_JAN);
-			SetDParam(1, month + STR_0162_JAN + 2);
-			SetDParam(2, year);
-			DrawString(x, y, month == 0 ? STR_016F : STR_016E, GRAPH_AXIS_LABEL_COLOUR);
-			month += 3;
-			if (month >= 12) {
-				month = 0;
-				year++;
-			}
-			x += GRAPH_X_POSITION_SEPARATION;
-		}
-	} else {
-		/* Draw the label under the data point rather than on the grid line. */
-		x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2) + 1;
-		y = gw->top + gw->height + 1;
-		uint16 label = gw->x_values_start;
-		for (int i = 0; i < gw->num_on_x_axis; i++) {
-			SetDParam(0, label);
-			DrawStringCentered(x, y, STR_01CB, GRAPH_AXIS_LABEL_COLOUR);
-			label += gw->x_values_increment;
-			x += GRAPH_X_POSITION_SEPARATION;
-		}
-	}
-	/* draw lines and dots */
-	for (int i = 0; i < gw->num_dataset; i++) {
-		if (!HasBit(gw->excluded_data, i)) {
-			/* Centre the dot between the grid lines. */
-			x = gw->left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2);
-			byte color  = gw->colors[i];
-			uint prev_x = INVALID_DATAPOINT_POS;
-			uint prev_y = INVALID_DATAPOINT_POS;
-			for (int j = 0; j < gw->num_on_x_axis; j++) {
-				OverflowSafeInt64 datapoint = gw->cost[i][j];
-				if (datapoint != INVALID_DATAPOINT) {
-					/*
-					 * Check whether we need to reduce the 'accuracy' of the
-					 * datapoint value and the highest value to splut overflows.
-					 * And when 'drawing' 'one million' or 'one million and one'
-					 * there is no significant difference, so the least
-					 * significant bits can just be removed.
-					 *
-					 * If there are more bits needed than would fit in a 32 bits
-					 * integer, so at about 31 bits because of the sign bit, the
-					 * least significant bits are removed.
-					 */
-					int mult_range = FindLastBit(x_axis_offset) + FindLastBit(abs(datapoint));
-					int reduce_range = max(mult_range - 31, 0);
-					/* Handle negative values differently (don't shift sign) */
-					if (datapoint < 0) {
-						datapoint = -(abs(datapoint) >> reduce_range);
-					} else {
-						datapoint >>= reduce_range;
-					}
-					y = gw->top + x_axis_offset - (x_axis_offset * datapoint) / (highest_value >> reduce_range);
-					/* Draw the point. */
-					GfxFillRect(x - 1, y - 1, x + 1, y + 1, color);
-					/* Draw the line connected to the previous point. */
-					if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, color);
-					prev_x = x;
-					prev_y = y;
-				} else {
-					prev_x = INVALID_DATAPOINT_POS;
-					prev_y = INVALID_DATAPOINT_POS;
-				}
-				x += GRAPH_X_POSITION_SEPARATION;
-			}
-		}
-	}
-}
 /****************/
 /* GRAPH LEGEND */
 /****************/
-static void GraphLegendWndProc(Window *w, WindowEvent *e)
+struct GraphLegendWindow : Window {
-{
+	GraphLegendWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
-	switch (e->event) {
+	{
-		case WE_CREATE:
+		for (uint i = 3; i < this->widget_count; i++) {
-			for (uint i = 3; i < w->widget_count; i++) {
+			if (!HasBit(_legend_excluded_players, i - 3)) this->LowerWidget(i);
-				if (!HasBit(_legend_excluded_players, i - 3)) w->LowerWidget(i);
+		}
-			}
-			break;
+		this->FindWindowPlacementAndResize(desc);
+	}
-		case WE_PAINT: {
-			const Player *p;
+	virtual void OnPaint()
+	{
-			FOR_ALL_PLAYERS(p) {
+		const Player *p;
-				if (p->is_active) continue;
+		FOR_ALL_PLAYERS(p) {
-				SetBit(_legend_excluded_players, p->index);
+			if (p->is_active) continue;
-				w->RaiseWidget(p->index + 3);
-			}
+			SetBit(_legend_excluded_players, p->index);
+			this->RaiseWidget(p->index + 3);
-			DrawWindowWidgets(w);
+		}
-			FOR_ALL_PLAYERS(p) {
+		this->DrawWidgets();
-				if (!p->is_active) continue;
+		FOR_ALL_PLAYERS(p) {
-				DrawPlayerIcon(p->index, 4, 18 + p->index * 12);
+			if (!p->is_active) continue;
-				SetDParam(0, p->index);
+			DrawPlayerIcon(p->index, 4, 18 + p->index * 12);
-				SetDParam(1, p->index);
-				DrawString(21, 17 + p->index * 12, STR_7021, HasBit(_legend_excluded_players, p->index) ? TC_BLACK : TC_WHITE);
+			SetDParam(0, p->index);
-			}
+			SetDParam(1, p->index);
-			break;
+			DrawString(21, 17 + p->index * 12, STR_7021, HasBit(_legend_excluded_players, p->index) ? TC_BLACK : TC_WHITE);
 		}
+	}
-		case WE_CLICK:
-			if (!IsInsideMM(e->we.click.widget, 3, 11)) return;
+	virtual void OnClick(Point pt, int widget)
+	{
-			ToggleBit(_legend_excluded_players, e->we.click.widget - 3);
+		if (!IsInsideMM(widget, 3, 11)) return;
-			w->ToggleWidgetLoweredState(e->we.click.widget);
-			w->SetDirty();
+		ToggleBit(_legend_excluded_players, widget - 3);
-			InvalidateWindow(WC_INCOME_GRAPH, 0);
+		this->ToggleWidgetLoweredState(widget);
-			InvalidateWindow(WC_OPERATING_PROFIT, 0);
+		this->SetDirty();
-			InvalidateWindow(WC_DELIVERED_CARGO, 0);
+		InvalidateWindow(WC_INCOME_GRAPH, 0);
-			InvalidateWindow(WC_PERFORMANCE_HISTORY, 0);
+		InvalidateWindow(WC_OPERATING_PROFIT, 0);
-			InvalidateWindow(WC_COMPANY_VALUE, 0);
+		InvalidateWindow(WC_DELIVERED_CARGO, 0);
-			break;
+		InvalidateWindow(WC_PERFORMANCE_HISTORY, 0);
-	}
+		InvalidateWindow(WC_COMPANY_VALUE, 0);
-}
+	}
+};
 static const Widget _graph_legend_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                       STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   249,     0,    13, STR_704E_KEY_TO_COMPANY_GRAPHS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   249,    14,   113, 0x0,                            STR_NULL},
 static const WindowDesc _graph_legend_desc = {
 	WDP_AUTO, WDP_AUTO, 250, 114, 250, 114,
 	WC_GRAPH_LEGEND, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_graph_legend_widgets,
-	GraphLegendWndProc
 };
 static void ShowGraphLegend()
 {
-	AllocateWindowDescFront<Window>(&_graph_legend_desc, 0);
+	AllocateWindowDescFront<GraphLegendWindow>(&_graph_legend_desc, 0);
 }
+/******************/
+/* BASE OF GRAPHS */
+/*****************/
+struct BaseGraphWindow : Window {
+protected:
+	enum {
+		GRAPH_MAX_DATASETS = 32,
+		GRAPH_AXIS_LABEL_COLOUR = TC_BLACK,
+		GRAPH_AXIS_LINE_COLOUR  = 215,
+		GRAPH_X_POSITION_BEGINNING  = 44,  ///< Start the graph 44 pixels from gd_left
+		GRAPH_X_POSITION_SEPARATION = 22,  ///< There are 22 pixels between each X value
+		GRAPH_NUM_LINES_Y = 9, ///< How many horizontal lines to draw.
+		/* 9 is convenient as that means the distance between them is the gd_height of the graph / 8,
+		* which is the same
+		* as height >> 3. */
+	};
+	uint excluded_data; ///< bitmask of the datasets that shouldn't be displayed.
+	byte num_dataset;
+	byte num_on_x_axis;
+	bool has_negative_values;
+	byte num_vert_lines;
+	/* The starting month and year that values are plotted against. If month is
+	 * 0xFF, use x_values_start and x_values_increment below instead. */
+	byte month;
+	Year year;
+	/* These values are used if the graph is being plotted against values
+	 * rather than the dates specified by month and year. */
+	uint16 x_values_start;
+	uint16 x_values_increment;
+	int gd_left, gd_top;  ///< Where to start drawing the graph, in pixels.
+	uint gd_height;    ///< The height of the graph in pixels.
+	StringID format_str_y_axis;
+	byte colors[GRAPH_MAX_DATASETS];
+	OverflowSafeInt64 cost[GRAPH_MAX_DATASETS][24]; ///< last 2 years
+	void DrawGraph() const
+	{
+		uint x, y;                       ///< Reused whenever x and y coordinates are needed.
+		OverflowSafeInt64 highest_value; ///< Highest value to be drawn.
+		int x_axis_offset;               ///< Distance from the top of the graph to the x axis.
+		/* the colors and cost array of GraphDrawer must accomodate
+		* both values for cargo and players. So if any are higher, quit */
+		assert(GRAPH_MAX_DATASETS >= (int)NUM_CARGO && GRAPH_MAX_DATASETS >= (int)MAX_PLAYERS);
+		assert(this->num_vert_lines > 0);
+		byte grid_colour = _colour_gradient[14][4];
+		/* The coordinates of the opposite edges of the graph. */
+		int bottom = this->gd_top + this->gd_height - 1;
+		int right  = this->gd_left + GRAPH_X_POSITION_BEGINNING + this->num_vert_lines * GRAPH_X_POSITION_SEPARATION - 1;
+		/* Draw the vertical grid lines. */
+		/* Don't draw the first line, as that's where the axis will be. */
+		x = this->gd_left + GRAPH_X_POSITION_BEGINNING + GRAPH_X_POSITION_SEPARATION;
+		for (int i = 0; i < this->num_vert_lines; i++) {
+			GfxFillRect(x, this->gd_top, x, bottom, grid_colour);
+			x += GRAPH_X_POSITION_SEPARATION;
+		}
+		/* Draw the horizontal grid lines. */
+		x = this->gd_left + GRAPH_X_POSITION_BEGINNING;
+		y = this->gd_height + this->gd_top;
+		for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
+			GfxFillRect(x, y, right, y, grid_colour);
+			y -= (this->gd_height / (GRAPH_NUM_LINES_Y - 1));
+		}
+		/* Draw the y axis. */
+		GfxFillRect(x, this->gd_top, x, bottom, GRAPH_AXIS_LINE_COLOUR);
+		/* Find the distance from the gd_top of the graph to the x axis. */
+		x_axis_offset = this->gd_height;
+		/* The graph is currently symmetrical about the x axis. */
+		if (this->has_negative_values) x_axis_offset /= 2;
+		/* Draw the x axis. */
+		y = x_axis_offset + this->gd_top;
+		GfxFillRect(x, y, right, y, GRAPH_AXIS_LINE_COLOUR);
+		/* Find the largest value that will be drawn. */
+		if (this->num_on_x_axis == 0)
+			return;
+		assert(this->num_on_x_axis > 0);
+		assert(this->num_dataset > 0);
+		/* Start of with a value of twice the gd_height of the graph in pixels. It's a
+		* bit arbitrary, but it makes the cargo payment graph look a little nicer,
+		* and prevents division by zero when calculating where the datapoint
+		* should be drawn. */
+		highest_value = x_axis_offset * 2;
+		for (int i = 0; i < this->num_dataset; i++) {
+			if (!HasBit(this->excluded_data, i)) {
+				for (int j = 0; j < this->num_on_x_axis; j++) {
+					OverflowSafeInt64 datapoint = this->cost[i][j];
+					if (datapoint != INVALID_DATAPOINT) {
+						/* For now, if the graph has negative values the scaling is
+						* symmetrical about the x axis, so take the absolute value
+						* of each data point. */
+						highest_value = max(highest_value, abs(datapoint));
+					}
+				}
+			}
+		}
+		/* Round up highest_value so that it will divide cleanly into the number of
+		* axis labels used. */
+		int round_val = highest_value % (GRAPH_NUM_LINES_Y - 1);
+		if (round_val != 0) highest_value += (GRAPH_NUM_LINES_Y - 1 - round_val);
+		/* draw text strings on the y axis */
+		int64 y_label = highest_value;
+		int64 y_label_separation = highest_value / (GRAPH_NUM_LINES_Y - 1);
+		/* If there are negative values, the graph goes from highest_value to
+		* -highest_value, not highest_value to 0. */
+		if (this->has_negative_values) y_label_separation *= 2;
+		x = this->gd_left + GRAPH_X_POSITION_BEGINNING + 1;
+		y = this->gd_top - 3;
+		for (int i = 0; i < GRAPH_NUM_LINES_Y; i++) {
+			SetDParam(0, this->format_str_y_axis);
+			SetDParam(1, y_label);
+			DrawStringRightAligned(x, y, STR_0170, GRAPH_AXIS_LABEL_COLOUR);
+			y_label -= y_label_separation;
+			y += (this->gd_height / (GRAPH_NUM_LINES_Y - 1));
+		}
+		/* draw strings on the x axis */
+		if (this->month != 0xFF) {
+			x = this->gd_left + GRAPH_X_POSITION_BEGINNING;
+			y = this->gd_top + this->gd_height + 1;
+			byte month = this->month;
+			Year year  = this->year;
+			for (int i = 0; i < this->num_on_x_axis; i++) {
+				SetDParam(0, month + STR_0162_JAN);
+				SetDParam(1, month + STR_0162_JAN + 2);
+				SetDParam(2, year);
+				DrawString(x, y, month == 0 ? STR_016F : STR_016E, GRAPH_AXIS_LABEL_COLOUR);
+				month += 3;
+				if (month >= 12) {
+					month = 0;
+					year++;
+				}
+				x += GRAPH_X_POSITION_SEPARATION;
+			}
+		} else {
+			/* Draw the label under the data point rather than on the grid line. */
+			x = this->gd_left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2) + 1;
+			y = this->gd_top + this->gd_height + 1;
+			uint16 label = this->x_values_start;
+			for (int i = 0; i < this->num_on_x_axis; i++) {
+				SetDParam(0, label);
+				DrawStringCentered(x, y, STR_01CB, GRAPH_AXIS_LABEL_COLOUR);
+				label += this->x_values_increment;
+				x += GRAPH_X_POSITION_SEPARATION;
+			}
+		}
+		/* draw lines and dots */
+		for (int i = 0; i < this->num_dataset; i++) {
+			if (!HasBit(this->excluded_data, i)) {
+				/* Centre the dot between the grid lines. */
+				x = this->gd_left + GRAPH_X_POSITION_BEGINNING + (GRAPH_X_POSITION_SEPARATION / 2);
+				byte color  = this->colors[i];
+				uint prev_x = INVALID_DATAPOINT_POS;
+				uint prev_y = INVALID_DATAPOINT_POS;
+				for (int j = 0; j < this->num_on_x_axis; j++) {
+					OverflowSafeInt64 datapoint = this->cost[i][j];
+					if (datapoint != INVALID_DATAPOINT) {
+						/*
+						* Check whether we need to reduce the 'accuracy' of the
+						* datapoint value and the highest value to splut overflows.
+						* And when 'drawing' 'one million' or 'one million and one'
+						* there is no significant difference, so the least
+						* significant bits can just be removed.
+						*
+						* If there are more bits needed than would fit in a 32 bits
+						* integer, so at about 31 bits because of the sign bit, the
+						* least significant bits are removed.
+						*/
+						int mult_range = FindLastBit(x_axis_offset) + FindLastBit(abs(datapoint));
+						int reduce_range = max(mult_range - 31, 0);
+						/* Handle negative values differently (don't shift sign) */
+						if (datapoint < 0) {
+							datapoint = -(abs(datapoint) >> reduce_range);
+						} else {
+							datapoint >>= reduce_range;
+						}
+						y = this->gd_top + x_axis_offset - (x_axis_offset * datapoint) / (highest_value >> reduce_range);
+						/* Draw the point. */
+						GfxFillRect(x - 1, y - 1, x + 1, y + 1, color);
+						/* Draw the line connected to the previous point. */
+						if (prev_x != INVALID_DATAPOINT_POS) GfxDrawLine(prev_x, prev_y, x, y, color);
+						prev_x = x;
+						prev_y = y;
+					} else {
+						prev_x = INVALID_DATAPOINT_POS;
+						prev_y = INVALID_DATAPOINT_POS;
+					}
+					x += GRAPH_X_POSITION_SEPARATION;
+				}
+			}
+		}
+	}
+	BaseGraphWindow(const WindowDesc *desc, WindowNumber window_number, int left,
+									int top, int height, bool has_negative_values, StringID format_str_y_axis) :
+			Window(desc, window_number), has_negative_values(has_negative_values),
+			gd_left(left), gd_top(top), gd_height(height), format_str_y_axis(format_str_y_axis)
+	{
+		InvalidateWindow(WC_GRAPH_LEGEND, 0);
+	}
+public:
+	virtual void OnPaint()
+	{
+		this->DrawWidgets();
+		uint excluded_players = _legend_excluded_players;
+		/* Exclude the players which aren't valid */
+		const Player* p;
+		FOR_ALL_PLAYERS(p) {
+			if (!p->is_active) SetBit(excluded_players, p->index);
+		}
+		this->excluded_data = excluded_players;
+		this->num_vert_lines = 24;
+		byte nums = 0;
+		FOR_ALL_PLAYERS(p) {
+			if (p->is_active) nums = max(nums, p->num_valid_stat_ent);
+		}
+		this->num_on_x_axis = min(nums, 24);
+		int mo = (_cur_month / 3 - nums) * 3;
+		int yr = _cur_year;
+		while (mo < 0) {
+			yr--;
+			mo += 12;
+		}
+		this->year = yr;
+		this->month = mo;
+		int numd = 0;
+		FOR_ALL_PLAYERS(p) {
+			if (p->is_active) {
+				this->colors[numd] = _colour_gradient[p->player_color][6];
+				for (int j = this->num_on_x_axis, i = 0; --j >= 0;) {
+					this->cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : GetGraphData(p, j);
+					i++;
+				}
+			}
+			numd++;
+		}
+		this->num_dataset = numd;
+		this->DrawGraph();
+	}
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
+	{
+		return INVALID_DATAPOINT;
+	}
+	virtual void OnClick(Point pt, int widget)
+	{
+		/* Clicked on legend? */
+		if (widget == 2) ShowGraphLegend();
+	}
+};
 /********************/
 /* OPERATING PROFIT */
 /********************/
-static void SetupGraphDrawerForPlayers(GraphDrawer *gd)
+struct OperatingProfitGraphWindow : BaseGraphWindow {
-{
+	OperatingProfitGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	const Player* p;
+			BaseGraphWindow(desc, window_number, 2, 18, 136, true, STR_CURRCOMPACT)
-	uint excluded_players = _legend_excluded_players;
+	{
-	byte nums;
+		this->FindWindowPlacementAndResize(desc);
-	int mo, yr;
+	}
-	/* Exclude the players which aren't valid */
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
-	FOR_ALL_PLAYERS(p) {
+	{
-		if (!p->is_active) SetBit(excluded_players, p->index);
+		return p->old_economy[j].income + p->old_economy[j].expenses;
 	}
-	gd->excluded_data = excluded_players;
+};
-	gd->num_vert_lines = 24;
-	nums = 0;
-	FOR_ALL_PLAYERS(p) {
-		if (p->is_active) nums = max(nums, p->num_valid_stat_ent);
-	}
-	gd->num_on_x_axis = min(nums, 24);
-	mo = (_cur_month / 3 - nums) * 3;
-	yr = _cur_year;
-	while (mo < 0) {
-		yr--;
-		mo += 12;
-	}
-	gd->year = yr;
-	gd->month = mo;
-}
-static void OperatingProfitWndProc(Window *w, WindowEvent *e)
-{
-	switch (e->event) {
-		case WE_PAINT: {
-			GraphDrawer gd;
-			const Player* p;
-			DrawWindowWidgets(w);
-			gd.left = 2;
-			gd.top = 18;
-			gd.height = 136;
-			gd.has_negative_values = true;
-			gd.format_str_y_axis = STR_CURRCOMPACT;
-			SetupGraphDrawerForPlayers(&gd);
-			int numd = 0;
-			FOR_ALL_PLAYERS(p) {
-				if (p->is_active) {
-					gd.colors[numd] = _colour_gradient[p->player_color][6];
-					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (p->old_economy[j].income + p->old_economy[j].expenses);
-						i++;
-					}
-				}
-				numd++;
-			}
-			gd.num_dataset = numd;
-			DrawGraph(&gd);
-			break;
-		}
-		case WE_CLICK:
-			/* Clicked on legend? */
-			if (e->we.click.widget == 2) ShowGraphLegend();
-			break;
-	}
-}
 static const Widget _operating_profit_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7025_OPERATING_PROFIT_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                    STR_704D_SHOW_KEY_TO_GRAPHS},
 static const WindowDesc _operating_profit_desc = {
 	WDP_AUTO, WDP_AUTO, 576, 174, 576, 174,
 	WC_OPERATING_PROFIT, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_operating_profit_widgets,
-	OperatingProfitWndProc
 };
 void ShowOperatingProfitGraph()
 {
-	if (AllocateWindowDescFront<Window>(&_operating_profit_desc, 0)) {
+	AllocateWindowDescFront<OperatingProfitGraphWindow>(&_operating_profit_desc, 0);
-		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-	}
 }
 /****************/
 /* INCOME GRAPH */
 /****************/
-static void IncomeGraphWndProc(Window *w, WindowEvent *e)
+struct IncomeGraphWindow : BaseGraphWindow {
-{
+	IncomeGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	switch (e->event) {
+			BaseGraphWindow(desc, window_number, 2, 18, 104, false, STR_CURRCOMPACT)
-		case WE_PAINT: {
+	{
-			GraphDrawer gd;
+		this->FindWindowPlacementAndResize(desc);
-			const Player* p;
+	}
-			DrawWindowWidgets(w);
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
+	{
-			gd.left = 2;
+		return p->old_economy[j].income;
-			gd.top = 18;
+	}
-			gd.height = 104;
+};
-			gd.has_negative_values = false;
-			gd.format_str_y_axis = STR_CURRCOMPACT;
-			SetupGraphDrawerForPlayers(&gd);
-			int numd = 0;
-			FOR_ALL_PLAYERS(p) {
-				if (p->is_active) {
-					gd.colors[numd] = _colour_gradient[p->player_color][6];
-					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].income;
-						i++;
-					}
-				}
-				numd++;
-			}
-			gd.num_dataset = numd;
-			DrawGraph(&gd);
-			break;
-		}
-		case WE_CLICK:
-			if (e->we.click.widget == 2) ShowGraphLegend();
-			break;
-	}
-}
 static const Widget _income_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,              STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7022_INCOME_GRAPH, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,          STR_704D_SHOW_KEY_TO_GRAPHS},
 static const WindowDesc _income_graph_desc = {
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_INCOME_GRAPH, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_income_graph_widgets,
-	IncomeGraphWndProc
 };
 void ShowIncomeGraph()
 {
-	if (AllocateWindowDescFront<Window>(&_income_graph_desc, 0)) {
+	AllocateWindowDescFront<IncomeGraphWindow>(&_income_graph_desc, 0);
-		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-	}
 }
 /*******************/
 /* DELIVERED CARGO */
 /*******************/
-static void DeliveredCargoGraphWndProc(Window *w, WindowEvent *e)
+struct DeliveredCargoGraphWindow : BaseGraphWindow {
-{
+	DeliveredCargoGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	switch (e->event) {
+			BaseGraphWindow(desc, window_number, 2, 18, 104, false, STR_7024)
-		case WE_PAINT: {
+	{
-			GraphDrawer gd;
+		this->FindWindowPlacementAndResize(desc);
-			const Player* p;
+	}
-			DrawWindowWidgets(w);
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
+	{
-			gd.left = 2;
+		return p->old_economy[j].delivered_cargo;
-			gd.top = 18;
+	}
-			gd.height = 104;
+};
-			gd.has_negative_values = false;
-			gd.format_str_y_axis = STR_7024;
-			SetupGraphDrawerForPlayers(&gd);
-			int numd = 0;
-			FOR_ALL_PLAYERS(p) {
-				if (p->is_active) {
-					gd.colors[numd] = _colour_gradient[p->player_color][6];
-					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (OverflowSafeInt64)p->old_economy[j].delivered_cargo;
-						i++;
-					}
-				}
-				numd++;
-			}
-			gd.num_dataset = numd;
-			DrawGraph(&gd);
-			break;
-		}
-		case WE_CLICK:
-			if (e->we.click.widget == 2) ShowGraphLegend();
-			break;
-	}
-}
 static const Widget _delivered_cargo_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7050_UNITS_OF_CARGO_DELIVERED, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                      STR_704D_SHOW_KEY_TO_GRAPHS},
 static const WindowDesc _delivered_cargo_graph_desc = {
 	WDP_AUTO, WDP_AUTO, 576, 142, 576, 142,
 	WC_DELIVERED_CARGO, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_delivered_cargo_graph_widgets,
-	DeliveredCargoGraphWndProc
 };
 void ShowDeliveredCargoGraph()
 {
-	if (AllocateWindowDescFront<Window>(&_delivered_cargo_graph_desc, 0)) {
+	AllocateWindowDescFront<DeliveredCargoGraphWindow>(&_delivered_cargo_graph_desc, 0);
-		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-	}
 }
 /***********************/
 /* PERFORMANCE HISTORY */
 /***********************/
-static void PerformanceHistoryWndProc(Window *w, WindowEvent *e)
+struct PerformanceHistoryGraphWindow : BaseGraphWindow {
-{
+	PerformanceHistoryGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	switch (e->event) {
+			BaseGraphWindow(desc, window_number, 2, 18, 200, false, STR_7024)
-		case WE_PAINT: {
+	{
-			GraphDrawer gd;
+		this->FindWindowPlacementAndResize(desc);
-			const Player* p;
+	}
-			DrawWindowWidgets(w);
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
+	{
-			gd.left = 2;
+		return p->old_economy[j].performance_history;
-			gd.top = 18;
+	}
-			gd.height = 200;
-			gd.has_negative_values = false;
+	virtual void OnClick(Point pt, int widget)
-			gd.format_str_y_axis = STR_7024;
+	{
-			SetupGraphDrawerForPlayers(&gd);
+		if (widget == 3) ShowPerformanceRatingDetail();
+		this->BaseGraphWindow::OnClick(pt, widget);
-			int numd = 0;
+	}
-			FOR_ALL_PLAYERS(p) {
+};
-				if (p->is_active) {
-					gd.colors[numd] = _colour_gradient[p->player_color][6];
-					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : (OverflowSafeInt64)p->old_economy[j].performance_history;
-						i++;
-					}
-				}
-				numd++;
-			}
-			gd.num_dataset = numd;
-			DrawGraph(&gd);
-			break;
-		}
-		case WE_CLICK:
-			if (e->we.click.widget == 2) ShowGraphLegend();
-			if (e->we.click.widget == 3) ShowPerformanceRatingDetail();
-			break;
-	}
-}
 static const Widget _performance_history_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                             STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   475,     0,    13, STR_7051_COMPANY_PERFORMANCE_RATINGS, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,                         STR_704D_SHOW_KEY_TO_GRAPHS},
 static const WindowDesc _performance_history_desc = {
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_PERFORMANCE_HISTORY, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_performance_history_widgets,
-	PerformanceHistoryWndProc
 };
 void ShowPerformanceHistoryGraph()
 {
-	if (AllocateWindowDescFront<Window>(&_performance_history_desc, 0)) {
+	AllocateWindowDescFront<PerformanceHistoryGraphWindow>(&_performance_history_desc, 0);
-		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-	}
 }
 /*****************/
 /* COMPANY VALUE */
 /*****************/
-static void CompanyValueGraphWndProc(Window *w, WindowEvent *e)
+struct CompanyValueGraphWindow : BaseGraphWindow {
-{
+	CompanyValueGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	switch (e->event) {
+			BaseGraphWindow(desc, window_number, 2, 18, 200, false, STR_CURRCOMPACT)
-		case WE_PAINT: {
+	{
-			GraphDrawer gd;
+		this->FindWindowPlacementAndResize(desc);
-			const Player* p;
+	}
-			DrawWindowWidgets(w);
+	virtual OverflowSafeInt64 GetGraphData(const Player *p, int j)
+	{
-			gd.left = 2;
+		return p->old_economy[j].company_value;
-			gd.top = 18;
+	}
-			gd.height = 200;
+};
-			gd.has_negative_values = false;
-			gd.format_str_y_axis = STR_CURRCOMPACT;
-			SetupGraphDrawerForPlayers(&gd);
-			int numd = 0;
-			FOR_ALL_PLAYERS(p) {
-				if (p->is_active) {
-					gd.colors[numd] = _colour_gradient[p->player_color][6];
-					for (int j = gd.num_on_x_axis, i = 0; --j >= 0;) {
-						gd.cost[numd][i] = (j >= p->num_valid_stat_ent) ? INVALID_DATAPOINT : p->old_economy[j].company_value;
-						i++;
-					}
-				}
-				numd++;
-			}
-			gd.num_dataset = numd;
-			DrawGraph(&gd);
-			break;
-		}
-		case WE_CLICK:
-			if (e->we.click.widget == 2) ShowGraphLegend();
-			break;
-	}
-}
 static const Widget _company_value_graph_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   525,     0,    13, STR_7052_COMPANY_VALUES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   526,   575,     0,    13, STR_704C_KEY,            STR_704D_SHOW_KEY_TO_GRAPHS},
 static const WindowDesc _company_value_graph_desc = {
 	WDP_AUTO, WDP_AUTO, 576, 238, 576, 238,
 	WC_COMPANY_VALUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_company_value_graph_widgets,
-	CompanyValueGraphWndProc
 };
 void ShowCompanyValueGraph()
 {
-	if (AllocateWindowDescFront<Window>(&_company_value_graph_desc, 0)) {
+	AllocateWindowDescFront<CompanyValueGraphWindow>(&_company_value_graph_desc, 0);
-		InvalidateWindow(WC_GRAPH_LEGEND, 0);
-	}
 }
 /*****************/
 /* PAYMENT RATES */
 /*****************/
-static void CargoPaymentRatesWndProc(Window *w, WindowEvent *e)
+struct PaymentRatesGraphWindow : BaseGraphWindow {
-{
+	PaymentRatesGraphWindow(const WindowDesc *desc, WindowNumber window_number) :
-	switch (e->event) {
+			BaseGraphWindow(desc, window_number, 2, 24, 200, false, STR_CURRCOMPACT)
-		case WE_PAINT: {
+	{
-			GraphDrawer gd;
+		uint num_active = 0;
+		for (CargoID c = 0; c < NUM_CARGO; c++) {
-			DrawWindowWidgets(w);
+			if (GetCargo(c)->IsValid()) num_active++;
+		}
-			int x = 495;
-			int y = 24;
+		/* Resize the window to fit the cargo types */
+		ResizeWindow(this, 0, max(num_active, 12U) * 8);
-			gd.excluded_data = _legend_excluded_cargo;
-			gd.left = 2;
+		/* Add widgets for each cargo type */
-			gd.top = 24;
+		this->widget_count += num_active;
-			gd.height = w->height - 38;
+		this->widget = ReallocT(this->widget, this->widget_count + 1);
-			gd.has_negative_values = false;
+		this->widget[this->widget_count].type = WWT_LAST;
-			gd.format_str_y_axis = STR_CURRCOMPACT;
-			gd.num_on_x_axis = 20;
+		/* Set the properties of each widget */
-			gd.num_vert_lines = 20;
+		for (uint i = 0; i != num_active; i++) {
-			gd.month = 0xFF;
+			Widget *wi = &this->widget[3 + i];
-			gd.x_values_start     = 10;
+			wi->type     = WWT_PANEL;
-			gd.x_values_increment = 10;
+			wi->display_flags = RESIZE_NONE;
+			wi->color    = 12;
-			uint i = 0;
+			wi->left     = 493;
-			for (CargoID c = 0; c < NUM_CARGO; c++) {
+			wi->right    = 562;
-				const CargoSpec *cs = GetCargo(c);
+			wi->top      = 24 + i * 8;
-				if (!cs->IsValid()) continue;
+			wi->bottom   = wi->top + 7;
+			wi->data     = 0;
-				/* Only draw labels for widgets that exist. If the widget doesn't
+			wi->tooltips = STR_7064_TOGGLE_GRAPH_FOR_CARGO;
-				 * exist then the local player has used the climate cheat or
-				 * changed the NewGRF configuration with this window open. */
+			if (!HasBit(_legend_excluded_cargo, i)) this->LowerWidget(i + 3);
-				if (i + 3 < w->widget_count) {
+		}
-					/* Since the buttons have no text, no images,
-					 * both the text and the colored box have to be manually painted.
+		this->SetDirty();
-					 * clk_dif will move one pixel down and one pixel to the right
-					 * when the button is clicked */
+		this->gd_height = this->height - 38;
-					byte clk_dif = w->IsWidgetLowered(i + 3) ? 1 : 0;
+		this->num_on_x_axis = 20;
+		this->num_vert_lines = 20;
-					GfxFillRect(x + clk_dif, y + clk_dif, x + 8 + clk_dif, y + 5 + clk_dif, 0);
+		this->month = 0xFF;
-					GfxFillRect(x + 1 + clk_dif, y + 1 + clk_dif, x + 7 + clk_dif, y + 4 + clk_dif, cs->legend_colour);
+		this->x_values_start     = 10;
-					SetDParam(0, cs->name);
+		this->x_values_increment = 10;
-					DrawString(x + 14 + clk_dif, y + clk_dif, STR_7065, TC_FROMSTRING);
-					y += 8;
+		this->FindWindowPlacementAndResize(desc);
-				}
+	}
-				gd.colors[i] = cs->legend_colour;
+	virtual void OnPaint()
-				for (uint j = 0; j != 20; j++) {
+	{
-					gd.cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, c);
+		this->DrawWidgets();
-				}
+		this->excluded_data = _legend_excluded_cargo;
-				i++;
-			}
+		int x = 495;
-			gd.num_dataset = i;
+		int y = 24;
-			DrawGraph(&gd);
+		uint i = 0;
+		for (CargoID c = 0; c < NUM_CARGO; c++) {
-			DrawString(2 + 46, 24 + gd.height + 7, STR_7062_DAYS_IN_TRANSIT, TC_FROMSTRING);
+			const CargoSpec *cs = GetCargo(c);
-			DrawString(2 + 84, 24 - 9, STR_7063_PAYMENT_FOR_DELIVERING, TC_FROMSTRING);
+			if (!cs->IsValid()) continue;
-			break;
-		}
+			/* Only draw labels for widgets that exist. If the widget doesn't
+				* exist then the local player has used the climate cheat or
-		case WE_CLICK:
+				* changed the NewGRF configuration with this window open. */
-			if (e->we.click.widget >= 3) {
+			if (i + 3 < this->widget_count) {
-				ToggleBit(_legend_excluded_cargo, e->we.click.widget - 3);
+				/* Since the buttons have no text, no images,
-				w->ToggleWidgetLoweredState(e->we.click.widget);
+					* both the text and the colored box have to be manually painted.
-				w->SetDirty();
+					* clk_dif will move one pixel down and one pixel to the right
-			}
+					* when the button is clicked */
-			break;
+				byte clk_dif = this->IsWidgetLowered(i + 3) ? 1 : 0;
-	}
-}
+				GfxFillRect(x + clk_dif, y + clk_dif, x + 8 + clk_dif, y + 5 + clk_dif, 0);
+				GfxFillRect(x + 1 + clk_dif, y + 1 + clk_dif, x + 7 + clk_dif, y + 4 + clk_dif, cs->legend_colour);
+				SetDParam(0, cs->name);
+				DrawString(x + 14 + clk_dif, y + clk_dif, STR_7065, TC_FROMSTRING);
+				y += 8;
+			}
+			this->colors[i] = cs->legend_colour;
+			for (uint j = 0; j != 20; j++) {
+				this->cost[i][j] = GetTransportedGoodsIncome(10, 20, j * 6 + 6, c);
+			}
+			i++;
+		}
+		this->num_dataset = i;
+		this->DrawGraph();
+		DrawString(2 + 46, 24 + this->gd_height + 7, STR_7062_DAYS_IN_TRANSIT, TC_FROMSTRING);
+		DrawString(2 + 84, 24 - 9, STR_7063_PAYMENT_FOR_DELIVERING, TC_FROMSTRING);
+	}
+	virtual void OnClick(Point pt, int widget)
+	{
+		if (widget >= 3) {
+			ToggleBit(_legend_excluded_cargo, widget - 3);
+			this->ToggleWidgetLoweredState(widget);
+			this->SetDirty();
+		}
+	}
+};
 static const Widget _cargo_payment_rates_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                     STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   567,     0,    13, STR_7061_CARGO_PAYMENT_RATES, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL, RESIZE_BOTTOM,    14,     0,   567,    14,    45, 0x0,                          STR_NULL},
 static const WindowDesc _cargo_payment_rates_desc = {
 	WDP_AUTO, WDP_AUTO, 568, 46, 568, 46,
 	WC_PAYMENT_RATES, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_cargo_payment_rates_widgets,
-	CargoPaymentRatesWndProc
 };
 void ShowCargoPaymentRates()
 {
-	Window *w = AllocateWindowDescFront<Window>(&_cargo_payment_rates_desc, 0);
+	AllocateWindowDescFront<PaymentRatesGraphWindow>(&_cargo_payment_rates_desc, 0);
-	if (w == NULL) return;
-	/* Count the number of active cargo types */
-	uint num_active = 0;
-	for (CargoID c = 0; c < NUM_CARGO; c++) {
-		if (GetCargo(c)->IsValid()) num_active++;
-	}
-	/* Resize the window to fit the cargo types */
-	ResizeWindow(w, 0, max(num_active, 12U) * 8);
-	/* Add widgets for each cargo type */
-	w->widget_count += num_active;
-	w->widget = ReallocT(w->widget, w->widget_count + 1);
-	w->widget[w->widget_count].type = WWT_LAST;
-	/* Set the properties of each widget */
-	for (uint i = 0; i != num_active; i++) {
-		Widget *wi = &w->widget[3 + i];
-		wi->type     = WWT_PANEL;
-		wi->display_flags = RESIZE_NONE;
-		wi->color    = 12;
-		wi->left     = 493;
-		wi->right    = 562;
-		wi->top      = 24 + i * 8;
-		wi->bottom   = wi->top + 7;
-		wi->data     = 0;
-		wi->tooltips = STR_7064_TOGGLE_GRAPH_FOR_CARGO;
-		if (!HasBit(_legend_excluded_cargo, i)) w->LowerWidget(i + 3);
-	}
-	w->SetDirty();
 }
 /************************/
 /* COMPANY LEAGUE TABLE */
 /************************/
 	const Player* p2 = *(const Player* const*)elem2;
 	return p2->old_economy[1].performance_history - p1->old_economy[1].performance_history;
 }
-static void CompanyLeagueWndProc(Window *w, WindowEvent *e)
+struct CompanyLeagueWindow : Window {
-{
+	CompanyLeagueWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
-	switch (e->event) {
+	{
-		case WE_PAINT: {
+	}
-			const Player* plist[MAX_PLAYERS];
-			const Player* p;
+	virtual void OnPaint()
+	{
-			DrawWindowWidgets(w);
+		const Player *plist[MAX_PLAYERS];
+		const Player *p;
-			uint pl_num = 0;
-			FOR_ALL_PLAYERS(p) if (p->is_active) plist[pl_num++] = p;
+		this->DrawWidgets();
-			qsort((void*)plist, pl_num, sizeof(*plist), PerfHistComp);
+		uint pl_num = 0;
+		FOR_ALL_PLAYERS(p) if (p->is_active) plist[pl_num++] = p;
-			for (uint i = 0; i != pl_num; i++) {
-				p = plist[i];
+		qsort((void*)plist, pl_num, sizeof(*plist), PerfHistComp);
-				SetDParam(0, i + STR_01AC_1ST);
-				SetDParam(1, p->index);
+		for (uint i = 0; i != pl_num; i++) {
-				SetDParam(2, p->index);
+			p = plist[i];
-				SetDParam(3, GetPerformanceTitleFromValue(p->old_economy[1].performance_history));
+			SetDParam(0, i + STR_01AC_1ST);
+			SetDParam(1, p->index);
-				DrawString(2, 15 + i * 10, i == 0 ? STR_7054 : STR_7055, TC_FROMSTRING);
+			SetDParam(2, p->index);
-				DrawPlayerIcon(p->index, 27, 16 + i * 10);
+			SetDParam(3, GetPerformanceTitleFromValue(p->old_economy[1].performance_history));
-			}
+			DrawString(2, 15 + i * 10, i == 0 ? STR_7054 : STR_7055, TC_FROMSTRING);
-			break;
+			DrawPlayerIcon(p->index, 27, 16 + i * 10);
 		}
 	}
-}
+};
 static const Widget _company_league_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE, 14,   0,  10,  0, 13, STR_00C5,                      STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION, RESIZE_NONE, 14,  11, 387,  0, 13, STR_7053_COMPANY_LEAGUE_TABLE, STR_018C_WINDOW_TITLE_DRAG_THIS},
 static const WindowDesc _company_league_desc = {
 	WDP_AUTO, WDP_AUTO, 400, 97, 400, 97,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_company_league_widgets,
-	CompanyLeagueWndProc
 };
 void ShowCompanyLeagueTable()
 {
-	AllocateWindowDescFront<Window>(&_company_league_desc, 0);
+	AllocateWindowDescFront<CompanyLeagueWindow>(&_company_league_desc, 0);
 }
 /*****************************/
 /* PERFORMANCE RATING DETAIL */
 /*****************************/
-static void PerformanceRatingDetailWndProc(Window *w, WindowEvent *e)
+struct PerformanceRatingDetailWindow : Window {
-{
+	static PlayerID player;
-	static PlayerID _performance_rating_detail_player = INVALID_PLAYER;
+	int timeout;
-	switch (e->event) {
+	PerformanceRatingDetailWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, window_number)
-		case WE_PAINT: {
+	{
-			byte x;
+		/* Disable the players who are not active */
-			uint16 y = 14;
+		for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
-			int total_score = 0;
+			this->SetWidgetDisabledState(i + 13, !GetPlayer(i)->is_active);
-			int color_done, color_notdone;
+		}
-			/* Draw standard stuff */
+		this->UpdatePlayerStats();
-			DrawWindowWidgets(w);
+		if (player != INVALID_PLAYER) this->LowerWidget(player + 13);
-			/* Check if the currently selected player is still active. */
-			if (_performance_rating_detail_player == INVALID_PLAYER || !GetPlayer(_performance_rating_detail_player)->is_active) {
+		this->FindWindowPlacementAndResize(desc);
-				if (_performance_rating_detail_player != INVALID_PLAYER) {
+	}
-					/* Raise and disable the widget for the previous selection. */
-					w->RaiseWidget(_performance_rating_detail_player + 13);
+	void UpdatePlayerStats()
-					w->DisableWidget(_performance_rating_detail_player + 13);
+	{
-					w->SetDirty();
+		/* Update all player stats with the current data
+		 * (this is because _score_info is not saved to a savegame) */
-					_performance_rating_detail_player = INVALID_PLAYER;
+		Player *p;
+		FOR_ALL_PLAYERS(p) {
+			if (p->is_active) UpdateCompanyRatingAndValue(p, false);
+		}
+		this->timeout = DAY_TICKS * 5;
+	}
+	virtual void OnPaint()
+	{
+		byte x;
+		uint16 y = 14;
+		int total_score = 0;
+		int color_done, color_notdone;
+		/* Draw standard stuff */
+		this->DrawWidgets();
+		/* Check if the currently selected player is still active. */
+		if (player == INVALID_PLAYER || !GetPlayer(player)->is_active) {
+			if (player != INVALID_PLAYER) {
+				/* Raise and disable the widget for the previous selection. */
+				this->RaiseWidget(player + 13);
+				this->DisableWidget(player + 13);
+				this->SetDirty();
+				player = INVALID_PLAYER;
+			}
+			for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
+				if (GetPlayer(i)->is_active) {
+					/* Lower the widget corresponding to this player. */
+					this->LowerWidget(i + 13);
+					this->SetDirty();
+					player = i;
+					break;
 				}
+			}
-				for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
+		}
-					if (GetPlayer(i)->is_active) {
-						/* Lower the widget corresponding to this player. */
+		/* If there are no active players, don't display anything else. */
-						w->LowerWidget(i + 13);
+		if (player == INVALID_PLAYER) return;
-						w->SetDirty();
+		/* Paint the player icons */
-						_performance_rating_detail_player = i;
+		for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
-						break;
+			if (!GetPlayer(i)->is_active) {
-					}
+				/* Check if we have the player as an active player */
+				if (!this->IsWidgetDisabled(i + 13)) {
+					/* Bah, player gone :( */
+					this->DisableWidget(i + 13);
+					/* We need a repaint */
+					this->SetDirty();
 				}
-			}
+				continue;
+			}
-			/* If there are no active players, don't display anything else. */
-			if (_performance_rating_detail_player == INVALID_PLAYER) break;
+			/* Check if we have the player marked as inactive */
+			if (this->IsWidgetDisabled(i + 13)) {
-			/* Paint the player icons */
+				/* New player! Yippie :p */
-			for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
+				this->EnableWidget(i + 13);
-				if (!GetPlayer(i)->is_active) {
+				/* We need a repaint */
-					/* Check if we have the player as an active player */
+				this->SetDirty();
-					if (!w->IsWidgetDisabled(i + 13)) {
+			}
-						/* Bah, player gone :( */
-						w->DisableWidget(i + 13);
+			x = (i == player) ? 1 : 0;
+			DrawPlayerIcon(i, i * 37 + 13 + x, 16 + x);
-						/* We need a repaint */
+		}
-						w->SetDirty();
-					}
+		/* The colors used to show how the progress is going */
-					continue;
+		color_done = _colour_gradient[COLOUR_GREEN][4];
-				}
+		color_notdone = _colour_gradient[COLOUR_RED][4];
-				/* Check if we have the player marked as inactive */
+		/* Draw all the score parts */
-				if (w->IsWidgetDisabled(i + 13)) {
+		for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) {
-					/* New player! Yippie :p */
+			int val    = _score_part[player][i];
-					w->EnableWidget(i + 13);
+			int needed = _score_info[i].needed;
-					/* We need a repaint */
+			int score  = _score_info[i].score;
-					w->SetDirty();
-				}
+			y += 20;
+			/* SCORE_TOTAL has his own rulez ;) */
-				x = (i == _performance_rating_detail_player) ? 1 : 0;
+			if (i == SCORE_TOTAL) {
-				DrawPlayerIcon(i, i * 37 + 13 + x, 16 + x);
+				needed = total_score;
-			}
+				score = SCORE_MAX;
+			} else {
-			/* The colors used to show how the progress is going */
+				total_score += score;
-			color_done = _colour_gradient[COLOUR_GREEN][4];
+			}
-			color_notdone = _colour_gradient[COLOUR_RED][4];
+			DrawString(7, y, STR_PERFORMANCE_DETAIL_VEHICLES + i, TC_FROMSTRING);
-			/* Draw all the score parts */
-			for (ScoreID i = SCORE_BEGIN; i < SCORE_END; i++) {
+			/* Draw the score */
-				int val    = _score_part[_performance_rating_detail_player][i];
+			SetDParam(0, score);
-				int needed = _score_info[i].needed;
+			DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, TC_FROMSTRING);
-				int score  = _score_info[i].score;
+			/* Calculate the %-bar */
-				y += 20;
+			x = Clamp(val, 0, needed) * 50 / needed;
-				/* SCORE_TOTAL has his own rulez ;) */
-				if (i == SCORE_TOTAL) {
+			/* SCORE_LOAN is inversed */
-					needed = total_score;
+			if (val < 0 && i == SCORE_LOAN) x = 0;
-					score = SCORE_MAX;
-				} else {
+			/* Draw the bar */
-					total_score += score;
+			if (x !=  0) GfxFillRect(112,     y - 2, 112 + x,  y + 10, color_done);
-				}
+			if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone);
-				DrawString(7, y, STR_PERFORMANCE_DETAIL_VEHICLES + i, TC_FROMSTRING);
+			/* Calculate the % */
+			x = Clamp(val, 0, needed) * 100 / needed;
-				/* Draw the score */
-				SetDParam(0, score);
+			/* SCORE_LOAN is inversed */
-				DrawStringRightAligned(107, y, SET_PERFORMANCE_DETAIL_INT, TC_FROMSTRING);
+			if (val < 0 && i == SCORE_LOAN) x = 0;
-				/* Calculate the %-bar */
+			/* Draw it */
-				x = Clamp(val, 0, needed) * 50 / needed;
+			SetDParam(0, x);
+			DrawStringCentered(137, y, STR_PERFORMANCE_DETAIL_PERCENT, TC_FROMSTRING);
-				/* SCORE_LOAN is inversed */
-				if (val < 0 && i == SCORE_LOAN) x = 0;
+			/* SCORE_LOAN is inversed */
+			if (i == SCORE_LOAN) val = needed - val;
-				/* Draw the bar */
-				if (x !=  0) GfxFillRect(112,     y - 2, 112 + x,  y + 10, color_done);
+			/* Draw the amount we have against what is needed
-				if (x != 50) GfxFillRect(112 + x, y - 2, 112 + 50, y + 10, color_notdone);
+				* For some of them it is in currency format */
+			SetDParam(0, val);
-				/* Calculate the % */
+			SetDParam(1, needed);
-				x = Clamp(val, 0, needed) * 100 / needed;
+			switch (i) {
+				case SCORE_MIN_PROFIT:
-				/* SCORE_LOAN is inversed */
+				case SCORE_MIN_INCOME:
-				if (val < 0 && i == SCORE_LOAN) x = 0;
+				case SCORE_MAX_INCOME:
+				case SCORE_MONEY:
-				/* Draw it */
+				case SCORE_LOAN:
-				SetDParam(0, x);
+					DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY, TC_FROMSTRING);
-				DrawStringCentered(137, y, STR_PERFORMANCE_DETAIL_PERCENT, TC_FROMSTRING);
+					break;
+				default:
-				/* SCORE_LOAN is inversed */
+					DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_INT, TC_FROMSTRING);
-				if (i == SCORE_LOAN) val = needed - val;
+			}
+		}
-				/* Draw the amount we have against what is needed
+	}
-				 * For some of them it is in currency format */
-				SetDParam(0, val);
+	virtual void OnClick(Point pt, int widget)
-				SetDParam(1, needed);
+	{
-				switch (i) {
+		/* Check which button is clicked */
-					case SCORE_MIN_PROFIT:
+		if (IsInsideMM(widget, 13, 21)) {
-					case SCORE_MIN_INCOME:
+			/* Is it no on disable? */
-					case SCORE_MAX_INCOME:
+			if (!this->IsWidgetDisabled(widget)) {
-					case SCORE_MONEY:
+				this->RaiseWidget(player + 13);
-					case SCORE_LOAN:
+				player = (PlayerID)(widget - 13);
-						DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_CURRENCY, TC_FROMSTRING);
+				this->LowerWidget(player + 13);
-						break;
+				this->SetDirty();
-					default:
+			}
-						DrawString(167, y, STR_PERFORMANCE_DETAIL_AMOUNT_INT, TC_FROMSTRING);
+		}
-				}
+	}
-			}
+	virtual void OnTick()
-			break;
+	{
-		}
+		if (_pause_game != 0) return;
-		case WE_CLICK:
+		/* Update the player score every 5 days */
-			/* Check which button is clicked */
+		if (--this->timeout == 0) {
-			if (IsInsideMM(e->we.click.widget, 13, 21)) {
+			this->UpdatePlayerStats();
-				/* Is it no on disable? */
+			this->SetDirty();
-				if (!w->IsWidgetDisabled(e->we.click.widget)) {
+		}
-					w->RaiseWidget(_performance_rating_detail_player + 13);
+	}
-					_performance_rating_detail_player = (PlayerID)(e->we.click.widget - 13);
+};
-					w->LowerWidget(_performance_rating_detail_player + 13);
-					w->SetDirty();
+PlayerID PerformanceRatingDetailWindow::player = INVALID_PLAYER;
-				}
-			}
-			break;
-		case WE_CREATE: {
-			Player *p2;
-			/* Disable the players who are not active */
-			for (PlayerID i = PLAYER_FIRST; i < MAX_PLAYERS; i++) {
-				w->SetWidgetDisabledState(i + 13, !GetPlayer(i)->is_active);
-			}
-			/* Update all player stats with the current data
-			 * (this is because _score_info is not saved to a savegame) */
-			FOR_ALL_PLAYERS(p2) {
-				if (p2->is_active) UpdateCompanyRatingAndValue(p2, false);
-			}
-			w->custom[0] = DAY_TICKS;
-			w->custom[1] = 5;
-			if (_performance_rating_detail_player != INVALID_PLAYER) w->LowerWidget(_performance_rating_detail_player + 13);
-			w->SetDirty();
-			break;
-		}
-		case WE_TICK:
-			if (_pause_game != 0) break;
-			/* Update the player score every 5 days */
-			if (--w->custom[0] == 0) {
-				w->custom[0] = DAY_TICKS;
-				if (--w->custom[1] == 0) {
-					Player *p2;
-					w->custom[1] = 5;
-					FOR_ALL_PLAYERS(p2) {
-						/* Skip if player is not active */
-						if (p2->is_active) UpdateCompanyRatingAndValue(p2, false);
-					}
-					w->SetDirty();
-				}
-			}
-			break;
-	}
-}
 static const Widget _performance_rating_detail_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,               STR_018B_CLOSE_WINDOW},
 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   298,     0,    13, STR_PERFORMANCE_DETAIL, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   298,    14,    27, 0x0,                    STR_NULL},
 static const WindowDesc _performance_rating_detail_desc = {
 	WDP_AUTO, WDP_AUTO, 299, 228, 299, 228,
 	WC_PERFORMANCE_DETAIL, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_performance_rating_detail_widgets,
-	PerformanceRatingDetailWndProc
 };
 void ShowPerformanceRatingDetail()
 {
-	AllocateWindowDescFront<Window>(&_performance_rating_detail_desc, 0);
+	AllocateWindowDescFront<PerformanceRatingDetailWindow>(&_performance_rating_detail_desc, 0);
 }

branch	noai
changeset 10645	8cbdb511a674
parent 10513	33cb70ff2f5d
child 10715	6bdf79ffb022