mirror of
https://github.com/luanti-org/luanti.git
synced 2025-06-27 16:36:03 +00:00
Add a list of servers to the "Multiplayer" tab
If USE_CURL is set, it also downloads a list from a remote server. The url of this list is configurable in minetest.conf using the setting "serverlist_url" The local list of favorite servers is saved in client/serverlist/filename filename is also configureable using the setting "serverlist_file"
This commit is contained in:
Jeija
Perttu Ahola
parent
c691d619c2
commit
6f93c01af9
9 changed files with 431 additions and 16 deletions
|
|
@ -114,6 +114,9 @@ enum
|
|||
GUI_ID_CONFIGURE_WORLD_BUTTON,
|
||||
GUI_ID_WORLD_LISTBOX,
|
||||
GUI_ID_TAB_CONTROL,
|
||||
GUI_ID_SERVERLIST,
|
||||
GUI_ID_SERVERLIST_TOGGLE,
|
||||
GUI_ID_SERVERLIST_DELETE,
|
||||
};
|
||||
|
||||
enum
|
||||
|
|
@ -361,14 +364,14 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
|
|||
// Nickname + password
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 110, 20);
|
||||
rect += m_topleft_client + v2s32(35+30, 50+6);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-60-100, 10+6);
|
||||
Environment->addStaticText(wgettext("Name/Password"),
|
||||
rect, false, true, this, -1);
|
||||
}
|
||||
changeCtype("C");
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 230, 30);
|
||||
rect += m_topleft_client + v2s32(160+30, 50);
|
||||
core::rect<s32> rect(0, 0, 120, 30);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
|
||||
gui::IGUIElement *e =
|
||||
Environment->addEditBox(m_data->name.c_str(), rect, true, this, GUI_ID_NAME_INPUT);
|
||||
if(m_data->name == L"")
|
||||
|
|
@ -376,7 +379,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
|
|||
}
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 120, 30);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-60-100, 50);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-60-100, 90);
|
||||
gui::IGUIEditBox *e =
|
||||
Environment->addEditBox(L"", rect, true, this, 264);
|
||||
e->setPasswordBox(true);
|
||||
|
|
@ -385,17 +388,29 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
|
|||
|
||||
}
|
||||
changeCtype("");
|
||||
// Server List
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 390, 160);
|
||||
rect += m_topleft_client + v2s32(50, 10);
|
||||
gui::IGUIListBox *e = Environment->addListBox(rect, this,
|
||||
GUI_ID_SERVERLIST);
|
||||
e->setDrawBackground(true);
|
||||
if (m_data->serverlist_show_available == false)
|
||||
m_data->servers = ServerList::getLocal();
|
||||
updateGuiServerList();
|
||||
e->setSelected(0);
|
||||
}
|
||||
// Address + port
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 110, 20);
|
||||
rect += m_topleft_client + v2s32(35+30, 100+6);
|
||||
rect += m_topleft_client + v2s32(50, m_size_client.Y-50-15+6);
|
||||
Environment->addStaticText(wgettext("Address/Port"),
|
||||
rect, false, true, this, -1);
|
||||
}
|
||||
changeCtype("C");
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 230, 30);
|
||||
rect += m_topleft_client + v2s32(160+30, 100);
|
||||
core::rect<s32> rect(0, 0, 260, 30);
|
||||
rect += m_topleft_client + v2s32(50, m_size_client.Y-25-15);
|
||||
gui::IGUIElement *e =
|
||||
Environment->addEditBox(m_data->address.c_str(), rect, true,
|
||||
this, GUI_ID_ADDRESS_INPUT);
|
||||
|
|
@ -404,18 +419,43 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
|
|||
}
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 120, 30);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-60-100, 100);
|
||||
rect += m_topleft_client + v2s32(50+260+10, m_size_client.Y-25-15);
|
||||
Environment->addEditBox(m_data->port.c_str(), rect, true,
|
||||
this, GUI_ID_PORT_INPUT);
|
||||
}
|
||||
changeCtype("");
|
||||
#if USE_CURL
|
||||
// Toggle Serverlist (Favorites/Online)
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 260, 30);
|
||||
rect += m_topleft_client + v2s32(50,
|
||||
180);
|
||||
gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_TOGGLE,
|
||||
wgettext("Show Public"));
|
||||
e->setIsPushButton(true);
|
||||
if (m_data->serverlist_show_available)
|
||||
{
|
||||
e->setText(wgettext("Show Favorites"));
|
||||
e->setPressed();
|
||||
}
|
||||
}
|
||||
#endif
|
||||
// Delete Local Favorite
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 120, 30);
|
||||
rect += m_topleft_client + v2s32(50+260+10, 180);
|
||||
gui::IGUIButton *e = Environment->addButton(rect, this, GUI_ID_SERVERLIST_DELETE,
|
||||
wgettext("Delete"));
|
||||
if (m_data->serverlist_show_available) // Hidden on Show-Online mode
|
||||
e->setVisible(false);
|
||||
}
|
||||
// Start game button
|
||||
{
|
||||
core::rect<s32> rect(0, 0, 180, 30);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-180-30,
|
||||
m_size_client.Y-30-15);
|
||||
core::rect<s32> rect(0, 0, 120, 30);
|
||||
rect += m_topleft_client + v2s32(m_size_client.X-130-30,
|
||||
m_size_client.Y-25-15);
|
||||
Environment->addButton(rect, this, GUI_ID_JOIN_GAME_BUTTON,
|
||||
wgettext("Start Game / Connect"));
|
||||
wgettext("Connect"));
|
||||
}
|
||||
changeCtype("C");
|
||||
}
|
||||
|
|
@ -868,6 +908,12 @@ void GUIMainMenu::readInput(MainMenuData *dst)
|
|||
if(e != NULL && e->getType() == gui::EGUIET_LIST_BOX)
|
||||
dst->selected_world = ((gui::IGUIListBox*)e)->getSelected();
|
||||
}
|
||||
{
|
||||
ServerListSpec server =
|
||||
getServerListSpec(wide_to_narrow(dst->address), wide_to_narrow(dst->port));
|
||||
dst->servername = server.name;
|
||||
dst->serverdescription = server.description;
|
||||
}
|
||||
}
|
||||
|
||||
void GUIMainMenu::acceptInput()
|
||||
|
|
@ -912,6 +958,11 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
|
|||
regenerateGui(m_screensize_old);
|
||||
return true;
|
||||
}
|
||||
if(event.GUIEvent.EventType==gui::EGET_LISTBOX_CHANGED && event.GUIEvent.Caller->getID() == GUI_ID_SERVERLIST)
|
||||
{
|
||||
serverListOnSelected();
|
||||
return true;
|
||||
}
|
||||
if(event.GUIEvent.EventType==gui::EGET_BUTTON_CLICKED)
|
||||
{
|
||||
switch(event.GUIEvent.Caller->getID())
|
||||
|
|
@ -919,7 +970,8 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
|
|||
case GUI_ID_JOIN_GAME_BUTTON: {
|
||||
MainMenuData cur;
|
||||
readInput(&cur);
|
||||
if(cur.address == L"" && getTab() == TAB_MULTIPLAYER){
|
||||
if (getTab() == TAB_MULTIPLAYER && cur.address == L"")
|
||||
{
|
||||
(new GUIMessageMenu(env, parent, -1, menumgr,
|
||||
wgettext("Address required."))
|
||||
)->drop();
|
||||
|
|
@ -987,6 +1039,45 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
|
|||
menu->drop();
|
||||
return true;
|
||||
}
|
||||
case GUI_ID_SERVERLIST_DELETE: {
|
||||
gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
|
||||
u16 selected = ((gui::IGUIListBox*)serverlist)->getSelected();
|
||||
if (selected == -1) return true;
|
||||
ServerList::deleteEntry(m_data->servers[selected]);
|
||||
m_data->servers = ServerList::getLocal();
|
||||
updateGuiServerList();
|
||||
if (selected > 0)
|
||||
selected -= 1;
|
||||
serverlist->setSelected(selected);
|
||||
serverListOnSelected();
|
||||
return true;
|
||||
}
|
||||
#if USE_CURL
|
||||
case GUI_ID_SERVERLIST_TOGGLE: {
|
||||
gui::IGUIElement *togglebutton = getElementFromId(GUI_ID_SERVERLIST_TOGGLE);
|
||||
gui::IGUIElement *deletebutton = getElementFromId(GUI_ID_SERVERLIST_DELETE);
|
||||
gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
|
||||
if (m_data->serverlist_show_available) // switch to favorite list
|
||||
{
|
||||
m_data->servers = ServerList::getLocal();
|
||||
togglebutton->setText(wgettext("Show Public"));
|
||||
deletebutton->setVisible(true);
|
||||
updateGuiServerList();
|
||||
serverlist->setSelected(0);
|
||||
}
|
||||
else // switch to online list
|
||||
{
|
||||
m_data->servers = ServerList::getOnline();
|
||||
togglebutton->setText(wgettext("Show Favorites"));
|
||||
deletebutton->setVisible(false);
|
||||
updateGuiServerList();
|
||||
serverlist->setSelected(0);
|
||||
}
|
||||
serverListOnSelected();
|
||||
|
||||
m_data->serverlist_show_available = !m_data->serverlist_show_available;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
}
|
||||
if(event.GUIEvent.EventType==gui::EGET_EDITBOX_ENTER)
|
||||
|
|
@ -1009,6 +1100,14 @@ bool GUIMainMenu::OnEvent(const SEvent& event)
|
|||
m_data->address = L""; // Force local game
|
||||
quitMenu();
|
||||
return true;
|
||||
case GUI_ID_SERVERLIST:
|
||||
gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
|
||||
if (serverlist->getSelected() > -1)
|
||||
{
|
||||
acceptInput();
|
||||
quitMenu();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1053,3 +1152,55 @@ void GUIMainMenu::displayMessageMenu(std::wstring msg)
|
|||
{
|
||||
(new GUIMessageMenu(env, parent, -1, menumgr, msg))->drop();
|
||||
}
|
||||
|
||||
void GUIMainMenu::updateGuiServerList()
|
||||
{
|
||||
gui::IGUIListBox *serverlist = (gui::IGUIListBox *)getElementFromId(GUI_ID_SERVERLIST);
|
||||
serverlist->clear();
|
||||
|
||||
for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
|
||||
i != m_data->servers.end(); i++)
|
||||
{
|
||||
std::string text;
|
||||
if (i->name != "" && i->description != "")
|
||||
text = i->name + " (" + i->description + ")";
|
||||
else if (i->name !="")
|
||||
text = i->name;
|
||||
else
|
||||
text = i->address + ":" + i->port;
|
||||
|
||||
serverlist->addItem(narrow_to_wide(text).c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void GUIMainMenu::serverListOnSelected()
|
||||
{
|
||||
if (!m_data->servers.empty())
|
||||
{
|
||||
gui::IGUIListBox *serverlist = (gui::IGUIListBox*)getElementFromId(GUI_ID_SERVERLIST);
|
||||
u16 id = serverlist->getSelected();
|
||||
if (id < 0) return;
|
||||
((gui::IGUIEditBox*)getElementFromId(GUI_ID_ADDRESS_INPUT))
|
||||
->setText(narrow_to_wide(m_data->servers[id].address).c_str());
|
||||
((gui::IGUIEditBox*)getElementFromId(GUI_ID_PORT_INPUT))
|
||||
->setText(narrow_to_wide(m_data->servers[id].port).c_str());
|
||||
}
|
||||
}
|
||||
|
||||
ServerListSpec GUIMainMenu::getServerListSpec(std::string address, std::string port)
|
||||
{
|
||||
ServerListSpec server;
|
||||
server.address = address;
|
||||
server.port = port;
|
||||
for(std::vector<ServerListSpec>::iterator i = m_data->servers.begin();
|
||||
i != m_data->servers.end(); i++)
|
||||
{
|
||||
if (i->address == address && i->port == port)
|
||||
{
|
||||
server.description = i->description;
|
||||
server.name = i->name;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return server;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue