Import of client tree

1 files changed, 224 insertions, 26 deletions

diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index d85f4e83..526a8e8f 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -18,7 +18,7 @@
  *  along with The Mana World; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
- *  $Id$
+ *  $Id: login.cpp 4045 2008-04-07 15:23:07Z b_lindeijer $
  */
 
 #include "login.h"
@@ -29,12 +29,19 @@
 
 #include "../main.h"
 #include "../logindata.h"
+#include "../configuration.h"
 
 #include "button.h"
 #include "checkbox.h"
 #include "ok_dialog.h"
 #include "passwordfield.h"
 #include "textfield.h"
+#include "../utils/tostring.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)
@@ -42,59 +49,89 @@ LoginDialog::LoginDialog(LoginData *loginData):
     gcn::Label *userLabel = new gcn::Label("Name:");
     gcn::Label *passLabel = new gcn::Label("Password:");
     gcn::Label *serverLabel = new gcn::Label("Server:");
+    gcn::Label *portLabel = new gcn::Label("Port:");
+    mServerList = new DropDownList("MostRecent00",
+                                   "216.139.126.36",
+                                   "6901",
+                                   MAX_SERVER_LIST_SIZE);
+    mServerListBox = new gcn::ListBox(mServerList);
+    mServerScrollArea = new ScrollArea();
+
     mUserField = new TextField(mLoginData->username);
     mPassField = new PasswordField(mLoginData->password);
-    mServerField = new TextField(mLoginData->hostname);
+    mServerField = new TextField(mServerList->getServerAt(0));
+    mPortField = new TextField(mServerList->getPortAt(0));
+    mServerDropDown = new DropDown(mServerList,
+                                   mServerScrollArea,
+                                   mServerListBox);
+
     mKeepCheck = new CheckBox("Keep", mLoginData->remember);
     mOkButton = new Button("OK", "ok", this);
     mCancelButton = new Button("Cancel", "cancel", this);
     mRegisterButton = new Button("Register", "register", this);
 
-    const int width = 220;
-    const int height = 100;
-
-    setContentSize(width, height);
-
-    userLabel->setPosition(5, 5);
-    passLabel->setPosition(5, 14 + userLabel->getHeight());
-    serverLabel->setPosition(
-            5, 23 + userLabel->getHeight() + passLabel->getHeight());
-    mUserField->setPosition(65, 5);
-    mPassField->setPosition(65, 14 + userLabel->getHeight());
-    mServerField->setPosition(
-            65, 23 + userLabel->getHeight() + passLabel->getHeight());
-    mUserField->setWidth(width - 70);
-    mPassField->setWidth(width - 70);
-    mServerField->setWidth(width - 70);
-    mKeepCheck->setPosition(4, 77);
+    setContentSize(LOGIN_DIALOG_WIDTH, LOGIN_DIALOG_HEIGHT);
+
+    const int USER_TOP = 5;
+    userLabel->setPosition(5, USER_TOP);
+    mUserField->setPosition(65, USER_TOP);
+    mUserField->setWidth(FIELD_WIDTH);
+
+    const int PASS_TOP = 9 + USER_TOP + userLabel->getHeight();
+    passLabel->setPosition(5, PASS_TOP);
+    mPassField->setPosition(65, PASS_TOP);
+    mPassField->setWidth(FIELD_WIDTH);
+
+    const int SERVER_TOP = 9 + PASS_TOP + passLabel->getHeight();
+    serverLabel->setPosition(5, SERVER_TOP);
+    mServerField->setPosition(65, SERVER_TOP);
+    mServerField->setWidth(FIELD_WIDTH);
+
+    const int PORT_TOP = 9 + SERVER_TOP + serverLabel->getHeight();
+    portLabel->setPosition(5, PORT_TOP);
+    mPortField->setPosition(65, PORT_TOP);
+    mPortField->setWidth(FIELD_WIDTH);
+
+    const int DROP_DOWN_TOP = 9 + PORT_TOP + serverLabel->getHeight();
+    mServerDropDown->setPosition(5, DROP_DOWN_TOP);
+    mServerDropDown->setWidth(FIELD_WIDTH);
+
+    const int REST_TOP = LOGIN_DIALOG_HEIGHT - mCancelButton->getHeight() - 5;
+
+    mKeepCheck->setPosition(4, REST_TOP);
     mCancelButton->setPosition(
-            width - mCancelButton->getWidth() - 5,
-            height - mCancelButton->getHeight() - 5);
+            LOGIN_DIALOG_WIDTH - mCancelButton->getWidth() - 5, REST_TOP);
     mOkButton->setPosition(
-            mCancelButton->getX() - mOkButton->getWidth() - 5,
-            height - mOkButton->getHeight() - 5);
+            mCancelButton->getX() - mOkButton->getWidth() - 5, REST_TOP);
     mRegisterButton->setPosition(
-            mKeepCheck->getX() + mKeepCheck->getWidth() + 10,
-            height - mRegisterButton->getHeight() - 5);
+            mKeepCheck->getX() + mKeepCheck->getWidth() + 10, REST_TOP);
 
     mUserField->setActionEventId("ok");
     mPassField->setActionEventId("ok");
     mServerField->setActionEventId("ok");
