openttd-ottdgrfs: comparison src/network/network

equal deleted inserted replaced

-:6c4314786d68
+:8cbdb511a674
 #include "../gfx_func.h"
 #include "../player_func.h"
 #include "../settings_type.h"
 #include "../widgets/dropdown_func.h"
 #include "../querystring_gui.h"
+#include "../sortlist_type.h"
 #include "table/strings.h"
 #include "../table/sprites.h"
 #define BGC 5
 				!sel->online ||
 				sel->info.grfconfig == NULL);
 		SetDParam(0, 0x00);
 		SetDParam(1, _lan_internet_types_dropdown[_network_lan_internet]);
-		DrawWindowWidgets(this);
+		this->DrawWidgets();
 		/* Edit box to set player name */
 		this->DrawEditBox(NGWW_PLAYER);
 		DrawString(this->widget[NGWW_PLAYER].left - 100, 23, STR_NETWORK_PLAYER_NAME, TC_GOLD);
 		/* Sort based on widgets: name, clients, compatibility */
 		switch (this->servers.sort_type) {
-			case NGWW_NAME    - NGWW_NAME: DrawSortButtonState(this, NGWW_NAME,    arrow); break;
+			case NGWW_NAME    - NGWW_NAME: this->DrawSortButtonState(NGWW_NAME,    arrow); break;
-			case NGWW_CLIENTS - NGWW_NAME: DrawSortButtonState(this, NGWW_CLIENTS, arrow); break;
+			case NGWW_CLIENTS - NGWW_NAME: this->DrawSortButtonState(NGWW_CLIENTS, arrow); break;
-			case NGWW_INFO    - NGWW_NAME: DrawSortButtonState(this, NGWW_INFO,    arrow); break;
+			case NGWW_INFO    - NGWW_NAME: this->DrawSortButtonState(NGWW_INFO,    arrow); break;
 		}
 		uint16 y = NET_PRC__OFFSET_TOP_WIDGET + 3;
 		int32 n = 0;
 		int32 pos = this->vscroll.pos;
 		if (data != 0) this->server = NULL;
 		this->servers.flags |= VL_REBUILD;
 		this->SetDirty();
 	}
-	virtual bool OnKeyPress(uint16 key, uint16 keycode)
+	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
-		bool cont = true;
+		EventState state = ES_NOT_HANDLED;
 		if (this->field != NGWW_PLAYER) {
 			if (this->server != NULL) {
 				if (keycode == WKC_DELETE) { // Press 'delete' to remove servers
 					NetworkGameListRemoveItem(this->server);
 					NetworkRebuildHostList();
 					this->server = NULL;
 				}
 			}
-			return cont;
+			return state;
 		}
-		if (this->HandleEditBoxKey(NGWW_PLAYER, keycode, key, cont) == 1) return cont; // enter pressed
+		if (this->HandleEditBoxKey(NGWW_PLAYER, keycode, key, state) == 1) return state; // enter pressed
 		/* The name is only allowed when it starts with a letter! */
 		if (StrEmpty(this->edit_str_buf) && this->edit_str_buf[0] != ' ') {
 			ttd_strlcpy(_network_player_name, this->edit_str_buf, lengthof(_network_player_name));
 		} else {
 			ttd_strlcpy(_network_player_name, "Player", lengthof(_network_player_name));
 		}
-		return cont;
+		return state;
 	}
 	virtual void OnQueryTextFinished(char *str)
 	{
 		if (!StrEmpty(str)) {
 static const WindowDesc _network_game_window_desc = {
 	WDP_CENTER, WDP_CENTER, 450, 264, 550, 264,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_STD_BTN | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
 	_network_game_window_widgets,
-	NULL,
 };
 void ShowNetworkGameWindow()
 {
 	static bool first = true;
 		SetDParam(1, _connection_types_dropdown[_network_advertise]);
 		SetDParam(2, _network_game_info.clients_max);
 		SetDParam(3, _network_game_info.companies_max);
 		SetDParam(4, _network_game_info.spectators_max);
 		SetDParam(5, STR_NETWORK_LANG_ANY + _network_game_info.server_lang);
-		DrawWindowWidgets(this);
+		this->DrawWidgets();
 		/* editbox to set game name */
 		this->DrawEditBox(NSSW_GAMENAME);
 		/* if password is set, draw red '*' next to 'Set password' button */
 	virtual void OnMouseLoop()
 	{
 		if (this->field == NSSW_GAMENAME) this->HandleEditBox(NSSW_GAMENAME);
 	}
-	virtual bool OnKeyPress(uint16 key, uint16 keycode)
+	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
-		bool cont = true;
+		EventState state = ES_NOT_HANDLED;
 		if (this->field == NSSW_GAMENAME) {
-			if (this->HandleEditBoxKey(NSSW_GAMENAME, key, keycode, cont) == 1) return cont; // enter pressed
+			if (this->HandleEditBoxKey(NSSW_GAMENAME, key, keycode, state) == 1) return state; // enter pressed
 			ttd_strlcpy(_network_server_name, this->text.buf, sizeof(_network_server_name));
 		}
-		return cont;
+		return state;
 	}
 	virtual void OnQueryTextFinished(char *str)
 	{
 		if (str == NULL) return;
 static const WindowDesc _network_start_server_window_desc = {
 	WDP_CENTER, WDP_CENTER, 420, 244, 420, 244,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_network_start_server_window_widgets,
-	NULL,
 };
 static void ShowNetworkStartServerWindow()
 {
 	DeleteWindowById(WC_NETWORK_WINDOW, 0);
 		/* Cannot spectate if there are too many spectators */
 		this->SetWidgetDisabledState(NLWW_SPECTATE, gi->spectators_on >= gi->spectators_max);
 		/* Draw window widgets */
 		SetDParamStr(0, gi->server_name);
-		DrawWindowWidgets(this);
+		this->DrawWidgets();
 		/* Draw company list */
 		pos = this->vscroll.pos;
 		while (pos < gi->companies_on) {
 			byte company = NetworkLobbyFindCompanyIndex(pos);
 static const WindowDesc _network_lobby_window_desc = {
 	WDP_CENTER, WDP_CENTER, 420, 235, 420, 235,
 	WC_NETWORK_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 	_network_lobby_window_widgets,
-	NULL,
 };
 /* Show the networklobbywindow with the selected server
 * @param ngl Selected game pointer which is passed to the new window */
 static void ShowNetworkLobbyWindow(NetworkGameList *ngl)
 // Every action must be of this form
 typedef void ClientList_Action_Proc(byte client_no);
 // Max 10 actions per client
 #define MAX_CLIENTLIST_ACTION 10
-// Some standard bullshit.. defines variables ;)
-static void ClientListWndProc(Window *w, WindowEvent *e);
-static void ClientListPopupWndProc(Window *w, WindowEvent *e);
-static byte _selected_clientlist_item = 255;
-static byte _selected_clientlist_y = 0;
-static char _clientlist_action[MAX_CLIENTLIST_ACTION][50];
-static ClientList_Action_Proc *_clientlist_proc[MAX_CLIENTLIST_ACTION];
 enum {
 	CLNWND_OFFSET = 16,
 	CLNWND_ROWSIZE = 10
 };
 static const Widget _client_list_popup_widgets[] = {
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   99,     0,     0,     0, STR_NULL},
 {   WIDGETS_END},
 };
-static WindowDesc _client_list_desc = {
+static const WindowDesc _client_list_desc = {
 	WDP_AUTO, WDP_AUTO, 250, 1, 250, 1,
 	WC_CLIENT_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_client_list_widgets,
-	ClientListWndProc
 };
 // Finds the Xth client-info that is active
 static const NetworkClientInfo *NetworkFindClientInfo(byte client_no)
 {
 	/* No action ;) */
 }
-/**
+struct NetworkClientListPopupWindow : Window {
-* An action is clicked! What do we do?
+	int sel_index;
-*/
+	int client_no;
-static void HandleClientListPopupClick(byte index, byte clientno)
+	char action[MAX_CLIENTLIST_ACTION][50];
-{
+	ClientList_Action_Proc *proc[MAX_CLIENTLIST_ACTION];
-	/* A click on the Popup of the ClientList.. handle the command */
-	if (index < MAX_CLIENTLIST_ACTION && _clientlist_proc[index] != NULL) {
+	NetworkClientListPopupWindow(int x, int y, const Widget *widgets, int client_no) :
-		_clientlist_proc[index](clientno);
+			Window(x, y, 150, 100, WC_TOOLBAR_MENU, widgets),
-	}
+			sel_index(0), client_no(client_no)
-}
+	{
+		/*
-/**
+		 * Fill the actions this client has.
-* Finds the amount of clients and set the height correct
+		 * Watch is, max 50 chars long!
-*/
+		 */
-static bool CheckClientListHeight(Window *w)
-{
+		const NetworkClientInfo *ci = NetworkFindClientInfo(client_no);
-	int num = 0;
-	const NetworkClientInfo *ci;
+		int i = 0;
+		if (_network_own_client_index != ci->client_index) {
-	/* Should be replaced with a loop through all clients */
+			GetString(this->action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT, lastof(this->action[i]));
-	FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
+			this->proc[i++] = &ClientList_SpeakToClient;
-		num++;
+		}
-	}
+		if (IsValidPlayer(ci->client_playas) || ci->client_playas == PLAYER_SPECTATOR) {
-	num *= CLNWND_ROWSIZE;
+			GetString(this->action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY, lastof(this->action[i]));
+			this->proc[i++] = &ClientList_SpeakToCompany;
-	/* If height is changed */
+		}
-	if (w->height != CLNWND_OFFSET + num + 1) {
+		GetString(this->action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL, lastof(this->action[i]));
-		// XXX - magic unfortunately; (num + 2) has to be one bigger than heigh (num + 1)
+		this->proc[i++] = &ClientList_SpeakToAll;
-		w->SetDirty();
-		w->widget[3].bottom = w->widget[3].top + num + 2;
+		if (_network_own_client_index != ci->client_index) {
-		w->height = CLNWND_OFFSET + num + 1;
+			/* We are no spectator and the player we want to give money to is no spectator and money gifts are allowed */
-		w->SetDirty();
+			if (IsValidPlayer(_network_playas) && IsValidPlayer(ci->client_playas) && _patches.give_money) {
-		return false;
+				GetString(this->action[i], STR_NETWORK_CLIENTLIST_GIVE_MONEY, lastof(this->action[i]));
-	}
+				this->proc[i++] = &ClientList_GiveMoney;
-	return true;
+			}
-}
+		}
-/**
+		/* A server can kick clients (but not himself) */
-* Finds the amount of actions in the popup and set the height correct
+		if (_network_server && _network_own_client_index != ci->client_index) {
-*/
+			GetString(this->action[i], STR_NETWORK_CLIENTLIST_KICK, lastof(this->action[i]));
-static uint ClientListPopupHeight()
+			this->proc[i++] = &ClientList_Kick;
-{
-	int num = 0;
+			sprintf(this->action[i],"Ban"); // XXX GetString?
+			this->proc[i++] = &ClientList_Ban;
-	// Find the amount of actions
+		}
-	for (int i = 0; i < MAX_CLIENTLIST_ACTION; i++) {
-		if (_clientlist_action[i][0] == '\0') continue;
+		if (i == 0) {
-		if (_clientlist_proc[i] == NULL) continue;
+			GetString(this->action[i], STR_NETWORK_CLIENTLIST_NONE, lastof(this->action[i]));
-		num++;
+			this->proc[i++] = &ClientList_None;
-	}
+		}
-	num *= CLNWND_ROWSIZE;
+		/* Calculate the height */
+		int h = ClientListPopupHeight();
-	return num + 1;
-}
+		/* Allocate the popup */
+		this->widget[0].bottom = this->widget[0].top + h;
+		this->widget[0].right = this->widget[0].left + 150;
+		this->flags4 &= ~WF_WHITE_BORDER_MASK;
+		this->FindWindowPlacementAndResize(150, h + 1);
+	}
+	/**
+	 * An action is clicked! What do we do?
+	 */
+	void HandleClientListPopupClick(byte index)
+	{
+		/* A click on the Popup of the ClientList.. handle the command */
+		if (index < MAX_CLIENTLIST_ACTION && this->proc[index] != NULL) {
+			this->proc[index](this->client_no);
+		}
+	}
+	/**
+	 * Finds the amount of actions in the popup and set the height correct
+	 */
+	uint ClientListPopupHeight()
+	{
+		int num = 0;
+		// Find the amount of actions
+		for (int i = 0; i < MAX_CLIENTLIST_ACTION; i++) {
+			if (this->action[i][0] == '\0') continue;
+			if (this->proc[i] == NULL) continue;
+			num++;
+		}
+		num *= CLNWND_ROWSIZE;
+		return num + 1;
+	}
+	virtual void OnPaint()
+	{
+		this->DrawWidgets();
+		/* Draw the actions */
+		int sel = this->sel_index;
+		int y = 1;
+		for (int i = 0; i < MAX_CLIENTLIST_ACTION; i++, y += CLNWND_ROWSIZE) {
+			if (this->action[i][0] == '\0') continue;
+			if (this->proc[i] == NULL) continue;
+			TextColour colour;
+			if (sel-- == 0) { // Selected item, highlight it
+				GfxFillRect(1, y, 150 - 2, y + CLNWND_ROWSIZE - 1, 0);
+				colour = TC_WHITE;
+			} else {
+				colour = TC_BLACK;
+			}
+			DoDrawString(this->action[i], 4, y, colour);
+		}
+	}
+	virtual void OnMouseLoop()
+	{
+		/* We selected an action */
+		int index = (_cursor.pos.y - this->top) / CLNWND_ROWSIZE;
+		if (_left_button_down) {
+			if (index == -1 || index == this->sel_index) return;
+			this->sel_index = index;
+			this->SetDirty();
+		} else {
+			if (index >= 0 && _cursor.pos.y >= this->top) {
+				HandleClientListPopupClick(index);
+			}
+			DeleteWindowById(WC_TOOLBAR_MENU, 0);
+		}
+	}
+};
 /**
 * Show the popup (action list)
 */
-static Window *PopupClientList(Window *w, int client_no, int x, int y)
+static void PopupClientList(int client_no, int x, int y)
 {
-	int i;
-	const NetworkClientInfo *ci;
 	DeleteWindowById(WC_TOOLBAR_MENU, 0);
-	/* Clean the current actions */
+	if (NetworkFindClientInfo(client_no) == NULL) return;
-	for (i = 0; i < MAX_CLIENTLIST_ACTION; i++) {
-		_clientlist_action[i][0] = '\0';
+	new NetworkClientListPopupWindow(x, y, _client_list_popup_widgets, client_no);
-		_clientlist_proc[i] = NULL;
-	}
-	/*
-	 * Fill the actions this client has.
-	 * Watch is, max 50 chars long!
-	 */
-	ci = NetworkFindClientInfo(client_no);
-	if (ci == NULL) return NULL;
-	i = 0;
-	if (_network_own_client_index != ci->client_index) {
-		GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_CLIENT, lastof(_clientlist_action[i]));
-		_clientlist_proc[i++] = &ClientList_SpeakToClient;
-	}
-	if (IsValidPlayer(ci->client_playas) || ci->client_playas == PLAYER_SPECTATOR) {
-		GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_COMPANY, lastof(_clientlist_action[i]));
-		_clientlist_proc[i++] = &ClientList_SpeakToCompany;
-	}
-	GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_SPEAK_TO_ALL, lastof(_clientlist_action[i]));
-	_clientlist_proc[i++] = &ClientList_SpeakToAll;
-	if (_network_own_client_index != ci->client_index) {
-		/* We are no spectator and the player we want to give money to is no spectator and money gifts are allowed */
-		if (IsValidPlayer(_network_playas) && IsValidPlayer(ci->client_playas) && _patches.give_money) {
-			GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_GIVE_MONEY, lastof(_clientlist_action[i]));
-			_clientlist_proc[i++] = &ClientList_GiveMoney;
-		}
-	}
-	/* A server can kick clients (but not himself) */
-	if (_network_server && _network_own_client_index != ci->client_index) {
-		GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_KICK, lastof(_clientlist_action[i]));
-		_clientlist_proc[i++] = &ClientList_Kick;
-		sprintf(_clientlist_action[i],"Ban"); // XXX GetString?
-		_clientlist_proc[i++] = &ClientList_Ban;
-	}
-	if (i == 0) {
-		GetString(_clientlist_action[i], STR_NETWORK_CLIENTLIST_NONE, lastof(_clientlist_action[i]));
-		_clientlist_proc[i++] = &ClientList_None;
-	}
-	/* Calculate the height */
-	int h = ClientListPopupHeight();
-	/* Allocate the popup */
-	w = new Window(x, y, 150, h + 1, ClientListPopupWndProc, WC_TOOLBAR_MENU, _client_list_popup_widgets);
-	w->widget[0].bottom = w->widget[0].top + h;
-	w->widget[0].right = w->widget[0].left + 150;
-	w->flags4 &= ~WF_WHITE_BORDER_MASK;
-	WP(w, menu_d).item_count = 0;
-	// Save our client
-	WP(w, menu_d).main_button = client_no;
-	WP(w, menu_d).sel_index = 0;
-	return w;
-}
-/** Main handle for the client popup list
-* uses menu_d WP macro */
-static void ClientListPopupWndProc(Window *w, WindowEvent *e)
-{
-	switch (e->event) {
-		case WE_PAINT: {
-			DrawWindowWidgets(w);
-			/* Draw the actions */
-			int sel = WP(w, menu_d).sel_index;
-			int y = 1;
-			for (int i = 0; i < MAX_CLIENTLIST_ACTION; i++, y += CLNWND_ROWSIZE) {
-				if (_clientlist_action[i][0] == '\0') continue;
-				if (_clientlist_proc[i] == NULL) continue;
-				TextColour colour;
-				if (sel-- == 0) { // Selected item, highlight it
-					GfxFillRect(1, y, 150 - 2, y + CLNWND_ROWSIZE - 1, 0);
-					colour = TC_WHITE;
-				} else {
-					colour = TC_BLACK;
-				}
-				DoDrawString(_clientlist_action[i], 4, y, colour);
-			}
-		} break;
-		case WE_MOUSELOOP: {
-			/* We selected an action */
-			int index = (_cursor.pos.y - w->top) / CLNWND_ROWSIZE;
-			if (_left_button_down) {
-				if (index == -1 || index == WP(w, menu_d).sel_index) return;
-				WP(w, menu_d).sel_index = index;
-				w->SetDirty();
-			} else {
-				if (index >= 0 && _cursor.pos.y >= w->top) {
-					HandleClientListPopupClick(index, WP(w, menu_d).main_button);
-				}
-				DeleteWindowById(WC_TOOLBAR_MENU, 0);
-			}
-		} break;
-	}
 }
 /**
 * Main handle for clientlist
 */
-static void ClientListWndProc(Window *w, WindowEvent *e)
+struct NetworkClientListWindow : Window
 {
-	switch (e->event) {
+	byte selected_item;
-		case WE_PAINT: {
+	byte selected_y;
-			NetworkClientInfo *ci;
-			int i = 0;
+	NetworkClientListWindow(const WindowDesc *desc, WindowNumber window_number) :
+			Window(desc, window_number),
-			/* Check if we need to reset the height */
+			selected_item(0),
-			if (!CheckClientListHeight(w)) break;
+			selected_y(255)
+	{
-			DrawWindowWidgets(w);
+		this->FindWindowPlacementAndResize(desc);
+	}
-			int y = CLNWND_OFFSET;
+	/**
-			FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
+	 * Finds the amount of clients and set the height correct
-				TextColour colour;
+	 */
-				if (_selected_clientlist_item == i++) { // Selected item, highlight it
+	bool CheckClientListHeight()
-					GfxFillRect(1, y, 248, y + CLNWND_ROWSIZE - 1, 0);
+	{
-					colour = TC_WHITE;
+		int num = 0;
-				} else {
+		const NetworkClientInfo *ci;
-					colour = TC_BLACK;
-				}
+		/* Should be replaced with a loop through all clients */
+		FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
-				if (ci->client_index == NETWORK_SERVER_INDEX) {
+			num++;
-					DrawString(4, y, STR_NETWORK_SERVER, colour);
+		}
-				} else {
-					DrawString(4, y, STR_NETWORK_CLIENT, colour);
+		num *= CLNWND_ROWSIZE;
-				}
+		/* If height is changed */
-				/* Filter out spectators */
+		if (this->height != CLNWND_OFFSET + num + 1) {
-				if (IsValidPlayer(ci->client_playas)) DrawPlayerIcon(ci->client_playas, 64, y + 1);
+			// XXX - magic unfortunately; (num + 2) has to be one bigger than heigh (num + 1)
+			this->SetDirty();
-				DoDrawString(ci->client_name, 81, y, colour);
+			this->widget[3].bottom = this->widget[3].top + num + 2;
+			this->height = CLNWND_OFFSET + num + 1;
-				y += CLNWND_ROWSIZE;
+			this->SetDirty();
+			return false;
+		}
+		return true;
+	}
+	virtual void OnPaint()
+	{
+		NetworkClientInfo *ci;
+		int i = 0;
+		/* Check if we need to reset the height */
+		if (!this->CheckClientListHeight()) return;
+		this->DrawWidgets();
+		int y = CLNWND_OFFSET;
+		FOR_ALL_ACTIVE_CLIENT_INFOS(ci) {
+			TextColour colour;
+			if (this->selected_item == i++) { // Selected item, highlight it
+				GfxFillRect(1, y, 248, y + CLNWND_ROWSIZE - 1, 0);
+				colour = TC_WHITE;
+			} else {
+				colour = TC_BLACK;
 			}
-		} break;
+			if (ci->client_index == NETWORK_SERVER_INDEX) {
-		case WE_CLICK:
+				DrawString(4, y, STR_NETWORK_SERVER, colour);
-			/* Show the popup with option */
+			} else {
-			if (_selected_clientlist_item != 255) {
+				DrawString(4, y, STR_NETWORK_CLIENT, colour);
-				PopupClientList(w, _selected_clientlist_item, e->we.click.pt.x + w->left, e->we.click.pt.y + w->top);
 			}
-			break;
+			/* Filter out spectators */
-		case WE_MOUSEOVER:
+			if (IsValidPlayer(ci->client_playas)) DrawPlayerIcon(ci->client_playas, 64, y + 1);
-			/* -1 means we left the current window */
-			if (e->we.mouseover.pt.y == -1) {
+			DoDrawString(ci->client_name, 81, y, colour);
-				_selected_clientlist_y = 0;
-				_selected_clientlist_item = 255;
+			y += CLNWND_ROWSIZE;
-				w->SetDirty();
+		}
-				break;
+	}
-			}
-			/* It did not change.. no update! */
+	virtual void OnClick(Point pt, int widget)
-			if (e->we.mouseover.pt.y == _selected_clientlist_y) break;
+	{
+		/* Show the popup with option */
-			/* Find the new selected item (if any) */
+		if (this->selected_item != 255) {
-			_selected_clientlist_y = e->we.mouseover.pt.y;
+			PopupClientList(this->selected_item, pt.x + this->left, pt.y + this->top);
-			if (e->we.mouseover.pt.y > CLNWND_OFFSET) {
+		}
-				_selected_clientlist_item = (e->we.mouseover.pt.y - CLNWND_OFFSET) / CLNWND_ROWSIZE;
+	}
-			} else {
-				_selected_clientlist_item = 255;
+	virtual void OnMouseOver(Point pt, int widget)
-			}
+	{
+		/* -1 means we left the current window */
-			/* Repaint */
+		if (pt.y == -1) {
-			w->SetDirty();
+			this->selected_y = 0;
-			break;
+			this->selected_item = 255;
+			this->SetDirty();
-		case WE_DESTROY: case WE_CREATE:
+			return;
-			/* When created or destroyed, data is reset */
+		}
-			_selected_clientlist_item = 255;
+		/* It did not change.. no update! */
-			_selected_clientlist_y = 0;
+		if (pt.y == this->selected_y) return;
-			break;
-	}
+		/* Find the new selected item (if any) */
-}
+		this->selected_y = pt.y;
+		if (pt.y > CLNWND_OFFSET) {
+			this->selected_item = (pt.y - CLNWND_OFFSET) / CLNWND_ROWSIZE;
+		} else {
+			this->selected_item = 255;
+		}
+		/* Repaint */
+		this->SetDirty();
+	}
+};
 void ShowClientList()
 {
-	AllocateWindowDescFront<Window>(&_client_list_desc, 0);
+	AllocateWindowDescFront<NetworkClientListWindow>(&_client_list_desc, 0);
 }
 static NetworkPasswordType pw_type;
 		case NETWORK_COMPANY_PASSWORD: caption = STR_NETWORK_NEED_COMPANY_PASSWORD_CAPTION; break;
 	}
 	ShowQueryString(STR_EMPTY, caption, 20, 180, FindWindowById(WC_NETWORK_STATUS_WINDOW, 0), CS_ALPHANUMERAL);
 }
+struct NetworkJoinStatusWindow : Window {
-static void NetworkJoinStatusWindowWndProc(Window *w, WindowEvent *e)
+	NetworkJoinStatusWindow(const WindowDesc *desc) : Window(desc)
-{
+	{
-	switch (e->event) {
+		this->parent = FindWindowById(WC_NETWORK_WINDOW, 0);
-		case WE_PAINT: {
+	}
-			uint8 progress; // used for progress bar
-			DrawWindowWidgets(w);
+	virtual void OnPaint()
+	{
-			DrawStringCentered(125, 35, STR_NETWORK_CONNECTING_1 + _network_join_status, TC_GREY);
+		uint8 progress; // used for progress bar
-			switch (_network_join_status) {
+		this->DrawWidgets();
-				case NETWORK_JOIN_STATUS_CONNECTING: case NETWORK_JOIN_STATUS_AUTHORIZING:
-				case NETWORK_JOIN_STATUS_GETTING_COMPANY_INFO:
+		DrawStringCentered(125, 35, STR_NETWORK_CONNECTING_1 + _network_join_status, TC_GREY);
-					progress = 10; // first two stages 10%
+		switch (_network_join_status) {
-					break;
+			case NETWORK_JOIN_STATUS_CONNECTING: case NETWORK_JOIN_STATUS_AUTHORIZING:
-				case NETWORK_JOIN_STATUS_WAITING:
+			case NETWORK_JOIN_STATUS_GETTING_COMPANY_INFO:
-					SetDParam(0, _network_join_waiting);
+				progress = 10; // first two stages 10%
-					DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_WAITING, TC_GREY);
+				break;
-					progress = 15; // third stage is 15%
+			case NETWORK_JOIN_STATUS_WAITING:
-					break;
+				SetDParam(0, _network_join_waiting);
-				case NETWORK_JOIN_STATUS_DOWNLOADING:
+				DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_WAITING, TC_GREY);
-					SetDParam(0, _network_join_kbytes);
+				progress = 15; // third stage is 15%
-					SetDParam(1, _network_join_kbytes_total);
+				break;
-					DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_DOWNLOADING, TC_GREY);
+			case NETWORK_JOIN_STATUS_DOWNLOADING:
-					/* Fallthrough */
+				SetDParam(0, _network_join_kbytes);
-				default: /* Waiting is 15%, so the resting receivement of map is maximum 70% */
+				SetDParam(1, _network_join_kbytes_total);
-					progress = 15 + _network_join_kbytes * (100 - 15) / _network_join_kbytes_total;
+				DrawStringCentered(125, 46, STR_NETWORK_CONNECTING_DOWNLOADING, TC_GREY);
-			}
+				/* Fallthrough */
+			default: /* Waiting is 15%, so the resting receivement of map is maximum 70% */
-			/* Draw nice progress bar :) */
+				progress = 15 + _network_join_kbytes * (100 - 15) / _network_join_kbytes_total;
-			DrawFrameRect(20, 18, (int)((w->width - 20) * progress / 100), 28, 10, FR_NONE);
+		}
-		} break;
+		/* Draw nice progress bar :) */
-		case WE_CLICK:
+		DrawFrameRect(20, 18, (int)((this->width - 20) * progress / 100), 28, 10, FR_NONE);
-			if (e->we.click.widget == 2) { //Disconnect button
+	}
-				NetworkDisconnect();
-				SwitchMode(SM_MENU);
+	virtual void OnClick(Point pt, int widget)
-				ShowNetworkGameWindow();
+	{
-			}
+		if (widget == 2) { //Disconnect button
-			break;
+			NetworkDisconnect();
+			SwitchMode(SM_MENU);
-		case WE_ON_EDIT_TEXT:
+			ShowNetworkGameWindow();
-			if (StrEmpty(e->we.edittext.str)) {
+		}
-				NetworkDisconnect();
+	}
-				ShowNetworkGameWindow();
-			} else {
+	virtual void OnQueryTextFinished(char *str)
-				SEND_COMMAND(PACKET_CLIENT_PASSWORD)(pw_type, e->we.edittext.str);
+	{
-			}
+		if (StrEmpty(str)) {
-			break;
+			NetworkDisconnect();
-	}
+			ShowNetworkGameWindow();
-}
+		} else {
+			SEND_COMMAND(PACKET_CLIENT_PASSWORD)(pw_type, str);
+		}
+	}
+};
 static const Widget _network_join_status_window_widget[] = {
 {    WWT_CAPTION,   RESIZE_NONE,    14,     0,   249,     0,    13, STR_NETWORK_CONNECTING, STR_018C_WINDOW_TITLE_DRAG_THIS},
 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   249,    14,    84, 0x0,                    STR_NULL},
 { WWT_PUSHTXTBTN,   RESIZE_NONE,   BTC,    75,   175,    69,    80, STR_NETWORK_DISCONNECT, STR_NULL},
 static const WindowDesc _network_join_status_window_desc = {
 	WDP_CENTER, WDP_CENTER, 250, 85, 250, 85,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET | WDF_MODAL,
 	_network_join_status_window_widget,
-	NetworkJoinStatusWindowWndProc,
 };
 void ShowJoinStatusWindow()
 {
 	DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
-	Window *w = new Window(&_network_join_status_window_desc);
+	new NetworkJoinStatusWindow(&_network_join_status_window_desc);
-	/* Parent the status window to the lobby */
-	if (w != NULL) w->parent = FindWindowById(WC_NETWORK_WINDOW, 0);
 }
 static void SendChat(const char *buf, DestType type, int dest)
 {
 	if (StrEmpty(buf)) return;
 			STR_NETWORK_CHAT_ALL_CAPTION,
 			STR_NETWORK_CHAT_COMPANY_CAPTION,
 			STR_NETWORK_CHAT_CLIENT_CAPTION
 		};
