1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 01:04:50 +01:00

Refactor Server Start Window to Class (#17592)

* Refactor first

* Update refactor

* Add fixes requested

* Dropped static
This commit is contained in:
Henry Cheng
2022-07-23 15:47:17 -04:00
committed by GitHub
parent 5688eb511d
commit 46a2047309

View File

@@ -24,12 +24,6 @@
using namespace OpenRCT2;
static char _port[7];
static char _name[65];
static char _description[MAX_SERVER_DESCRIPTION_LENGTH];
static char _greeting[CHAT_INPUT_SIZE];
static char _password[33];
// clang-format off
enum {
WIDX_BACKGROUND,
@@ -51,287 +45,263 @@ enum {
static constexpr const int32_t WW = 300;
static constexpr const int32_t WH = 154;
static rct_widget window_server_start_widgets[] = {
MakeWidget ({ 0, 0}, { WW, WH}, WindowWidgetType::Frame, WindowColour::Primary ), // panel / background
MakeWidget ({ 1, 1}, {298, 14}, WindowWidgetType::Caption, WindowColour::Primary , STR_START_SERVER, STR_WINDOW_TITLE_TIP ), // title bar
MakeWidget ({WW-13, 2}, { 11, 12}, WindowWidgetType::CloseBox, WindowColour::Primary , STR_CLOSE_X, STR_CLOSE_WINDOW_TIP ), // close x button
MakeWidget ({ 120, 20}, {173, 13}, WindowWidgetType::TextBox, WindowColour::Secondary ), // port text box
MakeWidget ({ 120, 36}, {173, 13}, WindowWidgetType::TextBox, WindowColour::Secondary ), // name text box
MakeWidget ({ 120, 52}, {173, 13}, WindowWidgetType::TextBox, WindowColour::Secondary ), // description text box
MakeWidget ({ 120, 68}, {173, 13}, WindowWidgetType::TextBox, WindowColour::Secondary ), // greeting text box
MakeWidget ({ 120, 84}, {173, 13}, WindowWidgetType::TextBox, WindowColour::Secondary ), // password text box
MakeSpinnerWidgets({ 120, 100}, {173, 12}, WindowWidgetType::Spinner, WindowColour::Secondary, STR_SERVER_MAX_PLAYERS_VALUE ), // max players (3 widgets)
MakeWidget ({ 6, 117}, {287, 14}, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_ADVERTISE, STR_ADVERTISE_SERVER_TIP), // advertise checkbox
MakeWidget ({ 6, WH-6-13}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_NEW_GAME ), // start server button
MakeWidget ({ 112, WH-6-13}, {101, 14}, WindowWidgetType::Button, WindowColour::Secondary, STR_LOAD_GAME ), // None
static rct_widget _windowServerStartWidgets[] = {
MakeWidget({ 0, 0 }, { WW, WH }, WindowWidgetType::Frame, WindowColour::Primary), // panel / background
MakeWidget({ 1, 1 }, { 298, 14 }, WindowWidgetType::Caption, WindowColour::Primary, STR_START_SERVER,STR_WINDOW_TITLE_TIP), // title bar
MakeWidget({ WW - 13, 2 }, { 11, 12 }, WindowWidgetType::CloseBox, WindowColour::Primary, STR_CLOSE_X,STR_CLOSE_WINDOW_TIP), // close x button
MakeWidget({ 120, 20 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::Secondary), // port text box
MakeWidget({ 120, 36 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::Secondary), // name text box
MakeWidget({ 120, 52 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::Secondary), // description text box
MakeWidget({ 120, 68 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::Secondary), // greeting text box
MakeWidget({ 120, 84 }, { 173, 13 }, WindowWidgetType::TextBox, WindowColour::Secondary), // password text box
MakeSpinnerWidgets({ 120, 100 }, { 173, 12 }, WindowWidgetType::Spinner, WindowColour::Secondary,STR_SERVER_MAX_PLAYERS_VALUE), // max players (3 widgets)
MakeWidget({ 6, 117 }, { 287, 14 }, WindowWidgetType::Checkbox, WindowColour::Secondary, STR_ADVERTISE,STR_ADVERTISE_SERVER_TIP), // advertise checkbox
MakeWidget({ 6, WH - 6 - 13 }, { 101, 14 }, WindowWidgetType::Button, WindowColour::Secondary,STR_NEW_GAME), // start server button
MakeWidget({ 112, WH - 6 - 13 }, { 101, 14 }, WindowWidgetType::Button, WindowColour::Secondary, STR_LOAD_GAME), // None
WIDGETS_END,
};
static void WindowServerStartClose(rct_window *w);
static void WindowServerStartMouseup(rct_window *w, rct_widgetindex widgetIndex);
static void WindowServerStartUpdate(rct_window *w);
static void WindowServerStartTextinput(rct_window *w, rct_widgetindex widgetIndex, char *text);
static void WindowServerStartInvalidate(rct_window *w);
static void WindowServerStartPaint(rct_window *w, rct_drawpixelinfo *dpi);
static rct_window_event_list window_server_start_events([](auto& events)
{
events.close = &WindowServerStartClose;
events.mouse_up = &WindowServerStartMouseup;
events.update = &WindowServerStartUpdate;
events.text_input = &WindowServerStartTextinput;
events.invalidate = &WindowServerStartInvalidate;
events.paint = &WindowServerStartPaint;
});
// clang-format on
class ServerStartWindow final : public Window
{
public:
void OnOpen() override
{
widgets = _windowServerStartWidgets;
widgets[WIDX_PORT_INPUT].string = _port;
widgets[WIDX_NAME_INPUT].string = _name;
widgets[WIDX_DESCRIPTION_INPUT].string = _description;
widgets[WIDX_GREETING_INPUT].string = _greeting;
widgets[WIDX_PASSWORD_INPUT].string = _password;
InitScrollWidgets();
no_list_items = 0;
selected_list_item = -1;
frame_no = 0;
min_width = width;
min_height = height;
max_width = min_width;
max_height = min_height;
page = 0;
list_information_type = 0;
snprintf(_port, 7, "%u", gConfigNetwork.default_port);
safe_strcpy(_name, gConfigNetwork.server_name.c_str(), sizeof(_name));
safe_strcpy(_description, gConfigNetwork.server_description.c_str(), sizeof(_description));
safe_strcpy(_greeting, gConfigNetwork.server_greeting.c_str(), sizeof(_greeting));
}
void OnMouseUp(rct_widgetindex widgetIndex) override
{
switch (widgetIndex)
{
case WIDX_CLOSE:
Close();
break;
case WIDX_PORT_INPUT:
window_start_textbox(this, widgetIndex, STR_STRING, _port, 6);
break;
case WIDX_NAME_INPUT:
window_start_textbox(this, widgetIndex, STR_STRING, _name, 64);
break;
case WIDX_DESCRIPTION_INPUT:
window_start_textbox(this, widgetIndex, STR_STRING, _description, MAX_SERVER_DESCRIPTION_LENGTH);
break;
case WIDX_GREETING_INPUT:
window_start_textbox(this, widgetIndex, STR_STRING, _greeting, CHAT_INPUT_SIZE);
break;
case WIDX_PASSWORD_INPUT:
window_start_textbox(this, widgetIndex, STR_STRING, _password, 32);
break;
case WIDX_MAXPLAYERS_INCREASE:
if (gConfigNetwork.maxplayers < 255)
{
gConfigNetwork.maxplayers++;
}
config_save_default();
Invalidate();
break;
case WIDX_MAXPLAYERS_DECREASE:
if (gConfigNetwork.maxplayers > 1)
{
gConfigNetwork.maxplayers--;
}
config_save_default();
Invalidate();
break;
case WIDX_ADVERTISE_CHECKBOX:
gConfigNetwork.advertise = !gConfigNetwork.advertise;
config_save_default();
Invalidate();
break;
case WIDX_START_SERVER:
network_set_password(_password);
WindowScenarioselectOpen(ScenarioSelectCallback, false);
break;
case WIDX_LOAD_SERVER:
network_set_password(_password);
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(LoadSaveCallback));
context_open_intent(&intent);
break;
}
}
void OnPrepareDraw() override
{
ColourSchemeUpdateByClass(this, WC_SERVER_LIST);
WidgetSetCheckboxValue(this, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise);
auto ft = Formatter::Common();
ft.Increment(18);
ft.Add<uint16_t>(gConfigNetwork.maxplayers);
}
void OnUpdate() override
{
if (gCurrentTextBox.window.classification == classification && gCurrentTextBox.window.number == number)
{
window_update_textbox_caret();
widget_invalidate(this, WIDX_NAME_INPUT);
widget_invalidate(this, WIDX_DESCRIPTION_INPUT);
widget_invalidate(this, WIDX_GREETING_INPUT);
widget_invalidate(this, WIDX_PASSWORD_INPUT);
}
}
void OnTextInput(rct_widgetindex widgetIndex, std::string_view text) override
{
if (text.empty())
return;
std::string temp = static_cast<std::string>(text);
switch (widgetIndex)
{
case WIDX_PORT_INPUT:
if (strcmp(_port, temp.c_str()) == 0)
return;
std::fill_n(_port, sizeof(_port), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_port, temp.c_str(), sizeof(_port));
}
gConfigNetwork.default_port = atoi(_port);
config_save_default();
widget_invalidate(this, WIDX_NAME_INPUT);
break;
case WIDX_NAME_INPUT:
if (strcmp(_name, temp.c_str()) == 0)
return;
std::fill_n(_name, sizeof(_name), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_name, temp.c_str(), sizeof(_name));
}
if (_name[0] != '\0')
{
gConfigNetwork.server_name = _name;
config_save_default();
}
widget_invalidate(this, WIDX_NAME_INPUT);
break;
case WIDX_DESCRIPTION_INPUT:
if (strcmp(_description, temp.c_str()) == 0)
return;
std::fill_n(_description, sizeof(_description), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_description, temp.c_str(), sizeof(_description));
}
if (_description[0] != '\0')
{
gConfigNetwork.server_description = _description;
config_save_default();
}
widget_invalidate(this, WIDX_DESCRIPTION_INPUT);
break;
case WIDX_GREETING_INPUT:
if (strcmp(_greeting, temp.c_str()) == 0)
return;
std::fill_n(_greeting, sizeof(_greeting), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_greeting, temp.c_str(), sizeof(_greeting));
}
if (_greeting[0] != '\0')
{
gConfigNetwork.server_greeting = _greeting;
config_save_default();
}
widget_invalidate(this, WIDX_GREETING_INPUT);
break;
case WIDX_PASSWORD_INPUT:
if (strcmp(_password, temp.c_str()) == 0)
return;
std::fill_n(_password, sizeof(_password), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_password, temp.c_str(), sizeof(_password));
}
widget_invalidate(this, WIDX_PASSWORD_INPUT);
break;
}
}
void OnDraw(rct_drawpixelinfo& dpi) override
{
DrawWidgets(dpi);
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_PORT_INPUT].top }, STR_PORT, {}, { colours[1] });
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_NAME_INPUT].top }, STR_SERVER_NAME, {}, { colours[1] });
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_DESCRIPTION_INPUT].top }, STR_SERVER_DESCRIPTION, {},
{ colours[1] });
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_GREETING_INPUT].top }, STR_SERVER_GREETING, {}, { colours[1] });
DrawTextBasic(
&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_PASSWORD_INPUT].top }, STR_PASSWORD, {}, { colours[1] });
DrawTextBasic(&dpi, windowPos + ScreenCoordsXY{ 6, widgets[WIDX_MAXPLAYERS].top }, STR_MAX_PLAYERS, {}, { colours[1] });
}
private:
char _port[7];
char _name[65];
char _description[MAX_SERVER_DESCRIPTION_LENGTH];
char _greeting[CHAT_INPUT_SIZE];
char _password[33];
static void ScenarioSelectCallback(const utf8* path)
{
game_notify_map_change();
if (GetContext()->LoadParkFromFile(path, false, true))
{
network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
}
}
static void LoadSaveCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK)
{
game_notify_map_change();
context_load_park_from_file(path);
network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
}
}
};
rct_window* WindowServerStartOpen()
{
rct_window* window;
// Check if window is already open
window = window_bring_to_front_by_class(WC_SERVER_START);
if (window != nullptr)
return window;
window = WindowCreateCentred(WW, WH, &window_server_start_events, WC_SERVER_START, WF_10);
window_server_start_widgets[WIDX_PORT_INPUT].string = _port;
window_server_start_widgets[WIDX_NAME_INPUT].string = _name;
window_server_start_widgets[WIDX_DESCRIPTION_INPUT].string = _description;
window_server_start_widgets[WIDX_GREETING_INPUT].string = _greeting;
window_server_start_widgets[WIDX_PASSWORD_INPUT].string = _password;
window->widgets = window_server_start_widgets;
WindowInitScrollWidgets(window);
window->no_list_items = 0;
window->selected_list_item = -1;
window->frame_no = 0;
window->min_width = window->width;
window->min_height = window->height;
window->max_width = window->min_width;
window->max_height = window->min_height;
window->page = 0;
window->list_information_type = 0;
snprintf(_port, 7, "%u", gConfigNetwork.default_port);
safe_strcpy(_name, gConfigNetwork.server_name.c_str(), sizeof(_name));
safe_strcpy(_description, gConfigNetwork.server_description.c_str(), sizeof(_description));
safe_strcpy(_greeting, gConfigNetwork.server_greeting.c_str(), sizeof(_greeting));
return window;
}
static void WindowServerStartClose(rct_window* w)
{
}
static void WindowServerStartScenarioselectCallback(const utf8* path)
{
game_notify_map_change();
if (GetContext()->LoadParkFromFile(path, false, true))
{
network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
}
}
static void WindowServerStartLoadsaveCallback(int32_t result, const utf8* path)
{
if (result == MODAL_RESULT_OK)
{
game_notify_map_change();
context_load_park_from_file(path);
network_begin_server(gConfigNetwork.default_port, gConfigNetwork.listen_address);
}
}
static void WindowServerStartMouseup(rct_window* w, rct_widgetindex widgetIndex)
{
switch (widgetIndex)
{
case WIDX_CLOSE:
window_close(w);
break;
case WIDX_PORT_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, _port, 6);
break;
case WIDX_NAME_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, _name, 64);
break;
case WIDX_DESCRIPTION_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, _description, MAX_SERVER_DESCRIPTION_LENGTH);
break;
case WIDX_GREETING_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, _greeting, CHAT_INPUT_SIZE);
break;
case WIDX_PASSWORD_INPUT:
window_start_textbox(w, widgetIndex, STR_STRING, _password, 32);
break;
case WIDX_MAXPLAYERS_INCREASE:
if (gConfigNetwork.maxplayers < 255)
{
gConfigNetwork.maxplayers++;
}
config_save_default();
w->Invalidate();
break;
case WIDX_MAXPLAYERS_DECREASE:
if (gConfigNetwork.maxplayers > 1)
{
gConfigNetwork.maxplayers--;
}
config_save_default();
w->Invalidate();
break;
case WIDX_ADVERTISE_CHECKBOX:
gConfigNetwork.advertise = !gConfigNetwork.advertise;
config_save_default();
w->Invalidate();
break;
case WIDX_START_SERVER:
network_set_password(_password);
WindowScenarioselectOpen(WindowServerStartScenarioselectCallback, false);
break;
case WIDX_LOAD_SERVER:
network_set_password(_password);
auto intent = Intent(WC_LOADSAVE);
intent.putExtra(INTENT_EXTRA_LOADSAVE_TYPE, LOADSAVETYPE_LOAD | LOADSAVETYPE_GAME);
intent.putExtra(INTENT_EXTRA_CALLBACK, reinterpret_cast<void*>(WindowServerStartLoadsaveCallback));
context_open_intent(&intent);
break;
}
}
static void WindowServerStartUpdate(rct_window* w)
{
if (gCurrentTextBox.window.classification == w->classification && gCurrentTextBox.window.number == w->number)
{
window_update_textbox_caret();
widget_invalidate(w, WIDX_NAME_INPUT);
widget_invalidate(w, WIDX_DESCRIPTION_INPUT);
widget_invalidate(w, WIDX_GREETING_INPUT);
widget_invalidate(w, WIDX_PASSWORD_INPUT);
}
}
static void WindowServerStartTextinput(rct_window* w, rct_widgetindex widgetIndex, char* text)
{
if (text == nullptr)
return;
switch (widgetIndex)
{
case WIDX_PORT_INPUT:
if (strcmp(_port, text) == 0)
return;
std::fill_n(_port, sizeof(_port), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_port, text, sizeof(_port));
}
gConfigNetwork.default_port = atoi(_port);
config_save_default();
widget_invalidate(w, WIDX_NAME_INPUT);
break;
case WIDX_NAME_INPUT:
if (strcmp(_name, text) == 0)
return;
std::fill_n(_name, sizeof(_name), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_name, text, sizeof(_name));
}
if (_name[0] != '\0')
{
gConfigNetwork.server_name = _name;
config_save_default();
}
widget_invalidate(w, WIDX_NAME_INPUT);
break;
case WIDX_DESCRIPTION_INPUT:
if (strcmp(_description, text) == 0)
return;
std::fill_n(_description, sizeof(_description), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_description, text, sizeof(_description));
}
if (_description[0] != '\0')
{
gConfigNetwork.server_description = _description;
config_save_default();
}
widget_invalidate(w, WIDX_DESCRIPTION_INPUT);
break;
case WIDX_GREETING_INPUT:
if (strcmp(_greeting, text) == 0)
return;
std::fill_n(_greeting, sizeof(_greeting), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_greeting, text, sizeof(_greeting));
}
if (_greeting[0] != '\0')
{
gConfigNetwork.server_greeting = _greeting;
config_save_default();
}
widget_invalidate(w, WIDX_GREETING_INPUT);
break;
case WIDX_PASSWORD_INPUT:
if (strcmp(_password, text) == 0)
return;
std::fill_n(_password, sizeof(_password), 0x00);
if (text[0] != '\0')
{
safe_strcpy(_password, text, sizeof(_password));
}
widget_invalidate(w, WIDX_PASSWORD_INPUT);
break;
}
}
static void WindowServerStartInvalidate(rct_window* w)
{
ColourSchemeUpdateByClass(w, WC_SERVER_LIST);
WidgetSetCheckboxValue(w, WIDX_ADVERTISE_CHECKBOX, gConfigNetwork.advertise);
auto ft = Formatter::Common();
ft.Increment(18);
ft.Add<uint16_t>(gConfigNetwork.maxplayers);
}
static void WindowServerStartPaint(rct_window* w, rct_drawpixelinfo* dpi)
{
WindowDrawWidgets(w, dpi);
DrawTextBasic(dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_PORT_INPUT].top }, STR_PORT, {}, { w->colours[1] });
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_NAME_INPUT].top }, STR_SERVER_NAME, {}, { w->colours[1] });
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_DESCRIPTION_INPUT].top }, STR_SERVER_DESCRIPTION, {},
{ w->colours[1] });
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_GREETING_INPUT].top }, STR_SERVER_GREETING, {},
{ w->colours[1] });
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_PASSWORD_INPUT].top }, STR_PASSWORD, {}, { w->colours[1] });
DrawTextBasic(
dpi, w->windowPos + ScreenCoordsXY{ 6, w->widgets[WIDX_MAXPLAYERS].top }, STR_MAX_PLAYERS, {}, { w->colours[1] });
return WindowFocusOrCreate<ServerStartWindow>(WC_SERVER_START, WW, WH, WF_CENTRE_SCREEN);
}
#endif