1 files changed, 72 insertions, 15 deletions

diff --git a/src/gui/login.h b/src/gui/login.h
index 1c23a0f5..9a97cd4d 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -1,35 +1,43 @@
 /*
  *  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
  */
 
-#ifndef _TMW_LOGIN_H
-#define _TMW_LOGIN_H
+#ifndef LOGIN_H
+#define LOGIN_H
+
+#include <string>
+#include <vector>
 
-#include <iosfwd>
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
+#ifdef EATHENA_SUPPORT
+#include <guichan/listmodel.hpp>
+#endif
 
 #include "window.h"
-#include "../guichanfwd.h"
 
 class LoginData;
+#ifdef EATHENA_SUPPORT
+class DropDown;
+class ScrollArea;
+#endif
 
 /**
  * The login dialog.
@@ -48,11 +56,6 @@ class LoginDialog : public Window, public gcn::ActionListener,
         LoginDialog(LoginData *loginData);
 
         /**
-         * Destructor
-         */
-        ~LoginDialog();
-
-        /**
          * Called when receiving actions from the widgets.
          */
         void action(const gcn::ActionEvent &event);
@@ -67,17 +70,71 @@ class LoginDialog : public Window, public gcn::ActionListener,
          * Returns whether submit can be enabled. This is true in the login
          * state, when all necessary fields have some text.
          */
-        bool
-        canSubmit();
+        bool canSubmit();
+
+#ifdef EATHENA_SUPPORT
+        /**
+         * Function to decide whether string is an unsigned short or not
+         *
+         * @param str the string to parse
+         *
+         * @return true is str is an unsigned short, false otherwise
+         */
+        static bool isUShort(const std::string &str);
 
+        /**
+         * Converts string to an unsigned short (undefined if invalid)
+         *
+         * @param str the string to parse
+         *
+         * @return the value str represents
+         */
+        static unsigned short getUShort(const std::string &str);
+
+#endif
         gcn::TextField *mUserField;
         gcn::TextField *mPassField;
+#ifdef EATHENA_SUPPORT
+        gcn::TextField *mServerField;
+        gcn::TextField *mPortField;
+        DropDown *mServerDropDown;
+#endif
         gcn::CheckBox *mKeepCheck;
         gcn::Button *mOkButton;
         gcn::Button *mCancelButton;
         gcn::Button *mRegisterButton;
 
         LoginData *mLoginData;
+
+#ifdef EATHENA_SUPPORT
+        /**
+         * Helper class to keep a list of all the recent entries for the
+         * dropdown
+         */
+        class DropDownList : public gcn::ListModel
+        {
+            private:
+                std::vector<std::string> mServers;
+                std::vector<std::string> mPorts;
+                std::string mConfigPrefix;
+                int mMaxEntries;
+                void saveEntry(const std::string &server,
+                               const std::string &port, int &saved);
+            public:
+                DropDownList(std::string prefix,
+                             std::vector<std::string> dfltServer,
+                             std::vector<std::string> dfltPort,
+                             int maxEntries);
+                void save(const std::string &server, const std::string &port);
+                int getNumberOfElements();
+                std::string getElementAt(int i);
+                std::string getServerAt(int i);
+                std::string getPortAt(int i);
+        };
+        DropDownList *mServerList;
+        gcn::ListBox *mServerListBox;
+        gcn::ScrollArea *mServerScrollArea;
+#endif
 };
 
 #endif