-		DrawWindowWidgets(this);
+		this->DrawWidgets();
 		assert((uint)this->dtype < lengthof(chat_captions));
 		DrawStringRightAligned(this->widget[2].left - 2, this->widget[2].top + 1, chat_captions[this->dtype], TC_BLACK);
 		this->DrawEditBox(2);
 	}
 	virtual void OnMouseLoop()
 	{
 		this->HandleEditBox(2);
 	}
-	virtual bool OnKeyPress(uint16 key, uint16 keycode)
+	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
-		bool cont = true;
+		EventState state = ES_NOT_HANDLED;
 		if (keycode == WKC_TAB) {
 			ChatTabCompletion();
 		} else {
 			_chat_tab_completion_active = false;
-			switch (this->HandleEditBoxKey(2, key, keycode, cont)) {
+			switch (this->HandleEditBoxKey(2, key, keycode, state)) {
 				case 1: /* Return */
 					SendChat(this->text.buf, this->dtype, this->dest);
 				/* FALLTHROUGH */
 				case 2: /* Escape */ delete this; break;
 			}
 		}
-		return cont;
+		return state;
 	}
 };
 static const Widget _chat_window_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE,  14,   0,  10,  0, 13, STR_00C5,                  STR_018B_CLOSE_WINDOW},
 static const WindowDesc _chat_window_desc = {
 	WDP_CENTER, -26, 320, 14, 640, 14, // x, y, width, height
 	WC_SEND_NETWORK_MSG, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_DEF_WIDGET,
 	_chat_window_widgets,
-	NULL
 };
 void ShowNetworkChatQueryWindow(DestType type, int dest)
 {
 	DeleteWindowById(WC_SEND_NETWORK_MSG, 0);
 	NCPWW_CANCEL,                   ///< Close the window without changing anything
 	NCPWW_OK,                       ///< Safe the password etc.
 };
 struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow {
-	NetworkCompanyPasswordWindow(const WindowDesc *desc) : QueryStringBaseWindow(desc)
+	NetworkCompanyPasswordWindow(const WindowDesc *desc, Window *parent) : QueryStringBaseWindow(desc)
 	{
+		this->parent = parent;
 		this->afilter = CS_ALPHANUMERAL;
 		InitializeTextBuffer(&this->text, this->edit_str_buf, min(lengthof(_network_default_company_pass), lengthof(this->edit_str_buf)), 0);
 		this->FindWindowPlacementAndResize(desc);
 	}
 		NetworkChangeCompanyPassword(1, &password);
 	}
 	virtual void OnPaint()
 	{
-		DrawWindowWidgets(this);
+		this->DrawWidgets();
 		this->DrawEditBox(4);
 	}
 	virtual void OnClick(Point pt, int widget)
 	{
 	virtual void OnMouseLoop()
 	{
 		this->HandleEditBox(4);
 	}
-	virtual bool OnKeyPress(uint16 key, uint16 keycode)
+	virtual EventState OnKeyPress(uint16 key, uint16 keycode)
 	{
-		bool cont;
+		EventState state;
-		switch (this->HandleEditBoxKey(4, key, keycode, cont)) {
+		switch (this->HandleEditBoxKey(4, key, keycode, state)) {
 			case 1: // Return
 				this->OnOk();
 				/* FALL THROUGH */
 			case 2: // Escape
 				delete this;
 				break;
 		}
-		return cont;
+		return state;
 	}
 };
 static const Widget _ncp_window_widgets[] = {
 {   WWT_CLOSEBOX, RESIZE_NONE, 14,   0,  10,  0, 13, STR_00C5,                          STR_018B_CLOSE_WINDOW},
 static const WindowDesc _ncp_window_desc = {
 	WDP_AUTO, WDP_AUTO, 300, 63, 300, 63,
 	WC_COMPANY_PASSWORD_WINDOW, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON,
 	_ncp_window_widgets,
-	NULL
+};
-};
+void ShowNetworkCompanyPasswordWindow(Window *parent)
-void ShowNetworkCompanyPasswordWindow()
 {
 	DeleteWindowById(WC_COMPANY_PASSWORD_WINDOW, 0);
-	new NetworkCompanyPasswordWindow(&_ncp_window_desc);
+	new NetworkCompanyPasswordWindow(&_ncp_window_desc, parent);
 }
 #endif /* ENABLE_NETWORK */

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