1 files changed, 243 insertions, 23 deletions

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index 615045b6..e68a8da1 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -1,72 +1,127 @@
 /*
  *  The Mana World
- *  Copyright 2004 The Mana World Development Team
+ *  Copyright (C) 2004  The Mana World Development Team
  *
  *  This file is part of The Mana World.
  *
- *  The Mana World is free software; you can redistribute it and/or modify
+ *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  any later version.
  *
- *  The Mana World is distributed in the hope that it will be useful,
+ *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with The Mana World; if not, write to the Free Software
+ *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "login.h"
-
-#include <string>
-
 #include <guichan/widgets/label.hpp>
 
-#include "../main.h"
-#include "../logindata.h"
-
 #include "button.h"
 #include "checkbox.h"
+#include "listbox.h"
+#include "login.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
+#include "scrollarea.h"
 #include "textfield.h"
 
+#include "widgets/dropdown.h"
 #include "widgets/layout.h"
 
+#include "../main.h"
+#include "../logindata.h"
+#include "../configuration.h"
+
 #include "../utils/gettext.h"
+#include "../utils/stringutils.h"
+
+static const int MAX_SERVER_LIST_SIZE = 5;
+static const int LOGIN_DIALOG_WIDTH = 220;
+static const int LOGIN_DIALOG_HEIGHT = 140;
+static const int FIELD_WIDTH = LOGIN_DIALOG_WIDTH - 70;
 
 LoginDialog::LoginDialog(LoginData *loginData):
     Window(_("Login")), mLoginData(loginData)
 {
     gcn::Label *userLabel = new gcn::Label(_("Name:"));
     gcn::Label *passLabel = new gcn::Label(_("Password:"));
+#ifdef EATHENA_SUPPORT
+    gcn::Label *serverLabel = new gcn::Label(_("Server:"));
+    gcn::Label *portLabel = new gcn::Label(_("Port:"));
+    gcn::Label *dropdownLabel = new gcn::Label(_("Recent:"));
+    std::vector<std::string> dfltServer;
+    dfltServer.push_back("server.themanaworld.org");
+    std::vector<std::string> dfltPort;
+    dfltPort.push_back("6901");
+    mServerList = new DropDownList("MostRecent00", dfltServer, dfltPort,
+                                   MAX_SERVER_LIST_SIZE);
+    mServerListBox = new ListBox(mServerList);
+    mServerScrollArea = new ScrollArea;
+#endif
+
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
+#ifdef EATHENA_SUPPORT
+    mServerField = new TextField(mServerList->getServerAt(0));
+    mPortField = new TextField(mServerList->getPortAt(0));
+    mServerDropDown = new DropDown(mServerList,
+                                   mServerScrollArea,
+                                   mServerListBox);
+    mServerDropDown->setOpaque(false);
+#endif
+
     mKeepCheck = new CheckBox(_("Remember Username"), mLoginData->remember);
-    mOkButton = new Button(_("Ok"), "ok", this);
+    mOkButton = new Button(_("OK"), "ok", this);
     mCancelButton = new Button(_("Cancel"), "cancel", this);
     mRegisterButton = new Button(_("Register"), "register", this);
 
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
+#ifdef EATHENA_SUPPORT
+    mServerField->setActionEventId("ok");
+    mPortField->setActionEventId("ok");
+    mServerDropDown->setActionEventId("changeSelection");
+#endif
 
     mUserField->addKeyListener(this);
     mPassField->addKeyListener(this);
+#ifdef EATHENA_SUPPORT
+    mServerField->addKeyListener(this);
+    mPortField->addKeyListener(this);
+    mServerDropDown->addKeyListener(this);
+#endif
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
+#ifdef EATHENA_SUPPORT
+    mServerField->addActionListener(this);
+    mPortField->addActionListener(this);
+    mServerDropDown->addActionListener(this);
     mKeepCheck->addActionListener(this);
+#endif
 
     place(0, 0, userLabel);
     place(0, 1, passLabel);
-    place(1, 0, mUserField, 3).setPadding(2);
-    place(1, 1, mPassField, 3).setPadding(2);
-    place(0, 2, mKeepCheck, 4);
-    place(0, 3, mRegisterButton).setHAlign(LayoutCell::LEFT);
-    place(2, 3, mOkButton);
-    place(3, 3, mCancelButton);
+#ifdef EATHENA_SUPPORT
+    place(0, 2, serverLabel);
+    place(0, 3, portLabel);
+    place(0, 4, dropdownLabel);
+#endif
+    place(1, 0, mUserField, 3).setPadding(1);
+    place(1, 1, mPassField, 3).setPadding(1);
+#ifdef EATHENA_SUPPORT
+    place(1, 2, mServerField, 3).setPadding(1);
+    place(1, 3, mPortField, 3).setPadding(1);
+    place(1, 4, mServerDropDown, 3).setPadding(1);
+#endif
+    place(0, 5, mKeepCheck, 4);
+    place(0, 6, mRegisterButton).setHAlign(LayoutCell::LEFT);
+    place(2, 6, mCancelButton);
+    place(3, 6, mOkButton);
     reflowLayout(250, 0);
 
     setLocationRelativeTo(getParent());
@@ -81,14 +136,14 @@ LoginDialog::LoginDialog(LoginData *loginData):
     mOkButton->setEnabled(canSubmit());
 }
 
-LoginDialog::~LoginDialog()
-{
-}
-
 void LoginDialog::action(const gcn::ActionEvent &event)
 {
     if (event.getId() == "ok" && canSubmit())
     {
+#ifdef EATHENA_SUPPORT
+        mLoginData->hostname = mServerField->getText();
+        mLoginData->port = getUShort(mPortField->getText());
+#endif
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
         mLoginData->remember = mKeepCheck->isSelected();
@@ -96,16 +151,43 @@ void LoginDialog::action(const gcn::ActionEvent &event)
 
         mOkButton->setEnabled(false);
         mRegisterButton->setEnabled(false);
-
+#ifdef EATHENA_SUPPORT
+        mServerList->save(mServerField->getText(), mPortField->getText());
+        state = STATE_ACCOUNT;
+#else
         state = STATE_LOGIN_ATTEMPT;
+#endif
     }
+#ifdef EATHENA_SUPPORT
+    else if (event.getId() == "changeSelection")
+    {
+        int selected = mServerListBox->getSelected();
+        mServerField->setText(mServerList->getServerAt(selected));
+        mPortField->setText(mServerList->getPortAt(selected));
+    }
+#endif
     else if (event.getId() == "cancel")
     {
+#ifdef TMWSERV_SUPPORT
         state = STATE_SWITCH_ACCOUNTSERVER;
+#else
+        state = STATE_EXIT;
+#endif
     }
     else if (event.getId() == "register")
     {
+#ifdef EATHENA_SUPPORT
         // Transfer these fields on to the register dialog
+        mLoginData->hostname = mServerField->getText();
+        if (isUShort(mPortField->getText()))
+        {
+            mLoginData->port = getUShort(mPortField->getText());
+        }
+        else
+        {
+            mLoginData->port = 6901;
+        }
+#endif
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
 
@@ -122,5 +204,143 @@ bool LoginDialog::canSubmit()
 {
     return !mUserField->getText().empty() &&
            !mPassField->getText().empty() &&
+#ifdef EATHENA_SUPPORT
+           !mServerField->getText().empty() &&
+           isUShort(mPortField->getText()) &&
+#endif
            state == STATE_LOGIN;
 }
+
+#ifdef EATHENA_SUPPORT
+bool LoginDialog::isUShort(const std::string &str)
+{
+    if (str.empty())
+    {
+        return false;
+    }
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+         strPtr != strEnd; ++strPtr)
+    {
+        if (*strPtr < '0' || *strPtr > '9')
+        {
+            return false;
+        }
+        l = l * 10 + (*strPtr - '0'); // *strPtr - '0' will never be negative
+        if (l > 65535)
+        {
+            return false;
+        }
+    }
+    return true;
+}
+
+unsigned short LoginDialog::getUShort(const std::string &str)
+{
+    unsigned long l = 0;
+    for (std::string::const_iterator strPtr = str.begin(), strEnd = str.end();
+         strPtr != strEnd; ++strPtr)
+    {
+        l = l * 10 + (*strPtr - '0');
+    }
+    return static_cast<unsigned short>(l);
+}
+
+/**
+ * LoginDialog::DropDownList
+ */
+
+void LoginDialog::DropDownList::saveEntry(const std::string &server,
+                                          const std::string &port, int &saved)
+{
+    if (saved < MAX_SERVER_LIST_SIZE && !server.empty())
+    {
+        config.setValue(mConfigPrefix + "Server" + toString(saved), server);
+        config.setValue(mConfigPrefix + "Port" + toString(saved), port);
+        ++saved;
+    }
+}
+
+LoginDialog::DropDownList::DropDownList(std::string prefix,
+                                        std::vector<std::string> dflt,
+                                        std::vector<std::string> dfltPort,
+                                        int maxEntries) :
+                                        mConfigPrefix(prefix),
+                                        mMaxEntries(maxEntries)
+{
+    for (int i = 0; i < maxEntries; ++i)
+    {
+        std::string server = config.getValue(mConfigPrefix + "Server" +
+                                             toString(i), "");
+        if (server.empty()) // Just in case had original config entries
+        {
+            server = config.getValue(mConfigPrefix + "ServerList" +
+                                     toString(i), "");
+        }
+        std::string port = config.getValue(mConfigPrefix + "Port" +
+                                           toString(i), dfltPort.front());
+
+        if (!server.empty())
+        {
+            mServers.push_back(server);
+            mPorts.push_back(port);
+        }
+    }
+    if (mServers.empty())
+    {
+        mServers.assign(dflt.begin(), dflt.end());
+        mPorts.assign(dfltPort.begin(), dfltPort.end());
+    }
+}
+
+void LoginDialog::DropDownList::save(const std::string &server,
+                                     const std::string &port)
+{
+    int position = 0;
+    saveEntry(server, port, position);
+    for (std::vector<std::string>::const_iterator sPtr = mServers.begin(),
+             sEnd = mServers.end(),
+             pPtr = mPorts.begin(),
+             pEnd = mPorts.end();
+         sPtr != sEnd && pPtr != pEnd;
+         ++sPtr, ++pPtr)
+    {
+        if (*sPtr != server || *pPtr != port)
+        {
+            saveEntry(*sPtr, *pPtr, position);
+        }
+    }
+}
+
+int LoginDialog::DropDownList::getNumberOfElements()
+{
+    return mServers.size();
+}
+
+std::string LoginDialog::DropDownList::getElementAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return getServerAt(i) + ":" + getPortAt(i);
+}
+
+std::string LoginDialog::DropDownList::getServerAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return mServers.at(i);
+}
+
+std::string LoginDialog::DropDownList::getPortAt(int i)
+{
+    if (i < 0 || i >= getNumberOfElements())
+    {
+        return "";
+    }
+    return mPorts.at(i);
+}
+#endif