+    mServerDropDown->setActionEventId("changeSelection");
 
     mUserField->addKeyListener(this);
     mPassField->addKeyListener(this);
     mServerField->addKeyListener(this);
+    mPortField->addKeyListener(this);
+    mServerDropDown->addKeyListener(this);
     mUserField->addActionListener(this);
     mPassField->addActionListener(this);
     mServerField->addActionListener(this);
+    mPortField->addActionListener(this);
+    mServerDropDown->addActionListener(this);
     mKeepCheck->addActionListener(this);
 
     add(userLabel);
     add(passLabel);
     add(serverLabel);
+    add(portLabel);
     add(mUserField);
     add(mPassField);
     add(mServerField);
+    add(mPortField);
+    add(mServerDropDown);
     add(mKeepCheck);
     add(mOkButton);
     add(mCancelButton);
@@ -114,6 +151,9 @@ LoginDialog::LoginDialog(LoginData *loginData):
 
 LoginDialog::~LoginDialog()
 {
+    delete mServerList;
+    delete mServerListBox;
+    delete mServerScrollArea;
 }
 
 void
@@ -122,6 +162,7 @@ LoginDialog::action(const gcn::ActionEvent &event)
     if (event.getId() == "ok" && canSubmit())
     {
         mLoginData->hostname = mServerField->getText();
+        mLoginData->port = getUShort(mPortField->getText());
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
         mLoginData->remember = mKeepCheck->isSelected();
@@ -129,9 +170,15 @@ LoginDialog::action(const gcn::ActionEvent &event)
 
         mOkButton->setEnabled(false);
         mRegisterButton->setEnabled(false);
-
+        mServerList->save(mServerField->getText(), mPortField->getText());
         state = ACCOUNT_STATE;
     }
+    else if (event.getId() == "changeSelection")
+    {
+        int selected = mServerListBox->getSelected();
+        mServerField->setText(mServerList->getServerAt(selected));
+        mPortField->setText(mServerList->getPortAt(selected));
+    }
     else if (event.getId() == "cancel")
     {
         state = EXIT_STATE;
@@ -140,6 +187,14 @@ LoginDialog::action(const gcn::ActionEvent &event)
     {
         // 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;
+    }
         mLoginData->username = mUserField->getText();
         mLoginData->password = mPassField->getText();
 
@@ -159,5 +214,148 @@ LoginDialog::canSubmit()
     return !mUserField->getText().empty() &&
            !mPassField->getText().empty() &&
            !mServerField->getText().empty() &&
+           isUShort(mPortField->getText()) &&
            state == LOGIN_STATE;
 }
+
+bool
+LoginDialog::isUShort(const std::string &str)
+{
+    if (str == "")
+    {
+        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 != "")
+    {
+        config.setValue(mConfigPrefix + "Server" + toString(saved), server);
+        config.setValue(mConfigPrefix + "Port" + toString(saved), port);
+        ++saved;
+    }
+}
+
+LoginDialog::DropDownList::DropDownList(std::string prefix,
+                                        std::string dflt,
+                    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 == "") // Just in case had original config entries
+        {
+            server = config.getValue(mConfigPrefix + "ServerList" +
+                                     toString(i), "");
+        }
+        std::string port = config.getValue(mConfigPrefix + "Port" +
+                                           toString(i), dfltPort);
+
+        if (server != "")
+        {
+            mServers.push_back(server);
+            mPorts.push_back(port);
+        }
+    }
+    if (mServers.size() == 0)
+    {
+        mServers.push_back(dflt);
+        mPorts.push_back(dfltPort);
+    }
+
+}
+
+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);
+}