From 2bf2ed0002854e644cc6b39198ddc95df928311c Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 7 Jul 2013 00:45:31 +0000
Subject: [PATCH 01/44] Start of creating servers

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13108 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/lobby_settings.stkgui         |  2 +
 sources.cmake                                 |  2 +-
 src/online/current_online_user.cpp            | 35 ++++++++++++
 src/online/current_online_user.hpp            |  5 ++
 src/online/online_user.hpp                    | 10 ++--
 .../networking_lobby_settings.cpp             | 54 +++++++++++++++----
 .../networking_lobby_settings.hpp             | 21 +++++---
 src/states_screens/online_screen.cpp          |  1 +
 8 files changed, 106 insertions(+), 24 deletions(-)

diff --git a/data/gui/online/lobby_settings.stkgui b/data/gui/online/lobby_settings.stkgui
index fc5ff8deb..27bba564c 100644
--- a/data/gui/online/lobby_settings.stkgui
+++ b/data/gui/online/lobby_settings.stkgui
@@ -17,6 +17,8 @@
                     <gauge id="max_players" proportion="2" min_value="2" max_value="12"/>
                 </div>
             </div>
+            
+            <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
         </box>
         
         <spacer width="10" height="7%"/>
diff --git a/sources.cmake b/sources.cmake
index ed3f136cd..a72fa0434 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,4 +1,4 @@
-# Generated by ./update_file_list.sh. Do not edit this file manually.
+# Generated by /home/gl3nn/repos/gsoc-stk-branch/update_file_list.sh. Do not edit this file manually.
 set(STK_SOURCES
 src/addons/addon.cpp
 src/addons/addons_manager.cpp
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index 7df8191b2..bdf64cc19 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -47,6 +47,7 @@ void CurrentOnlineUser::deallocate()
 CurrentOnlineUser::CurrentOnlineUser(){
     m_is_signed_in = false;
     m_is_guest = false;
+    m_is_server_host = false;
     m_id = 0;
     m_name = "";
     m_token = "";
@@ -117,6 +118,40 @@ bool CurrentOnlineUser::signIn( const irr::core::stringw &username,
 
     return m_is_signed_in;
 }
+
+// ============================================================================
+
+bool CurrentOnlineUser::createServer(  const irr::core::stringw &name,
+                                        int max_players,
+                                        irr::core::stringw &info)
+{
+    assert(m_is_signed_in && !m_is_guest && !m_is_server_host);
+    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+    connector->setParameter("action",           std::string("create_server"));
+    connector->setParameter("token",            m_token);
+    connector->setParameter("userid",           m_id);
+    connector->setParameter("name",             name);
+    connector->setParameter("max_players",      max_players);
+    const XMLNode * result = connector->getXMLFromPage();
+    std::string rec_success = "";
+    if(result->get("success", &rec_success))
+    {
+       if (rec_success =="yes")
+       {
+           // FIXME
+           m_is_server_host = true;
+       }
+       result->get("info", &info);
+    }
+    else
+    {
+       info = _("Unable to connect to the server. Check your internet connection or try again later.");
+    }
+
+    return m_is_server_host;
+}
+
+
 // ============================================================================
 bool CurrentOnlineUser::signOut(){
     assert(m_is_signed_in == true);
diff --git a/src/online/current_online_user.hpp b/src/online/current_online_user.hpp
index 987d77a9d..ab694ddeb 100644
--- a/src/online/current_online_user.hpp
+++ b/src/online/current_online_user.hpp
@@ -57,6 +57,11 @@ class CurrentOnlineUser : public OnlineUser
                         irr::core::stringw &info);
         // Logout - Best to be followed by CurrentOnlineUser::deallocate
         bool signOut();
+
+        bool createServer(  const irr::core::stringw &name,
+                            int max_players,
+                            irr::core::stringw &info);
+
         /** Returns the username if signed in. */
         irr::core::stringw getUserName() const;
         bool isSignedIn(){ return m_is_signed_in; }
diff --git a/src/online/online_user.hpp b/src/online/online_user.hpp
index cf9bae7f8..6d67a12f6 100644
--- a/src/online/online_user.hpp
+++ b/src/online/online_user.hpp
@@ -34,18 +34,16 @@ class OnlineUser
 
     protected:
 
-        irr::core::stringw m_name;
-        uint32_t m_id;
+        bool                    m_is_server_host;
+        irr::core::stringw      m_name;
+        uint32_t                m_id;
         OnlineUser(){}
 
     public:
 
-        /**
-          * Constructor
-          */
         OnlineUser(const irr::core::stringw &username);
 
-        /** Returns the username. */
+
         irr::core::stringw getUserName() const { return m_name; }
         uint32_t getUserID() const { return m_id; }
 
diff --git a/src/states_screens/networking_lobby_settings.cpp b/src/states_screens/networking_lobby_settings.cpp
index 8e82fc313..7cc6a423b 100644
--- a/src/states_screens/networking_lobby_settings.cpp
+++ b/src/states_screens/networking_lobby_settings.cpp
@@ -24,17 +24,13 @@
 
 #include "challenges/game_slot.hpp"
 #include "challenges/unlock_manager.hpp"
-#include "graphics/irr_driver.hpp"
-#include "guiengine/scalable_font.hpp"
-#include "input/device_manager.hpp"
-#include "input/input_manager.hpp"
-#include "io/file_manager.hpp"
-#include "main_loop.hpp"
+#include "audio/sfx_manager.hpp"
 #include "states_screens/online_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "modes/demo_world.hpp"
 #include "utils/translation.hpp"
+#include "states_screens/networking_lobby.hpp"
 
 #include "online/current_online_user.hpp"
 
@@ -55,6 +51,20 @@ NetworkingLobbySettings::NetworkingLobbySettings() : Screen("online/lobby_settin
 void NetworkingLobbySettings::loadedFromFile()
 {
 
+
+    m_name_widget = getWidget<TextBoxWidget>("name");
+    assert(m_name_widget != NULL);
+    m_max_players_widget = getWidget<SpinnerWidget>("max_players");
+    assert(m_max_players_widget != NULL);
+
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+
+    m_create_widget = getWidget<ButtonWidget>("create");
+    assert(m_create_widget != NULL);
+    m_cancel_widget = getWidget<ButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
+
 }   // loadedFromFile
 
 // ----------------------------------------------------------------------------
@@ -76,18 +86,44 @@ void NetworkingLobbySettings::init()
 {
     Screen::init();
     setInitialFocus();
-    DemoWorld::resetIdleTime(); //FIXME : what's this?}   // init
+    DemoWorld::resetIdleTime();
 }
 // ----------------------------------------------------------------------------
 void NetworkingLobbySettings::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
 }   // onUpdate
 
-// ----------------------------------------------------------------------------
 
+// ----------------------------------------------------------------------------
+void NetworkingLobbySettings::createServer()
+{
+    const stringw name = m_name_widget->getText().trim();
+    int max_players = m_max_players_widget->getValue();
+    stringw info = "";
+    if(CurrentOnlineUser::get()->createServer(name, max_players, info))
+    {
+        StateManager::get()->escapePressed();
+        StateManager::get()->pushScreen(NetworkingLobby::getInstance());
+    }
+    else
+    {
+        sfx_manager->quickSound( "anvil" );
+        m_info_widget->setColor(irr::video::SColor(255, 255, 0, 0));
+        m_info_widget->setText(info, false);
+    }
+}
+
+// ----------------------------------------------------------------------------
 void NetworkingLobbySettings::eventCallback(Widget* widget, const std::string& name, const int playerID)
 {
-
+    if (name == m_cancel_widget->m_properties[PROP_ID])
+    {
+        StateManager::get()->escapePressed();
+    }
+    else if (name == m_create_widget->m_properties[PROP_ID])
+    {
+        createServer();
+    }
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/networking_lobby_settings.hpp b/src/states_screens/networking_lobby_settings.hpp
index 234af94df..d27718b12 100644
--- a/src/states_screens/networking_lobby_settings.hpp
+++ b/src/states_screens/networking_lobby_settings.hpp
@@ -19,9 +19,10 @@
 #define HEADER_NETWORKING_LOBBY_SETTINGS_HPP
 
 #include "guiengine/screen.hpp"
+#include "guiengine/widgets/button_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/ribbon_widget.hpp"
-#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
+#include "guiengine/widgets/spinner_widget.hpp"
 
 namespace GUIEngine { class Widget; class ListWidget; }
 
@@ -37,18 +38,22 @@ private:
 
     NetworkingLobbySettings();
 
+    GUIEngine::TextBoxWidget * m_name_widget;
+    GUIEngine::SpinnerWidget * m_max_players_widget;
+
+    GUIEngine::LabelWidget * m_info_widget;
+
+    GUIEngine::ButtonWidget * m_create_widget;
+    GUIEngine::ButtonWidget * m_cancel_widget;
+
     /** \brief Checks if the user is still signed in. */
     bool hasLostConnection();
     /** \brief Sets which widget has to be focused. Depends on the user state. */
     void setInitialFocus();
 
-public:
+    void createServer();
 
-    enum Action
-    {
-        Create                  = 1,    // A new server should be created
-        Edit                    = 2,    // The settings of the server should be edited
-    };
+public:
 
     virtual void onUpdate(float delta,  irr::video::IVideoDriver* driver) OVERRIDE;
 
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 2e891b6f7..0cb20d045 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -154,6 +154,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     if (name == "back")
     {
         StateManager::get()->escapePressed();
+        return;
     }
 
     RibbonWidget* ribbon = dynamic_cast<RibbonWidget*>(widget);

From 8dd9314eaf503d835b370bd3a32ef59ae6f7874d Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 12 Jul 2013 01:07:26 +0000
Subject: [PATCH 02/44] server fetching and selection

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13193 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/server_selection.stkgui |  17 +++
 sources.cmake                           |   4 +
 src/online/current_online_user.cpp      |  27 ++++
 src/online/current_online_user.hpp      |   4 +
 src/online/server.cpp                   |  84 ++++++++++
 src/online/server.hpp                   | 135 +++++++++++++++++
 src/states_screens/server_selection.cpp | 194 ++++++++++++++++++++++++
 src/states_screens/server_selection.hpp |  94 ++++++++++++
 8 files changed, 559 insertions(+)
 create mode 100644 data/gui/online/server_selection.stkgui
 create mode 100644 src/online/server.cpp
 create mode 100644 src/online/server.hpp
 create mode 100644 src/states_screens/server_selection.cpp
 create mode 100644 src/states_screens/server_selection.hpp

diff --git a/data/gui/online/server_selection.stkgui b/data/gui/online/server_selection.stkgui
new file mode 100644
index 000000000..c863b9cc2
--- /dev/null
+++ b/data/gui/online/server_selection.stkgui
@@ -0,0 +1,17 @@
+<stkgui>
+
+<div x="0%" y="0%" width="100%" height="98%" layout="vertical-row" >
+
+    <div x="0" y="0" width="100%" layout="horizontal-row" height="8%">
+        <icon-button id="back"   height="100%" icon="gui/back.png"/>
+        <header text_align="center" proportion="1" text="Server Selection" align="center"/>
+        <icon-button id="reload"   height="90%" icon="gui/restart.png"/>
+    </div>
+  
+    <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
+        <list id="server_list" x="0" y="0" width="100%" height="100%"/>
+    </box>
+       
+</div>
+
+</stkgui>
diff --git a/sources.cmake b/sources.cmake
index a72fa0434..43b9b019f 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -147,6 +147,7 @@ src/network/race_state.cpp
 src/online/current_online_user.cpp
 src/online/http_connector.cpp
 src/online/online_user.cpp
+src/online/server.cpp
 src/physics/btKart.cpp
 src/physics/btKartRaycast.cpp
 src/physics/btUprightConstraint.cpp
@@ -205,6 +206,7 @@ src/states_screens/race_gui.cpp
 src/states_screens/race_gui_overworld.cpp
 src/states_screens/race_result_gui.cpp
 src/states_screens/race_setup_screen.cpp
+src/states_screens/server_selection.cpp
 src/states_screens/soccer_setup_screen.cpp
 src/states_screens/state_manager.cpp
 src/states_screens/story_mode_lobby.cpp
@@ -412,6 +414,7 @@ src/network/world_loaded_message.hpp
 src/online/current_online_user.hpp
 src/online/http_connector.hpp
 src/online/online_user.hpp
+src/online/server.hpp
 src/physics/btKart.hpp
 src/physics/btKartRaycast.hpp
 src/physics/btUprightConstraint.hpp
@@ -473,6 +476,7 @@ src/states_screens/race_gui.hpp
 src/states_screens/race_gui_overworld.hpp
 src/states_screens/race_result_gui.hpp
 src/states_screens/race_setup_screen.hpp
+src/states_screens/server_selection.hpp
 src/states_screens/soccer_setup_screen.hpp
 src/states_screens/state_manager.hpp
 src/states_screens/story_mode_lobby.hpp
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index bdf64cc19..f263b374c 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -176,6 +176,33 @@ bool CurrentOnlineUser::signOut(){
     return !m_is_signed_in;
 }
 
+// ============================================================================
+PtrVector<Server> * CurrentOnlineUser::getServerList(){
+    assert(m_is_signed_in == true);
+    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+    connector->setParameter("action",std::string("get_server_list"));
+    connector->setParameter("token",m_token);
+    connector->setParameter("userid",m_id);
+
+
+    const XMLNode * result = connector->getXMLFromPage();
+    std::string rec_success = "";
+    if(result->get("success", &rec_success))
+    {
+        if (rec_success =="yes")
+        {
+            const XMLNode * servers_xml = result->getNode("servers");
+            PtrVector<Server> * servers = new PtrVector<Server>;
+            for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
+            {
+                servers->push_back(new Server(*servers_xml->getNode(i)));
+            }
+            return servers;
+        }
+    }
+    return NULL;
+}
+
 // ============================================================================
 
 irr::core::stringw CurrentOnlineUser::getUserName() const
diff --git a/src/online/current_online_user.hpp b/src/online/current_online_user.hpp
index ab694ddeb..dca35f28b 100644
--- a/src/online/current_online_user.hpp
+++ b/src/online/current_online_user.hpp
@@ -22,6 +22,8 @@
 #include "online/online_user.hpp"
 #include <string>
 #include <irrString.h>
+#include "utils/ptr_vector.hpp"
+#include "online/server.hpp"
 
 
 // ============================================================================
@@ -62,6 +64,8 @@ class CurrentOnlineUser : public OnlineUser
                             int max_players,
                             irr::core::stringw &info);
 
+        PtrVector<Server> * getServerList();
+
         /** Returns the username if signed in. */
         irr::core::stringw getUserName() const;
         bool isSignedIn(){ return m_is_signed_in; }
diff --git a/src/online/server.cpp b/src/online/server.cpp
new file mode 100644
index 000000000..e1f26322c
--- /dev/null
+++ b/src/online/server.cpp
@@ -0,0 +1,84 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+/**
+  \page online Online
+  */
+
+#include "online/server.hpp"
+
+#include "io/xml_node.hpp"
+#include "utils/constants.hpp"
+#include "utils/string_utils.hpp"
+
+Server::SortOrder Server::m_sort_order=Server::SO_NAME;
+
+Server::Server(const XMLNode & xml)
+{
+    assert(xml.getName() == "server");
+    m_name              = "";
+    m_server_id         = 0;
+    m_description       = "";
+    m_current_players   = 0;
+    m_max_players   = 0;
+
+    xml.get("name", &m_lower_case_name);
+    m_name     = StringUtils::decodeFromHtmlEntities(m_lower_case_name);
+    m_lower_case_name = StringUtils::toLowerCase(m_lower_case_name);
+
+    std::string description;
+    xml.get("description", &description);
+    m_description     = StringUtils::decodeFromHtmlEntities(description);
+    // resolve XML entities
+    //m_description = StringUtils::replace(m_description, "&#10;", "\n");
+    //m_description = StringUtils::replace(m_description, "&#13;", ""); // ignore \r
+
+    xml.get("id",               &m_server_id);
+    xml.get("max_players",      &m_max_players);
+    xml.get("current_players",  &m_current_players);
+
+};   // Server(const XML&)
+
+// ----------------------------------------------------------------------------
+/** 
+ * \brief Filter the add-on with a list of words.
+ * \param words A list of words separated by ' '.
+ * \return true if the add-on contains one of the words, otherwise false.
+ */
+bool Server::filterByWords(const core::stringw words) const
+{
+    if (words == NULL || words.empty())
+        return true;
+
+    std::vector<core::stringw> list = StringUtils::split(words, ' ', false);
+
+    for (unsigned int i = 0; i < list.size(); i++)
+    {
+        list[i].make_lower();
+        
+        if ((core::stringw(m_name).make_lower()).find(list[i].c_str()) != -1)
+        {
+            return true;
+        }
+        
+        if ((core::stringw(m_description)).make_lower().find(list[i].c_str()) != -1)
+        {
+            return true;
+        }
+    }
+    
+    return false;
+} // filterByWords
diff --git a/src/online/server.hpp b/src/online/server.hpp
new file mode 100644
index 000000000..161af23be
--- /dev/null
+++ b/src/online/server.hpp
@@ -0,0 +1,135 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SERVER_HPP
+#define HEADER_SERVER_HPP
+
+/**
+  * \defgroup onlinegroup Online
+  * Represents a server that is joinable
+  */
+
+#include <string>
+#include <irrString.h>
+#include "io/xml_node.hpp"
+
+class XMLNode;
+
+/**
+  * \ingroup online
+  */
+class Server
+{
+public:
+
+    /** Set the sort order used in the comparison function. */
+    enum SortOrder { SO_SCORE   = 1,    // Sorted on satisfaction score
+                     SO_NAME    = 2,    // Sorted alphabetically by name
+                     SO_PLAYERS = 4
+    };
+
+protected:
+    /** The name to be displayed. */
+    irr::core::stringw m_name;
+    std::string m_lower_case_name; //Used for comparison
+
+    irr::core::stringw m_description;
+
+    int m_server_id;
+
+    int m_max_players;
+
+    int m_current_players;
+
+    float m_satisfaction_score;
+
+    /** The sort order to be used in the comparison. */
+    static SortOrder m_sort_order;
+
+    Server() {};
+
+public:
+
+     /** Initialises the object from an XML node. */
+     Server(const XMLNode & xml);
+    // ------------------------------------------------------------------------
+    /** Sets the sort order used in the comparison function. It is static, so
+     *  that each instance can access the sort order. */
+    static void setSortOrder(SortOrder so) { m_sort_order = so; }
+    // ------------------------------------------------------------------------
+    /** Returns the name of the server. */
+    const irr::core::stringw& getName() const { return m_name; }
+    const std::string & getLowerCaseName() const { return m_lower_case_name; }
+    // ------------------------------------------------------------------------
+    /** Returns the name of the server. */
+    const irr::core::stringw& getDescription() const { return m_description; }
+    // ------------------------------------------------------------------------
+    const float getScore() const { return m_satisfaction_score; }
+    // ------------------------------------------------------------------------
+    /** Returns the ID of this server. */
+    const int getServerId() const { return m_server_id; }
+    const int getMaxPlayers() const { return m_max_players; }
+    const int getCurrentPlayers() const { return m_current_players; }
+    // ------------------------------------------------------------------------
+    bool filterByWords(const irr::core::stringw words) const;
+    // ------------------------------------------------------------------------
+    
+    /** Compares two servers according to the sort order currently defined.
+     *  \param a The addon to compare this addon to.
+     */
+    bool operator<(const Server &server) const
+    {
+        switch(m_sort_order)
+        {
+            case SO_SCORE:
+                return m_satisfaction_score < server.getScore();
+                break;
+            case SO_NAME:
+                // m_id is the lower case name
+                return m_name < server.getName();
+                break;
+        }   // switch
+        return true;
+    }   // operator<
+
+    // ------------------------------------------------------------------------
+    /** Compares two addons according to the sort order currently defined.
+     *  Comparison is done for sorting in descending order.
+     *  \param a The addon to compare this addon to.
+     */
+    bool operator>(const Server &server) const
+    {
+        switch(m_sort_order)
+        {
+            /*case SO_SCORE:
+                return m_satisfaction_score > server.getScore();
+                break;*/
+            case SO_NAME:
+                return m_lower_case_name > server.getLowerCaseName();
+                break;
+            case SO_PLAYERS:
+                return m_current_players > server.getCurrentPlayers();
+                break;
+        }   // switch
+        return true;
+    }   // operator>
+
+};   // Server
+
+
+#endif
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
new file mode 100644
index 000000000..037c5192b
--- /dev/null
+++ b/src/states_screens/server_selection.cpp
@@ -0,0 +1,194 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2010 Lucas Baudin, Joerg Henrichs
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "states_screens/server_selection.hpp"
+
+#include <iostream>
+#include <assert.h>
+
+#include "guiengine/modaldialog.hpp"
+#include "guiengine/widget.hpp"
+#include "states_screens/dialogs/message_dialog.hpp"
+#include "states_screens/state_manager.hpp"
+#include "utils/translation.hpp"
+#include "online/current_online_user.hpp"
+
+
+DEFINE_SCREEN_SINGLETON( ServerSelection );
+
+// ----------------------------------------------------------------------------
+
+ServerSelection::ServerSelection() : Screen("server_selection.stkgui")
+{
+    m_selected_index = -1;
+    m_reload_timer = 0.0f;
+}   // ServerSelection
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::loadedFromFile()
+{
+
+    m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
+    m_reload_widget = getWidget<GUIEngine::IconButtonWidget>("reload");
+
+    m_server_list_widget = getWidget<GUIEngine::ListWidget>("server_list");
+    assert(m_server_list_widget != NULL);
+    m_server_list_widget->setColumnListener(this);
+    
+    m_servers = CurrentOnlineUser::get()->getServerList();
+}   // loadedFromFile
+
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::beforeAddingWidget()
+{
+    m_server_list_widget->clearColumns();
+    m_server_list_widget->addColumn( _("Name"), 4 );
+    m_server_list_widget->addColumn( _("Players"), 1 );
+    m_server_list_widget->addColumn( _("Max"), 1 );
+}
+// ----------------------------------------------------------------------------
+
+void ServerSelection::init()
+{
+    Screen::init();
+    m_reloading = false;
+    m_sort_desc = true;
+    m_reload_widget->setActivated();
+
+    // Set the default sort order
+    Server::setSortOrder(Server::SO_NAME);
+    loadList();
+}   // init
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::unloaded()
+{
+}
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::tearDown()
+{
+}
+
+// ----------------------------------------------------------------------------
+/** Loads the list of all servers. The gui element will be
+ *  updated.
+ *  \param type Must be 'kart' or 'track'.
+ */
+void ServerSelection::loadList()
+{
+    // First create a list of sorted entries
+
+    m_servers->insertionSort(/*start=*/0, m_sort_desc);
+
+    m_server_list_widget->clear();
+
+    for(int i=0; i<m_servers->size(); i++)
+    {
+        core::stringw table_entry;
+        table_entry.append((*m_servers)[i].getName());
+        table_entry.append("\t");
+        table_entry.append((*m_servers)[i].getCurrentPlayers());
+        table_entry.append("\t");
+        table_entry.append((*m_servers)[i].getMaxPlayers());
+        m_server_list_widget->addItem("server", table_entry);
+
+    }
+}   // loadList
+
+// ----------------------------------------------------------------------------
+void ServerSelection::onColumnClicked(int column_id)
+{
+    switch(column_id)
+    {
+        case 0: Server::setSortOrder(Server::SO_NAME); break;
+        case 1: Server::setSortOrder(Server::SO_PLAYERS); break;
+        case 2: Server::setSortOrder(Server::SO_PLAYERS); break;
+        default: assert(0); break;
+    }   // switch
+    /** \brief Toggle the sort order after column click **/
+    m_sort_desc = !m_sort_desc;
+    loadList();
+}   // onColumnClicked
+
+// ----------------------------------------------------------------------------
+void ServerSelection::eventCallback( GUIEngine::Widget* widget,
+                                     const std::string& name,
+                                     const int playerID)
+{
+    if (name == "back")
+    {
+        StateManager::get()->escapePressed();
+    }
+
+    else if (name == "reload")
+    {
+        if (!m_reloading)
+        {
+            m_reloading = true;
+            m_server_list_widget->clear();
+
+            m_server_list_widget->addItem("spacer", L"");
+            m_server_list_widget->addItem("loading", _("Please wait while the list is being updated."));
+        }
+    }
+
+    else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID])
+    {
+        m_selected_index = m_server_list_widget->getSelectionID();
+        //new ServerInfoDialog(0.8f, 0.8f, id);
+    }
+
+}   // eventCallback
+
+// ----------------------------------------------------------------------------
+/** Selects the last selected item on the list (which is the item that
+ *  is just being installed) again. This function is used from the
+ *  addons_loading screen: when it is closed, it will reset the
+ *  select item so that people can keep on installing from that
+ *  point on.
+*/
+void ServerSelection::setLastSelected()
+{
+    if(m_selected_index>-1)
+    {
+        m_server_list_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+        m_server_list_widget->setSelectionID(m_selected_index);
+    }
+}   // setLastSelected
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::onUpdate(float dt, irr::video::IVideoDriver*)
+{
+    m_reload_timer += dt;
+    if (m_reloading)
+    {
+        m_reloading = false;
+        if(m_reload_timer > 5000.0f)
+        {
+            m_servers = CurrentOnlineUser::get()->getServerList();
+            m_reload_timer = 0.0f;
+        }
+        loadList();
+    }
+}   // onUpdate
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
new file mode 100644
index 000000000..07f775dbc
--- /dev/null
+++ b/src/states_screens/server_selection.hpp
@@ -0,0 +1,94 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SERVER_SELECTION_HPP
+#define HEADER_SERVER_SELECTION_HPP
+
+#include "guiengine/screen.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "utils/ptr_vector.hpp"
+#include "online/server.hpp"
+
+namespace GUIEngine { class Widget; }
+
+/**
+  * \brief ServerSelection
+  * \ingroup states_screens
+  */
+class ServerSelection :  public GUIEngine::Screen,
+                         public GUIEngine::ScreenSingleton<ServerSelection>,
+                         public GUIEngine::IListWidgetHeaderListener
+{
+    friend class GUIEngine::ScreenSingleton<ServerSelection>;
+
+private:
+    ServerSelection();
+
+    GUIEngine::IconButtonWidget * m_back_widget;
+    GUIEngine::IconButtonWidget * m_reload_widget;
+    GUIEngine::LabelWidget * m_update_status;
+    GUIEngine::ListWidget *  m_server_list_widget;
+
+    /** Currently selected type. */
+    std::string      m_type;
+
+    /** The currently selected index, used to re-select this item after
+     *  addons_loading is being displayed. */
+    int              m_selected_index;
+
+    bool             m_reloading;
+
+    /** \brief To check (and set) if sort order is descending **/
+    bool             m_sort_desc;
+
+    float            m_reload_timer;
+
+    PtrVector<Server> * m_servers;
+
+public:
+
+    /** Load the addons into the main list.*/
+    void loadList();
+
+    /** \brief implement callback from parent class GUIEngine::Screen */
+    virtual void loadedFromFile() OVERRIDE;
+
+    virtual void unloaded() OVERRIDE;
+
+    /** \brief implement callback from parent class GUIEngine::Screen */
+    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+                               const int playerID) OVERRIDE;
+
+    /** \brief implement callback from parent class GUIEngine::Screen */
+    virtual void beforeAddingWidget() OVERRIDE;
+
+    virtual void onColumnClicked(int columnId);
+
+    virtual void init() OVERRIDE;
+    virtual void tearDown() OVERRIDE;
+
+    /** \brief implement callback from parent class GUIEngine::Screen */
+    virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
+
+    void    setLastSelected();
+
+};
+
+#endif

From 200127102d4a769b1d97448816430ddf5d05033e Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 12 Jul 2013 23:12:31 +0000
Subject: [PATCH 03/44] Big commit related to server joining.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13196 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/lobby.stkgui                  |   6 +-
 data/gui/online/server_info_dialog.stkgui     |  33 +++++
 sources.cmake                                 |   4 +
 src/online/current_online_user.cpp            |  43 +++---
 src/online/current_online_user.hpp            |   8 +-
 src/online/server.cpp                         |  24 +---
 src/online/server.hpp                         |  17 ++-
 src/online/servers_manager.cpp                |  71 ++++++++++
 src/online/servers_manager.hpp                |  56 ++++++++
 src/states_screens/dialogs/login_dialog.cpp   |   2 +-
 .../dialogs/registration_dialog.cpp           |   4 +-
 .../dialogs/registration_dialog.hpp           |   2 +-
 .../dialogs/server_info_dialog.cpp            | 134 ++++++++++++++++++
 .../dialogs/server_info_dialog.hpp            |  63 ++++++++
 src/states_screens/networking_lobby.cpp       |  15 +-
 src/states_screens/networking_lobby.hpp       |   7 +-
 src/states_screens/online_screen.cpp          |  17 +--
 src/states_screens/server_selection.cpp       |  46 +++---
 src/states_screens/server_selection.hpp       |   6 +-
 19 files changed, 460 insertions(+), 98 deletions(-)
 create mode 100644 data/gui/online/server_info_dialog.stkgui
 create mode 100644 src/online/servers_manager.cpp
 create mode 100644 src/online/servers_manager.hpp
 create mode 100644 src/states_screens/dialogs/server_info_dialog.cpp
 create mode 100644 src/states_screens/dialogs/server_info_dialog.hpp

diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/lobby.stkgui
index d0e93283a..e0ccb94a9 100644
--- a/data/gui/online/lobby.stkgui
+++ b/data/gui/online/lobby.stkgui
@@ -6,8 +6,10 @@
         <div proportion="1" x="2%" width="96%" layout="vertical-row">
             <div width="100%" proportion="2" layout="horizontal-row">
                 <box id="info" proportion="2" height="100%" layout="vertical-row">
-                     <label I18N="In networking lobby" word_wrap="true" text="Description about room" 
-                     align="center" text-align="center"/> 
+                    <div width="100%" height="fit" layout="horizontal-row" >
+                        <label proportion="1" text_align="left" I18N="In the networking lobby" text="Server name :"/>
+                        <label proportion="2" text_align="left" id="server_name" text=""/>
+                    </div>
                 </box>
                 <spacer width="20" height="20"/>
                 <box proportion="1" height="100%" layout="vertical-row">
diff --git a/data/gui/online/server_info_dialog.stkgui b/data/gui/online/server_info_dialog.stkgui
new file mode 100644
index 000000000..bed82f815
--- /dev/null
+++ b/data/gui/online/server_info_dialog.stkgui
@@ -0,0 +1,33 @@
+<stkgui>
+
+    <div x="2%" y="5%" width="96%" height="85%" layout="vertical-row" >
+    
+        <header id="title" width="96%" height="fit" text_align="center" word_wrap="true"
+       I18N="In the server info dialog' dialog" text="Server Info"/>
+       
+       <spacer height="20" width="50">
+        
+        <div width="80%" align="center" layout="vertical-row" height="fit" >
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label proportion="1" text_align="left" I18N="In the server info dialog" text="Name"/>
+                <label id="name" proportion="2" text_align="left" text=""/>
+            </div>
+        </div>
+        
+        <spacer height="20" width="50">      
+        
+        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
+           
+        <spacer height="20" width="50"> 
+        
+        <buttonbar id="options" width="90%" height="20%" align="center">
+                <icon-button id="join" width="64" height="64" icon="gui/main_options.png"
+                             I18N="Login dialog"  text="Join" label_location="bottom"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+                             I18N="Login dialog" text="Cancel" label_location="bottom"/>
+        </buttonbar>
+        
+    
+    </div>
+
+</stkgui>
diff --git a/sources.cmake b/sources.cmake
index 43b9b019f..8d809a349 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -148,6 +148,7 @@ src/online/current_online_user.cpp
 src/online/http_connector.cpp
 src/online/online_user.cpp
 src/online/server.cpp
+src/online/servers_manager.cpp
 src/physics/btKart.cpp
 src/physics/btKartRaycast.cpp
 src/physics/btUprightConstraint.cpp
@@ -181,6 +182,7 @@ src/states_screens/dialogs/press_a_key_dialog.cpp
 src/states_screens/dialogs/race_paused_dialog.cpp
 src/states_screens/dialogs/registration_dialog.cpp
 src/states_screens/dialogs/select_challenge.cpp
+src/states_screens/dialogs/server_info_dialog.cpp
 src/states_screens/dialogs/track_info_dialog.cpp
 src/states_screens/dialogs/tutorial_message_dialog.cpp
 src/states_screens/feature_unlocked.cpp
@@ -415,6 +417,7 @@ src/online/current_online_user.hpp
 src/online/http_connector.hpp
 src/online/online_user.hpp
 src/online/server.hpp
+src/online/servers_manager.hpp
 src/physics/btKart.hpp
 src/physics/btKartRaycast.hpp
 src/physics/btUprightConstraint.hpp
@@ -451,6 +454,7 @@ src/states_screens/dialogs/press_a_key_dialog.hpp
 src/states_screens/dialogs/race_paused_dialog.hpp
 src/states_screens/dialogs/registration_dialog.hpp
 src/states_screens/dialogs/select_challenge.hpp
+src/states_screens/dialogs/server_info_dialog.hpp
 src/states_screens/dialogs/track_info_dialog.hpp
 src/states_screens/dialogs/tutorial_message_dialog.hpp
 src/states_screens/feature_unlocked.hpp
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index f263b374c..e85322e5a 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -153,13 +153,14 @@ bool CurrentOnlineUser::createServer(  const irr::core::stringw &name,
 
 
 // ============================================================================
-bool CurrentOnlineUser::signOut(){
+bool CurrentOnlineUser::signOut(irr::core::stringw &info){
     assert(m_is_signed_in == true);
     HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
     connector->setParameter("action",std::string("disconnect"));
     connector->setParameter("token",m_token);
     connector->setParameter("userid",m_id);
 
+
     const XMLNode * result = connector->getXMLFromPage();
     std::string rec_success = "";
     if(result->get("success", &rec_success))
@@ -172,35 +173,45 @@ bool CurrentOnlineUser::signOut(){
             m_is_signed_in = false;
             m_is_guest = false;
         }
+        result->get("info", &info);
+    }
+    else
+    {
+        info = _("Unable to connect to the server. Check your internet connection or try again later.");
     }
     return !m_is_signed_in;
 }
 
 // ============================================================================
-PtrVector<Server> * CurrentOnlineUser::getServerList(){
+
+bool CurrentOnlineUser::requestJoin(uint32_t server_id, irr::core::stringw &info){
     assert(m_is_signed_in == true);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",std::string("get_server_list"));
-    connector->setParameter("token",m_token);
-    connector->setParameter("userid",m_id);
-
-
+    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
+    connector->setParameter("action",std::string("request-connection"));
+    connector->setParameter("token", m_token);
+    connector->setParameter("id", m_id);
+    connector->setParameter("server_id", server_id);
+    bool success = false;
     const XMLNode * result = connector->getXMLFromPage();
     std::string rec_success = "";
     if(result->get("success", &rec_success))
     {
         if (rec_success =="yes")
         {
-            const XMLNode * servers_xml = result->getNode("servers");
-            PtrVector<Server> * servers = new PtrVector<Server>;
-            for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
-            {
-                servers->push_back(new Server(*servers_xml->getNode(i)));
-            }
-            return servers;
+            m_token = "";
+            m_name = "";
+            m_id = 0;
+            m_is_signed_in = false;
+            m_is_guest = false;
+            success = true;
         }
+        result->get("info", &info);
     }
-    return NULL;
+    else
+    {
+        info = _("Unable to connect to the server. Check your internet connection or try again later.");
+    }
+    return success;
 }
 
 // ============================================================================
diff --git a/src/online/current_online_user.hpp b/src/online/current_online_user.hpp
index dca35f28b..3b0c81ea2 100644
--- a/src/online/current_online_user.hpp
+++ b/src/online/current_online_user.hpp
@@ -22,10 +22,11 @@
 #include "online/online_user.hpp"
 #include <string>
 #include <irrString.h>
-#include "utils/ptr_vector.hpp"
+#include "utils/types.hpp"
 #include "online/server.hpp"
 
 
+
 // ============================================================================
 
 /**
@@ -58,13 +59,14 @@ class CurrentOnlineUser : public OnlineUser
                         bool terms,
                         irr::core::stringw &info);
         // Logout - Best to be followed by CurrentOnlineUser::deallocate
-        bool signOut();
+        bool signOut(   irr::core::stringw &info);
 
         bool createServer(  const irr::core::stringw &name,
                             int max_players,
                             irr::core::stringw &info);
 
-        PtrVector<Server> * getServerList();
+        bool requestJoin(   uint32_t server_id,
+                            irr::core::stringw &info);
 
         /** Returns the username if signed in. */
         irr::core::stringw getUserName() const;
diff --git a/src/online/server.cpp b/src/online/server.cpp
index e1f26322c..ad3b72984 100644
--- a/src/online/server.cpp
+++ b/src/online/server.cpp
@@ -24,28 +24,21 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
-Server::SortOrder Server::m_sort_order=Server::SO_NAME;
+Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
 
 Server::Server(const XMLNode & xml)
 {
     assert(xml.getName() == "server");
-    m_name              = "";
-    m_server_id         = 0;
-    m_description       = "";
-    m_current_players   = 0;
-    m_max_players   = 0;
+    m_name                      = "";
+    m_satisfaction_score        = 0;
+    m_server_id                 = 0;
+    m_current_players           = 0;
+    m_max_players               = 0;
 
     xml.get("name", &m_lower_case_name);
     m_name     = StringUtils::decodeFromHtmlEntities(m_lower_case_name);
     m_lower_case_name = StringUtils::toLowerCase(m_lower_case_name);
 
-    std::string description;
-    xml.get("description", &description);
-    m_description     = StringUtils::decodeFromHtmlEntities(description);
-    // resolve XML entities
-    //m_description = StringUtils::replace(m_description, "&#10;", "\n");
-    //m_description = StringUtils::replace(m_description, "&#13;", ""); // ignore \r
-
     xml.get("id",               &m_server_id);
     xml.get("max_players",      &m_max_players);
     xml.get("current_players",  &m_current_players);
@@ -73,11 +66,6 @@ bool Server::filterByWords(const core::stringw words) const
         {
             return true;
         }
-        
-        if ((core::stringw(m_description)).make_lower().find(list[i].c_str()) != -1)
-        {
-            return true;
-        }
     }
     
     return false;
diff --git a/src/online/server.hpp b/src/online/server.hpp
index 161af23be..80cdbe8f5 100644
--- a/src/online/server.hpp
+++ b/src/online/server.hpp
@@ -27,6 +27,7 @@
 #include <string>
 #include <irrString.h>
 #include "io/xml_node.hpp"
+#include "utils/types.hpp"
 
 class XMLNode;
 
@@ -48,9 +49,7 @@ protected:
     irr::core::stringw m_name;
     std::string m_lower_case_name; //Used for comparison
 
-    irr::core::stringw m_description;
-
-    int m_server_id;
+    uint32_t m_server_id;
 
     int m_max_players;
 
@@ -76,13 +75,10 @@ public:
     const irr::core::stringw& getName() const { return m_name; }
     const std::string & getLowerCaseName() const { return m_lower_case_name; }
     // ------------------------------------------------------------------------
-    /** Returns the name of the server. */
-    const irr::core::stringw& getDescription() const { return m_description; }
-    // ------------------------------------------------------------------------
     const float getScore() const { return m_satisfaction_score; }
     // ------------------------------------------------------------------------
     /** Returns the ID of this server. */
-    const int getServerId() const { return m_server_id; }
+    const uint32_t getServerId() const { return m_server_id; }
     const int getMaxPlayers() const { return m_max_players; }
     const int getCurrentPlayers() const { return m_current_players; }
     // ------------------------------------------------------------------------
@@ -103,6 +99,9 @@ public:
                 // m_id is the lower case name
                 return m_name < server.getName();
                 break;
+            case SO_PLAYERS:
+                return m_current_players < server.getCurrentPlayers();
+                break;
         }   // switch
         return true;
     }   // operator<
@@ -116,9 +115,9 @@ public:
     {
         switch(m_sort_order)
         {
-            /*case SO_SCORE:
+            case SO_SCORE:
                 return m_satisfaction_score > server.getScore();
-                break;*/
+                break;
             case SO_NAME:
                 return m_lower_case_name > server.getLowerCaseName();
                 break;
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
new file mode 100644
index 000000000..6b26e35e0
--- /dev/null
+++ b/src/online/servers_manager.cpp
@@ -0,0 +1,71 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#include "online/servers_manager.hpp"
+
+#include <string>
+#include <irrString.h>
+#include <assert.h>
+#include "online/http_connector.hpp"
+#include "config/user_config.hpp"
+#include "utils/translation.hpp"
+
+static ServersManager* user_singleton = NULL;
+
+ServersManager* ServersManager::get()
+{
+    if (user_singleton == NULL)
+        user_singleton = new ServersManager();
+    return user_singleton;
+}   // get
+
+void ServersManager::deallocate()
+{
+    delete user_singleton;
+    user_singleton = NULL;
+}   // deallocate
+
+// ============================================================================
+ServersManager::ServersManager(){
+    m_servers = new PtrVector<Server>;
+    refresh();
+}
+
+// ============================================================================
+void ServersManager::refresh()
+{
+    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+    connector->setParameter("action",std::string("get_server_list"));
+
+    const XMLNode * result = connector->getXMLFromPage();
+    std::string rec_success = "";
+    if(result->get("success", &rec_success))
+    {
+        if (rec_success =="yes")
+        {
+            const XMLNode * servers_xml = result->getNode("servers");
+            m_servers->clearAndDeleteAll();
+            for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
+            {
+                m_servers->push_back(new Server(*servers_xml->getNode(i)));
+            }
+        }
+    }
+    //FIXME error message
+}
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
new file mode 100644
index 000000000..d76a70b3f
--- /dev/null
+++ b/src/online/servers_manager.hpp
@@ -0,0 +1,56 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_SERVERS_MANAGER_HPP
+#define HEADER_CURRENT_ONLINE_USER_HPP
+
+#include "utils/ptr_vector.hpp"
+#include "online/server.hpp"
+
+
+// ============================================================================
+
+/**
+  * \brief
+  * \ingroup online
+  */
+class ServersManager
+{
+    private:
+        ServersManager();
+        PtrVector<Server> * m_servers;
+        bool m_not_fetched;
+        Server * m_joined_server;
+
+    public:
+        // singleton
+        static ServersManager* get();
+        static void deallocate();
+
+        void refresh();
+        PtrVector<Server> * getServers () const { return m_servers; };
+        int getNumServers () const { return m_servers->size(); };
+        Server * getServer (int index) const { return m_servers->get(index);};
+        void sort(bool sort_desc) { m_servers->insertionSort(0, sort_desc); };
+        void setJoinedServer(Server * server){ m_joined_server = server;};
+        Server * getJoinedServer(){ return m_joined_server;};
+};   // class ServersManager
+
+#endif
+
+/*EOF*/
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 5132cbbd3..44a1f78e3 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -160,7 +160,7 @@ void LoginDialog::onUpdate(float dt)
     {
         ModalDialog::dismiss();
         if (m_open_registration_dialog)
-            new RegistrationDialog(0.8f, 0.9f);
+            new RegistrationDialog();
 
     }
 
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 28417888c..eb0329997 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -38,8 +38,8 @@ using namespace irr::gui;
 
 // -----------------------------------------------------------------------------
 
-RegistrationDialog::RegistrationDialog(const float w, const float h, const Phase phase) :
-        ModalDialog(w,h)
+RegistrationDialog::RegistrationDialog(const Phase phase) :
+        ModalDialog(0.8f,0.9f)
 {
     m_self_destroy = false;
     m_show_registration_info = false;
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index 429289b5c..2fe24d5d4 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -37,7 +37,7 @@ public:
         Activation = 4
     };
 
-    RegistrationDialog(const float percentWidth, const float percentHeight, const Phase phase = Info);
+    RegistrationDialog(const Phase phase = Info);
     ~RegistrationDialog();
 
     void onEnterPressedInternal();
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
new file mode 100644
index 000000000..695dba9ef
--- /dev/null
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -0,0 +1,134 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "states_screens/dialogs/server_info_dialog.hpp"
+
+#include <IGUIEnvironment.h>
+
+#include "audio/sfx_manager.hpp"
+#include "config/player.hpp"
+#include "guiengine/engine.hpp"
+#include "states_screens/state_manager.hpp"
+#include "utils/translation.hpp"
+#include "utils/string_utils.hpp"
+#include "online/current_online_user.hpp"
+#include "online/servers_manager.hpp"
+#include "states_screens/dialogs/registration_dialog.hpp"
+#include "states_screens/networking_lobby.hpp"
+
+
+using namespace GUIEngine;
+using namespace irr;
+using namespace irr::gui;
+
+// -----------------------------------------------------------------------------
+
+ServerInfoDialog::ServerInfoDialog(Server * server) :
+        ModalDialog(0.8f,0.8f)
+{
+    m_server = server;
+    m_self_destroy = false;
+    m_enter_lobby = false;
+
+    loadFromFile("online/server_info_dialog.stkgui");
+
+    m_name_widget = getWidget<LabelWidget>("name");
+    assert(m_name_widget != NULL);
+    m_name_widget->setText(server->getName(),false);
+
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+
+    m_options_widget = getWidget<RibbonWidget>("options");
+    assert(m_options_widget != NULL);
+    m_join_widget = getWidget<IconButtonWidget>("join");
+    assert(m_join_widget != NULL);
+    m_cancel_widget = getWidget<IconButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
+    m_options_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+}
+
+// -----------------------------------------------------------------------------
+ServerInfoDialog::~ServerInfoDialog()
+{
+}
+// -----------------------------------------------------------------------------
+void ServerInfoDialog::requestJoin()
+{
+    //FIXME totally not correct. Receiving an answer, not kept in mind.
+    irr::core::stringw info;
+    if (CurrentOnlineUser::get()->requestJoin( m_server->getServerId(), info))
+    {
+        ServersManager::get()->setJoinedServer(m_server);
+        m_enter_lobby = true;
+    }
+    else
+    {
+        sfx_manager->quickSound( "anvil" );
+        m_info_widget->setColor(irr::video::SColor(255, 255, 0, 0));
+        m_info_widget->setText(info, false);
+    }
+}
+
+// -----------------------------------------------------------------------------
+GUIEngine::EventPropagation ServerInfoDialog::processEvent(const std::string& eventSource)
+{
+
+    if (eventSource == m_options_widget->m_properties[PROP_ID])
+    {
+        const std::string& selection = m_options_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+        if (selection == m_cancel_widget->m_properties[PROP_ID])
+        {
+            m_self_destroy = true;
+            return GUIEngine::EVENT_BLOCK;
+        }
+        else if(selection == m_join_widget->m_properties[PROP_ID])
+        {
+            requestJoin();
+            return GUIEngine::EVENT_BLOCK;
+        }
+    }
+    return GUIEngine::EVENT_LET;
+}
+
+// -----------------------------------------------------------------------------
+
+void ServerInfoDialog::onEnterPressedInternal()
+{
+
+    //If enter was pressed while none of the buttons was focused interpret as join event
+    const int playerID = PLAYER_ID_GAME_MASTER;
+    if (GUIEngine::isFocusedForPlayer(m_options_widget, playerID))
+        return;
+    requestJoin();
+}
+
+// -----------------------------------------------------------------------------
+
+void ServerInfoDialog::onUpdate(float dt)
+{
+    //If we want to open the registration dialog, we need to close this one first
+    m_enter_lobby && (m_self_destroy = true);
+
+    // It's unsafe to delete from inside the event handler so we do it here
+    if (m_self_destroy)
+    {
+        ModalDialog::dismiss();
+        if (m_enter_lobby)
+            StateManager::get()->pushScreen(NetworkingLobby::getInstance());
+    }
+}
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
new file mode 100644
index 000000000..5ee68348c
--- /dev/null
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -0,0 +1,63 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#ifndef HEADER_SERVER_INFO_DIALOG_HPP
+#define HEADER_SERVER_INFO_DIALOG_HPP
+
+#include <irrString.h>
+
+#include "guiengine/modaldialog.hpp"
+#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets/ribbon_widget.hpp"
+#include "guiengine/widgets/label_widget.hpp"
+#include "online/server.hpp"
+/**
+ * \brief Dialog that allows a user to sign in
+ * \ingroup states_screens
+ */
+class ServerInfoDialog : public GUIEngine::ModalDialog
+{
+
+private:
+    
+    bool m_self_destroy;
+    bool m_enter_lobby;
+
+    Server * m_server;
+
+    GUIEngine::LabelWidget * m_name_widget;
+    GUIEngine::LabelWidget * m_info_widget;
+
+    GUIEngine::RibbonWidget * m_options_widget;
+    GUIEngine::IconButtonWidget * m_join_widget;
+    GUIEngine::IconButtonWidget * m_cancel_widget;
+    
+    void requestJoin();
+
+public:
+    ServerInfoDialog(Server * server);
+    ~ServerInfoDialog();
+
+    void onEnterPressedInternal();
+    GUIEngine::EventPropagation processEvent(const std::string& eventSource);
+    
+    virtual void onUpdate(float dt);
+    //virtual void onTextUpdated();
+};
+
+#endif
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index d3d894a44..4dfbc0959 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -35,6 +35,7 @@
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "modes/demo_world.hpp"
 #include "utils/translation.hpp"
+#include "online/servers_manager.hpp"
 
 #include "online/current_online_user.hpp"
 
@@ -47,13 +48,16 @@ DEFINE_SCREEN_SINGLETON( NetworkingLobby );
 
 NetworkingLobby::NetworkingLobby() : Screen("online/lobby.stkgui")
 {
-
+    m_server = ServersManager::get()->getJoinedServer();
 }   // NetworkingLobby
 
 // ----------------------------------------------------------------------------
 
 void NetworkingLobby::loadedFromFile()
 {
+    m_server_name_widget = getWidget<LabelWidget>("server_name");
+    assert(m_server_name_widget != NULL);
+
     m_online_status_widget = getWidget<LabelWidget>("online_status");
     assert(m_online_status_widget != NULL);
 
@@ -65,12 +69,6 @@ void NetworkingLobby::loadedFromFile()
 
 }   // loadedFromFile
 
-// ----------------------------------------------------------------------------
-bool NetworkingLobby::hasLostConnection()
-{
-    return !CurrentOnlineUser::get()->isSignedIn();
-}
-
 // ----------------------------------------------------------------------------
 void NetworkingLobby::beforeAddingWidget()
 {
@@ -85,7 +83,8 @@ void NetworkingLobby::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime(); //FIXME : what's this?
-    m_online_status_widget->setText(irr::core::stringw(_("Signed in as : ")) + CurrentOnlineUser::get()->getUserName() + ".", false);
+    m_server_name_widget->setText(m_server->getName(),false);
+
 }   // init
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp
index 76779a67f..8bb05d76b 100644
--- a/src/states_screens/networking_lobby.hpp
+++ b/src/states_screens/networking_lobby.hpp
@@ -22,6 +22,7 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
+#include "online/server.hpp"
 
 namespace GUIEngine { class Widget; class ListWidget; }
 
@@ -35,8 +36,12 @@ class NetworkingLobby :     public GUIEngine::Screen,
 private:
     friend class GUIEngine::ScreenSingleton<NetworkingLobby>;
 
+    Server * m_server;
+
     NetworkingLobby();
 
+    GUIEngine::LabelWidget * m_server_name_widget;
+
     GUIEngine::LabelWidget * m_online_status_widget;
 
     GUIEngine::RibbonWidget * m_bottom_menu_widget;
@@ -44,8 +49,6 @@ private:
     GUIEngine::IconButtonWidget * m_register_widget;
     GUIEngine::IconButtonWidget * m_sign_out_widget;
 
-    /** \brief Checks if the user is still signed in. */
-    bool hasLostConnection();
     /** \brief Sets which widget has to be focused. Depends on the user state. */
     void setInitialFocus();
 
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 0cb20d045..0e2225ca5 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -30,13 +30,13 @@
 #include "input/input_manager.hpp"
 #include "io/file_manager.hpp"
 #include "main_loop.hpp"
-#include "states_screens/online_screen.hpp"
 #include "states_screens/state_manager.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/dialogs/login_dialog.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/networking_lobby.hpp"
 #include "states_screens/networking_lobby_settings.hpp"
+#include "states_screens/server_selection.hpp"
 #include "modes/demo_world.hpp"
 #include "utils/translation.hpp"
 
@@ -167,22 +167,22 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
     else if (selection == "sign_out")
     {
-        if (CurrentOnlineUser::get()->signOut())
+        irr::core::stringw info;
+        if (CurrentOnlineUser::get()->signOut(info))
         {
-            new MessageDialog( _("Signed out successfully.") );
+            new MessageDialog(_("Signed out successfully."));
             //GUIEngine::reshowCurrentScreen();
         }
         else
-            new MessageDialog( _("An error occured while signing out.") );
+            new MessageDialog(info);
     }
     else if (selection == "register")
     {
-        new RegistrationDialog(0.8f, 0.9f);
+        new RegistrationDialog();
     }
     else if (selection == "find_server")
     {
-        //if (m_recorded_state == Registered)
-            new MessageDialog("Coming soon!");
+        StateManager::get()->pushScreen(ServerSelection::getInstance());
     }
     else if (selection == "create_server")
     {
@@ -208,7 +208,8 @@ void OnlineScreen::onDisabledItemClicked(const std::string& item)
 {
     if (item == "find_server")
     {
-        new LoginDialog(LoginDialog::Registration_Required);
+        StateManager::get()->pushScreen(ServerSelection::getInstance());
+        // FIXME new LoginDialog(LoginDialog::Registration_Required);
     }
     else if (item =="create_server")
     {
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 037c5192b..09afb3e39 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -23,16 +23,17 @@
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/widget.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
+#include "states_screens/dialogs/server_info_dialog.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
-#include "online/current_online_user.hpp"
-
+#include "utils/string_utils.hpp"
+#include "online/servers_manager.hpp"
 
 DEFINE_SCREEN_SINGLETON( ServerSelection );
 
 // ----------------------------------------------------------------------------
 
-ServerSelection::ServerSelection() : Screen("server_selection.stkgui")
+ServerSelection::ServerSelection() : Screen("online/server_selection.stkgui")
 {
     m_selected_index = -1;
     m_reload_timer = 0.0f;
@@ -49,8 +50,6 @@ void ServerSelection::loadedFromFile()
     m_server_list_widget = getWidget<GUIEngine::ListWidget>("server_list");
     assert(m_server_list_widget != NULL);
     m_server_list_widget->setColumnListener(this);
-    
-    m_servers = CurrentOnlineUser::get()->getServerList();
 }   // loadedFromFile
 
 
@@ -60,8 +59,7 @@ void ServerSelection::beforeAddingWidget()
 {
     m_server_list_widget->clearColumns();
     m_server_list_widget->addColumn( _("Name"), 4 );
-    m_server_list_widget->addColumn( _("Players"), 1 );
-    m_server_list_widget->addColumn( _("Max"), 1 );
+    m_server_list_widget->addColumn( _("Players"), 2);
 }
 // ----------------------------------------------------------------------------
 
@@ -94,25 +92,26 @@ void ServerSelection::tearDown()
  *  updated.
  *  \param type Must be 'kart' or 'track'.
  */
-void ServerSelection::loadList()
+void ServerSelection::loadList(bool refresh)
 {
-    // First create a list of sorted entries
-
-    m_servers->insertionSort(/*start=*/0, m_sort_desc);
-
     m_server_list_widget->clear();
+    ServersManager * manager = ServersManager::get();
+    if (refresh)
+        manager->refresh();
+    manager->sort(m_sort_desc);
 
-    for(int i=0; i<m_servers->size(); i++)
+    for(int i=0; i <  manager->getNumServers(); i++)
     {
+        Server * server = manager->getServer(i);
         core::stringw table_entry;
-        table_entry.append((*m_servers)[i].getName());
+        table_entry.append(server->getName());
         table_entry.append("\t");
-        table_entry.append((*m_servers)[i].getCurrentPlayers());
-        table_entry.append("\t");
-        table_entry.append((*m_servers)[i].getMaxPlayers());
+        table_entry.append(StringUtils::toWString(server->getCurrentPlayers()));
+        table_entry.append("/");
+        table_entry.append(StringUtils::toWString(server->getMaxPlayers()));
         m_server_list_widget->addItem("server", table_entry);
-
     }
+
 }   // loadList
 
 // ----------------------------------------------------------------------------
@@ -122,7 +121,6 @@ void ServerSelection::onColumnClicked(int column_id)
     {
         case 0: Server::setSortOrder(Server::SO_NAME); break;
         case 1: Server::setSortOrder(Server::SO_PLAYERS); break;
-        case 2: Server::setSortOrder(Server::SO_PLAYERS); break;
         default: assert(0); break;
     }   // switch
     /** \brief Toggle the sort order after column click **/
@@ -146,7 +144,6 @@ void ServerSelection::eventCallback( GUIEngine::Widget* widget,
         {
             m_reloading = true;
             m_server_list_widget->clear();
-
             m_server_list_widget->addItem("spacer", L"");
             m_server_list_widget->addItem("loading", _("Please wait while the list is being updated."));
         }
@@ -155,7 +152,7 @@ void ServerSelection::eventCallback( GUIEngine::Widget* widget,
     else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID])
     {
         m_selected_index = m_server_list_widget->getSelectionID();
-        //new ServerInfoDialog(0.8f, 0.8f, id);
+        new ServerInfoDialog(ServersManager::get()->getServer(m_selected_index));
     }
 
 }   // eventCallback
@@ -186,9 +183,12 @@ void ServerSelection::onUpdate(float dt, irr::video::IVideoDriver*)
         m_reloading = false;
         if(m_reload_timer > 5000.0f)
         {
-            m_servers = CurrentOnlineUser::get()->getServerList();
+            loadList(true);
             m_reload_timer = 0.0f;
         }
-        loadList();
+        else
+        {
+            loadList(false);
+        }
     }
 }   // onUpdate
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
index 07f775dbc..ea698da6c 100644
--- a/src/states_screens/server_selection.hpp
+++ b/src/states_screens/server_selection.hpp
@@ -23,8 +23,6 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/list_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
-#include "utils/ptr_vector.hpp"
-#include "online/server.hpp"
 
 namespace GUIEngine { class Widget; }
 
@@ -60,12 +58,10 @@ private:
 
     float            m_reload_timer;
 
-    PtrVector<Server> * m_servers;
-
 public:
 
     /** Load the addons into the main list.*/
-    void loadList();
+    void loadList(bool refresh = false);
 
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE;

From 3463a01e8561063f9db81e0b0f7925723d986a64 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 13 Jul 2013 15:59:27 +0000
Subject: [PATCH 04/44] Remember session (without GUI) and starting to
 integrate online-multiplayer and addons networking code. (Limited to config
 file for now.)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13202 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/config/user_config.hpp         | 49 +++++++++++++++++++++-------
 src/online/current_online_user.cpp | 51 ++++++++++++++++++++++++++++--
 src/online/current_online_user.hpp |  3 ++
 3 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/src/config/user_config.hpp b/src/config/user_config.hpp
index 597061976..548c938be 100644
--- a/src/config/user_config.hpp
+++ b/src/config/user_config.hpp
@@ -603,16 +603,48 @@ namespace UserConfigParams
         PARAM_DEFAULT( WStringUserConfigParam(L"", "default_player",
                                               "Which player to use by default (if empty, will prompt)") );
 
-    // ---- Online multiplayer related
+    // ---- Internet related
+
+    PARAM_PREFIX IntUserConfigParam        m_internet_status
+            PARAM_DEFAULT(  IntUserConfigParam(0, "enable_internet",
+                                               "Status of internet: 0 user "
+                                               "wasn't asked, 1: allowed, 2: "
+                                               "not allowed") );
+
+    // ---- Online gameplay related
+
+    PARAM_PREFIX GroupUserConfigParam       m_online_group
+            PARAM_DEFAULT( GroupUserConfigParam("OnlinePlay",
+                                          "Everything related to online play.") );
 
     PARAM_PREFIX StringUserConfigParam      m_server_multiplayer
-            PARAM_DEFAULT( StringUserConfigParam("http://api.stkaddons.net/",
-                                                 "server_multiplayer",
-                                                "The server used for online multiplayer."));
+            PARAM_DEFAULT( StringUserConfigParam(   "http://api.stkaddons.net/",
+                                                     "server_multiplayer",
+                                                     &m_online_group,
+                                                    "The server used for online multiplayer."));
+
+    PARAM_PREFIX BoolUserConfigParam        m_saved_session
+            PARAM_DEFAULT(  BoolUserConfigParam(    false,
+                                                    "saved_session",
+                                                    &m_online_group,
+                                                    "Is there a saved session?") );
+
+    PARAM_PREFIX IntUserConfigParam         m_saved_user
+            PARAM_DEFAULT(  IntUserConfigParam(     0,
+                                                    "saved_user",
+                                                    &m_online_group,
+                                                    "User ID of the saved session.") );
+
+    PARAM_PREFIX StringUserConfigParam      m_saved_token
+            PARAM_DEFAULT(  StringUserConfigParam(  "",
+                                                    "saved_token",
+                                                    &m_online_group,
+                                                    "Token of the saved session.") );
+
 
     // ---- Addon server related entries
     PARAM_PREFIX GroupUserConfigParam       m_addon_group
-        PARAM_DEFAULT( GroupUserConfigParam("AddonAndNews",
+            PARAM_DEFAULT( GroupUserConfigParam("AddonAndNews",
                                           "Addon and news related settings") );
 
     PARAM_PREFIX StringUserConfigParam      m_server_addons
@@ -643,13 +675,6 @@ namespace UserConfigParams
                                                "Don't show important message "
                                                "with this or a lower id again") );
 
-    PARAM_PREFIX IntUserConfigParam        m_internet_status
-            PARAM_DEFAULT(  IntUserConfigParam(0, "enable_internet",
-                                               &m_addon_group,
-                                               "Status of internet: 0 user "
-                                               "wasn't asked, 1: allowed, 2: "
-                                               "not allowed") );
-
     PARAM_PREFIX TimeUserConfigParam        m_addons_last_updated
             PARAM_DEFAULT(  TimeUserConfigParam(0, "addon_last_updated",
                                                 &m_addon_group,
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index e85322e5a..e11578f31 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -25,6 +25,7 @@
 #include "online/http_connector.hpp"
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
+#include "utils/log.hpp"
 
 static CurrentOnlineUser* user_singleton = NULL;
 
@@ -42,8 +43,6 @@ void CurrentOnlineUser::deallocate()
 }   // deallocate
 
 // ============================================================================
-
-
 CurrentOnlineUser::CurrentOnlineUser(){
     m_is_signed_in = false;
     m_is_guest = false;
@@ -53,6 +52,42 @@ CurrentOnlineUser::CurrentOnlineUser(){
     m_token = "";
 }
 
+// ============================================================================
+bool CurrentOnlineUser::trySavedSession()
+{
+    assert(m_is_signed_in == false);
+    if(UserConfigParams::m_saved_session)
+    {
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        connector->setParameter("action",std::string("validate"));
+        connector->setParameter("userid", UserConfigParams::m_saved_user);
+        connector->setParameter("token", UserConfigParams::m_saved_token);
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success = "";
+        std::string info;
+        if(result->get("success", &rec_success))
+        {
+            if (rec_success =="yes")
+            {
+                int token_fetched = result->get("token", &m_token);
+                int username_fetched = result->get("username", &m_name);
+                int userid_fetched = result->get("userid", &m_id);
+                assert(token_fetched && username_fetched && userid_fetched);
+                m_is_signed_in = true;
+                m_is_guest = false;
+            }
+            result->get("info", &info);
+            Log::info("trySavedSession","%s",info);
+        }
+        else
+        {
+            Log::error("trySavedSession","%s",
+                _("Unable to connect to the server. Check your internet connection or try again later."));
+        }
+    }
+    return m_is_signed_in;
+}
+
 // ============================================================================
 // Register
 bool CurrentOnlineUser::signUp( const irr::core::stringw &username,
@@ -89,6 +124,7 @@ bool CurrentOnlineUser::signUp( const irr::core::stringw &username,
 
 bool CurrentOnlineUser::signIn( const irr::core::stringw &username,
                                 const irr::core::stringw &password,
+                                bool save_session,
                                 irr::core::stringw &info)
 {
     assert(m_is_signed_in == false);
@@ -108,6 +144,12 @@ bool CurrentOnlineUser::signIn( const irr::core::stringw &username,
             assert(token_fetched && username_fetched && userid_fetched);
             m_is_signed_in = true;
             m_is_guest = false;
+            if(save_session)
+            {
+                UserConfigParams::m_saved_user = m_id;
+                UserConfigParams::m_saved_token = m_token;
+                UserConfigParams::m_saved_session = true;
+            }
         }
         result->get("info", &info);
     }
@@ -125,7 +167,7 @@ bool CurrentOnlineUser::createServer(  const irr::core::stringw &name,
                                         int max_players,
                                         irr::core::stringw &info)
 {
-    assert(m_is_signed_in && !m_is_guest && !m_is_server_host);
+    assert(m_is_signed_in && !m_is_guest);
     HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
     connector->setParameter("action",           std::string("create_server"));
     connector->setParameter("token",            m_token);
@@ -172,6 +214,9 @@ bool CurrentOnlineUser::signOut(irr::core::stringw &info){
             m_id = 0;
             m_is_signed_in = false;
             m_is_guest = false;
+            UserConfigParams::m_saved_user = 0;
+            UserConfigParams::m_saved_token = "";
+            UserConfigParams::m_saved_session = false;
         }
         result->get("info", &info);
     }
diff --git a/src/online/current_online_user.hpp b/src/online/current_online_user.hpp
index 3b0c81ea2..27c4df1c0 100644
--- a/src/online/current_online_user.hpp
+++ b/src/online/current_online_user.hpp
@@ -47,9 +47,12 @@ class CurrentOnlineUser : public OnlineUser
         // singleton
         static CurrentOnlineUser* get();
         static void deallocate();
+
+        bool trySavedSession();
         // Login
         bool signIn(    const irr::core::stringw &username,
                         const irr::core::stringw &password,
+                        bool save_session,
                         irr::core::stringw &info);
         // Register
         bool signUp(    const irr::core::stringw &username,

From ec34fcafa75712e6b1d33cb2273cef53270863a4 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 13 Jul 2013 22:25:17 +0000
Subject: [PATCH 05/44] Stay signed in works now (with checkbox in sign in
 dialog.)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/login_dialog.stkgui         | 21 ++++++++++++++++++---
 src/online/current_online_user.cpp          |  9 +++++----
 src/states_screens/dialogs/login_dialog.cpp | 10 ++++++++--
 src/states_screens/dialogs/login_dialog.hpp |  2 ++
 src/states_screens/online_screen.cpp        |  2 +-
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/data/gui/online/login_dialog.stkgui b/data/gui/online/login_dialog.stkgui
index c5152ab6a..739a3d34f 100644
--- a/data/gui/online/login_dialog.stkgui
+++ b/data/gui/online/login_dialog.stkgui
@@ -14,18 +14,33 @@
         <div width="80%" align="center" layout="vertical-row" height="fit" >
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the login dialog" text="Username"/>
-                <textbox proportion="2" id="username" I18N="In the login dialog"/>
+                <div proportion="2" height="100%" layout="horizontal-row">
+                    <spacer height="1" width="2%">
+                    <textbox proportion="2" id="username" I18N="In the login dialog"/>
+                </div>
             </div>
             
             <spacer height="20" width="20">
             
             <div width="100%" height="fit" layout="horizontal-row" >
                 <label proportion="1" text_align="left" I18N="In the login dialog" text="Password"/>
-                <textbox proportion="2" id="password" I18N="In the login dialog"/>
+                <div proportion="2" height="100%" layout="horizontal-row">
+                    <spacer height="1" width="2%">
+                    <textbox proportion="2" id="password" I18N="In the login dialog"/>
+                </div>
+            </div>
+            
+            <spacer height="20" width="20">
+            
+            <div width="100%" height="fit" layout="horizontal-row" >
+                <label proportion="1" text_align="left" I18N="In the login dialog" text="Stay signed in"/>
+                <div proportion="2" height="100%" layout="horizontal-row">
+                    <checkbox width="fit" height="fit" id="remember" I18N="In the login dialog"/>
+                </div>
             </div>
         </div>
         
-        <spacer height="20" width="50">      
+        <spacer height="20" width="50">
         
         <label id="message" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
            
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index e11578f31..c02b6c93e 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -55,13 +55,13 @@ CurrentOnlineUser::CurrentOnlineUser(){
 // ============================================================================
 bool CurrentOnlineUser::trySavedSession()
 {
-    assert(m_is_signed_in == false);
+    if (m_is_signed_in) return true;
     if(UserConfigParams::m_saved_session)
     {
         HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",std::string("validate"));
+        connector->setParameter("action",std::string("saved-session"));
         connector->setParameter("userid", UserConfigParams::m_saved_user);
-        connector->setParameter("token", UserConfigParams::m_saved_token);
+        connector->setParameter("token", UserConfigParams::m_saved_token.c_str());
         const XMLNode * result = connector->getXMLFromPage();
         std::string rec_success = "";
         std::string info;
@@ -73,11 +73,12 @@ bool CurrentOnlineUser::trySavedSession()
                 int username_fetched = result->get("username", &m_name);
                 int userid_fetched = result->get("userid", &m_id);
                 assert(token_fetched && username_fetched && userid_fetched);
+                UserConfigParams::m_saved_token = m_token;
                 m_is_signed_in = true;
                 m_is_guest = false;
             }
             result->get("info", &info);
-            Log::info("trySavedSession","%s",info);
+            Log::info("trySavedSession","%s",info.c_str());
         }
         else
         {
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 44a1f78e3..c6cbe0ed8 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -36,7 +36,7 @@ using namespace irr::gui;
 // -----------------------------------------------------------------------------
 
 LoginDialog::LoginDialog(const Message message_type) :
-        ModalDialog(0.8f,0.8f)
+        ModalDialog(0.8f,0.9f)
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
@@ -67,6 +67,10 @@ LoginDialog::LoginDialog(const Message message_type) :
     assert(m_password_widget != NULL);
     m_password_widget->setPasswordBox(true,L'*');
 
+    m_remember_widget = getWidget<CheckBoxWidget>("remember");
+    assert(m_remember_widget != NULL);
+    m_remember_widget->setState(false);
+
     m_message_widget = getWidget<LabelWidget>("message");
     assert(m_message_widget != NULL);
 
@@ -82,6 +86,8 @@ LoginDialog::LoginDialog(const Message message_type) :
     assert(m_as_guest_widget != NULL);
     m_cancel_widget = getWidget<IconButtonWidget>("cancel");
     assert(m_cancel_widget != NULL);
+
+
 }
 
 // -----------------------------------------------------------------------------
@@ -98,7 +104,7 @@ void LoginDialog::login()
     const stringw username = m_username_widget->getText().trim();
     const stringw password = m_password_widget->getText().trim();
     stringw info = "";
-    if(CurrentOnlineUser::get()->signIn(username,password,info))
+    if(CurrentOnlineUser::get()->signIn(username,password, m_remember_widget->getState(),info))
     {
         m_self_destroy = true;
     }
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 0f3025352..590289f8f 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -23,6 +23,7 @@
 
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
+#include "guiengine/widgets/check_box_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
@@ -42,6 +43,7 @@ private:
     GUIEngine::LabelWidget * m_info_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
     GUIEngine::TextBoxWidget * m_password_widget;
+    GUIEngine::CheckBoxWidget * m_remember_widget;
     GUIEngine::LabelWidget * m_message_widget;
 
     GUIEngine::RibbonWidget * m_options_widget;
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 0e2225ca5..ce882507b 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -52,6 +52,7 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = Not;
+    CurrentOnlineUser::get()->trySavedSession();
 }   // OnlineScreen
 
 // ----------------------------------------------------------------------------
@@ -106,7 +107,6 @@ void OnlineScreen::beforeAddingWidget()
     //Set everything that could be set invisible or deactivated, to active and visible
     m_bottom_menu_widget->setVisible(true);
     m_top_menu_widget->setVisible(true);
-
     hasStateChanged();
     if (m_recorded_state == Registered)
     {

From b44f547057403360ef858e9b5ac3fc53095fc129 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 00:34:47 +0000
Subject: [PATCH 06/44] Copied the CGUIListBox widget to make an STK version.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13213 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 CMakeLists.txt                        |   2 +
 sources.cmake                         |   1 +
 src/guiengine/widgets/CGUIListBox.cpp | 907 ++++++++++++++++++++++++++
 src/guiengine/widgets/CGUIListBox.h   | 187 ++++++
 src/guiengine/widgets/list_widget.cpp |  41 +-
 src/guiengine/widgets/list_widget.hpp |   4 +
 6 files changed, 1134 insertions(+), 8 deletions(-)
 create mode 100644 src/guiengine/widgets/CGUIListBox.cpp
 create mode 100644 src/guiengine/widgets/CGUIListBox.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 955a81a2f..c9f975109 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,8 @@ endif()
 # Build the irrlicht library
 add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
 include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
+include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/source/Irrlicht")
+
 
 
 # Set include paths
diff --git a/sources.cmake b/sources.cmake
index 8d809a349..a57995969 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -63,6 +63,7 @@ src/guiengine/widget.cpp
 src/guiengine/widgets/bubble_widget.cpp
 src/guiengine/widgets/button_widget.cpp
 src/guiengine/widgets/CGUIEditBox.cpp
+src/guiengine/widgets/CGUIListBox.cpp
 src/guiengine/widgets/check_box_widget.cpp
 src/guiengine/widgets/dynamic_ribbon_widget.cpp
 src/guiengine/widgets/icon_button_widget.cpp
diff --git a/src/guiengine/widgets/CGUIListBox.cpp b/src/guiengine/widgets/CGUIListBox.cpp
new file mode 100644
index 000000000..904997fd3
--- /dev/null
+++ b/src/guiengine/widgets/CGUIListBox.cpp
@@ -0,0 +1,907 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "CGUIListBox.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "IGUISpriteBank.h"
+#include "CGUIScrollBar.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUIListBox::CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
+			s32 id, core::rect<s32> rectangle, bool clip,
+			bool drawBack, bool moveOverSelect)
+: IGUIListBox(environment, parent, id, rectangle), Selected(-1),
+	ItemHeight(0),ItemHeightOverride(0),
+	TotalItemHeight(0), ItemsIconWidth(0), Font(0), IconBank(0),
+	ScrollBar(0), selectTime(0), LastKeyTime(0), Selecting(false), DrawBack(drawBack),
+	MoveOverSelect(moveOverSelect), AutoScroll(true), HighlightWhenNotFocused(true)
+{
+	#ifdef _DEBUG
+	setDebugName("CGUIListBox");
+	#endif
+
+	IGUISkin* skin = Environment->getSkin();
+	const s32 s = skin->getSize(EGDS_SCROLLBAR_SIZE);
+
+	ScrollBar = new CGUIScrollBar(false, Environment, this, -1,
+		core::rect<s32>(RelativeRect.getWidth() - s, 0, RelativeRect.getWidth(), RelativeRect.getHeight()),
+		!clip);
+	ScrollBar->setSubElement(true);
+	ScrollBar->setTabStop(false);
+	ScrollBar->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	ScrollBar->setVisible(false);
+	ScrollBar->setPos(0);
+
+	setNotClipped(!clip);
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+
+	updateAbsolutePosition();
+}
+
+
+//! destructor
+CGUIListBox::~CGUIListBox()
+{
+	if (ScrollBar)
+		ScrollBar->drop();
+
+	if (Font)
+		Font->drop();
+
+	if (IconBank)
+		IconBank->drop();
+}
+
+
+//! returns amount of list items
+u32 CGUIListBox::getItemCount() const
+{
+	return Items.size();
+}
+
+
+//! returns string of a list item. the may be a value from 0 to itemCount-1
+const wchar_t* CGUIListBox::getListItem(u32 id) const
+{
+	if (id>=Items.size())
+		return 0;
+
+	return Items[id].text.c_str();
+}
+
+
+//! Returns the icon of an item
+s32 CGUIListBox::getIcon(u32 id) const
+{
+	if (id>=Items.size())
+		return -1;
+
+	return Items[id].icon;
+}
+
+
+//! adds a list item, returns id of item
+u32 CGUIListBox::addItem(const wchar_t* text)
+{
+	return addItem(text, -1);
+}
+
+
+//! adds a list item, returns id of item
+void CGUIListBox::removeItem(u32 id)
+{
+	if (id >= Items.size())
+		return;
+
+	if ((u32)Selected==id)
+	{
+		Selected = -1;
+	}
+	else if ((u32)Selected > id)
+	{
+		Selected -= 1;
+		selectTime = os::Timer::getTime();
+	}
+
+	Items.erase(id);
+
+	recalculateItemHeight();
+}
+
+
+s32 CGUIListBox::getItemAt(s32 xpos, s32 ypos) const
+{
+	if ( 	xpos < AbsoluteRect.UpperLeftCorner.X || xpos >= AbsoluteRect.LowerRightCorner.X
+		||	ypos < AbsoluteRect.UpperLeftCorner.Y || ypos >= AbsoluteRect.LowerRightCorner.Y
+		)
+		return -1;
+
+	if ( ItemHeight == 0 )
+		return -1;
+
+	s32 item = ((ypos - AbsoluteRect.UpperLeftCorner.Y - 1) + ScrollBar->getPos()) / ItemHeight;
+	if ( item < 0 || item >= (s32)Items.size())
+		return -1;
+
+	return item;
+}
+
+//! clears the list
+void CGUIListBox::clear()
+{
+	Items.clear();
+	ItemsIconWidth = 0;
+	Selected = -1;
+
+	if (ScrollBar)
+		ScrollBar->setPos(0);
+
+	recalculateItemHeight();
+}
+
+
+void CGUIListBox::recalculateItemHeight()
+{
+	IGUISkin* skin = Environment->getSkin();
+
+	if (Font != skin->getFont())
+	{
+		if (Font)
+			Font->drop();
+
+		Font = skin->getFont();
+		if ( 0 == ItemHeightOverride )
+			ItemHeight = 0;
+
+		if (Font)
+		{
+			if ( 0 == ItemHeightOverride )
+				ItemHeight = Font->getDimension(L"A").Height + 4;
+
+			Font->grab();
+		}
+	}
+
+	TotalItemHeight = ItemHeight * Items.size();
+	ScrollBar->setMax( core::max_(0, TotalItemHeight - AbsoluteRect.getHeight()) );
+	s32 minItemHeight = ItemHeight > 0 ? ItemHeight : 1;
+	ScrollBar->setSmallStep ( minItemHeight );
+	ScrollBar->setLargeStep ( 2*minItemHeight );
+
+	if ( TotalItemHeight <= AbsoluteRect.getHeight() )
+		ScrollBar->setVisible(false);
+	else
+		ScrollBar->setVisible(true);
+}
+
+
+//! returns id of selected item. returns -1 if no item is selected.
+s32 CGUIListBox::getSelected() const
+{
+	return Selected;
+}
+
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUIListBox::setSelected(s32 id)
+{
+	if ((u32)id>=Items.size())
+		Selected = -1;
+	else
+		Selected = id;
+
+	selectTime = os::Timer::getTime();
+
+	recalculateScrollPos();
+}
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUIListBox::setSelected(const wchar_t *item)
+{
+	s32 index = -1;
+
+	if ( item )
+	{
+		for ( index = 0; index < (s32) Items.size(); ++index )
+		{
+			if ( Items[index].text == item )
+				break;
+		}
+	}
+	setSelected ( index );
+}
+
+//! called if an event happened.
+bool CGUIListBox::OnEvent(const SEvent& event)
+{
+	if (isEnabled())
+	{
+		switch(event.EventType)
+		{
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+				(event.KeyInput.Key == KEY_DOWN ||
+				event.KeyInput.Key == KEY_UP   ||
+				event.KeyInput.Key == KEY_HOME ||
+				event.KeyInput.Key == KEY_END  ||
+				event.KeyInput.Key == KEY_NEXT ||
+				event.KeyInput.Key == KEY_PRIOR ) )
+			{
+				s32 oldSelected = Selected;
+				switch (event.KeyInput.Key)
+				{
+					case KEY_DOWN:
+						Selected += 1;
+						break;
+					case KEY_UP:
+						Selected -= 1;
+						break;
+					case KEY_HOME:
+						Selected = 0;
+						break;
+					case KEY_END:
+						Selected = (s32)Items.size()-1;
+						break;
+					case KEY_NEXT:
+						Selected += AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					case KEY_PRIOR:
+						Selected -= AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					default:
+						break;
+				}
+				if (Selected >= (s32)Items.size())
+					Selected = Items.size() - 1;
+				else
+				if (Selected<0)
+					Selected = 0;
+
+				recalculateScrollPos();
+
+				// post the news
+
+				if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect)
+				{
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+					Parent->OnEvent(e);
+				}
+
+				return true;
+			}
+			else
+			if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
+			{
+				if (Parent)
+				{
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
+					Parent->OnEvent(e);
+				}
+				return true;
+			}
+			else if (event.KeyInput.PressedDown && event.KeyInput.Char)
+			{
+				// change selection based on text as it is typed.
+				u32 now = os::Timer::getTime();
+
+				if (now - LastKeyTime < 500)
+				{
+					// add to key buffer if it isn't a key repeat
+					if (!(KeyBuffer.size() == 1 && KeyBuffer[0] == event.KeyInput.Char))
+					{
+						KeyBuffer += L" ";
+						KeyBuffer[KeyBuffer.size()-1] = event.KeyInput.Char;
+					}
+				}
+				else
+				{
+					KeyBuffer = L" ";
+					KeyBuffer[0] = event.KeyInput.Char;
+				}
+				LastKeyTime = now;
+
+				// find the selected item, starting at the current selection
+				s32 start = Selected;
+				// dont change selection if the key buffer matches the current item
+				if (Selected > -1 && KeyBuffer.size() > 1)
+				{
+					if (Items[Selected].text.size() >= KeyBuffer.size() &&
+						KeyBuffer.equals_ignore_case(Items[Selected].text.subString(0,KeyBuffer.size())))
+						return true;
+				}
+
+				s32 current;
+				for (current = start+1; current < (s32)Items.size(); ++current)
+				{
+					if (Items[current].text.size() >= KeyBuffer.size())
+					{
+						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
+						{
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
+							{
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+				for (current = 0; current <= start; ++current)
+				{
+					if (Items[current].text.size() >= KeyBuffer.size())
+					{
+						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
+						{
+							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
+							{
+								Selected = current;
+								SEvent e;
+								e.EventType = EET_GUI_EVENT;
+								e.GUIEvent.Caller = this;
+								e.GUIEvent.Element = 0;
+								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+								Parent->OnEvent(e);
+							}
+							setSelected(current);
+							return true;
+						}
+					}
+				}
+
+				return true;
+			}
+			break;
+
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
+			{
+			case gui::EGET_SCROLL_BAR_CHANGED:
+				if (event.GUIEvent.Caller == ScrollBar)
+					return true;
+				break;
+			case gui::EGET_ELEMENT_FOCUS_LOST:
+				{
+					if (event.GUIEvent.Caller == this)
+						Selecting = false;
+				}
+			default:
+			break;
+			}
+			break;
+
+		case EET_MOUSE_INPUT_EVENT:
+			{
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+				switch(event.MouseInput.Event)
+				{
+				case EMIE_MOUSE_WHEEL:
+					ScrollBar->setPos(ScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1)*-ItemHeight/2);
+					return true;
+
+				case EMIE_LMOUSE_PRESSED_DOWN:
+				{
+					Selecting = true;
+					return true;
+				}
+
+				case EMIE_LMOUSE_LEFT_UP:
+				{
+					Selecting = false;
+
+					if (isPointInside(p))
+						selectNew(event.MouseInput.Y);
+
+					return true;
+				}
+
+				case EMIE_MOUSE_MOVED:
+					if (Selecting || MoveOverSelect)
+					{
+						if (isPointInside(p))
+						{
+							selectNew(event.MouseInput.Y, true);
+							return true;
+						}
+					}
+				default:
+				break;
+				}
+			}
+			break;
+		case EET_LOG_TEXT_EVENT:
+		case EET_USER_EVENT:
+		case EET_JOYSTICK_INPUT_EVENT:
+		case EGUIET_FORCE_32_BIT:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+
+void CGUIListBox::selectNew(s32 ypos, bool onlyHover)
+{
+	u32 now = os::Timer::getTime();
+	s32 oldSelected = Selected;
+
+	Selected = getItemAt(AbsoluteRect.UpperLeftCorner.X, ypos);
+	if (Selected<0 && !Items.empty())
+		Selected = 0;
+
+	recalculateScrollPos();
+
+	gui::EGUI_EVENT_TYPE eventType = (Selected == oldSelected && now < selectTime + 500) ? EGET_LISTBOX_SELECTED_AGAIN : EGET_LISTBOX_CHANGED;
+	selectTime = now;
+	// post the news
+	if (Parent && !onlyHover)
+	{
+		SEvent event;
+		event.EventType = EET_GUI_EVENT;
+		event.GUIEvent.Caller = this;
+		event.GUIEvent.Element = 0;
+		event.GUIEvent.EventType = eventType;
+		Parent->OnEvent(event);
+	}
+}
+
+
+//! Update the position and size of the listbox, and update the scrollbar
+void CGUIListBox::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+
+	recalculateItemHeight();
+}
+
+
+//! draws the element and its children
+void CGUIListBox::draw()
+{
+	if (!IsVisible)
+		return;
+
+	recalculateItemHeight(); // if the font changed
+
+	IGUISkin* skin = Environment->getSkin();
+
+	core::rect<s32>* clipRect = 0;
+
+	// draw background
+	core::rect<s32> frameRect(AbsoluteRect);
+
+	// draw items
+
+	core::rect<s32> clientClip(AbsoluteRect);
+	clientClip.UpperLeftCorner.Y += 1;
+	clientClip.UpperLeftCorner.X += 1;
+	if (ScrollBar->isVisible())
+		clientClip.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
+	clientClip.LowerRightCorner.Y -= 1;
+	clientClip.clipAgainst(AbsoluteClippingRect);
+
+	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT), true,
+		DrawBack, frameRect, &clientClip);
+
+	if (clipRect)
+		clientClip.clipAgainst(*clipRect);
+
+	frameRect = AbsoluteRect;
+	frameRect.UpperLeftCorner.X += 1;
+	if (ScrollBar->isVisible())
+		frameRect.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
+
+	frameRect.LowerRightCorner.Y = AbsoluteRect.UpperLeftCorner.Y + ItemHeight;
+
+	frameRect.UpperLeftCorner.Y -= ScrollBar->getPos();
+	frameRect.LowerRightCorner.Y -= ScrollBar->getPos();
+
+	bool hl = (HighlightWhenNotFocused || Environment->hasFocus(this) || Environment->hasFocus(ScrollBar));
+
+	for (s32 i=0; i<(s32)Items.size(); ++i)
+	{
+		if (frameRect.LowerRightCorner.Y >= AbsoluteRect.UpperLeftCorner.Y &&
+			frameRect.UpperLeftCorner.Y <= AbsoluteRect.LowerRightCorner.Y)
+		{
+			if (i == Selected && hl)
+				skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), frameRect, &clientClip);
+
+			core::rect<s32> textRect = frameRect;
+			textRect.UpperLeftCorner.X += 3;
+
+			if (Font)
+			{
+				if (IconBank && (Items[i].icon > -1))
+				{
+					core::position2di iconPos = textRect.UpperLeftCorner;
+					iconPos.Y += textRect.getHeight() / 2;
+					iconPos.X += ItemsIconWidth/2;
+
+					if ( i==Selected && hl )
+					{
+						IconBank->draw2DSprite( (u32)Items[i].icon, iconPos, &clientClip,
+							hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
+							getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
+							selectTime, os::Timer::getTime(), false, true);
+					}
+					else
+					{
+						IconBank->draw2DSprite( (u32)Items[i].icon, iconPos, &clientClip,
+							hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
+							0 , (i==Selected) ? os::Timer::getTime() : 0, false, true);
+					}
+				}
+
+				textRect.UpperLeftCorner.X += ItemsIconWidth+3;
+
+				if ( i==Selected && hl )
+				{
+					Font->draw(Items[i].text.c_str(), textRect,
+						hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ?
+						getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
+						false, true, &clientClip);
+				}
+				else
+				{
+					Font->draw(Items[i].text.c_str(), textRect,
+						hasItemOverrideColor(i, EGUI_LBC_TEXT) ? getItemOverrideColor(i, EGUI_LBC_TEXT) : getItemDefaultColor(EGUI_LBC_TEXT),
+						false, true, &clientClip);
+				}
+
+				textRect.UpperLeftCorner.X -= ItemsIconWidth+3;
+			}
+		}
+
+		frameRect.UpperLeftCorner.Y += ItemHeight;
+		frameRect.LowerRightCorner.Y += ItemHeight;
+	}
+
+	IGUIElement::draw();
+}
+
+
+//! adds an list item with an icon
+u32 CGUIListBox::addItem(const wchar_t* text, s32 icon)
+{
+	ListItem i;
+	i.text = text;
+	i.icon = icon;
+
+	Items.push_back(i);
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+
+	return Items.size() - 1;
+}
+
+
+void CGUIListBox::setSpriteBank(IGUISpriteBank* bank)
+{
+    if ( bank == IconBank )
+        return;
+	if (IconBank)
+		IconBank->drop();
+
+	IconBank = bank;
+	if (IconBank)
+		IconBank->grab();
+}
+
+
+void CGUIListBox::recalculateScrollPos()
+{
+	if (!AutoScroll)
+		return;
+
+	const s32 selPos = (Selected == -1 ? TotalItemHeight : Selected * ItemHeight) - ScrollBar->getPos();
+
+	if (selPos < 0)
+	{
+		ScrollBar->setPos(ScrollBar->getPos() + selPos);
+	}
+	else
+	if (selPos > AbsoluteRect.getHeight() - ItemHeight)
+	{
+		ScrollBar->setPos(ScrollBar->getPos() + selPos - AbsoluteRect.getHeight() + ItemHeight);
+	}
+}
+
+
+void CGUIListBox::setAutoScrollEnabled(bool scroll)
+{
+	AutoScroll = scroll;
+}
+
+
+bool CGUIListBox::isAutoScrollEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return AutoScroll;
+}
+
+
+bool CGUIListBox::getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc & useColorLabel, core::stringc & colorLabel) const
+{
+	switch ( colorType )
+	{
+	case EGUI_LBC_TEXT:
+		useColorLabel = "UseColText";
+		colorLabel = "ColText";
+		break;
+	case EGUI_LBC_TEXT_HIGHLIGHT:
+		useColorLabel = "UseColTextHl";
+		colorLabel = "ColTextHl";
+		break;
+	case EGUI_LBC_ICON:
+		useColorLabel = "UseColIcon";
+		colorLabel = "ColIcon";
+		break;
+	case EGUI_LBC_ICON_HIGHLIGHT:
+		useColorLabel = "UseColIconHl";
+		colorLabel = "ColIconHl";
+		break;
+	default:
+		return false;
+	}
+	return true;
+}
+
+
+//! Writes attributes of the element.
+void CGUIListBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
+{
+	IGUIListBox::serializeAttributes(out,options);
+
+	// todo: out->addString	("IconBank",		IconBank->getName?);
+	out->addBool    ("DrawBack",        DrawBack);
+	out->addBool    ("MoveOverSelect",  MoveOverSelect);
+	out->addBool    ("AutoScroll",      AutoScroll);
+
+	out->addInt("ItemCount", Items.size());
+	for (u32 i=0;i<Items.size(); ++i)
+	{
+		core::stringc label("text");
+		label += i;
+		out->addString(label.c_str(), Items[i].text.c_str() );
+
+		for ( s32 c=0; c < (s32)EGUI_LBC_COUNT; ++c )
+		{
+			core::stringc useColorLabel, colorLabel;
+			if ( !getSerializationLabels((EGUI_LISTBOX_COLOR)c, useColorLabel, colorLabel) )
+				return;
+			label = useColorLabel; label += i;
+			if ( Items[i].OverrideColors[c].Use )
+			{
+				out->addBool(label.c_str(), true );
+				label = colorLabel; label += i;
+				out->addColor(label.c_str(), Items[i].OverrideColors[c].Color);
+			}
+			else
+			{
+				out->addBool(label.c_str(), false );
+			}
+		}
+	}
+}
+
+
+//! Reads attributes of the element
+void CGUIListBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
+{
+	clear();
+
+	DrawBack        = in->getAttributeAsBool("DrawBack");
+	MoveOverSelect  = in->getAttributeAsBool("MoveOverSelect");
+	AutoScroll      = in->getAttributeAsBool("AutoScroll");
+
+	IGUIListBox::deserializeAttributes(in,options);
+
+	const s32 count = in->getAttributeAsInt("ItemCount");
+	for (s32 i=0; i<count; ++i)
+	{
+		core::stringc label("text");
+		ListItem item;
+
+		label += i;
+		item.text = in->getAttributeAsStringW(label.c_str());
+
+		addItem(item.text.c_str(), item.icon);
+
+		for ( u32 c=0; c < EGUI_LBC_COUNT; ++c )
+		{
+			core::stringc useColorLabel, colorLabel;
+			if ( !getSerializationLabels((EGUI_LISTBOX_COLOR)c, useColorLabel, colorLabel) )
+				return;
+			label = useColorLabel; label += i;
+			Items[i].OverrideColors[c].Use = in->getAttributeAsBool(label.c_str());
+			if ( Items[i].OverrideColors[c].Use )
+			{
+				label = colorLabel; label += i;
+				Items[i].OverrideColors[c].Color = in->getAttributeAsColor(label.c_str());
+			}
+		}
+	}
+}
+
+
+void CGUIListBox::recalculateItemWidth(s32 icon)
+{
+	if (IconBank && icon > -1 &&
+		IconBank->getSprites().size() > (u32)icon &&
+		IconBank->getSprites()[(u32)icon].Frames.size())
+	{
+		u32 rno = IconBank->getSprites()[(u32)icon].Frames[0].rectNumber;
+		if (IconBank->getPositions().size() > rno)
+		{
+			const s32 w = IconBank->getPositions()[rno].getWidth();
+			if (w > ItemsIconWidth)
+				ItemsIconWidth = w;
+		}
+	}
+}
+
+
+void CGUIListBox::setItem(u32 index, const wchar_t* text, s32 icon)
+{
+	if ( index >= Items.size() )
+		return;
+
+	Items[index].text = text;
+	Items[index].icon = icon;
+
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+}
+
+
+//! Insert the item at the given index
+//! Return the index on success or -1 on failure.
+s32 CGUIListBox::insertItem(u32 index, const wchar_t* text, s32 icon)
+{
+	ListItem i;
+	i.text = text;
+	i.icon = icon;
+
+	Items.insert(i, index);
+	recalculateItemHeight();
+	recalculateItemWidth(icon);
+
+	return index;
+}
+
+
+void CGUIListBox::swapItems(u32 index1, u32 index2)
+{
+	if ( index1 >= Items.size() || index2 >= Items.size() )
+		return;
+
+	ListItem dummmy = Items[index1];
+	Items[index1] = Items[index2];
+	Items[index2] = dummmy;
+}
+
+
+void CGUIListBox::setItemOverrideColor(u32 index, video::SColor color)
+{
+	for ( u32 c=0; c < EGUI_LBC_COUNT; ++c )
+	{
+		Items[index].OverrideColors[c].Use = true;
+		Items[index].OverrideColors[c].Color = color;
+	}
+}
+
+
+void CGUIListBox::setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color)
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return;
+
+	Items[index].OverrideColors[colorType].Use = true;
+	Items[index].OverrideColors[colorType].Color = color;
+}
+
+
+void CGUIListBox::clearItemOverrideColor(u32 index)
+{
+	for (u32 c=0; c < (u32)EGUI_LBC_COUNT; ++c )
+	{
+		Items[index].OverrideColors[c].Use = false;
+	}
+}
+
+
+void CGUIListBox::clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType)
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return;
+
+	Items[index].OverrideColors[colorType].Use = false;
+}
+
+
+bool CGUIListBox::hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return false;
+
+	return Items[index].OverrideColors[colorType].Use;
+}
+
+
+video::SColor CGUIListBox::getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if ( (u32)index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return video::SColor();
+
+	return Items[index].OverrideColors[colorType].Color;
+}
+
+
+video::SColor CGUIListBox::getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const
+{
+	IGUISkin* skin = Environment->getSkin();
+	if ( !skin )
+		return video::SColor();
+
+	switch ( colorType )
+	{
+		case EGUI_LBC_TEXT:
+			return skin->getColor(EGDC_BUTTON_TEXT);
+		case EGUI_LBC_TEXT_HIGHLIGHT:
+			return skin->getColor(EGDC_HIGH_LIGHT_TEXT);
+		case EGUI_LBC_ICON:
+			return skin->getColor(EGDC_ICON);
+		case EGUI_LBC_ICON_HIGHLIGHT:
+			return skin->getColor(EGDC_ICON_HIGH_LIGHT);
+		default:
+			return video::SColor();
+	}
+}
+
+//! set global itemHeight
+void CGUIListBox::setItemHeight( s32 height )
+{
+	ItemHeight = height;
+	ItemHeightOverride = 1;
+}
+
+
+//! Sets whether to draw the background
+void CGUIListBox::setDrawBackground(bool draw)
+{
+    DrawBack = draw;
+}
+
+
+} // end namespace gui
+} // end namespace irr
+
+
diff --git a/src/guiengine/widgets/CGUIListBox.h b/src/guiengine/widgets/CGUIListBox.h
new file mode 100644
index 000000000..5be28bbb3
--- /dev/null
+++ b/src/guiengine/widgets/CGUIListBox.h
@@ -0,0 +1,187 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_GUI_LIST_BOX_H_INCLUDED__
+#define __C_GUI_LIST_BOX_H_INCLUDED__
+
+#include "IrrCompileConfig.h"
+
+#include "IGUIListBox.h"
+#include "irrArray.h"
+
+namespace irr
+{
+namespace gui
+{
+
+	class IGUIFont;
+	class IGUIScrollBar;
+
+	class CGUIListBox : public IGUIListBox
+	{
+	public:
+		//! constructor
+		CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
+			s32 id, core::rect<s32> rectangle, bool clip=true,
+			bool drawBack=false, bool moveOverSelect=false);
+
+		//! destructor
+		virtual ~CGUIListBox();
+
+		//! returns amount of list items
+		virtual u32 getItemCount() const;
+
+		//! returns string of a list item. the id may be a value from 0 to itemCount-1
+		virtual const wchar_t* getListItem(u32 id) const;
+
+		//! adds an list item, returns id of item
+		virtual u32 addItem(const wchar_t* text);
+
+		//! clears the list
+		virtual void clear();
+
+		//! returns id of selected item. returns -1 if no item is selected.
+		virtual s32 getSelected() const;
+
+		//! sets the selected item. Set this to -1 if no item should be selected
+		virtual void setSelected(s32 id);
+
+		//! sets the selected item. Set this to -1 if no item should be selected
+		virtual void setSelected(const wchar_t *item);
+
+		//! called if an event happened.
+		virtual bool OnEvent(const SEvent& event);
+
+		//! draws the element and its children
+		virtual void draw();
+
+		//! adds an list item with an icon
+		//! \param text Text of list entry
+		//! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+		//! \return
+		//! returns the id of the new created item
+		virtual u32 addItem(const wchar_t* text, s32 icon);
+
+		//! Returns the icon of an item
+		virtual s32 getIcon(u32 id) const;
+
+		//! removes an item from the list
+		virtual void removeItem(u32 id);
+
+		//! get the the id of the item at the given absolute coordinates
+		virtual s32 getItemAt(s32 xpos, s32 ypos) const;
+
+		//! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
+		//! the built-in-font by default. A sprite can be displayed in front of every list item.
+		//! An icon is an index within the icon sprite bank. Several default icons are available in the
+		//! skin through getIcon
+		virtual void setSpriteBank(IGUISpriteBank* bank);
+
+		//! set whether the listbox should scroll to newly selected items
+		virtual void setAutoScrollEnabled(bool scroll);
+
+		//! returns true if automatic scrolling is enabled, false if not.
+		virtual bool isAutoScrollEnabled() const;
+
+		//! Update the position and size of the listbox, and update the scrollbar
+		virtual void updateAbsolutePosition();
+
+		//! Writes attributes of the element.
+		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
+
+		//! Reads attributes of the element
+		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
+
+		//! set all item colors at given index to color
+		virtual void setItemOverrideColor(u32 index, video::SColor color);
+
+		//! set all item colors of specified type at given index to color
+		virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color);
+
+		//! clear all item colors at index
+		virtual void clearItemOverrideColor(u32 index);
+
+		//! clear item color at index for given colortype
+		virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType);
+
+		//! has the item at index its color overwritten?
+		virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
+
+		//! return the overwrite color at given item index.
+		virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
+
+		//! return the default color which is used for the given colorType
+		virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const;
+
+		//! set the item at the given index
+		virtual void setItem(u32 index, const wchar_t* text, s32 icon);
+
+		//! Insert the item at the given index
+		//! Return the index on success or -1 on failure.
+		virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon);
+
+		//! Swap the items at the given indices
+		virtual void swapItems(u32 index1, u32 index2);
+
+		//! set global itemHeight
+		virtual void setItemHeight( s32 height );
+
+        //! Sets whether to draw the background
+        virtual void setDrawBackground(bool draw);
+
+
+	private:
+
+		struct ListItem
+		{
+			ListItem() : icon(-1)
+			{}
+
+			core::stringw text;
+			s32 icon;
+
+			// A multicolor extension
+			struct ListItemOverrideColor
+			{
+				ListItemOverrideColor() : Use(false) {}
+				bool Use;
+				video::SColor Color;
+			};
+			ListItemOverrideColor OverrideColors[EGUI_LBC_COUNT];
+		};
+
+		void recalculateItemHeight();
+		void selectNew(s32 ypos, bool onlyHover=false);
+		void recalculateScrollPos();
+
+		// extracted that function to avoid copy&paste code
+		void recalculateItemWidth(s32 icon);
+
+		// get labels used for serialization
+		bool getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc & useColorLabel, core::stringc & colorLabel) const;
+
+		core::array< ListItem > Items;
+		s32 Selected;
+		s32 ItemHeight;
+		s32 ItemHeightOverride;
+		s32 TotalItemHeight;
+		s32 ItemsIconWidth;
+		gui::IGUIFont* Font;
+		gui::IGUISpriteBank* IconBank;
+		gui::IGUIScrollBar* ScrollBar;
+		u32 selectTime;
+		u32 LastKeyTime;
+		core::stringw KeyBuffer;
+		bool Selecting;
+		bool DrawBack;
+		bool MoveOverSelect;
+		bool AutoScroll;
+		bool HighlightWhenNotFocused;
+	};
+
+
+} // end namespace gui
+} // end namespace irr
+
+#endif
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index 19c9f2094..6cef01047 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -15,14 +15,18 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include "guiengine/widgets/list_widget.hpp"
+
 #include "guiengine/CGUISpriteBank.h"
 #include "guiengine/engine.hpp"
-#include "guiengine/widgets/list_widget.hpp"
 #include "io/file_manager.hpp"
 
+
+
 #include <IGUIElement.h>
-#include <IGUIEnvironment.h>
-#include <IGUIListBox.h>
+#include <IGUISkin.h>
+#include <CGUIEnvironment.h>
+#include "IGUIFontBitmap.h"
 
 #include <sstream>
 
@@ -80,8 +84,8 @@ void ListWidget::setIcons(STKModifiedSpriteBank* icons, int size)
 
 }
 
-// -----------------------------------------------------------------------------
 
+// -----------------------------------------------------------------------------
 void ListWidget::add()
 {
     const int header_height = GUIEngine::getFontHeight() + 15;
@@ -89,11 +93,32 @@ void ListWidget::add()
     rect<s32> widget_size = (m_header.size() > 0 ? rect<s32>(m_x, m_y + header_height, m_x + m_w, m_y + m_h) :
                                                    rect<s32>(m_x, m_y, m_x + m_w, m_y + m_h) );
 
-    IGUIListBox* list = GUIEngine::getGUIEnv()->addListBox (widget_size, m_parent, getNewID());
-    list->setAutoScrollEnabled(false);
+    IGUISkin * current_skin = GUIEngine::getGUIEnv()->getSkin();
+    IGUIFont * current_font = GUIEngine::getGUIEnv()->getBuiltInFont();
+    IGUIListBox* m_list_box = new CGUIListBox(
+        GUIEngine::getGUIEnv(),
+        m_parent ? m_parent : (CGUIEnvironment *)GUIEngine::getGUIEnv(),
+        getNewID(),
+        widget_size,
+        true,
+        true,
+        false);
 
-    m_element = list;
-    m_element->setTabOrder( list->getID() );
+    if (current_skin && current_skin->getSpriteBank())
+    {
+            m_list_box->setSpriteBank(current_skin->getSpriteBank());
+    }
+    else if (current_font && current_font->getType() == EGFT_BITMAP)
+    {
+            m_list_box->setSpriteBank( ((IGUIFontBitmap*)current_font)->getSpriteBank());
+    }
+
+    m_list_box->drop();
+
+    m_list_box->setAutoScrollEnabled(false);
+
+    m_element = m_list_box;
+    m_element->setTabOrder( m_list_box->getID() );
 
     if (m_header.size() > 0)
     {
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index ee7eb9df4..8beb96ca5 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -26,6 +26,8 @@
 #include "guiengine/widgets/button_widget.hpp"
 #include "utils/leak_check.hpp"
 #include "utils/ptr_vector.hpp"
+#include "IGUIElement.h"
+#include "guiengine/widgets/CGUIListBox.h"
 
 namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 
@@ -87,6 +89,8 @@ namespace GUIEngine
         
         IListWidgetHeaderListener* m_listener;
         
+        irr::gui::IGUIListBox * m_list_box;
+
     public:
         
         LEAK_CHECK()

From 2d0d407d7fa7fc4294880c7de755b84cdaee371f Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 01:01:56 +0000
Subject: [PATCH 07/44] Small bugfixes in the CGUIListBox

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13214 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/widgets/CGUIListBox.cpp |  4 +++-
 src/guiengine/widgets/CGUIListBox.h   |  6 +++---
 src/guiengine/widgets/list_widget.cpp | 21 ++++++++++-----------
 src/guiengine/widgets/list_widget.hpp |  3 ---
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/guiengine/widgets/CGUIListBox.cpp b/src/guiengine/widgets/CGUIListBox.cpp
index 904997fd3..253ddb850 100644
--- a/src/guiengine/widgets/CGUIListBox.cpp
+++ b/src/guiengine/widgets/CGUIListBox.cpp
@@ -2,7 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#include "CGUIListBox.h"
+#include "guiengine/widgets/CGUIListBox.h"
 
 #include "IGUISkin.h"
 #include "IGUIEnvironment.h"
@@ -390,7 +390,9 @@ bool CGUIListBox::OnEvent(const SEvent& event)
 				{
 					if (event.GUIEvent.Caller == this)
 						Selecting = false;
+					break;
 				}
+
 			default:
 			break;
 			}
diff --git a/src/guiengine/widgets/CGUIListBox.h b/src/guiengine/widgets/CGUIListBox.h
index 5be28bbb3..7f6d21278 100644
--- a/src/guiengine/widgets/CGUIListBox.h
+++ b/src/guiengine/widgets/CGUIListBox.h
@@ -2,8 +2,8 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
-#ifndef __C_GUI_LIST_BOX_H_INCLUDED__
-#define __C_GUI_LIST_BOX_H_INCLUDED__
+#ifndef HEADER_CGUILISTBOX_HPP
+#define HEADER_CGUILISTBOX_HPP
 
 #include "IrrCompileConfig.h"
 
@@ -22,7 +22,7 @@ namespace gui
 	{
 	public:
 		//! constructor
-		CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
+	        CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
 			s32 id, core::rect<s32> rectangle, bool clip=true,
 			bool drawBack=false, bool moveOverSelect=false);
 
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index 6cef01047..ba8def7bf 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -17,15 +17,14 @@
 
 #include "guiengine/widgets/list_widget.hpp"
 
+#include "guiengine/widgets/CGUIListBox.h"
 #include "guiengine/CGUISpriteBank.h"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
 
-
-
 #include <IGUIElement.h>
 #include <IGUISkin.h>
-#include <CGUIEnvironment.h>
+#include <IGUIEnvironment.h>
 #include "IGUIFontBitmap.h"
 
 #include <sstream>
@@ -95,9 +94,9 @@ void ListWidget::add()
 
     IGUISkin * current_skin = GUIEngine::getGUIEnv()->getSkin();
     IGUIFont * current_font = GUIEngine::getGUIEnv()->getBuiltInFont();
-    IGUIListBox* m_list_box = new CGUIListBox(
+    IGUIListBox * list_box = new CGUIListBox(
         GUIEngine::getGUIEnv(),
-        m_parent ? m_parent : (CGUIEnvironment *)GUIEngine::getGUIEnv(),
+        m_parent ? m_parent : GUIEngine::getGUIEnv()->getRootGUIElement(),
         getNewID(),
         widget_size,
         true,
@@ -106,19 +105,19 @@ void ListWidget::add()
 
     if (current_skin && current_skin->getSpriteBank())
     {
-            m_list_box->setSpriteBank(current_skin->getSpriteBank());
+            list_box->setSpriteBank(current_skin->getSpriteBank());
     }
     else if (current_font && current_font->getType() == EGFT_BITMAP)
     {
-            m_list_box->setSpriteBank( ((IGUIFontBitmap*)current_font)->getSpriteBank());
+            list_box->setSpriteBank( ((IGUIFontBitmap*)current_font)->getSpriteBank());
     }
 
-    m_list_box->drop();
+    list_box->drop();
 
-    m_list_box->setAutoScrollEnabled(false);
+    list_box->setAutoScrollEnabled(false);
 
-    m_element = m_list_box;
-    m_element->setTabOrder( m_list_box->getID() );
+    m_element = list_box;
+    m_element->setTabOrder( list_box->getID() );
 
     if (m_header.size() > 0)
     {
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index 8beb96ca5..4e1a3191c 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -27,7 +27,6 @@
 #include "utils/leak_check.hpp"
 #include "utils/ptr_vector.hpp"
 #include "IGUIElement.h"
-#include "guiengine/widgets/CGUIListBox.h"
 
 namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 
@@ -88,8 +87,6 @@ namespace GUIEngine
         std::vector< Column > m_header;
         
         IListWidgetHeaderListener* m_listener;
-        
-        irr::gui::IGUIListBox * m_list_box;
 
     public:
         

From de6cc44b2aafd7ddb3d1b0478dc4ff95b9e612f7 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 21:33:33 +0000
Subject: [PATCH 08/44] List widget now supports multiple columns, each cell
 can have an icon and or text.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13216 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 sources.cmake                            |   2 +-
 src/guiengine/widgets/CGUIListBox.cpp    | 909 -----------------------
 src/guiengine/widgets/CGUIListBox.h      | 187 -----
 src/guiengine/widgets/CGUISTKListBox.cpp | 754 +++++++++++++++++++
 src/guiengine/widgets/CGUISTKListBox.h   | 196 +++++
 src/guiengine/widgets/list_widget.cpp    | 130 ++--
 src/guiengine/widgets/list_widget.hpp    |  34 +-
 src/states_screens/addons_screen.cpp     |  43 +-
 8 files changed, 1067 insertions(+), 1188 deletions(-)
 delete mode 100644 src/guiengine/widgets/CGUIListBox.cpp
 delete mode 100644 src/guiengine/widgets/CGUIListBox.h
 create mode 100644 src/guiengine/widgets/CGUISTKListBox.cpp
 create mode 100644 src/guiengine/widgets/CGUISTKListBox.h

diff --git a/sources.cmake b/sources.cmake
index a57995969..c9f8454a7 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -63,7 +63,7 @@ src/guiengine/widget.cpp
 src/guiengine/widgets/bubble_widget.cpp
 src/guiengine/widgets/button_widget.cpp
 src/guiengine/widgets/CGUIEditBox.cpp
-src/guiengine/widgets/CGUIListBox.cpp
+src/guiengine/widgets/CGUISTKListBox.cpp
 src/guiengine/widgets/check_box_widget.cpp
 src/guiengine/widgets/dynamic_ribbon_widget.cpp
 src/guiengine/widgets/icon_button_widget.cpp
diff --git a/src/guiengine/widgets/CGUIListBox.cpp b/src/guiengine/widgets/CGUIListBox.cpp
deleted file mode 100644
index 253ddb850..000000000
--- a/src/guiengine/widgets/CGUIListBox.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "guiengine/widgets/CGUIListBox.h"
-
-#include "IGUISkin.h"
-#include "IGUIEnvironment.h"
-#include "IVideoDriver.h"
-#include "IGUIFont.h"
-#include "IGUISpriteBank.h"
-#include "CGUIScrollBar.h"
-#include "os.h"
-
-namespace irr
-{
-namespace gui
-{
-
-//! constructor
-CGUIListBox::CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
-			s32 id, core::rect<s32> rectangle, bool clip,
-			bool drawBack, bool moveOverSelect)
-: IGUIListBox(environment, parent, id, rectangle), Selected(-1),
-	ItemHeight(0),ItemHeightOverride(0),
-	TotalItemHeight(0), ItemsIconWidth(0), Font(0), IconBank(0),
-	ScrollBar(0), selectTime(0), LastKeyTime(0), Selecting(false), DrawBack(drawBack),
-	MoveOverSelect(moveOverSelect), AutoScroll(true), HighlightWhenNotFocused(true)
-{
-	#ifdef _DEBUG
-	setDebugName("CGUIListBox");
-	#endif
-
-	IGUISkin* skin = Environment->getSkin();
-	const s32 s = skin->getSize(EGDS_SCROLLBAR_SIZE);
-
-	ScrollBar = new CGUIScrollBar(false, Environment, this, -1,
-		core::rect<s32>(RelativeRect.getWidth() - s, 0, RelativeRect.getWidth(), RelativeRect.getHeight()),
-		!clip);
-	ScrollBar->setSubElement(true);
-	ScrollBar->setTabStop(false);
-	ScrollBar->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
-	ScrollBar->setVisible(false);
-	ScrollBar->setPos(0);
-
-	setNotClipped(!clip);
-
-	// this element can be tabbed to
-	setTabStop(true);
-	setTabOrder(-1);
-
-	updateAbsolutePosition();
-}
-
-
-//! destructor
-CGUIListBox::~CGUIListBox()
-{
-	if (ScrollBar)
-		ScrollBar->drop();
-
-	if (Font)
-		Font->drop();
-
-	if (IconBank)
-		IconBank->drop();
-}
-
-
-//! returns amount of list items
-u32 CGUIListBox::getItemCount() const
-{
-	return Items.size();
-}
-
-
-//! returns string of a list item. the may be a value from 0 to itemCount-1
-const wchar_t* CGUIListBox::getListItem(u32 id) const
-{
-	if (id>=Items.size())
-		return 0;
-
-	return Items[id].text.c_str();
-}
-
-
-//! Returns the icon of an item
-s32 CGUIListBox::getIcon(u32 id) const
-{
-	if (id>=Items.size())
-		return -1;
-
-	return Items[id].icon;
-}
-
-
-//! adds a list item, returns id of item
-u32 CGUIListBox::addItem(const wchar_t* text)
-{
-	return addItem(text, -1);
-}
-
-
-//! adds a list item, returns id of item
-void CGUIListBox::removeItem(u32 id)
-{
-	if (id >= Items.size())
-		return;
-
-	if ((u32)Selected==id)
-	{
-		Selected = -1;
-	}
-	else if ((u32)Selected > id)
-	{
-		Selected -= 1;
-		selectTime = os::Timer::getTime();
-	}
-
-	Items.erase(id);
-
-	recalculateItemHeight();
-}
-
-
-s32 CGUIListBox::getItemAt(s32 xpos, s32 ypos) const
-{
-	if ( 	xpos < AbsoluteRect.UpperLeftCorner.X || xpos >= AbsoluteRect.LowerRightCorner.X
-		||	ypos < AbsoluteRect.UpperLeftCorner.Y || ypos >= AbsoluteRect.LowerRightCorner.Y
-		)
-		return -1;
-
-	if ( ItemHeight == 0 )
-		return -1;
-
-	s32 item = ((ypos - AbsoluteRect.UpperLeftCorner.Y - 1) + ScrollBar->getPos()) / ItemHeight;
-	if ( item < 0 || item >= (s32)Items.size())
-		return -1;
-
-	return item;
-}
-
-//! clears the list
-void CGUIListBox::clear()
-{
-	Items.clear();
-	ItemsIconWidth = 0;
-	Selected = -1;
-
-	if (ScrollBar)
-		ScrollBar->setPos(0);
-
-	recalculateItemHeight();
-}
-
-
-void CGUIListBox::recalculateItemHeight()
-{
-	IGUISkin* skin = Environment->getSkin();
-
-	if (Font != skin->getFont())
-	{
-		if (Font)
-			Font->drop();
-
-		Font = skin->getFont();
-		if ( 0 == ItemHeightOverride )
-			ItemHeight = 0;
-
-		if (Font)
-		{
-			if ( 0 == ItemHeightOverride )
-				ItemHeight = Font->getDimension(L"A").Height + 4;
-
-			Font->grab();
-		}
-	}
-
-	TotalItemHeight = ItemHeight * Items.size();
-	ScrollBar->setMax( core::max_(0, TotalItemHeight - AbsoluteRect.getHeight()) );
-	s32 minItemHeight = ItemHeight > 0 ? ItemHeight : 1;
-	ScrollBar->setSmallStep ( minItemHeight );
-	ScrollBar->setLargeStep ( 2*minItemHeight );
-
-	if ( TotalItemHeight <= AbsoluteRect.getHeight() )
-		ScrollBar->setVisible(false);
-	else
-		ScrollBar->setVisible(true);
-}
-
-
-//! returns id of selected item. returns -1 if no item is selected.
-s32 CGUIListBox::getSelected() const
-{
-	return Selected;
-}
-
-
-//! sets the selected item. Set this to -1 if no item should be selected
-void CGUIListBox::setSelected(s32 id)
-{
-	if ((u32)id>=Items.size())
-		Selected = -1;
-	else
-		Selected = id;
-
-	selectTime = os::Timer::getTime();
-
-	recalculateScrollPos();
-}
-
-//! sets the selected item. Set this to -1 if no item should be selected
-void CGUIListBox::setSelected(const wchar_t *item)
-{
-	s32 index = -1;
-
-	if ( item )
-	{
-		for ( index = 0; index < (s32) Items.size(); ++index )
-		{
-			if ( Items[index].text == item )
-				break;
-		}
-	}
-	setSelected ( index );
-}
-
-//! called if an event happened.
-bool CGUIListBox::OnEvent(const SEvent& event)
-{
-	if (isEnabled())
-	{
-		switch(event.EventType)
-		{
-		case EET_KEY_INPUT_EVENT:
-			if (event.KeyInput.PressedDown &&
-				(event.KeyInput.Key == KEY_DOWN ||
-				event.KeyInput.Key == KEY_UP   ||
-				event.KeyInput.Key == KEY_HOME ||
-				event.KeyInput.Key == KEY_END  ||
-				event.KeyInput.Key == KEY_NEXT ||
-				event.KeyInput.Key == KEY_PRIOR ) )
-			{
-				s32 oldSelected = Selected;
-				switch (event.KeyInput.Key)
-				{
-					case KEY_DOWN:
-						Selected += 1;
-						break;
-					case KEY_UP:
-						Selected -= 1;
-						break;
-					case KEY_HOME:
-						Selected = 0;
-						break;
-					case KEY_END:
-						Selected = (s32)Items.size()-1;
-						break;
-					case KEY_NEXT:
-						Selected += AbsoluteRect.getHeight() / ItemHeight;
-						break;
-					case KEY_PRIOR:
-						Selected -= AbsoluteRect.getHeight() / ItemHeight;
-						break;
-					default:
-						break;
-				}
-				if (Selected >= (s32)Items.size())
-					Selected = Items.size() - 1;
-				else
-				if (Selected<0)
-					Selected = 0;
-
-				recalculateScrollPos();
-
-				// post the news
-
-				if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect)
-				{
-					SEvent e;
-					e.EventType = EET_GUI_EVENT;
-					e.GUIEvent.Caller = this;
-					e.GUIEvent.Element = 0;
-					e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-					Parent->OnEvent(e);
-				}
-
-				return true;
-			}
-			else
-			if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
-			{
-				if (Parent)
-				{
-					SEvent e;
-					e.EventType = EET_GUI_EVENT;
-					e.GUIEvent.Caller = this;
-					e.GUIEvent.Element = 0;
-					e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
-					Parent->OnEvent(e);
-				}
-				return true;
-			}
-			else if (event.KeyInput.PressedDown && event.KeyInput.Char)
-			{
-				// change selection based on text as it is typed.
-				u32 now = os::Timer::getTime();
-
-				if (now - LastKeyTime < 500)
-				{
-					// add to key buffer if it isn't a key repeat
-					if (!(KeyBuffer.size() == 1 && KeyBuffer[0] == event.KeyInput.Char))
-					{
-						KeyBuffer += L" ";
-						KeyBuffer[KeyBuffer.size()-1] = event.KeyInput.Char;
-					}
-				}
-				else
-				{
-					KeyBuffer = L" ";
-					KeyBuffer[0] = event.KeyInput.Char;
-				}
-				LastKeyTime = now;
-
-				// find the selected item, starting at the current selection
-				s32 start = Selected;
-				// dont change selection if the key buffer matches the current item
-				if (Selected > -1 && KeyBuffer.size() > 1)
-				{
-					if (Items[Selected].text.size() >= KeyBuffer.size() &&
-						KeyBuffer.equals_ignore_case(Items[Selected].text.subString(0,KeyBuffer.size())))
-						return true;
-				}
-
-				s32 current;
-				for (current = start+1; current < (s32)Items.size(); ++current)
-				{
-					if (Items[current].text.size() >= KeyBuffer.size())
-					{
-						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
-						{
-							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
-							{
-								SEvent e;
-								e.EventType = EET_GUI_EVENT;
-								e.GUIEvent.Caller = this;
-								e.GUIEvent.Element = 0;
-								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-								Parent->OnEvent(e);
-							}
-							setSelected(current);
-							return true;
-						}
-					}
-				}
-				for (current = 0; current <= start; ++current)
-				{
-					if (Items[current].text.size() >= KeyBuffer.size())
-					{
-						if (KeyBuffer.equals_ignore_case(Items[current].text.subString(0,KeyBuffer.size())))
-						{
-							if (Parent && Selected != current && !Selecting && !MoveOverSelect)
-							{
-								Selected = current;
-								SEvent e;
-								e.EventType = EET_GUI_EVENT;
-								e.GUIEvent.Caller = this;
-								e.GUIEvent.Element = 0;
-								e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
-								Parent->OnEvent(e);
-							}
-							setSelected(current);
-							return true;
-						}
-					}
-				}
-
-				return true;
-			}
-			break;
-
-		case EET_GUI_EVENT:
-			switch(event.GUIEvent.EventType)
-			{
-			case gui::EGET_SCROLL_BAR_CHANGED:
-				if (event.GUIEvent.Caller == ScrollBar)
-					return true;
-				break;
-			case gui::EGET_ELEMENT_FOCUS_LOST:
-				{
-					if (event.GUIEvent.Caller == this)
-						Selecting = false;
-					break;
-				}
-
-			default:
-			break;
-			}
-			break;
-
-		case EET_MOUSE_INPUT_EVENT:
-			{
-				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
-
-				switch(event.MouseInput.Event)
-				{
-				case EMIE_MOUSE_WHEEL:
-					ScrollBar->setPos(ScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1)*-ItemHeight/2);
-					return true;
-
-				case EMIE_LMOUSE_PRESSED_DOWN:
-				{
-					Selecting = true;
-					return true;
-				}
-
-				case EMIE_LMOUSE_LEFT_UP:
-				{
-					Selecting = false;
-
-					if (isPointInside(p))
-						selectNew(event.MouseInput.Y);
-
-					return true;
-				}
-
-				case EMIE_MOUSE_MOVED:
-					if (Selecting || MoveOverSelect)
-					{
-						if (isPointInside(p))
-						{
-							selectNew(event.MouseInput.Y, true);
-							return true;
-						}
-					}
-				default:
-				break;
-				}
-			}
-			break;
-		case EET_LOG_TEXT_EVENT:
-		case EET_USER_EVENT:
-		case EET_JOYSTICK_INPUT_EVENT:
-		case EGUIET_FORCE_32_BIT:
-			break;
-		}
-	}
-
-	return IGUIElement::OnEvent(event);
-}
-
-
-void CGUIListBox::selectNew(s32 ypos, bool onlyHover)
-{
-	u32 now = os::Timer::getTime();
-	s32 oldSelected = Selected;
-
-	Selected = getItemAt(AbsoluteRect.UpperLeftCorner.X, ypos);
-	if (Selected<0 && !Items.empty())
-		Selected = 0;
-
-	recalculateScrollPos();
-
-	gui::EGUI_EVENT_TYPE eventType = (Selected == oldSelected && now < selectTime + 500) ? EGET_LISTBOX_SELECTED_AGAIN : EGET_LISTBOX_CHANGED;
-	selectTime = now;
-	// post the news
-	if (Parent && !onlyHover)
-	{
-		SEvent event;
-		event.EventType = EET_GUI_EVENT;
-		event.GUIEvent.Caller = this;
-		event.GUIEvent.Element = 0;
-		event.GUIEvent.EventType = eventType;
-		Parent->OnEvent(event);
-	}
-}
-
-
-//! Update the position and size of the listbox, and update the scrollbar
-void CGUIListBox::updateAbsolutePosition()
-{
-	IGUIElement::updateAbsolutePosition();
-
-	recalculateItemHeight();
-}
-
-
-//! draws the element and its children
-void CGUIListBox::draw()
-{
-	if (!IsVisible)
-		return;
-
-	recalculateItemHeight(); // if the font changed
-
-	IGUISkin* skin = Environment->getSkin();
-
-	core::rect<s32>* clipRect = 0;
-
-	// draw background
-	core::rect<s32> frameRect(AbsoluteRect);
-
-	// draw items
-
-	core::rect<s32> clientClip(AbsoluteRect);
-	clientClip.UpperLeftCorner.Y += 1;
-	clientClip.UpperLeftCorner.X += 1;
-	if (ScrollBar->isVisible())
-		clientClip.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
-	clientClip.LowerRightCorner.Y -= 1;
-	clientClip.clipAgainst(AbsoluteClippingRect);
-
-	skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT), true,
-		DrawBack, frameRect, &clientClip);
-
-	if (clipRect)
-		clientClip.clipAgainst(*clipRect);
-
-	frameRect = AbsoluteRect;
-	frameRect.UpperLeftCorner.X += 1;
-	if (ScrollBar->isVisible())
-		frameRect.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
-
-	frameRect.LowerRightCorner.Y = AbsoluteRect.UpperLeftCorner.Y + ItemHeight;
-
-	frameRect.UpperLeftCorner.Y -= ScrollBar->getPos();
-	frameRect.LowerRightCorner.Y -= ScrollBar->getPos();
-
-	bool hl = (HighlightWhenNotFocused || Environment->hasFocus(this) || Environment->hasFocus(ScrollBar));
-
-	for (s32 i=0; i<(s32)Items.size(); ++i)
-	{
-		if (frameRect.LowerRightCorner.Y >= AbsoluteRect.UpperLeftCorner.Y &&
-			frameRect.UpperLeftCorner.Y <= AbsoluteRect.LowerRightCorner.Y)
-		{
-			if (i == Selected && hl)
-				skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), frameRect, &clientClip);
-
-			core::rect<s32> textRect = frameRect;
-			textRect.UpperLeftCorner.X += 3;
-
-			if (Font)
-			{
-				if (IconBank && (Items[i].icon > -1))
-				{
-					core::position2di iconPos = textRect.UpperLeftCorner;
-					iconPos.Y += textRect.getHeight() / 2;
-					iconPos.X += ItemsIconWidth/2;
-
-					if ( i==Selected && hl )
-					{
-						IconBank->draw2DSprite( (u32)Items[i].icon, iconPos, &clientClip,
-							hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
-							getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
-							selectTime, os::Timer::getTime(), false, true);
-					}
-					else
-					{
-						IconBank->draw2DSprite( (u32)Items[i].icon, iconPos, &clientClip,
-							hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
-							0 , (i==Selected) ? os::Timer::getTime() : 0, false, true);
-					}
-				}
-
-				textRect.UpperLeftCorner.X += ItemsIconWidth+3;
-
-				if ( i==Selected && hl )
-				{
-					Font->draw(Items[i].text.c_str(), textRect,
-						hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ?
-						getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
-						false, true, &clientClip);
-				}
-				else
-				{
-					Font->draw(Items[i].text.c_str(), textRect,
-						hasItemOverrideColor(i, EGUI_LBC_TEXT) ? getItemOverrideColor(i, EGUI_LBC_TEXT) : getItemDefaultColor(EGUI_LBC_TEXT),
-						false, true, &clientClip);
-				}
-
-				textRect.UpperLeftCorner.X -= ItemsIconWidth+3;
-			}
-		}
-
-		frameRect.UpperLeftCorner.Y += ItemHeight;
-		frameRect.LowerRightCorner.Y += ItemHeight;
-	}
-
-	IGUIElement::draw();
-}
-
-
-//! adds an list item with an icon
-u32 CGUIListBox::addItem(const wchar_t* text, s32 icon)
-{
-	ListItem i;
-	i.text = text;
-	i.icon = icon;
-
-	Items.push_back(i);
-	recalculateItemHeight();
-	recalculateItemWidth(icon);
-
-	return Items.size() - 1;
-}
-
-
-void CGUIListBox::setSpriteBank(IGUISpriteBank* bank)
-{
-    if ( bank == IconBank )
-        return;
-	if (IconBank)
-		IconBank->drop();
-
-	IconBank = bank;
-	if (IconBank)
-		IconBank->grab();
-}
-
-
-void CGUIListBox::recalculateScrollPos()
-{
-	if (!AutoScroll)
-		return;
-
-	const s32 selPos = (Selected == -1 ? TotalItemHeight : Selected * ItemHeight) - ScrollBar->getPos();
-
-	if (selPos < 0)
-	{
-		ScrollBar->setPos(ScrollBar->getPos() + selPos);
-	}
-	else
-	if (selPos > AbsoluteRect.getHeight() - ItemHeight)
-	{
-		ScrollBar->setPos(ScrollBar->getPos() + selPos - AbsoluteRect.getHeight() + ItemHeight);
-	}
-}
-
-
-void CGUIListBox::setAutoScrollEnabled(bool scroll)
-{
-	AutoScroll = scroll;
-}
-
-
-bool CGUIListBox::isAutoScrollEnabled() const
-{
-	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
-	return AutoScroll;
-}
-
-
-bool CGUIListBox::getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc & useColorLabel, core::stringc & colorLabel) const
-{
-	switch ( colorType )
-	{
-	case EGUI_LBC_TEXT:
-		useColorLabel = "UseColText";
-		colorLabel = "ColText";
-		break;
-	case EGUI_LBC_TEXT_HIGHLIGHT:
-		useColorLabel = "UseColTextHl";
-		colorLabel = "ColTextHl";
-		break;
-	case EGUI_LBC_ICON:
-		useColorLabel = "UseColIcon";
-		colorLabel = "ColIcon";
-		break;
-	case EGUI_LBC_ICON_HIGHLIGHT:
-		useColorLabel = "UseColIconHl";
-		colorLabel = "ColIconHl";
-		break;
-	default:
-		return false;
-	}
-	return true;
-}
-
-
-//! Writes attributes of the element.
-void CGUIListBox::serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options=0) const
-{
-	IGUIListBox::serializeAttributes(out,options);
-
-	// todo: out->addString	("IconBank",		IconBank->getName?);
-	out->addBool    ("DrawBack",        DrawBack);
-	out->addBool    ("MoveOverSelect",  MoveOverSelect);
-	out->addBool    ("AutoScroll",      AutoScroll);
-
-	out->addInt("ItemCount", Items.size());
-	for (u32 i=0;i<Items.size(); ++i)
-	{
-		core::stringc label("text");
-		label += i;
-		out->addString(label.c_str(), Items[i].text.c_str() );
-
-		for ( s32 c=0; c < (s32)EGUI_LBC_COUNT; ++c )
-		{
-			core::stringc useColorLabel, colorLabel;
-			if ( !getSerializationLabels((EGUI_LISTBOX_COLOR)c, useColorLabel, colorLabel) )
-				return;
-			label = useColorLabel; label += i;
-			if ( Items[i].OverrideColors[c].Use )
-			{
-				out->addBool(label.c_str(), true );
-				label = colorLabel; label += i;
-				out->addColor(label.c_str(), Items[i].OverrideColors[c].Color);
-			}
-			else
-			{
-				out->addBool(label.c_str(), false );
-			}
-		}
-	}
-}
-
-
-//! Reads attributes of the element
-void CGUIListBox::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options=0)
-{
-	clear();
-
-	DrawBack        = in->getAttributeAsBool("DrawBack");
-	MoveOverSelect  = in->getAttributeAsBool("MoveOverSelect");
-	AutoScroll      = in->getAttributeAsBool("AutoScroll");
-
-	IGUIListBox::deserializeAttributes(in,options);
-
-	const s32 count = in->getAttributeAsInt("ItemCount");
-	for (s32 i=0; i<count; ++i)
-	{
-		core::stringc label("text");
-		ListItem item;
-
-		label += i;
-		item.text = in->getAttributeAsStringW(label.c_str());
-
-		addItem(item.text.c_str(), item.icon);
-
-		for ( u32 c=0; c < EGUI_LBC_COUNT; ++c )
-		{
-			core::stringc useColorLabel, colorLabel;
-			if ( !getSerializationLabels((EGUI_LISTBOX_COLOR)c, useColorLabel, colorLabel) )
-				return;
-			label = useColorLabel; label += i;
-			Items[i].OverrideColors[c].Use = in->getAttributeAsBool(label.c_str());
-			if ( Items[i].OverrideColors[c].Use )
-			{
-				label = colorLabel; label += i;
-				Items[i].OverrideColors[c].Color = in->getAttributeAsColor(label.c_str());
-			}
-		}
-	}
-}
-
-
-void CGUIListBox::recalculateItemWidth(s32 icon)
-{
-	if (IconBank && icon > -1 &&
-		IconBank->getSprites().size() > (u32)icon &&
-		IconBank->getSprites()[(u32)icon].Frames.size())
-	{
-		u32 rno = IconBank->getSprites()[(u32)icon].Frames[0].rectNumber;
-		if (IconBank->getPositions().size() > rno)
-		{
-			const s32 w = IconBank->getPositions()[rno].getWidth();
-			if (w > ItemsIconWidth)
-				ItemsIconWidth = w;
-		}
-	}
-}
-
-
-void CGUIListBox::setItem(u32 index, const wchar_t* text, s32 icon)
-{
-	if ( index >= Items.size() )
-		return;
-
-	Items[index].text = text;
-	Items[index].icon = icon;
-
-	recalculateItemHeight();
-	recalculateItemWidth(icon);
-}
-
-
-//! Insert the item at the given index
-//! Return the index on success or -1 on failure.
-s32 CGUIListBox::insertItem(u32 index, const wchar_t* text, s32 icon)
-{
-	ListItem i;
-	i.text = text;
-	i.icon = icon;
-
-	Items.insert(i, index);
-	recalculateItemHeight();
-	recalculateItemWidth(icon);
-
-	return index;
-}
-
-
-void CGUIListBox::swapItems(u32 index1, u32 index2)
-{
-	if ( index1 >= Items.size() || index2 >= Items.size() )
-		return;
-
-	ListItem dummmy = Items[index1];
-	Items[index1] = Items[index2];
-	Items[index2] = dummmy;
-}
-
-
-void CGUIListBox::setItemOverrideColor(u32 index, video::SColor color)
-{
-	for ( u32 c=0; c < EGUI_LBC_COUNT; ++c )
-	{
-		Items[index].OverrideColors[c].Use = true;
-		Items[index].OverrideColors[c].Color = color;
-	}
-}
-
-
-void CGUIListBox::setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color)
-{
-	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
-		return;
-
-	Items[index].OverrideColors[colorType].Use = true;
-	Items[index].OverrideColors[colorType].Color = color;
-}
-
-
-void CGUIListBox::clearItemOverrideColor(u32 index)
-{
-	for (u32 c=0; c < (u32)EGUI_LBC_COUNT; ++c )
-	{
-		Items[index].OverrideColors[c].Use = false;
-	}
-}
-
-
-void CGUIListBox::clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType)
-{
-	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
-		return;
-
-	Items[index].OverrideColors[colorType].Use = false;
-}
-
-
-bool CGUIListBox::hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
-{
-	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
-		return false;
-
-	return Items[index].OverrideColors[colorType].Use;
-}
-
-
-video::SColor CGUIListBox::getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
-{
-	if ( (u32)index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
-		return video::SColor();
-
-	return Items[index].OverrideColors[colorType].Color;
-}
-
-
-video::SColor CGUIListBox::getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const
-{
-	IGUISkin* skin = Environment->getSkin();
-	if ( !skin )
-		return video::SColor();
-
-	switch ( colorType )
-	{
-		case EGUI_LBC_TEXT:
-			return skin->getColor(EGDC_BUTTON_TEXT);
-		case EGUI_LBC_TEXT_HIGHLIGHT:
-			return skin->getColor(EGDC_HIGH_LIGHT_TEXT);
-		case EGUI_LBC_ICON:
-			return skin->getColor(EGDC_ICON);
-		case EGUI_LBC_ICON_HIGHLIGHT:
-			return skin->getColor(EGDC_ICON_HIGH_LIGHT);
-		default:
-			return video::SColor();
-	}
-}
-
-//! set global itemHeight
-void CGUIListBox::setItemHeight( s32 height )
-{
-	ItemHeight = height;
-	ItemHeightOverride = 1;
-}
-
-
-//! Sets whether to draw the background
-void CGUIListBox::setDrawBackground(bool draw)
-{
-    DrawBack = draw;
-}
-
-
-} // end namespace gui
-} // end namespace irr
-
-
diff --git a/src/guiengine/widgets/CGUIListBox.h b/src/guiengine/widgets/CGUIListBox.h
deleted file mode 100644
index 7f6d21278..000000000
--- a/src/guiengine/widgets/CGUIListBox.h
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef HEADER_CGUILISTBOX_HPP
-#define HEADER_CGUILISTBOX_HPP
-
-#include "IrrCompileConfig.h"
-
-#include "IGUIListBox.h"
-#include "irrArray.h"
-
-namespace irr
-{
-namespace gui
-{
-
-	class IGUIFont;
-	class IGUIScrollBar;
-
-	class CGUIListBox : public IGUIListBox
-	{
-	public:
-		//! constructor
-	        CGUIListBox(IGUIEnvironment* environment, IGUIElement* parent,
-			s32 id, core::rect<s32> rectangle, bool clip=true,
-			bool drawBack=false, bool moveOverSelect=false);
-
-		//! destructor
-		virtual ~CGUIListBox();
-
-		//! returns amount of list items
-		virtual u32 getItemCount() const;
-
-		//! returns string of a list item. the id may be a value from 0 to itemCount-1
-		virtual const wchar_t* getListItem(u32 id) const;
-
-		//! adds an list item, returns id of item
-		virtual u32 addItem(const wchar_t* text);
-
-		//! clears the list
-		virtual void clear();
-
-		//! returns id of selected item. returns -1 if no item is selected.
-		virtual s32 getSelected() const;
-
-		//! sets the selected item. Set this to -1 if no item should be selected
-		virtual void setSelected(s32 id);
-
-		//! sets the selected item. Set this to -1 if no item should be selected
-		virtual void setSelected(const wchar_t *item);
-
-		//! called if an event happened.
-		virtual bool OnEvent(const SEvent& event);
-
-		//! draws the element and its children
-		virtual void draw();
-
-		//! adds an list item with an icon
-		//! \param text Text of list entry
-		//! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
-		//! \return
-		//! returns the id of the new created item
-		virtual u32 addItem(const wchar_t* text, s32 icon);
-
-		//! Returns the icon of an item
-		virtual s32 getIcon(u32 id) const;
-
-		//! removes an item from the list
-		virtual void removeItem(u32 id);
-
-		//! get the the id of the item at the given absolute coordinates
-		virtual s32 getItemAt(s32 xpos, s32 ypos) const;
-
-		//! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
-		//! the built-in-font by default. A sprite can be displayed in front of every list item.
-		//! An icon is an index within the icon sprite bank. Several default icons are available in the
-		//! skin through getIcon
-		virtual void setSpriteBank(IGUISpriteBank* bank);
-
-		//! set whether the listbox should scroll to newly selected items
-		virtual void setAutoScrollEnabled(bool scroll);
-
-		//! returns true if automatic scrolling is enabled, false if not.
-		virtual bool isAutoScrollEnabled() const;
-
-		//! Update the position and size of the listbox, and update the scrollbar
-		virtual void updateAbsolutePosition();
-
-		//! Writes attributes of the element.
-		virtual void serializeAttributes(io::IAttributes* out, io::SAttributeReadWriteOptions* options) const;
-
-		//! Reads attributes of the element
-		virtual void deserializeAttributes(io::IAttributes* in, io::SAttributeReadWriteOptions* options);
-
-		//! set all item colors at given index to color
-		virtual void setItemOverrideColor(u32 index, video::SColor color);
-
-		//! set all item colors of specified type at given index to color
-		virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color);
-
-		//! clear all item colors at index
-		virtual void clearItemOverrideColor(u32 index);
-
-		//! clear item color at index for given colortype
-		virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType);
-
-		//! has the item at index its color overwritten?
-		virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
-
-		//! return the overwrite color at given item index.
-		virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
-
-		//! return the default color which is used for the given colorType
-		virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const;
-
-		//! set the item at the given index
-		virtual void setItem(u32 index, const wchar_t* text, s32 icon);
-
-		//! Insert the item at the given index
-		//! Return the index on success or -1 on failure.
-		virtual s32 insertItem(u32 index, const wchar_t* text, s32 icon);
-
-		//! Swap the items at the given indices
-		virtual void swapItems(u32 index1, u32 index2);
-
-		//! set global itemHeight
-		virtual void setItemHeight( s32 height );
-
-        //! Sets whether to draw the background
-        virtual void setDrawBackground(bool draw);
-
-
-	private:
-
-		struct ListItem
-		{
-			ListItem() : icon(-1)
-			{}
-
-			core::stringw text;
-			s32 icon;
-
-			// A multicolor extension
-			struct ListItemOverrideColor
-			{
-				ListItemOverrideColor() : Use(false) {}
-				bool Use;
-				video::SColor Color;
-			};
-			ListItemOverrideColor OverrideColors[EGUI_LBC_COUNT];
-		};
-
-		void recalculateItemHeight();
-		void selectNew(s32 ypos, bool onlyHover=false);
-		void recalculateScrollPos();
-
-		// extracted that function to avoid copy&paste code
-		void recalculateItemWidth(s32 icon);
-
-		// get labels used for serialization
-		bool getSerializationLabels(EGUI_LISTBOX_COLOR colorType, core::stringc & useColorLabel, core::stringc & colorLabel) const;
-
-		core::array< ListItem > Items;
-		s32 Selected;
-		s32 ItemHeight;
-		s32 ItemHeightOverride;
-		s32 TotalItemHeight;
-		s32 ItemsIconWidth;
-		gui::IGUIFont* Font;
-		gui::IGUISpriteBank* IconBank;
-		gui::IGUIScrollBar* ScrollBar;
-		u32 selectTime;
-		u32 LastKeyTime;
-		core::stringw KeyBuffer;
-		bool Selecting;
-		bool DrawBack;
-		bool MoveOverSelect;
-		bool AutoScroll;
-		bool HighlightWhenNotFocused;
-	};
-
-
-} // end namespace gui
-} // end namespace irr
-
-#endif
diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
new file mode 100644
index 000000000..a3ca8a543
--- /dev/null
+++ b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -0,0 +1,754 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+//               2013 Glenn De Jonghe
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#include "guiengine/widgets/CGUISTKListBox.h"
+
+#include "IGUISkin.h"
+#include "IGUIEnvironment.h"
+#include "IVideoDriver.h"
+#include "IGUIFont.h"
+#include "IGUISpriteBank.h"
+#include "CGUIScrollBar.h"
+#include "os.h"
+
+namespace irr
+{
+namespace gui
+{
+
+//! constructor
+CGUISTKListBox::CGUISTKListBox(IGUIEnvironment* environment, IGUIElement* parent,
+			s32 id, core::rect<s32> rectangle, bool clip,
+			bool drawBack, bool moveOverSelect)
+: IGUIElement(EGUIET_LIST_BOX, environment, parent, id, rectangle), Selected(-1),
+	ItemHeight(0),ItemHeightOverride(0),
+	TotalItemHeight(0), ItemsIconWidth(0), Font(0), IconBank(0),
+	ScrollBar(0), selectTime(0), LastKeyTime(0), Selecting(false), DrawBack(drawBack),
+	MoveOverSelect(moveOverSelect), AutoScroll(true), HighlightWhenNotFocused(true)
+{
+	#ifdef _DEBUG
+	setDebugName("CGUISTKListBox");
+	#endif
+
+	IGUISkin* skin = Environment->getSkin();
+	const s32 s = skin->getSize(EGDS_SCROLLBAR_SIZE);
+
+	ScrollBar = new CGUIScrollBar(false, Environment, this, -1,
+		core::rect<s32>(RelativeRect.getWidth() - s, 0, RelativeRect.getWidth(), RelativeRect.getHeight()),
+		!clip);
+	ScrollBar->setSubElement(true);
+	ScrollBar->setTabStop(false);
+	ScrollBar->setAlignment(EGUIA_LOWERRIGHT, EGUIA_LOWERRIGHT, EGUIA_UPPERLEFT, EGUIA_LOWERRIGHT);
+	ScrollBar->setVisible(false);
+	ScrollBar->setPos(0);
+
+	setNotClipped(!clip);
+
+	// this element can be tabbed to
+	setTabStop(true);
+	setTabOrder(-1);
+
+	updateAbsolutePosition();
+}
+
+
+//! destructor
+CGUISTKListBox::~CGUISTKListBox()
+{
+	if (ScrollBar)
+		ScrollBar->drop();
+
+	if (Font)
+		Font->drop();
+
+	if (IconBank)
+		IconBank->drop();
+}
+
+
+//! returns amount of list items
+u32 CGUISTKListBox::getItemCount() const
+{
+	return Items.size();
+}
+
+
+
+const wchar_t* CGUISTKListBox::getCellText(u32 row_num, u32 col_num) const
+{
+        if ( row_num >= Items.size() )
+                return 0;
+        if ( col_num >= Items[row_num].m_contents.size() )
+                return 0;
+	return Items[row_num].m_contents[col_num].m_text.c_str();
+}
+
+CGUISTKListBox::ListItem CGUISTKListBox::getItem(u32 id) const
+{
+    return Items[id];
+}
+
+
+//! Returns the icon of an item
+s32 CGUISTKListBox::getIcon(u32 row_num, u32 col_num) const
+{
+    if ( row_num >= Items.size() )
+            return -1;
+    if ( col_num >= Items[row_num].m_contents.size() )
+            return -1;
+    return Items[row_num].m_contents[col_num].m_icon;
+}
+
+void CGUISTKListBox::removeItem(u32 id)
+{
+	if (id >= Items.size())
+		return;
+
+	if ((u32)Selected==id)
+	{
+		Selected = -1;
+	}
+	else if ((u32)Selected > id)
+	{
+		Selected -= 1;
+		selectTime = os::Timer::getTime();
+	}
+
+	Items.erase(id);
+
+	recalculateItemHeight();
+}
+
+
+s32 CGUISTKListBox::getItemAt(s32 xpos, s32 ypos) const
+{
+	if ( 	xpos < AbsoluteRect.UpperLeftCorner.X || xpos >= AbsoluteRect.LowerRightCorner.X
+		||	ypos < AbsoluteRect.UpperLeftCorner.Y || ypos >= AbsoluteRect.LowerRightCorner.Y
+		)
+		return -1;
+
+	if ( ItemHeight == 0 )
+		return -1;
+
+	s32 item = ((ypos - AbsoluteRect.UpperLeftCorner.Y - 1) + ScrollBar->getPos()) / ItemHeight;
+	if ( item < 0 || item >= (s32)Items.size())
+		return -1;
+
+	return item;
+}
+
+//! clears the list
+void CGUISTKListBox::clear()
+{
+	Items.clear();
+	ItemsIconWidth = 0;
+	Selected = -1;
+
+	if (ScrollBar)
+		ScrollBar->setPos(0);
+
+	recalculateItemHeight();
+}
+
+
+void CGUISTKListBox::recalculateItemHeight()
+{
+	IGUISkin* skin = Environment->getSkin();
+
+	if (Font != skin->getFont())
+	{
+		if (Font)
+			Font->drop();
+
+		Font = skin->getFont();
+		if ( 0 == ItemHeightOverride )
+			ItemHeight = 0;
+
+		if (Font)
+		{
+			if ( 0 == ItemHeightOverride )
+				ItemHeight = Font->getDimension(L"A").Height + 4;
+
+			Font->grab();
+		}
+	}
+
+	TotalItemHeight = ItemHeight * Items.size();
+	ScrollBar->setMax( core::max_(0, TotalItemHeight - AbsoluteRect.getHeight()) );
+	s32 minItemHeight = ItemHeight > 0 ? ItemHeight : 1;
+	ScrollBar->setSmallStep ( minItemHeight );
+	ScrollBar->setLargeStep ( 2*minItemHeight );
+
+	if ( TotalItemHeight <= AbsoluteRect.getHeight() )
+		ScrollBar->setVisible(false);
+	else
+		ScrollBar->setVisible(true);
+}
+
+
+//! returns id of selected item. returns -1 if no item is selected.
+s32 CGUISTKListBox::getSelected() const
+{
+	return Selected;
+}
+
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUISTKListBox::setSelected(s32 id)
+{
+	if ((u32)id>=Items.size())
+		Selected = -1;
+	else
+		Selected = id;
+
+	selectTime = os::Timer::getTime();
+
+	recalculateScrollPos();
+}
+
+s32 CGUISTKListBox::getRowByCellText(const wchar_t * text)
+{
+    s32 row_index = -1;
+    s32 col_index = -1;
+    if (text)
+    {
+        for ( row_index = 0; row_index < (s32) Items.size(); ++row_index )
+        {
+            for ( col_index = 0; col_index < (s32) Items[row_index].m_contents.size(); ++col_index )
+            {
+                if ( Items[row_index].m_contents[col_index].m_text == text ) return row_index;
+            }
+        }
+    }
+    return -1;
+}
+
+//! sets the selected item. Set this to -1 if no item should be selected
+void CGUISTKListBox::setSelectedByCellText(const wchar_t * text)
+{
+    setSelected(getRowByCellText(text));
+}
+
+s32 CGUISTKListBox::getRowByInternalName(const std::string & text) const
+{
+    s32 row_index = -1;
+    if (text != "")
+    {
+        for ( row_index = 0; row_index < (s32) Items.size(); ++row_index )
+        {
+            if (Items[row_index].m_internal_name == text) return row_index;
+        }
+    }
+    return -1;
+}
+
+//! called if an event happened.
+bool CGUISTKListBox::OnEvent(const SEvent& event)
+{
+	if (isEnabled())
+	{
+		switch(event.EventType)
+		{
+		case EET_KEY_INPUT_EVENT:
+			if (event.KeyInput.PressedDown &&
+				(event.KeyInput.Key == KEY_DOWN ||
+				event.KeyInput.Key == KEY_UP   ||
+				event.KeyInput.Key == KEY_HOME ||
+				event.KeyInput.Key == KEY_END  ||
+				event.KeyInput.Key == KEY_NEXT ||
+				event.KeyInput.Key == KEY_PRIOR ) )
+			{
+				s32 oldSelected = Selected;
+				switch (event.KeyInput.Key)
+				{
+					case KEY_DOWN:
+						Selected += 1;
+						break;
+					case KEY_UP:
+						Selected -= 1;
+						break;
+					case KEY_HOME:
+						Selected = 0;
+						break;
+					case KEY_END:
+						Selected = (s32)Items.size()-1;
+						break;
+					case KEY_NEXT:
+						Selected += AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					case KEY_PRIOR:
+						Selected -= AbsoluteRect.getHeight() / ItemHeight;
+						break;
+					default:
+						break;
+				}
+				if (Selected >= (s32)Items.size())
+					Selected = Items.size() - 1;
+				else
+				if (Selected<0)
+					Selected = 0;
+
+				recalculateScrollPos();
+
+				// post the news
+
+				if (oldSelected != Selected && Parent && !Selecting && !MoveOverSelect)
+				{
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_CHANGED;
+					Parent->OnEvent(e);
+				}
+
+				return true;
+			}
+			else
+			if (!event.KeyInput.PressedDown && ( event.KeyInput.Key == KEY_RETURN || event.KeyInput.Key == KEY_SPACE ) )
+			{
+				if (Parent)
+				{
+					SEvent e;
+					e.EventType = EET_GUI_EVENT;
+					e.GUIEvent.Caller = this;
+					e.GUIEvent.Element = 0;
+					e.GUIEvent.EventType = EGET_LISTBOX_SELECTED_AGAIN;
+					Parent->OnEvent(e);
+				}
+				return true;
+			}
+			break;
+
+		case EET_GUI_EVENT:
+			switch(event.GUIEvent.EventType)
+			{
+			case gui::EGET_SCROLL_BAR_CHANGED:
+				if (event.GUIEvent.Caller == ScrollBar)
+					return true;
+				break;
+			case gui::EGET_ELEMENT_FOCUS_LOST:
+				{
+					if (event.GUIEvent.Caller == this)
+						Selecting = false;
+					break;
+				}
+
+			default:
+			break;
+			}
+			break;
+
+		case EET_MOUSE_INPUT_EVENT:
+			{
+				core::position2d<s32> p(event.MouseInput.X, event.MouseInput.Y);
+
+				switch(event.MouseInput.Event)
+				{
+				case EMIE_MOUSE_WHEEL:
+					ScrollBar->setPos(ScrollBar->getPos() + (event.MouseInput.Wheel < 0 ? -1 : 1)*-ItemHeight/2);
+					return true;
+
+				case EMIE_LMOUSE_PRESSED_DOWN:
+				{
+					Selecting = true;
+					return true;
+				}
+
+				case EMIE_LMOUSE_LEFT_UP:
+				{
+					Selecting = false;
+
+					if (isPointInside(p))
+						selectNew(event.MouseInput.Y);
+
+					return true;
+				}
+
+				case EMIE_MOUSE_MOVED:
+					if (Selecting || MoveOverSelect)
+					{
+						if (isPointInside(p))
+						{
+							selectNew(event.MouseInput.Y, true);
+							return true;
+						}
+					}
+				default:
+				break;
+				}
+			}
+			break;
+		case EET_LOG_TEXT_EVENT:
+		case EET_USER_EVENT:
+		case EET_JOYSTICK_INPUT_EVENT:
+		case EGUIET_FORCE_32_BIT:
+			break;
+		}
+	}
+
+	return IGUIElement::OnEvent(event);
+}
+
+
+void CGUISTKListBox::selectNew(s32 ypos, bool onlyHover)
+{
+	u32 now = os::Timer::getTime();
+	s32 oldSelected = Selected;
+
+	Selected = getItemAt(AbsoluteRect.UpperLeftCorner.X, ypos);
+	if (Selected<0 && !Items.empty())
+		Selected = 0;
+
+	recalculateScrollPos();
+
+	gui::EGUI_EVENT_TYPE eventType = (Selected == oldSelected && now < selectTime + 500) ? EGET_LISTBOX_SELECTED_AGAIN : EGET_LISTBOX_CHANGED;
+	selectTime = now;
+	// post the news
+	if (Parent && !onlyHover)
+	{
+		SEvent event;
+		event.EventType = EET_GUI_EVENT;
+		event.GUIEvent.Caller = this;
+		event.GUIEvent.Element = 0;
+		event.GUIEvent.EventType = eventType;
+		Parent->OnEvent(event);
+	}
+}
+
+
+//! Update the position and size of the listbox, and update the scrollbar
+void CGUISTKListBox::updateAbsolutePosition()
+{
+	IGUIElement::updateAbsolutePosition();
+
+	recalculateItemHeight();
+}
+
+
+//! draws the element and its children
+void CGUISTKListBox::draw()
+{
+    if (!IsVisible)
+        return;
+
+    recalculateItemHeight(); // if the font changed
+
+    IGUISkin* skin = Environment->getSkin();
+
+    core::rect<s32>* clipRect = 0;
+
+    // draw background
+    core::rect<s32> frameRect(AbsoluteRect);
+
+    // draw items
+
+    core::rect<s32> clientClip(AbsoluteRect);
+    clientClip.UpperLeftCorner.Y += 1;
+    clientClip.UpperLeftCorner.X += 1;
+    if (ScrollBar->isVisible())
+        clientClip.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
+    clientClip.LowerRightCorner.Y -= 1;
+    clientClip.clipAgainst(AbsoluteClippingRect);
+
+    skin->draw3DSunkenPane(this, skin->getColor(EGDC_3D_HIGH_LIGHT), true,
+        DrawBack, frameRect, &clientClip);
+
+    if (clipRect)
+        clientClip.clipAgainst(*clipRect);
+
+    frameRect = AbsoluteRect;
+    frameRect.UpperLeftCorner.X += 1;
+    if (ScrollBar->isVisible())
+        frameRect.LowerRightCorner.X = AbsoluteRect.LowerRightCorner.X - skin->getSize(EGDS_SCROLLBAR_SIZE);
+
+    frameRect.LowerRightCorner.Y = AbsoluteRect.UpperLeftCorner.Y + ItemHeight;
+
+    frameRect.UpperLeftCorner.Y -= ScrollBar->getPos();
+    frameRect.LowerRightCorner.Y -= ScrollBar->getPos();
+
+    bool hl = (HighlightWhenNotFocused || Environment->hasFocus(this) || Environment->hasFocus(ScrollBar));
+
+    for (s32 i=0; i<(s32)Items.size(); ++i)
+    {
+        if (frameRect.LowerRightCorner.Y >= AbsoluteRect.UpperLeftCorner.Y &&
+            frameRect.UpperLeftCorner.Y <= AbsoluteRect.LowerRightCorner.Y)
+        {
+            if (i == Selected && hl)
+                skin->draw2DRectangle(this, skin->getColor(EGDC_HIGH_LIGHT), frameRect, &clientClip);
+
+            core::rect<s32> textRect = frameRect;
+
+            if (Font)
+            {
+                int total_proportion = 0;
+                for(int x = 0; x < Items[i].m_contents.size(); ++x)
+                {
+                    total_proportion += Items[i].m_contents[x].m_proportion;
+                }
+                int part_size = textRect.getWidth() / total_proportion;
+
+                for(int x = 0; x < Items[i].m_contents.size(); ++x)
+                {
+                    textRect.LowerRightCorner.X = textRect.UpperLeftCorner.X +
+                                                  (Items[i].m_contents[x].m_proportion * part_size);
+                    textRect.UpperLeftCorner.X += 3;
+
+                    if (IconBank && (Items[i].m_contents[x].m_icon > -1))
+                    {
+                        core::position2di iconPos = textRect.UpperLeftCorner;
+                        iconPos.Y += textRect.getHeight() / 2;
+                        iconPos.X += ItemsIconWidth/2;
+
+                        if ( i==Selected && hl )
+                        {
+                            IconBank->draw2DSprite(
+                                (u32)Items[i].m_contents[x].m_icon,
+                                iconPos, &clientClip,
+                                hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
+                                getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
+                                selectTime, os::Timer::getTime(), false, true);
+                        }
+                        else
+                        {
+                            IconBank->draw2DSprite(
+                                (u32)Items[i].m_contents[x].m_icon,
+                                iconPos,
+                                &clientClip,
+                                hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
+                                0 , (i==Selected) ? os::Timer::getTime() : 0, false, true);
+                        }
+                    }
+
+                    textRect.UpperLeftCorner.X += ItemsIconWidth+3;
+
+                    if ( i==Selected && hl )
+                    {
+                        Font->draw(
+                            Items[i].m_contents[x].m_text.c_str(),
+                            textRect,
+                            hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ?
+                            getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
+                            false, true, &clientClip);
+                    }
+                    else
+                    {
+                        Font->draw(
+                            Items[i].m_contents[x].m_text.c_str(),
+                            textRect,
+                            hasItemOverrideColor(i, EGUI_LBC_TEXT) ? getItemOverrideColor(i, EGUI_LBC_TEXT) : getItemDefaultColor(EGUI_LBC_TEXT),
+                            false, true, &clientClip);
+                    }
+                    //Position back to inital pos
+                    textRect.UpperLeftCorner.X -= ItemsIconWidth+6;
+                    //Calculate new beginning
+                    textRect.UpperLeftCorner.X += Items[i].m_contents[x].m_proportion * part_size;
+                }
+            }
+        }
+
+        frameRect.UpperLeftCorner.Y += ItemHeight;
+        frameRect.LowerRightCorner.Y += ItemHeight;
+    }
+
+    IGUIElement::draw();
+}
+
+
+//! adds an list item with an icon
+u32 CGUISTKListBox::addItem(const ListItem & item)
+{
+	Items.push_back(item);
+	recalculateItemHeight();
+	recalculateIconWidth();
+	return Items.size() - 1;
+}
+
+
+void CGUISTKListBox::setSpriteBank(IGUISpriteBank* bank)
+{
+    if ( bank == IconBank )
+        return;
+	if (IconBank)
+		IconBank->drop();
+
+	IconBank = bank;
+	if (IconBank)
+		IconBank->grab();
+}
+
+
+void CGUISTKListBox::recalculateScrollPos()
+{
+	if (!AutoScroll)
+		return;
+
+	const s32 selPos = (Selected == -1 ? TotalItemHeight : Selected * ItemHeight) - ScrollBar->getPos();
+
+	if (selPos < 0)
+	{
+		ScrollBar->setPos(ScrollBar->getPos() + selPos);
+	}
+	else
+	if (selPos > AbsoluteRect.getHeight() - ItemHeight)
+	{
+		ScrollBar->setPos(ScrollBar->getPos() + selPos - AbsoluteRect.getHeight() + ItemHeight);
+	}
+}
+
+
+void CGUISTKListBox::setAutoScrollEnabled(bool scroll)
+{
+	AutoScroll = scroll;
+}
+
+
+bool CGUISTKListBox::isAutoScrollEnabled() const
+{
+	_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
+	return AutoScroll;
+}
+
+void CGUISTKListBox::recalculateIconWidth()
+{
+    for(int x = 0; x < Items.getLast().m_contents.size(); ++x)
+    {
+        s32 icon = Items.getLast().m_contents[x].m_icon;
+	if (IconBank && icon > -1 &&
+		IconBank->getSprites().size() > (u32)icon &&
+		IconBank->getSprites()[(u32)icon].Frames.size())
+	{
+		u32 rno = IconBank->getSprites()[(u32)icon].Frames[0].rectNumber;
+		if (IconBank->getPositions().size() > rno)
+		{
+			const s32 w = IconBank->getPositions()[rno].getWidth();
+			if (w > ItemsIconWidth)
+				ItemsIconWidth = w;
+		}
+	}
+    }
+}
+
+
+void CGUISTKListBox::setCell(u32 row_num, u32 col_num, const wchar_t* text, s32 icon)
+{
+	if ( row_num >= Items.size() )
+		return;
+        if ( col_num >= Items[row_num].m_contents.size() )
+                return;
+        Items[row_num].m_contents[col_num].m_text = text;
+        Items[row_num].m_contents[col_num].m_icon = icon;
+
+	recalculateItemHeight();
+	recalculateIconWidth();
+}
+
+void CGUISTKListBox::swapItems(u32 index1, u32 index2)
+{
+	if ( index1 >= Items.size() || index2 >= Items.size() )
+		return;
+
+	ListItem dummmy = Items[index1];
+	Items[index1] = Items[index2];
+	Items[index2] = dummmy;
+}
+
+
+void CGUISTKListBox::setItemOverrideColor(u32 index, video::SColor color)
+{
+	for ( u32 c=0; c < EGUI_LBC_COUNT; ++c )
+	{
+		Items[index].OverrideColors[c].Use = true;
+		Items[index].OverrideColors[c].Color = color;
+	}
+}
+
+
+void CGUISTKListBox::setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color)
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return;
+
+	Items[index].OverrideColors[colorType].Use = true;
+	Items[index].OverrideColors[colorType].Color = color;
+}
+
+
+void CGUISTKListBox::clearItemOverrideColor(u32 index)
+{
+	for (u32 c=0; c < (u32)EGUI_LBC_COUNT; ++c )
+	{
+		Items[index].OverrideColors[c].Use = false;
+	}
+}
+
+
+void CGUISTKListBox::clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType)
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return;
+
+	Items[index].OverrideColors[colorType].Use = false;
+}
+
+
+bool CGUISTKListBox::hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if ( index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return false;
+
+	return Items[index].OverrideColors[colorType].Use;
+}
+
+
+video::SColor CGUISTKListBox::getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const
+{
+	if ( (u32)index >= Items.size() || colorType < 0 || colorType >= EGUI_LBC_COUNT )
+		return video::SColor();
+
+	return Items[index].OverrideColors[colorType].Color;
+}
+
+
+video::SColor CGUISTKListBox::getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const
+{
+	IGUISkin* skin = Environment->getSkin();
+	if ( !skin )
+		return video::SColor();
+
+	switch ( colorType )
+	{
+		case EGUI_LBC_TEXT:
+			return skin->getColor(EGDC_BUTTON_TEXT);
+		case EGUI_LBC_TEXT_HIGHLIGHT:
+			return skin->getColor(EGDC_HIGH_LIGHT_TEXT);
+		case EGUI_LBC_ICON:
+			return skin->getColor(EGDC_ICON);
+		case EGUI_LBC_ICON_HIGHLIGHT:
+			return skin->getColor(EGDC_ICON_HIGH_LIGHT);
+		default:
+			return video::SColor();
+	}
+}
+
+//! set global itemHeight
+void CGUISTKListBox::setItemHeight( s32 height )
+{
+	ItemHeight = height;
+	ItemHeightOverride = 1;
+}
+
+
+//! Sets whether to draw the background
+void CGUISTKListBox::setDrawBackground(bool draw)
+{
+    DrawBack = draw;
+}
+
+
+} // end namespace gui
+} // end namespace irr
+
+
diff --git a/src/guiengine/widgets/CGUISTKListBox.h b/src/guiengine/widgets/CGUISTKListBox.h
new file mode 100644
index 000000000..b8e3fa662
--- /dev/null
+++ b/src/guiengine/widgets/CGUISTKListBox.h
@@ -0,0 +1,196 @@
+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+//               2013 Glenn De Jonghe
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef HEADER_CGUISTKListBox_HPP
+#define HEADER_CGUISTKListBox_HPP
+
+#include "IrrCompileConfig.h"
+
+#include "IGUIListBox.h"
+#include "IGUIElement.h"
+#include "irrArray.h"
+#include <string>
+
+namespace irr
+{
+    namespace gui
+    {
+	class IGUIFont;
+	class IGUIScrollBar;
+
+	class CGUISTKListBox : public IGUIElement
+	{
+	public:
+
+            struct ListItem
+            {
+
+                struct ListCell
+                {
+                    irr::core::stringw m_text;
+                    int m_proportion;
+                    s32 m_icon;
+
+                    ListCell(irr::core::stringw text, s32 icon = -1, int proportion = 1)
+                    {
+                        m_text = text;
+                        m_proportion = proportion;
+                        m_icon = icon;
+                    }
+                };
+
+                core::array< ListCell > m_contents;
+
+                // Actually only used in list_widget -- still refactoring FIXME
+                std::string m_internal_name;
+                int m_current_id;
+
+                // A multicolor extension
+                struct ListItemOverrideColor
+                {
+                        ListItemOverrideColor() : Use(false) {}
+                        bool Use;
+                        video::SColor Color;
+                };
+
+                ListItemOverrideColor OverrideColors[EGUI_LBC_COUNT];
+            };
+
+            //! constructor
+            CGUISTKListBox(IGUIEnvironment* environment, IGUIElement* parent,
+                    s32 id, core::rect<s32> rectangle, bool clip=true,
+                    bool drawBack=false, bool moveOverSelect=false);
+
+            //! destructor
+            virtual ~CGUISTKListBox();
+
+            //! returns amount of list items
+            virtual u32 getItemCount() const;
+
+            virtual const wchar_t* getCellText(u32 row_num, u32 col_num) const;
+
+            virtual ListItem getItem(u32 id) const;
+
+            //! clears the list
+            virtual void clear();
+
+            //! returns id of selected item. returns -1 if no item is selected.
+            virtual s32 getSelected() const;
+
+            //! sets the selected item. Set this to -1 if no item should be selected
+            virtual void setSelected(s32 id);
+
+            virtual s32 getRowByCellText(const wchar_t * text);
+
+            //! sets the selected item. Set this to -1 if no item should be selected
+            virtual void setSelectedByCellText(const wchar_t * text);
+
+            virtual s32 getRowByInternalName(const std::string & text) const;
+
+            //! called if an event happened.
+            virtual bool OnEvent(const SEvent& event);
+
+            //! draws the element and its children
+            virtual void draw();
+
+            //! adds an list item with an icon
+            //! \param text Text of list entry
+            //! \param icon Sprite index of the Icon within the current sprite bank. Set it to -1 if you want no icon
+            //! \return
+            //! returns the id of the new created item
+            //virtual u32 addItem(const wchar_t* text, s32 icon);
+
+            virtual u32 addItem(const ListItem & item);
+
+            //! Returns the icon of an item
+            virtual s32 getIcon(u32 row_num, u32 col_num) const;
+
+            //! removes an item from the list
+            virtual void removeItem(u32 id);
+
+            //! get the the id of the item at the given absolute coordinates
+            virtual s32 getItemAt(s32 xpos, s32 ypos) const;
+
+            //! Sets the sprite bank which should be used to draw list icons. This font is set to the sprite bank of
+            //! the built-in-font by default. A sprite can be displayed in front of every list item.
+            //! An icon is an index within the icon sprite bank. Several default icons are available in the
+            //! skin through getIcon
+            virtual void setSpriteBank(IGUISpriteBank* bank);
+
+            //! set whether the listbox should scroll to newly selected items
+            virtual void setAutoScrollEnabled(bool scroll);
+
+            //! returns true if automatic scrolling is enabled, false if not.
+            virtual bool isAutoScrollEnabled() const;
+
+            //! Update the position and size of the listbox, and update the scrollbar
+            virtual void updateAbsolutePosition();
+
+            //! set all item colors at given index to color
+            virtual void setItemOverrideColor(u32 index, video::SColor color);
+
+            //! set all item colors of specified type at given index to color
+            virtual void setItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType, video::SColor color);
+
+            //! clear all item colors at index
+            virtual void clearItemOverrideColor(u32 index);
+
+            //! clear item color at index for given colortype
+            virtual void clearItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType);
+
+            //! has the item at index its color overwritten?
+            virtual bool hasItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
+
+            //! return the overwrite color at given item index.
+            virtual video::SColor getItemOverrideColor(u32 index, EGUI_LISTBOX_COLOR colorType) const;
+
+            //! return the default color which is used for the given colorType
+            virtual video::SColor getItemDefaultColor(EGUI_LISTBOX_COLOR colorType) const;
+
+            //! set the item at the given index
+            virtual void setCell(u32 row_num, u32 col_num, const wchar_t* text, s32 icon);
+
+            //! Swap the items at the given indices
+            virtual void swapItems(u32 index1, u32 index2);
+
+            //! set global itemHeight
+            virtual void setItemHeight( s32 height );
+
+            //! Sets whether to draw the background
+            virtual void setDrawBackground(bool draw);
+
+	private:
+
+            void recalculateItemHeight();
+            void selectNew(s32 ypos, bool onlyHover=false);
+            void recalculateScrollPos();
+
+            // extracted that function to avoid copy&paste code
+            void recalculateIconWidth();
+
+            core::array< ListItem > Items;
+            s32 Selected;
+            s32 ItemHeight;
+            s32 ItemHeightOverride;
+            s32 TotalItemHeight;
+            s32 ItemsIconWidth;
+            gui::IGUIFont* Font;
+            gui::IGUISpriteBank* IconBank;
+            gui::IGUIScrollBar* ScrollBar;
+            u32 selectTime;
+            u32 LastKeyTime;
+            core::stringw KeyBuffer;
+            bool Selecting;
+            bool DrawBack;
+            bool MoveOverSelect;
+            bool AutoScroll;
+            bool HighlightWhenNotFocused;
+	};
+
+
+    } // end namespace gui
+} // end namespace irr
+
+#endif
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index ba8def7bf..4998ed27d 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -17,7 +17,6 @@
 
 #include "guiengine/widgets/list_widget.hpp"
 
-#include "guiengine/widgets/CGUIListBox.h"
 #include "guiengine/CGUISpriteBank.h"
 #include "guiengine/engine.hpp"
 #include "io/file_manager.hpp"
@@ -53,7 +52,7 @@ void ListWidget::setIcons(STKModifiedSpriteBank* icons, int size)
 
     if (m_use_icons)
     {
-        IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+        CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
         assert(list != NULL);
 
         list->setSpriteBank(m_icons);
@@ -94,7 +93,7 @@ void ListWidget::add()
 
     IGUISkin * current_skin = GUIEngine::getGUIEnv()->getSkin();
     IGUIFont * current_font = GUIEngine::getGUIEnv()->getBuiltInFont();
-    IGUIListBox * list_box = new CGUIListBox(
+    CGUISTKListBox * list_box = new CGUISTKListBox(
         GUIEngine::getGUIEnv(),
         m_parent ? m_parent : GUIEngine::getGUIEnv()->getRootGUIElement(),
         getNewID(),
@@ -173,91 +172,120 @@ void ListWidget::clear()
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
     assert(list != NULL);
 
     list->clear();
-    m_items.clear();
 }
 
 // -----------------------------------------------------------------------------
 
-void ListWidget::addItem(const std::string& internalName,
-                         const irr::core::stringw& name, const int icon)
+void ListWidget::addItem(   const std::string& internal_name,
+                            const irr::core::stringw &name,
+                            const int icon)
+{
+    // May only be called AFTER this widget has been add()ed
+    assert(m_element != NULL);
+
+    ListCell cell(name, icon);
+    ListItem newItem;
+    newItem.m_internal_name = internal_name;
+    newItem.m_contents.push_back(cell);
+
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
+    assert(list != NULL);
+
+    u32 itemID = list->addItem( newItem );
+    if (m_use_icons)
+    {
+        list->setItemOverrideColor( itemID, gui::EGUI_LBC_ICON, video::SColor(255,255,255,255) );
+        list->setItemOverrideColor( itemID, gui::EGUI_LBC_ICON_HIGHLIGHT, video::SColor(255,255,255,255) );
+    }
+    newItem.m_current_id = itemID;
+}
+
+// -----------------------------------------------------------------------------
+
+void ListWidget::addItem(const std::string& internal_name,
+                         PtrVector<ListCell> * contents)
 {
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
     ListItem newItem;
-    newItem.m_label = name;
-    newItem.m_internal_name = internalName;
+    newItem.m_internal_name = internal_name;
+    for(int i = 0; i < (int)contents->size(); i++)
+    {
+        newItem.m_contents.push_back(*contents->get(i));
+    }
 
-    IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
     assert(list != NULL);
 
-    if (m_use_icons && icon != -1)
+    u32 itemID = list->addItem( newItem );
+    if (m_use_icons)
     {
-        u32 itemID = list->addItem( name.c_str(), icon );
         list->setItemOverrideColor( itemID, gui::EGUI_LBC_ICON, video::SColor(255,255,255,255) );
         list->setItemOverrideColor( itemID, gui::EGUI_LBC_ICON_HIGHLIGHT, video::SColor(255,255,255,255) );
-        newItem.m_current_id = itemID;
     }
-    else
-    {
-        newItem.m_current_id = list->addItem( name.c_str() );
-    }
-    m_items.push_back(newItem);
+    newItem.m_current_id = itemID;
 }
 
 // -----------------------------------------------------------------------------
-
-void ListWidget::renameItem(const int itemID, const irr::core::stringw newName, const int icon)
+void ListWidget::renameCell(const int row_index, const int col_index, const irr::core::stringw newName, const int icon)
 {
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
     assert(list != NULL);
 
-    m_items[itemID].m_label = newName;
-    list->setItem(itemID, newName.c_str(), icon);
+    list->setCell(row_index, col_index, newName.c_str(), icon);
 
-    list->setItemOverrideColor( itemID, EGUI_LBC_TEXT          , video::SColor(255,0,0,0) );
-    list->setItemOverrideColor( itemID, EGUI_LBC_TEXT_HIGHLIGHT, video::SColor(255,255,255,255) );
+    list->setItemOverrideColor( row_index, EGUI_LBC_TEXT          , video::SColor(255,0,0,0) );
+    list->setItemOverrideColor( row_index, EGUI_LBC_TEXT_HIGHLIGHT, video::SColor(255,255,255,255) );
+}
+
+// -----------------------------------------------------------------------------
+void ListWidget::renameItem(const int row_index, const irr::core::stringw newName, const int icon)
+{
+    renameCell(row_index, 0, newName, icon);
 }
 
 // -----------------------------------------------------------------------------
 
 std::string ListWidget::getSelectionInternalName()
 {
-    if (getSelectionID() == -1) return "";
-    return m_items[ getSelectionID() ].m_internal_name;
 
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
+    assert(list != NULL);
+    if (getSelectionID() == -1 || (getSelectionID() >= (int)list->getItemCount()))
+        return "";
+    return list->getItem(getSelectionID()).m_internal_name;
 }
 
 // -----------------------------------------------------------------------------
-
-irr::core::stringw ListWidget::getSelectionLabel() const
+irr::core::stringw ListWidget::getSelectionLabel(const int cell) const
 {
-    const IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    const CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
     assert(list != NULL);
-    return list->getListItem( list->getSelected() );
+    return list->getCellText( list->getSelected(), cell);
 }
 
 // -----------------------------------------------------------------------------
 
 void ListWidget::selectItemWithLabel(const irr::core::stringw& name)
 {
-    IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
     assert(list != NULL);
-    return list->setSelected( name.c_str() );
+    return list->setSelectedByCellText( name.c_str() );
 }
 
 // -----------------------------------------------------------------------------
 
 void ListWidget::unfocused(const int playerID, Widget* new_focus)
 {
-    IGUIListBox* list = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
 
     // remove selection when leaving list
     if (list != NULL) list->setSelected(-1);
@@ -270,7 +298,7 @@ int ListWidget::getSelectionID() const
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    return getIrrlichtElement<IGUIListBox>()->getSelected();
+    return getIrrlichtElement<CGUISTKListBox>()->getSelected();
 }
 
 // -----------------------------------------------------------------------------
@@ -280,7 +308,7 @@ void ListWidget::setSelectionID(const int index)
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    IGUIListBox* irritem = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* irritem = getIrrlichtElement<CGUISTKListBox>();
 
     // auto-scroll to item when selecting something, don't auto-scroll when selecting nothing
     if (index != -1)
@@ -303,8 +331,7 @@ int ListWidget::getItemCount() const
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    const int count = getIrrlichtElement<IGUIListBox>()->getItemCount();
-    assert((int)m_items.size() == count);
+    const int count = getIrrlichtElement<CGUISTKListBox>()->getItemCount();
 
     return count;
 }
@@ -314,7 +341,6 @@ int ListWidget::getItemCount() const
 void ListWidget::elementRemoved()
 {
     Widget::elementRemoved();
-    m_items.clear();
 
     for (int n=0; n<m_header_elements.size(); n++)
     {
@@ -327,26 +353,12 @@ void ListWidget::elementRemoved()
 
 // -----------------------------------------------------------------------------
 
-int ListWidget::getItemID(const std::string internalName) const
-{
-    const int count = m_items.size();
-
-    for (int i=0; i<count; i++)
-    {
-        if (m_items[i].m_internal_name == internalName) return i;
-    }
-
-    return -1;
-}
-
-// -----------------------------------------------------------------------------
-
 void ListWidget::markItemRed(const int id, bool red)
 {
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    IGUIListBox* irritem = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* irritem = getIrrlichtElement<CGUISTKListBox>();
 
     if (red)
     {
@@ -367,7 +379,7 @@ void ListWidget::markItemBlue(const int id, bool blue)
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    IGUIListBox* irritem = getIrrlichtElement<IGUIListBox>();
+    CGUISTKListBox* irritem = getIrrlichtElement<CGUISTKListBox>();
 
     if (blue)
     {
@@ -413,3 +425,11 @@ EventPropagation ListWidget::transmitEvent(Widget* w,
 
     return EVENT_LET;
 }
+
+// -----------------------------------------------------------------------------
+int ListWidget::getItemID(const std::string internalName) const
+{
+    const CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
+    assert(list != NULL);
+    return list->getRowByInternalName(internalName);
+}
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index 4e1a3191c..657adbac8 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -22,12 +22,14 @@
 
 #include <irrString.h>
 
+#include "guiengine/widgets/CGUISTKListBox.h"
 #include "guiengine/widget.hpp"
 #include "guiengine/widgets/button_widget.hpp"
 #include "utils/leak_check.hpp"
 #include "utils/ptr_vector.hpp"
 #include "IGUIElement.h"
 
+
 namespace irr { namespace gui { class STKModifiedSpriteBank; } }
 
 namespace GUIEngine
@@ -48,7 +50,6 @@ namespace GUIEngine
     class ListWidget : public Widget
     {
         friend class Skin;
-
         
         /** \brief whether this list has icons */
         bool m_use_icons;
@@ -56,14 +57,6 @@ namespace GUIEngine
         /** \brief if m_use_icons is true, this will contain the icon bank */
         irr::gui::STKModifiedSpriteBank* m_icons;
                 
-        struct ListItem
-        {
-            std::string m_internal_name;
-            irr::core::stringw m_label;
-            int m_current_id;
-        };
-        std::vector< ListItem > m_items;
-
         PtrVector< ButtonWidget > m_header_elements;
         
         ButtonWidget* m_selected_column;
@@ -89,6 +82,8 @@ namespace GUIEngine
         IListWidgetHeaderListener* m_listener;
 
     public:
+        typedef irr::gui::CGUISTKListBox::ListItem ListItem;
+        typedef ListItem::ListCell ListCell;
         
         LEAK_CHECK()
         
@@ -125,8 +120,12 @@ namespace GUIEngine
          * \param icon   ID of the icon within the icon bank. Only used if an icon bank was passed.
          * \pre may only be called after the widget has been added to the screen with add()
          */
-        void addItem(const std::string& internal_name, 
-                     const irr::core::stringw &name, const int icon=-1);
+        void addItem(   const std::string& internal_name,
+                        const irr::core::stringw &name,
+                        const int icon=-1);
+
+        void addItem(   const std::string& internal_name,
+                        PtrVector<ListCell> * contents);
         
         /**
           * \brief erases all items in the list
@@ -152,7 +151,7 @@ namespace GUIEngine
           */
         std::string getSelectionInternalName();
         
-        irr::core::stringw getSelectionLabel() const;
+        irr::core::stringw getSelectionLabel(const int cell = 0) const;
         
         void selectItemWithLabel(const irr::core::stringw& name);
         
@@ -172,18 +171,23 @@ namespace GUIEngine
           * \brief rename an item and/or change its icon based on its ID
           * \pre may only be called after the widget has been added to the screen with add()
           */
-        void renameItem(const int itemID, const irr::core::stringw newName, const int icon=-1);
+        void renameCell(const int row_num, const int col_num, const irr::core::stringw newName, const int icon=-1);
         
+        /**
+         * renames first cell only
+         */
+        void renameItem(const int row_num, const irr::core::stringw newName, const int icon=-1);
+
         /**
           * \brief rename an item and/or change its icon based on its internal name
           * \pre may only be called after the widget has been added to the screen with add()
           */
-        void renameItem(const std::string internalName, const irr::core::stringw newName,
+        void renameCell(const std::string internalName, const int col_num, const irr::core::stringw newName,
                         const int icon=-1)
         {
             const int id = getItemID(internalName);
             assert(id != -1);
-            renameItem( id, newName, icon );
+            renameCell( id, col_num, newName, icon );
         }
         
         /**
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index b51dbea3f..6130ffc1b 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -279,10 +279,11 @@ void AddonsScreen::loadList()
             s = (addon->getName()+L"\t" +
                     core::stringc(addon->getDateAsString().c_str())).c_str();
 
-        gui::IGUIFont* font = GUIEngine::getFont();
+       /* gui::IGUIFont* font = GUIEngine::getFont();
 
         // first column is 0.666% of the list's width.
         // and icon width == icon height.
+
         const unsigned int available_width = (int)(w_list->m_w*0.6666f
                                                    - m_icon_height);
         if (font->getDimension(s.c_str()).Width > available_width)
@@ -291,7 +292,7 @@ void AddonsScreen::loadList()
             s.append("...");
         }
         else
-        {
+        {*/
             if (addon->getDesigner().size() == 0)
             {
                 s = addon->getName();
@@ -302,7 +303,7 @@ void AddonsScreen::loadList()
                 s = _C("addons", "%s by %s", addon->getName().c_str(),
                         addon->getDesigner().c_str());
             }
-
+            /*
             // check if text is too long to fit
             if (font->getDimension(s.c_str()).Width >  available_width)
             {
@@ -342,10 +343,9 @@ void AddonsScreen::loadList()
                 }   // for nlines.size()
 
                 s = final_string;
-            }   // if
-            s.append("\t");
-            s.append(addon->getDateAsString().c_str());
-        }
+                */
+            //}   // if
+        //}
 
         // we have no icon for featured+updateme, so if an add-on is updatable
         // forget about the featured icon
@@ -355,7 +355,10 @@ void AddonsScreen::loadList()
             icon += 2;
         }
 
-        w_list->addItem(addon->getId(), s.c_str(), icon);
+        PtrVector<GUIEngine::ListWidget::ListCell> * row = new PtrVector<GUIEngine::ListWidget::ListCell>;
+        row->push_back(new GUIEngine::ListWidget::ListCell(s.c_str(),icon,2));
+        row->push_back(new GUIEngine::ListWidget::ListCell(addon->getDateAsString().c_str(),-1,1));
+        w_list->addItem(addon->getId(), row);
 
         // Highlight if it's not approved in artists debug mode.
         if(UserConfigParams::m_artist_debug_mode &&
@@ -365,16 +368,16 @@ void AddonsScreen::loadList()
         }
     }
 
-	getWidget<GUIEngine::RibbonWidget>("category")->setActivated();
-	if(m_type == "kart")
-    	getWidget<GUIEngine::RibbonWidget>("category")->select("tab_kart",
-                                                        PLAYER_ID_GAME_MASTER);
-	else if(m_type == "track")
-    	getWidget<GUIEngine::RibbonWidget>("category")->select("tab_track",
-                                                        PLAYER_ID_GAME_MASTER);
+    getWidget<GUIEngine::RibbonWidget>("category")->setActivated();
+    if(m_type == "kart")
+    getWidget<GUIEngine::RibbonWidget>("category")->select("tab_kart",
+                                                    PLAYER_ID_GAME_MASTER);
+    else if(m_type == "track")
+    getWidget<GUIEngine::RibbonWidget>("category")->select("tab_track",
+                                                    PLAYER_ID_GAME_MASTER);
     else
-    	getWidget<GUIEngine::RibbonWidget>("category")->select("tab_update",
-                                                        PLAYER_ID_GAME_MASTER);
+    getWidget<GUIEngine::RibbonWidget>("category")->select("tab_update",
+                                                    PLAYER_ID_GAME_MASTER);
 }   // loadList
 
 // ----------------------------------------------------------------------------
@@ -384,7 +387,7 @@ void AddonsScreen::onColumnClicked(int column_id)
     {
     case 0: Addon::setSortOrder(Addon::SO_NAME); break;
     case 1: Addon::setSortOrder(Addon::SO_DATE); break;
-    default: assert(0);
+    default: assert(0); break;
     }   // switch
     /** \brief Toggle the sort order after column click **/
     m_sort_desc = !m_sort_desc;
@@ -412,9 +415,7 @@ void AddonsScreen::eventCallback(GUIEngine::Widget* widget,
             w_list->clear();
 
             w_list->addItem("spacer", L"");
-            w_list->addItem("loading",
-                            _("Please wait while addons are updated"),
-                            m_icon_loading);
+            w_list->addItem("loading",_("Please wait while addons are updated"), m_icon_loading);
         }
     }
 

From bc236c0f99ca37a5de9c28c91ae52167ebddc9e4 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 21:47:48 +0000
Subject: [PATCH 09/44] adjusted addons_screen and server_selection to use the
 new capabilities of the list widget

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13217 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/addons_screen.cpp    |  2 ++
 src/states_screens/server_selection.cpp | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 6130ffc1b..99636dfc5 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -279,6 +279,8 @@ void AddonsScreen::loadList()
             s = (addon->getName()+L"\t" +
                     core::stringc(addon->getDateAsString().c_str())).c_str();
 
+       //FIXME I'd like to move this to CGUISTKListBox.cpp
+
        /* gui::IGUIFont* font = GUIEngine::getFont();
 
         // first column is 0.666% of the list's width.
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 09afb3e39..351844d1f 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -58,8 +58,8 @@ void ServerSelection::loadedFromFile()
 void ServerSelection::beforeAddingWidget()
 {
     m_server_list_widget->clearColumns();
-    m_server_list_widget->addColumn( _("Name"), 4 );
-    m_server_list_widget->addColumn( _("Players"), 2);
+    m_server_list_widget->addColumn( _("Name"), 3 );
+    m_server_list_widget->addColumn( _("Players"), 1);
 }
 // ----------------------------------------------------------------------------
 
@@ -103,13 +103,14 @@ void ServerSelection::loadList(bool refresh)
     for(int i=0; i <  manager->getNumServers(); i++)
     {
         Server * server = manager->getServer(i);
-        core::stringw table_entry;
-        table_entry.append(server->getName());
-        table_entry.append("\t");
-        table_entry.append(StringUtils::toWString(server->getCurrentPlayers()));
-        table_entry.append("/");
-        table_entry.append(StringUtils::toWString(server->getMaxPlayers()));
-        m_server_list_widget->addItem("server", table_entry);
+        core::stringw num_players;
+        num_players.append(StringUtils::toWString(server->getCurrentPlayers()));
+        num_players.append("/");
+        num_players.append(StringUtils::toWString(server->getMaxPlayers()));
+        PtrVector<GUIEngine::ListWidget::ListCell> * row = new PtrVector<GUIEngine::ListWidget::ListCell>;
+        row->push_back(new GUIEngine::ListWidget::ListCell(server->getName(),-1,3));
+        row->push_back(new GUIEngine::ListWidget::ListCell(num_players,-1,1));
+        m_server_list_widget->addItem("server", row);
     }
 
 }   // loadList

From a0b20697d2c14c0097500b30077ffa050e3f4b3e Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 21:52:51 +0000
Subject: [PATCH 10/44] Removed space for icon, if there is none.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13218 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/widgets/CGUISTKListBox.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
index a3ca8a543..0a4a55e8d 100644
--- a/src/guiengine/widgets/CGUISTKListBox.cpp
+++ b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -520,9 +520,10 @@ void CGUISTKListBox::draw()
                                 hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
                                 0 , (i==Selected) ? os::Timer::getTime() : 0, false, true);
                         }
+                        textRect.UpperLeftCorner.X += ItemsIconWidth;
                     }
 
-                    textRect.UpperLeftCorner.X += ItemsIconWidth+3;
+                    textRect.UpperLeftCorner.X += 3;
 
                     if ( i==Selected && hl )
                     {

From 567f6302ed7f9950c85f0da7defc63175c8c4597 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 14 Jul 2013 22:24:06 +0000
Subject: [PATCH 11/44] Removed the old tab hack from scalable font. (Could
 someone check if done correctly?)  and made it possible for table entries to
 have both left-aligned and centered content.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13221 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/scalable_font.cpp          | 17 +++--------------
 src/guiengine/widgets/CGUISTKListBox.cpp |  6 +++---
 src/guiengine/widgets/CGUISTKListBox.h   |  4 +++-
 src/guiengine/widgets/list_widget.cpp    |  5 +++--
 src/guiengine/widgets/list_widget.hpp    |  3 ++-
 src/states_screens/addons_screen.cpp     |  6 +++---
 src/states_screens/server_selection.cpp  |  2 +-
 7 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 5fcddfea5..26cf20c3f 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -500,15 +500,12 @@ void ScalableFont::draw(const core::stringw& text,
     core::position2d<s32> offset = position.UpperLeftCorner;
     core::dimension2d<s32> text_dimension;
 
-    // When we use the "tab" hack, disable right-alignment, it messes up everything
-    bool has_tab = (text.findFirst(L'\t') != -1);
-
-    if ((m_rtl && !has_tab) || hcenter || vcenter || clip)
+    if (m_rtl || hcenter || vcenter || clip)
     {
         text_dimension = getDimension(text.c_str());
 
-        if (hcenter)                offset.X += (position.getWidth() - text_dimension.Width) / 2;
-        else if (m_rtl && !has_tab) offset.X += (position.getWidth() - text_dimension.Width);
+        if (hcenter)    offset.X += (position.getWidth() - text_dimension.Width) / 2;
+        else if (m_rtl) offset.X += (position.getWidth() - text_dimension.Width);
 
         if (vcenter)    offset.Y += (position.getHeight() - text_dimension.Height) / 2;
         if (clip)
@@ -519,14 +516,6 @@ void ScalableFont::draw(const core::stringw& text,
         }
     }
 
-    if (m_rtl && has_tab)
-    {
-        const int where = text.findFirst(L'\t');
-        core::stringw substr = text.subString(0, where-1);
-        text_dimension = getDimension(substr.c_str()) + getDimension(L"XX");
-        offset.X += (int)(position.getWidth()*m_tab_stop-text_dimension.Width);
-    }
-
     // ---- collect character locations
     const unsigned int text_size = text.size();
     core::array<s32>               indices(text_size);
diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
index 0a4a55e8d..f73d1de0a 100644
--- a/src/guiengine/widgets/CGUISTKListBox.cpp
+++ b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -488,7 +488,7 @@ void CGUISTKListBox::draw()
                 {
                     total_proportion += Items[i].m_contents[x].m_proportion;
                 }
-                int part_size = textRect.getWidth() / total_proportion;
+                int part_size = (int)(textRect.getWidth() / float(total_proportion));
 
                 for(int x = 0; x < Items[i].m_contents.size(); ++x)
                 {
@@ -532,7 +532,7 @@ void CGUISTKListBox::draw()
                             textRect,
                             hasItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) ?
                             getItemOverrideColor(i, EGUI_LBC_TEXT_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_TEXT_HIGHLIGHT),
-                            false, true, &clientClip);
+                            Items[i].m_contents[x].m_center, true, &clientClip);
                     }
                     else
                     {
@@ -540,7 +540,7 @@ void CGUISTKListBox::draw()
                             Items[i].m_contents[x].m_text.c_str(),
                             textRect,
                             hasItemOverrideColor(i, EGUI_LBC_TEXT) ? getItemOverrideColor(i, EGUI_LBC_TEXT) : getItemDefaultColor(EGUI_LBC_TEXT),
-                            false, true, &clientClip);
+                            Items[i].m_contents[x].m_center, true, &clientClip);
                     }
                     //Position back to inital pos
                     textRect.UpperLeftCorner.X -= ItemsIconWidth+6;
diff --git a/src/guiengine/widgets/CGUISTKListBox.h b/src/guiengine/widgets/CGUISTKListBox.h
index b8e3fa662..e8edeb151 100644
--- a/src/guiengine/widgets/CGUISTKListBox.h
+++ b/src/guiengine/widgets/CGUISTKListBox.h
@@ -32,12 +32,14 @@ namespace irr
                     irr::core::stringw m_text;
                     int m_proportion;
                     s32 m_icon;
+                    bool m_center;
 
-                    ListCell(irr::core::stringw text, s32 icon = -1, int proportion = 1)
+                    ListCell(irr::core::stringw text, s32 icon = -1, int proportion = 1, bool center = false)
                     {
                         m_text = text;
                         m_proportion = proportion;
                         m_icon = icon;
+                        m_center = center;
                     }
                 };
 
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index 4998ed27d..3d82cd5f5 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -182,12 +182,13 @@ void ListWidget::clear()
 
 void ListWidget::addItem(   const std::string& internal_name,
                             const irr::core::stringw &name,
-                            const int icon)
+                            const int icon,
+                            bool center)
 {
     // May only be called AFTER this widget has been add()ed
     assert(m_element != NULL);
 
-    ListCell cell(name, icon);
+    ListCell cell(name, icon, 1, center);
     ListItem newItem;
     newItem.m_internal_name = internal_name;
     newItem.m_contents.push_back(cell);
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index 657adbac8..d74937a77 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -122,7 +122,8 @@ namespace GUIEngine
          */
         void addItem(   const std::string& internal_name,
                         const irr::core::stringw &name,
-                        const int icon=-1);
+                        const int icon=-1,
+                        bool center = false);
 
         void addItem(   const std::string& internal_name,
                         PtrVector<ListCell> * contents);
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 99636dfc5..7450f8cbd 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -104,7 +104,7 @@ void AddonsScreen::beforeAddingWidget()
         getWidget<GUIEngine::ListWidget>("list_addons");
     assert(w_list != NULL);
     w_list->clearColumns();
-    w_list->addColumn( _("Add-on name"), 2 );
+    w_list->addColumn( _("Add-on name"), 3 );
     w_list->addColumn( _("Updated date"), 1 );
     
     GUIEngine::SpinnerWidget* w_filter_date =
@@ -358,8 +358,8 @@ void AddonsScreen::loadList()
         }
 
         PtrVector<GUIEngine::ListWidget::ListCell> * row = new PtrVector<GUIEngine::ListWidget::ListCell>;
-        row->push_back(new GUIEngine::ListWidget::ListCell(s.c_str(),icon,2));
-        row->push_back(new GUIEngine::ListWidget::ListCell(addon->getDateAsString().c_str(),-1,1));
+        row->push_back(new GUIEngine::ListWidget::ListCell(s.c_str(), icon, 3, false));
+        row->push_back(new GUIEngine::ListWidget::ListCell(addon->getDateAsString().c_str(), -1, 1, true));
         w_list->addItem(addon->getId(), row);
 
         // Highlight if it's not approved in artists debug mode.
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 351844d1f..027bc202b 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -109,7 +109,7 @@ void ServerSelection::loadList(bool refresh)
         num_players.append(StringUtils::toWString(server->getMaxPlayers()));
         PtrVector<GUIEngine::ListWidget::ListCell> * row = new PtrVector<GUIEngine::ListWidget::ListCell>;
         row->push_back(new GUIEngine::ListWidget::ListCell(server->getName(),-1,3));
-        row->push_back(new GUIEngine::ListWidget::ListCell(num_players,-1,1));
+        row->push_back(new GUIEngine::ListWidget::ListCell(num_players,-1,1,true));
         m_server_list_widget->addItem("server", row);
     }
 

From 67854a7efd1d32b21d7313e4d77e7424be8e7dc3 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 15 Jul 2013 00:25:56 +0000
Subject: [PATCH 12/44] You need to sign in now, for the features where it's
 needed. Also made a temporary implementation for quick play.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13224 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/servers_manager.cpp       |  8 ++++++++
 src/online/servers_manager.hpp       |  2 ++
 src/states_screens/online_screen.cpp | 30 +++++++++++++++++-----------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index 6b26e35e0..fb0ced8a4 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -69,3 +69,11 @@ void ServersManager::refresh()
     }
     //FIXME error message
 }
+
+// ============================================================================
+Server * ServersManager::getQuickPlay()
+{
+    if(m_servers->size() > 0)
+        return m_servers->get(0);
+    return NULL;
+}
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index d76a70b3f..912e0bda0 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -49,6 +49,8 @@ class ServersManager
         void sort(bool sort_desc) { m_servers->insertionSort(0, sort_desc); };
         void setJoinedServer(Server * server){ m_joined_server = server;};
         Server * getJoinedServer(){ return m_joined_server;};
+        //Returns the best server to join
+        Server * getQuickPlay();
 };   // class ServersManager
 
 #endif
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index ce882507b..dc38bc75a 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -22,8 +22,7 @@
 #include <string>
 #include <iostream>
 
-#include "challenges/game_slot.hpp"
-#include "challenges/unlock_manager.hpp"
+#include "audio/sfx_manager.hpp"
 #include "graphics/irr_driver.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "input/device_manager.hpp"
@@ -39,8 +38,9 @@
 #include "states_screens/server_selection.hpp"
 #include "modes/demo_world.hpp"
 #include "utils/translation.hpp"
-
 #include "online/current_online_user.hpp"
+#include "online/servers_manager.hpp"
+
 
 
 using namespace GUIEngine;
@@ -136,7 +136,7 @@ void OnlineScreen::init()
 {
     Screen::init();
     setInitialFocus();
-    DemoWorld::resetIdleTime(); //FIXME : what's this?
+    DemoWorld::resetIdleTime();
     m_online_status_widget->setText(irr::core::stringw(_("Signed in as : ")) + CurrentOnlineUser::get()->getUserName() + ".", false);
 }   // init
 
@@ -186,12 +186,21 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
     else if (selection == "create_server")
     {
-        //if (m_recorded_state == Registered)
         StateManager::get()->pushScreen(NetworkingLobbySettings::getInstance());
     }
     else if (selection == "quick_play")
     {
-        //if (m_recorded_state == Registered || m_recorded_state == Guest) FIXME
+        //FIXME temporary and the request join + join sequence should be placed in one method somewhere
+        Server * server = ServersManager::get()->getQuickPlay();
+        irr::core::stringw info;
+        if (CurrentOnlineUser::get()->requestJoin( server->getServerId(), info))
+        {
+            ServersManager::get()->setJoinedServer(server);
+        }
+        else
+        {
+            sfx_manager->quickSound( "anvil" );
+        }
         StateManager::get()->pushScreen(NetworkingLobby::getInstance());
     }
 
@@ -208,18 +217,15 @@ void OnlineScreen::onDisabledItemClicked(const std::string& item)
 {
     if (item == "find_server")
     {
-        StateManager::get()->pushScreen(ServerSelection::getInstance());
-        // FIXME new LoginDialog(LoginDialog::Registration_Required);
+        new LoginDialog(LoginDialog::Registration_Required);
     }
     else if (item =="create_server")
     {
-        StateManager::get()->pushScreen(NetworkingLobbySettings::getInstance());
-        // FIXME temporary; new LoginDialog(LoginDialog::Registration_Required);
+        new LoginDialog(LoginDialog::Registration_Required);
     }
     else if (item == "quick_play")
     {
-        StateManager::get()->pushScreen(NetworkingLobby::getInstance());
-        // FIXME temporary; new LoginDialog(LoginDialog::Signing_In_Required);
+        new LoginDialog(LoginDialog::Signing_In_Required);
     }
 }   // onDisabledItemClicked
 

From ebc1af345de113389fd06f92e856b384b0a330b8 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 15 Jul 2013 00:32:19 +0000
Subject: [PATCH 13/44] Remove the tab hack completely

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13225 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/scalable_font.cpp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 26cf20c3f..572f33a1f 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -526,14 +526,6 @@ void ScalableFont::draw(const core::stringw& text,
     {
         wchar_t c = text[i];
 
-        //hack: one tab character is supported, it moves the cursor to the tab stop
-        if (c == L'\t')
-        {
-            offset.X = (int)(position.UpperLeftCorner.X +
-                             position.getWidth()*m_tab_stop);
-            continue;
-        }
-
         if (c == L'\r' ||          // Windows breaks
             c == L'\n'    )        // Unix breaks
         {

From 395b000bee0cfd5df4ae8d6eac83a451838ccdb8 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 15 Jul 2013 00:37:05 +0000
Subject: [PATCH 14/44] Removed the addons_screen references to the tab_stop
 method which were left behind

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13226 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/scalable_font.cpp      | 1 -
 src/guiengine/scalable_font.hpp      | 6 ------
 src/states_screens/addons_screen.cpp | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/src/guiengine/scalable_font.cpp b/src/guiengine/scalable_font.cpp
index 572f33a1f..ddb5a65f1 100644
--- a/src/guiengine/scalable_font.cpp
+++ b/src/guiengine/scalable_font.cpp
@@ -32,7 +32,6 @@ ScalableFont::ScalableFont(IGUIEnvironment *env, const io::path& filename)
     m_fallback_kerning_width = 0;
     m_fallback_font_scale    = 1.0f;
     m_scale                  = 1.0f;
-    m_tab_stop               = 0.5f;
     m_is_hollow_copy         = false;
     m_black_border           = false;
     m_shadow                 = false;
diff --git a/src/guiengine/scalable_font.hpp b/src/guiengine/scalable_font.hpp
index c6aed9d81..85017b58d 100644
--- a/src/guiengine/scalable_font.hpp
+++ b/src/guiengine/scalable_font.hpp
@@ -61,9 +61,6 @@ class ScalableFont : public IGUIFontBitmap
     bool m_is_hollow_copy;
     bool m_rtl;
 
-    /** Position in range [0..1] of the single tab stop we support */
-    float m_tab_stop;
-
 public:
 
     LEAK_CHECK()
@@ -145,9 +142,6 @@ public:
 
     void updateRTL();
 
-    /** \param pos position of the tab stop, in range [0..1] */
-    void setTabStop(float pos) { m_tab_stop = pos; }
-
 private:
 
     struct SFontArea
diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp
index 7450f8cbd..9df3e15d8 100644
--- a/src/states_screens/addons_screen.cpp
+++ b/src/states_screens/addons_screen.cpp
@@ -140,8 +140,6 @@ void AddonsScreen::init()
 
 	getWidget<GUIEngine::RibbonWidget>("category")->setDeactivated();
 
-    GUIEngine::getFont()->setTabStop(0.66f);
-
     if(UserConfigParams::logAddons())
         std::cout << "[addons] Using directory <" + file_manager->getAddonsDir()
               << ">\n";
@@ -188,8 +186,6 @@ void AddonsScreen::unloaded()
 
 void AddonsScreen::tearDown()
 {
-    // return tab stop to the center when leaving this screen!!
-    GUIEngine::getFont()->setTabStop(0.5f);
 }
 
 // ----------------------------------------------------------------------------

From c2c314a2c27410fb4143a177ec0df09d761c330c Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 15 Jul 2013 01:20:06 +0000
Subject: [PATCH 15/44] Fixed issue that requesting to join a server signed you
 out.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_online_user.cpp   | 9 ++++-----
 src/states_screens/online_screen.cpp | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
index c02b6c93e..f75eee02f 100644
--- a/src/online/current_online_user.cpp
+++ b/src/online/current_online_user.cpp
@@ -244,13 +244,12 @@ bool CurrentOnlineUser::requestJoin(uint32_t server_id, irr::core::stringw &info
     {
         if (rec_success =="yes")
         {
-            m_token = "";
-            m_name = "";
-            m_id = 0;
-            m_is_signed_in = false;
-            m_is_guest = false;
             success = true;
         }
+        else
+        {
+            success = false;
+        }
         result->get("info", &info);
     }
     else
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index dc38bc75a..31d691c08 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -196,12 +196,12 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
         if (CurrentOnlineUser::get()->requestJoin( server->getServerId(), info))
         {
             ServersManager::get()->setJoinedServer(server);
+            StateManager::get()->pushScreen(NetworkingLobby::getInstance());
         }
         else
         {
             sfx_manager->quickSound( "anvil" );
         }
-        StateManager::get()->pushScreen(NetworkingLobby::getInstance());
     }
 
 }   // eventCallback

From ecaa073eb512c9f9416bea70aadcd57aa3603e2d Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 15 Jul 2013 01:32:09 +0000
Subject: [PATCH 16/44] Made the few buttons there are in lobby, do something.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13229 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/lobby.stkgui            |  8 ++------
 src/states_screens/networking_lobby.cpp | 20 ++++++++++++++++++--
 src/states_screens/networking_lobby.hpp |  6 +++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/data/gui/online/lobby.stkgui b/data/gui/online/lobby.stkgui
index e0ccb94a9..81bbd2256 100644
--- a/data/gui/online/lobby.stkgui
+++ b/data/gui/online/lobby.stkgui
@@ -38,12 +38,8 @@
             <spacer width="10" height="10" />                         
             
             <buttonbar id="menu_bottomrow" x="0" y="0" width="20%" height="100%" align="center">
-                <icon-button id="sign_in" width="64" height="64" icon="gui/main_about.png" extend_label="50"
-                             I18N="Main menu button" text="Sign In" label_location="hover"/>
-                <icon-button id="register" width="64" height="64" icon="gui/tutorial.png"  extend_label="75"
-                             I18N="Main menu button" text="Register" label_location="hover"/>
-                <icon-button id="sign_out" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
-                             I18N="Main menu button" text="Sign Out" label_location="hover"/>
+                <icon-button id="exit" width="64" height="64" icon="gui/main_quit.png"  extend_label="50"
+                             I18N="Main menu button" text="Exit" label_location="hover"/>
             </buttonbar>
             
         </bottombar>
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 4dfbc0959..4b8d7da64 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -55,6 +55,9 @@ NetworkingLobby::NetworkingLobby() : Screen("online/lobby.stkgui")
 
 void NetworkingLobby::loadedFromFile()
 {
+    m_back_widget = getWidget<IconButtonWidget>("back");
+    assert(m_back_widget != NULL);
+
     m_server_name_widget = getWidget<LabelWidget>("server_name");
     assert(m_server_name_widget != NULL);
 
@@ -63,9 +66,9 @@ void NetworkingLobby::loadedFromFile()
 
     m_bottom_menu_widget = getWidget<RibbonWidget>("menu_bottomrow");
     assert(m_bottom_menu_widget != NULL);
-    /*m_sign_in_widget = (IconButtonWidget *) m_bottom_menu_widget->findWidgetNamed("sign_in");
-    assert(m_sign_in_widget != NULL);*/
 
+    m_exit_widget = (IconButtonWidget *) m_bottom_menu_widget->findWidgetNamed("exit");
+    assert(m_exit_widget != NULL);
 
 }   // loadedFromFile
 
@@ -96,7 +99,20 @@ void NetworkingLobby::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 
 void NetworkingLobby::eventCallback(Widget* widget, const std::string& name, const int playerID)
 {
+    if (name == m_back_widget->m_properties[PROP_ID])
+    {
+        StateManager::get()->escapePressed();
+        return;
+    }
 
+    RibbonWidget* ribbon = dynamic_cast<RibbonWidget*>(widget);
+    if (ribbon == NULL) return;
+    std::string selection = ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+
+    if (selection == m_exit_widget->m_properties[PROP_ID])
+    {
+        StateManager::get()->escapePressed();
+    }
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp
index 8bb05d76b..12af31989 100644
--- a/src/states_screens/networking_lobby.hpp
+++ b/src/states_screens/networking_lobby.hpp
@@ -40,14 +40,14 @@ private:
 
     NetworkingLobby();
 
+    GUIEngine::IconButtonWidget * m_back_widget;
+
     GUIEngine::LabelWidget * m_server_name_widget;
 
     GUIEngine::LabelWidget * m_online_status_widget;
 
     GUIEngine::RibbonWidget * m_bottom_menu_widget;
-    GUIEngine::IconButtonWidget * m_sign_in_widget;
-    GUIEngine::IconButtonWidget * m_register_widget;
-    GUIEngine::IconButtonWidget * m_sign_out_widget;
+    GUIEngine::IconButtonWidget * m_exit_widget;
 
     /** \brief Sets which widget has to be focused. Depends on the user state. */
     void setInitialFocus();

From 3724fc3dae2116ca12f2016c8607638222f8a5fa Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 18 Jul 2013 21:18:40 +0000
Subject: [PATCH 17/44] First working version of asynchronous http requests.
 It's still a mess! Renamed some files and made use of an online namespace.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13274 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 sources.cmake                                 |  14 +-
 src/online/current_online_user.cpp            | 270 -----------------
 src/online/current_online_user.hpp            |  83 ------
 src/online/current_user.cpp                   | 279 ++++++++++++++++++
 src/online/current_user.hpp                   |  87 ++++++
 src/online/http_connector.cpp                 |   2 +-
 src/online/http_connector.hpp                 |   2 +-
 src/online/http_manager.cpp                   | 219 ++++++++++++++
 src/online/http_manager.hpp                   |  95 ++++++
 src/online/request.cpp                        | 201 +++++++++++++
 src/online/request.hpp                        | 182 ++++++++++++
 src/online/{online_user.cpp => user.cpp}      |  16 +-
 src/online/{online_user.hpp => user.hpp}      |  38 +--
 src/states_screens/dialogs/login_dialog.cpp   |  36 ++-
 src/states_screens/dialogs/login_dialog.hpp   |   3 +
 .../dialogs/registration_dialog.cpp           |   4 +-
 .../dialogs/server_info_dialog.cpp            |   4 +-
 src/states_screens/networking_lobby.cpp       |   2 -
 .../networking_lobby_settings.cpp             |   6 +-
 src/states_screens/online_screen.cpp          |  14 +-
 20 files changed, 1140 insertions(+), 417 deletions(-)
 delete mode 100644 src/online/current_online_user.cpp
 delete mode 100644 src/online/current_online_user.hpp
 create mode 100644 src/online/current_user.cpp
 create mode 100644 src/online/current_user.hpp
 create mode 100644 src/online/http_manager.cpp
 create mode 100644 src/online/http_manager.hpp
 create mode 100644 src/online/request.cpp
 create mode 100644 src/online/request.hpp
 rename src/online/{online_user.cpp => user.cpp} (77%)
 rename src/online/{online_user.hpp => user.hpp} (62%)

diff --git a/sources.cmake b/sources.cmake
index c9f8454a7..db63c1dbb 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -1,4 +1,4 @@
-# Generated by /home/gl3nn/repos/gsoc-stk-branch/update_file_list.sh. Do not edit this file manually.
+# Generated by ./update_file_list.sh. Do not edit this file manually.
 set(STK_SOURCES
 src/addons/addon.cpp
 src/addons/addons_manager.cpp
@@ -145,11 +145,13 @@ src/network/network_manager.cpp
 src/network/race_info_message.cpp
 src/network/race_result_message.cpp
 src/network/race_state.cpp
-src/online/current_online_user.cpp
+src/online/current_user.cpp
 src/online/http_connector.cpp
-src/online/online_user.cpp
+src/online/http_manager.cpp
+src/online/request.cpp
 src/online/server.cpp
 src/online/servers_manager.cpp
+src/online/user.cpp
 src/physics/btKart.cpp
 src/physics/btKartRaycast.cpp
 src/physics/btUprightConstraint.cpp
@@ -414,11 +416,13 @@ src/network/race_start_message.hpp
 src/network/race_state.hpp
 src/network/remote_kart_info.hpp
 src/network/world_loaded_message.hpp
-src/online/current_online_user.hpp
+src/online/current_user.hpp
 src/online/http_connector.hpp
-src/online/online_user.hpp
+src/online/http_manager.hpp
+src/online/request.hpp
 src/online/server.hpp
 src/online/servers_manager.hpp
+src/online/user.hpp
 src/physics/btKart.hpp
 src/physics/btKartRaycast.hpp
 src/physics/btUprightConstraint.hpp
diff --git a/src/online/current_online_user.cpp b/src/online/current_online_user.cpp
deleted file mode 100644
index f75eee02f..000000000
--- a/src/online/current_online_user.cpp
+++ /dev/null
@@ -1,270 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#include "online/current_online_user.hpp"
-
-#include <sstream>
-#include <stdlib.h>
-#include <assert.h>
-#include "online/http_connector.hpp"
-#include "config/user_config.hpp"
-#include "utils/translation.hpp"
-#include "utils/log.hpp"
-
-static CurrentOnlineUser* user_singleton = NULL;
-
-CurrentOnlineUser* CurrentOnlineUser::get()
-{
-    if (user_singleton == NULL)
-        user_singleton = new CurrentOnlineUser();
-    return user_singleton;
-}   // get
-
-void CurrentOnlineUser::deallocate()
-{
-    delete user_singleton;
-    user_singleton = NULL;
-}   // deallocate
-
-// ============================================================================
-CurrentOnlineUser::CurrentOnlineUser(){
-    m_is_signed_in = false;
-    m_is_guest = false;
-    m_is_server_host = false;
-    m_id = 0;
-    m_name = "";
-    m_token = "";
-}
-
-// ============================================================================
-bool CurrentOnlineUser::trySavedSession()
-{
-    if (m_is_signed_in) return true;
-    if(UserConfigParams::m_saved_session)
-    {
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",std::string("saved-session"));
-        connector->setParameter("userid", UserConfigParams::m_saved_user);
-        connector->setParameter("token", UserConfigParams::m_saved_token.c_str());
-        const XMLNode * result = connector->getXMLFromPage();
-        std::string rec_success = "";
-        std::string info;
-        if(result->get("success", &rec_success))
-        {
-            if (rec_success =="yes")
-            {
-                int token_fetched = result->get("token", &m_token);
-                int username_fetched = result->get("username", &m_name);
-                int userid_fetched = result->get("userid", &m_id);
-                assert(token_fetched && username_fetched && userid_fetched);
-                UserConfigParams::m_saved_token = m_token;
-                m_is_signed_in = true;
-                m_is_guest = false;
-            }
-            result->get("info", &info);
-            Log::info("trySavedSession","%s",info.c_str());
-        }
-        else
-        {
-            Log::error("trySavedSession","%s",
-                _("Unable to connect to the server. Check your internet connection or try again later."));
-        }
-    }
-    return m_is_signed_in;
-}
-
-// ============================================================================
-// Register
-bool CurrentOnlineUser::signUp( const irr::core::stringw &username,
-                                const irr::core::stringw &password,
-                                const irr::core::stringw &password_ver,
-                                const irr::core::stringw &email,
-                                bool terms,
-                                irr::core::stringw &info)
-{
-    assert(m_is_signed_in == false);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",std::string("register"));
-    connector->setParameter("username",username);
-    connector->setParameter("password",password);
-
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success;
-
-    bool success = false;
-    if(result->get("success", &rec_success))
-    {
-        success = (rec_success == "yes");
-        assert(result->get("info", &info));
-    }
-    else
-    {
-            info = _("Unable to connect to the server. Check your internet connection or try again later.");
-    }
-    return success;
-}
-
-
-// ============================================================================
-
-bool CurrentOnlineUser::signIn( const irr::core::stringw &username,
-                                const irr::core::stringw &password,
-                                bool save_session,
-                                irr::core::stringw &info)
-{
-    assert(m_is_signed_in == false);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",std::string("connect"));
-    connector->setParameter("username",username);
-    connector->setParameter("password",password);
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success = "";
-    if(result->get("success", &rec_success))
-    {
-        if (rec_success =="yes")
-        {
-            int token_fetched = result->get("token", &m_token);
-            int username_fetched = result->get("username", &m_name);
-            int userid_fetched = result->get("userid", &m_id);
-            assert(token_fetched && username_fetched && userid_fetched);
-            m_is_signed_in = true;
-            m_is_guest = false;
-            if(save_session)
-            {
-                UserConfigParams::m_saved_user = m_id;
-                UserConfigParams::m_saved_token = m_token;
-                UserConfigParams::m_saved_session = true;
-            }
-        }
-        result->get("info", &info);
-    }
-    else
-    {
-        info = _("Unable to connect to the server. Check your internet connection or try again later.");
-    }
-
-    return m_is_signed_in;
-}
-
-// ============================================================================
-
-bool CurrentOnlineUser::createServer(  const irr::core::stringw &name,
-                                        int max_players,
-                                        irr::core::stringw &info)
-{
-    assert(m_is_signed_in && !m_is_guest);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",           std::string("create_server"));
-    connector->setParameter("token",            m_token);
-    connector->setParameter("userid",           m_id);
-    connector->setParameter("name",             name);
-    connector->setParameter("max_players",      max_players);
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success = "";
-    if(result->get("success", &rec_success))
-    {
-       if (rec_success =="yes")
-       {
-           // FIXME
-           m_is_server_host = true;
-       }
-       result->get("info", &info);
-    }
-    else
-    {
-       info = _("Unable to connect to the server. Check your internet connection or try again later.");
-    }
-
-    return m_is_server_host;
-}
-
-
-// ============================================================================
-bool CurrentOnlineUser::signOut(irr::core::stringw &info){
-    assert(m_is_signed_in == true);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",std::string("disconnect"));
-    connector->setParameter("token",m_token);
-    connector->setParameter("userid",m_id);
-
-
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success = "";
-    if(result->get("success", &rec_success))
-    {
-        if (rec_success =="yes")
-        {
-            m_token = "";
-            m_name = "";
-            m_id = 0;
-            m_is_signed_in = false;
-            m_is_guest = false;
-            UserConfigParams::m_saved_user = 0;
-            UserConfigParams::m_saved_token = "";
-            UserConfigParams::m_saved_session = false;
-        }
-        result->get("info", &info);
-    }
-    else
-    {
-        info = _("Unable to connect to the server. Check your internet connection or try again later.");
-    }
-    return !m_is_signed_in;
-}
-
-// ============================================================================
-
-bool CurrentOnlineUser::requestJoin(uint32_t server_id, irr::core::stringw &info){
-    assert(m_is_signed_in == true);
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
-    connector->setParameter("action",std::string("request-connection"));
-    connector->setParameter("token", m_token);
-    connector->setParameter("id", m_id);
-    connector->setParameter("server_id", server_id);
-    bool success = false;
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success = "";
-    if(result->get("success", &rec_success))
-    {
-        if (rec_success =="yes")
-        {
-            success = true;
-        }
-        else
-        {
-            success = false;
-        }
-        result->get("info", &info);
-    }
-    else
-    {
-        info = _("Unable to connect to the server. Check your internet connection or try again later.");
-    }
-    return success;
-}
-
-// ============================================================================
-
-irr::core::stringw CurrentOnlineUser::getUserName() const
-{
-    if(m_is_signed_in)
-        return m_name;
-    else
-        return _("Currently not signed in");
-}
diff --git a/src/online/current_online_user.hpp b/src/online/current_online_user.hpp
deleted file mode 100644
index 27c4df1c0..000000000
--- a/src/online/current_online_user.hpp
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HEADER_CURRENT_ONLINE_USER_HPP
-#define HEADER_CURRENT_ONLINE_USER_HPP
-
-#include "online/online_user.hpp"
-#include <string>
-#include <irrString.h>
-#include "utils/types.hpp"
-#include "online/server.hpp"
-
-
-
-// ============================================================================
-
-/**
-  * \brief Class that represents an online registered user
-  * \ingroup online
-  */
-class CurrentOnlineUser : public OnlineUser
-{
-    private:
-
-    protected:
-        std::string m_token;
-        bool m_is_signed_in;
-        bool m_is_guest;
-        CurrentOnlineUser();
-
-    public:
-        // singleton
-        static CurrentOnlineUser* get();
-        static void deallocate();
-
-        bool trySavedSession();
-        // Login
-        bool signIn(    const irr::core::stringw &username,
-                        const irr::core::stringw &password,
-                        bool save_session,
-                        irr::core::stringw &info);
-        // Register
-        bool signUp(    const irr::core::stringw &username,
-                        const irr::core::stringw &password,
-                        const irr::core::stringw &password_ver,
-                        const irr::core::stringw &email,
-                        bool terms,
-                        irr::core::stringw &info);
-        // Logout - Best to be followed by CurrentOnlineUser::deallocate
-        bool signOut(   irr::core::stringw &info);
-
-        bool createServer(  const irr::core::stringw &name,
-                            int max_players,
-                            irr::core::stringw &info);
-
-        bool requestJoin(   uint32_t server_id,
-                            irr::core::stringw &info);
-
-        /** Returns the username if signed in. */
-        irr::core::stringw getUserName() const;
-        bool isSignedIn(){ return m_is_signed_in; }
-        bool isGuest(){ return m_is_guest; }
-
-};   // class CurrentOnlineUser
-
-#endif
-
-/*EOF*/
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
new file mode 100644
index 000000000..f6a3e7fdf
--- /dev/null
+++ b/src/online/current_user.cpp
@@ -0,0 +1,279 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+#include "online/current_user.hpp"
+
+#include <sstream>
+#include <stdlib.h>
+#include <assert.h>
+#include "online/http_connector.hpp"
+#include "config/user_config.hpp"
+#include "utils/translation.hpp"
+#include "utils/log.hpp"
+
+namespace online{
+    static CurrentUser* user_singleton = NULL;
+
+    CurrentUser* CurrentUser::get()
+    {
+        if (user_singleton == NULL)
+            user_singleton = new CurrentUser();
+        return user_singleton;
+    }   // get
+
+    void CurrentUser::deallocate()
+    {
+        delete user_singleton;
+        user_singleton = NULL;
+    }   // deallocate
+
+    // ============================================================================
+    CurrentUser::CurrentUser(){
+        m_is_signed_in = false;
+        m_is_guest = false;
+        m_is_server_host = false;
+        m_id = 0;
+        m_name = "";
+        m_token = "";
+        m_save_session = false;
+    }
+
+    // ============================================================================
+    bool CurrentUser::trySavedSession()
+    {
+        if (m_is_signed_in) return true;
+        if(UserConfigParams::m_saved_session)
+        {
+            HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+            connector->setParameter("action",std::string("saved-session"));
+            connector->setParameter("userid", UserConfigParams::m_saved_user);
+            connector->setParameter("token", UserConfigParams::m_saved_token.c_str());
+            const XMLNode * result = connector->getXMLFromPage();
+            std::string rec_success = "";
+            std::string info;
+            if(result->get("success", &rec_success))
+            {
+                if (rec_success =="yes")
+                {
+                    int token_fetched = result->get("token", &m_token);
+                    int username_fetched = result->get("username", &m_name);
+                    int userid_fetched = result->get("userid", &m_id);
+                    assert(token_fetched && username_fetched && userid_fetched);
+                    UserConfigParams::m_saved_token = m_token;
+                    m_is_signed_in = true;
+                    m_is_guest = false;
+                }
+                result->get("info", &info);
+                Log::info("trySavedSession","%s",info.c_str());
+            }
+            else
+            {
+                Log::error("trySavedSession","%s",
+                    _("Unable to connect to the server. Check your internet connection or try again later."));
+            }
+        }
+        return m_is_signed_in;
+    }
+
+    // ============================================================================
+    // Register
+    bool CurrentUser::signUp( const irr::core::stringw &username,
+                                    const irr::core::stringw &password,
+                                    const irr::core::stringw &password_ver,
+                                    const irr::core::stringw &email,
+                                    bool terms,
+                                    irr::core::stringw &info)
+    {
+        assert(m_is_signed_in == false);
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        connector->setParameter("action",std::string("register"));
+        connector->setParameter("username",username);
+        connector->setParameter("password",password);
+
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success;
+
+        bool success = false;
+        if(result->get("success", &rec_success))
+        {
+            success = (rec_success == "yes");
+            assert(result->get("info", &info));
+        }
+        else
+        {
+                info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        }
+        return success;
+    }
+
+
+    // ============================================================================
+
+    XMLRequest * CurrentUser::signInRequest(  const irr::core::stringw &username,
+                                            const irr::core::stringw &password,
+                                            bool save_session)
+    {
+        assert(m_is_signed_in == false);
+        m_save_session = save_session;
+        XMLRequest * request = new XMLRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        request->setParameter("action",std::string("connect"));
+        request->setParameter("username",username);
+        request->setParameter("password",password);
+        if(!HTTPManager::get()->addRequest(request))
+            assert(false);
+        return request;
+    }
+
+    bool CurrentUser::signIn(const XMLNode * input, irr::core::stringw &info)
+    {
+        std::string rec_success = "";
+        if(input->get("success", &rec_success))
+        {
+            if (rec_success =="yes")
+            {
+                int token_fetched = input->get("token", &m_token);
+                int username_fetched = input->get("username", &m_name);
+                int userid_fetched = input->get("userid", &m_id);
+                assert(token_fetched && username_fetched && userid_fetched);
+                m_is_signed_in = true;
+                m_is_guest = false;
+                if(m_save_session)
+                {
+                    UserConfigParams::m_saved_user = m_id;
+                    UserConfigParams::m_saved_token = m_token;
+                    UserConfigParams::m_saved_session = true;
+                }
+            }
+            input->get("info", &info);
+        }
+        else
+        {
+            info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        }
+
+        return m_is_signed_in;
+    }
+
+    // ============================================================================
+
+    bool CurrentUser::createServer(  const irr::core::stringw &name,
+                                            int max_players,
+                                            irr::core::stringw &info)
+    {
+        assert(m_is_signed_in && !m_is_guest);
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        connector->setParameter("action",           std::string("create_server"));
+        connector->setParameter("token",            m_token);
+        connector->setParameter("userid",           m_id);
+        connector->setParameter("name",             name);
+        connector->setParameter("max_players",      max_players);
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success = "";
+        if(result->get("success", &rec_success))
+        {
+           if (rec_success =="yes")
+           {
+               // FIXME
+               m_is_server_host = true;
+           }
+           result->get("info", &info);
+        }
+        else
+        {
+           info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        }
+
+        return m_is_server_host;
+    }
+
+
+    // ============================================================================
+    bool CurrentUser::signOut(irr::core::stringw &info){
+        assert(m_is_signed_in == true);
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        connector->setParameter("action",std::string("disconnect"));
+        connector->setParameter("token",m_token);
+        connector->setParameter("userid",m_id);
+
+
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success = "";
+        if(result->get("success", &rec_success))
+        {
+            if (rec_success =="yes")
+            {
+                m_token = "";
+                m_name = "";
+                m_id = 0;
+                m_is_signed_in = false;
+                m_is_guest = false;
+                UserConfigParams::m_saved_user = 0;
+                UserConfigParams::m_saved_token = "";
+                UserConfigParams::m_saved_session = false;
+            }
+            result->get("info", &info);
+        }
+        else
+        {
+            info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        }
+        return !m_is_signed_in;
+    }
+
+    // ============================================================================
+
+    bool CurrentUser::requestJoin(uint32_t server_id, irr::core::stringw &info){
+        assert(m_is_signed_in == true);
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
+        connector->setParameter("action",std::string("request-connection"));
+        connector->setParameter("token", m_token);
+        connector->setParameter("id", m_id);
+        connector->setParameter("server_id", server_id);
+        bool success = false;
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success = "";
+        if(result->get("success", &rec_success))
+        {
+            if (rec_success =="yes")
+            {
+                success = true;
+            }
+            else
+            {
+                success = false;
+            }
+            result->get("info", &info);
+        }
+        else
+        {
+            info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        }
+        return success;
+    }
+
+    // ============================================================================
+
+    irr::core::stringw CurrentUser::getUserName() const
+    {
+        if(m_is_signed_in)
+            return m_name;
+        else
+            return _("Currently not signed in");
+    }
+} // namespace online
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
new file mode 100644
index 000000000..07bac1b3f
--- /dev/null
+++ b/src/online/current_user.hpp
@@ -0,0 +1,87 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_CURRENT_ONLINE_USER_HPP
+#define HEADER_CURRENT_ONLINE_USER_HPP
+
+#include "online/user.hpp"
+#include <string>
+#include <irrString.h>
+#include "utils/types.hpp"
+#include "online/server.hpp"
+#include "http_manager.hpp"
+
+
+namespace online{
+    // ============================================================================
+
+    /**
+      * \brief Class that represents an online registered user
+      * \ingroup online
+      */
+    class CurrentUser : public User
+    {
+
+        protected:
+            std::string m_token;
+            bool m_is_signed_in;
+            bool m_is_guest;
+            bool m_save_session;
+            CurrentUser();
+
+        public:
+            // singleton
+            static CurrentUser* get();
+            static void deallocate();
+
+            bool trySavedSession();
+            // Login
+            XMLRequest * signInRequest(     const irr::core::stringw &username,
+                                            const irr::core::stringw &password,
+                                            bool save_session);
+
+            bool signIn( const XMLNode * input, irr::core::stringw &info);
+
+            // Register
+            bool signUp(    const irr::core::stringw &username,
+                            const irr::core::stringw &password,
+                            const irr::core::stringw &password_ver,
+                            const irr::core::stringw &email,
+                            bool terms,
+                            irr::core::stringw &info);
+            // Logout - Best to be followed by CurrentOnlineUser::deallocate
+            bool signOut(   irr::core::stringw &info);
+
+            bool createServer(  const irr::core::stringw &name,
+                                int max_players,
+                                irr::core::stringw &info);
+
+            bool requestJoin(   uint32_t server_id,
+                                irr::core::stringw &info);
+
+            /** Returns the username if signed in. */
+            irr::core::stringw getUserName() const;
+            bool isSignedIn(){ return m_is_signed_in; }
+            bool isGuest(){ return m_is_guest; }
+
+    };   // class CurrentUser
+} // namespace online
+
+#endif
+
+/*EOF*/
diff --git a/src/online/http_connector.cpp b/src/online/http_connector.cpp
index 6637fa39e..832b2d5c9 100644
--- a/src/online/http_connector.cpp
+++ b/src/online/http_connector.cpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/http_connector.hpp b/src/online/http_connector.hpp
index 0eecebb24..f221f7f06 100644
--- a/src/online/http_connector.hpp
+++ b/src/online/http_connector.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
new file mode 100644
index 000000000..6b2bc479a
--- /dev/null
+++ b/src/online/http_manager.cpp
@@ -0,0 +1,219 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "online/http_manager.hpp"
+
+#include <iostream>
+#include <stdio.h>
+#include <memory.h>
+#include <errno.h>
+
+#if defined(WIN32) && !defined(__CYGWIN__)
+#  include <windows.h>
+#  define isnan _isnan
+#else
+#  include <sys/time.h>
+#  include <math.h>
+#endif
+
+#if defined(WIN32) && !defined(__CYGWIN__)
+// Use Sleep, which takes time in msecs. It must be defined after the
+// includes, since otherwise irrlicht's sleep function is changed.
+#  define sleep(s) Sleep(1000*(s))
+#else
+#  include <unistd.h>
+#endif
+
+namespace online{
+
+    static HTTPManager * http_singleton = NULL;
+
+    HTTPManager* HTTPManager::get()
+    {
+        if (http_singleton == NULL)
+        {
+            http_singleton = new HTTPManager();
+            http_singleton->startNetworkThread();
+        }
+        return http_singleton;
+    }   // get
+
+    void HTTPManager::deallocate()
+    {
+        delete http_singleton;
+        http_singleton = NULL;
+    }   // deallocate
+
+
+    HTTPManager::HTTPManager(){
+        curl_global_init(CURL_GLOBAL_DEFAULT);
+        pthread_cond_init(&m_cond_request, NULL);
+    }
+
+    // ============================================================================
+    HTTPManager::~HTTPManager(){
+        curl_global_cleanup();
+    }
+
+
+    // ---------------------------------------------------------------------------
+    /** Start the actual network thread. This can not be done as part of
+     *  the constructor, since the assignment to the global network_http
+     *  variable has not been assigned at that stage, and the thread might
+     *  use network_http - a very subtle race condition. So the thread can
+     *  only be started after the assignment (in main) has been done.
+     */
+    void HTTPManager::startNetworkThread()
+    {
+        pthread_attr_t  attr;
+        pthread_attr_init(&attr);
+        pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
+        // Should be the default, but just in case:
+        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+        //pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+
+        m_thread_id.setAtomic(new pthread_t());
+        int error = pthread_create(m_thread_id.getData(), &attr,
+                                   &HTTPManager::mainLoop, this);
+        if(error)
+        {
+            m_thread_id.lock();
+            delete m_thread_id.getData();
+            m_thread_id.unlock();
+            m_thread_id.setAtomic(0);
+            Log::error("HTTP Manager", "Could not create thread, error=%d.\n", errno);
+        }
+        pthread_attr_destroy(&attr);
+    }   // startNetworkThread
+
+
+
+    // ---------------------------------------------------------------------------
+    /** This function inserts a high priority request to quit into the request
+     *  queue of the network thead, and also aborts any ongoing download.
+     *  Separating this allows more time for the thread to finish cleanly,
+     *  before it gets cancelled in the destructor.
+     */
+    void HTTPManager::stopNetworkThread()
+    {
+        // If a download should be active (which means it was cancelled by the
+        // user, in which case it will still be ongoing in the background)
+        // we can't get the mutex, and would have to wait for a timeout,
+        // and we couldn't finish STK. This way we request an abort of
+        // a download, which mean we can get the mutex and ask the service
+        // thread here to cancel properly.
+        cancelAllDownloads();
+
+        online::QuitRequest * request = new online::QuitRequest();
+        addRequest(request);
+    }   // stopNetworkThread
+
+
+    // ----------------------------------------------------------------------------
+    /** Signals to the progress function to request any ongoing download to be
+     *  cancelled. This function can also be called if there is actually no
+     *  download atm. The function progressDownload checks m_abort and will
+     *  return a non-zero value which causes libcurl to abort. */
+    void HTTPManager::cancelAllDownloads()
+    {
+        m_abort.setAtomic(true);
+    }   // cancelAllDownloads
+
+
+    // ----------------------------------------------------------------------------
+    /** Inserts a request into the queue of all requests. The request will be
+     *  sorted by priority.
+     *  \param request The pointer to the new request to insert.
+     */
+    bool HTTPManager::addRequest(online::Request *request)
+    {
+        if (request->isAllowedToAdd())
+        {
+            m_request_queue.lock();
+
+            m_request_queue.getData().push(request);
+            // Wake up the network http thread
+            pthread_cond_signal(&m_cond_request);
+
+            m_request_queue.unlock();
+            return true;
+        }
+        else
+        {
+            Log::info("HTTPManager::addrequest", "Did not add request.");
+            return false;
+        }
+    }   // insertRequest
+
+    // ---------------------------------------------------------------------------
+    /** The actual main loop, which is started as a separate thread from the
+     *  constructor. After testing for a new server, fetching news, the list
+     *  of packages to download, it will wait for commands to be issued.
+     *  \param obj: A pointer to this object, passed on by pthread_create
+     */
+    void *HTTPManager::mainLoop(void *obj)
+    {
+        HTTPManager *me = (HTTPManager*) obj;
+
+        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE,      NULL);
+
+        me->m_current_request = NULL;
+        me->m_request_queue.lock();
+        while(  me->m_request_queue.getData().empty() || !dynamic_cast<online::QuitRequest*>(me->m_request_queue.getData().top()) )
+        {
+            bool empty = me->m_request_queue.getData().empty();
+            // Wait in cond_wait for a request to arrive. The 'while' is necessary
+            // since "spurious wakeups from the pthread_cond_wait ... may occur"
+            // (pthread_cond_wait man page)!
+            while(empty)
+            {
+                pthread_cond_wait(&me->m_cond_request, me->m_request_queue.getMutex());
+                empty = me->m_request_queue.getData().empty();
+            }
+            me->m_current_request = me->m_request_queue.getData().top();
+            me->m_request_queue.getData().pop();
+            me->m_request_queue.unlock();
+            me->m_current_request->execute();
+
+            if(me->m_current_request->manageMemory())
+            {
+                delete me->m_current_request;
+                me->m_current_request = NULL;
+            }
+            me->m_request_queue.lock();
+        }   // while
+
+        // At this stage we have the lock for m_request_queue
+        while(!me->m_request_queue.getData().empty())
+        {
+            online::Request * request = me->m_request_queue.getData().top();
+            me->m_request_queue.getData().pop();
+            // Manage memory can be ignored here, all requests
+            // need to be freed.
+            delete request;
+        }
+        me->m_request_queue.unlock();
+
+        pthread_exit(NULL);
+        return 0;
+    }   // mainLoop
+} // namespace online
+
+
+
+
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
new file mode 100644
index 000000000..35f6717a5
--- /dev/null
+++ b/src/online/http_manager.hpp
@@ -0,0 +1,95 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 SuperTuxKart-Team
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HTTP_MANAGER_HPP
+#define HTTP_MANAGER_HPP
+
+#include <string>
+#include <curl/curl.h>
+#include <irrString.h>
+#include <queue>
+#include <pthread.h>
+
+#ifdef WIN32
+#  include <winsock2.h>
+#endif
+
+#include "io/xml_node.hpp"
+#include "utils/string_utils.hpp"
+#include "utils/synchronised.hpp"
+#include "online/request.hpp"
+
+namespace online{
+
+    /**
+      * \brief Class to connect with a server over HTTP
+      * \ingroup online
+      */
+    class HTTPManager
+    {
+        protected:
+
+            /** The current requested being worked on. */
+            online::Request                  *m_current_request;
+
+            /** A conditional variable to wake up the main loop. */
+            pthread_cond_t            m_cond_request;
+
+            /** Signal an abort in case that a download is still happening. */
+            Synchronised<bool>        m_abort;
+
+            /** Thread id of the thread running in this object. */
+            Synchronised<pthread_t *> m_thread_id;
+
+            /** The list of pointes to all requests. */
+            Synchronised< std::priority_queue <
+                                                online::Request*,
+                                                std::vector<online::Request*>,
+                                                online::Request::Compare
+                                               >
+                        >  m_request_queue;
+
+            static void  *mainLoop(void *obj);
+            void startNetworkThread();
+            void stopNetworkThread();
+
+
+            HTTPManager(); //const std::string &url
+            ~HTTPManager();
+
+        public:
+
+            // singleton
+            static HTTPManager* get();
+            static void deallocate();
+
+            //Execute
+            std::string getPage(online::Request * request);
+            XMLNode * getXMLFromPage(online::Request * request);
+
+            bool addRequest(online::Request *request);
+            void cancelAllDownloads();
+
+            bool getAbort(){ return m_abort.getAtomic(); };
+
+    }; //class HTTPManager
+} // namespace online
+
+#endif // HTTP_MANAGER_HPP
+
+/*EOF*/
diff --git a/src/online/request.cpp b/src/online/request.cpp
new file mode 100644
index 000000000..eaffa1469
--- /dev/null
+++ b/src/online/request.cpp
@@ -0,0 +1,201 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "online/request.hpp"
+
+#include <curl/curl.h>
+#include <assert.h>
+#include <online/http_manager.hpp>
+
+
+namespace online{
+
+    class HTTPManager;
+
+    // =========================================================================================
+
+    Request::Request(int priority, bool manage_memory)
+    {
+        m_priority      = priority;
+        m_manage_memory = manage_memory;
+        m_cancel        = false;
+        m_done          = false;
+    }   // Request
+
+    Request::~Request()
+    {
+    }
+
+    void Request::execute()
+    {
+        beforeOperation();
+        operation();
+        afterOperation();
+    }
+
+    // =========================================================================================
+
+    QuitRequest::QuitRequest()
+        : Request(9999,true)
+    {
+    }
+
+
+    // =========================================================================================
+
+    HTTPRequest::HTTPRequest(const std::string &url)
+        : Request(1,false)
+    {
+        m_url = url;
+        m_parameters = new Parameters;
+        m_progress.setAtomic(0);
+        m_added = false;
+    }
+
+    HTTPRequest::~HTTPRequest()
+    {
+        delete m_parameters;
+    }
+
+    bool HTTPRequest::isAllowedToAdd(){
+        if (m_url.size() > 5 && ( m_url.substr(0, 5) != "http:"))
+        {
+            Log::info("HTTPRequest::isAllowedToAdd", "Invalid URL.");
+            return false;
+        }
+        return true;
+    }
+
+    std::string HTTPRequest::downloadPage()
+    {
+        CURL * curl_session;
+        curl_session = curl_easy_init();
+        if(!curl_session)
+        {
+            Log::error("online/http_functions", "Error while initialising libCurl session");
+            return "";
+        }
+
+        curl_easy_setopt(curl_session, CURLOPT_URL, m_url.c_str());
+        Parameters::iterator iter;
+        std::string postString = "";
+        for (iter = m_parameters->begin(); iter != m_parameters->end(); ++iter)
+        {
+           if(iter != m_parameters->begin())
+               postString.append("&");
+           char * escaped = curl_easy_escape(curl_session , iter->first.c_str(), iter->first.size());
+           postString.append(escaped);
+           curl_free(escaped);
+           postString.append("=");
+           escaped = curl_easy_escape(curl_session , iter->second.c_str(), iter->second.size());
+           postString.append(escaped);
+           curl_free(escaped);
+        }
+        curl_easy_setopt(curl_session, CURLOPT_POSTFIELDS, postString.c_str());
+        std::string readBuffer;
+        curl_easy_setopt(curl_session, CURLOPT_WRITEFUNCTION, &HTTPRequest::WriteCallback);
+        curl_easy_setopt(curl_session, CURLOPT_NOPROGRESS, 0);
+        curl_easy_setopt(curl_session, CURLOPT_PROGRESSDATA, this);
+        curl_easy_setopt(curl_session, CURLOPT_PROGRESSFUNCTION, &HTTPRequest::progressDownload);
+        curl_easy_setopt(curl_session, CURLOPT_FILE, &readBuffer);
+        // Timeout
+        // Reduce the connection phase timeout (it's 300 by default).
+        // Add a low speed limit to have a sort of timeout in the
+        // download phase. Being under 10 B/s during a certain time will
+        // probably only happen when no access to the net is available.
+        // The timeout is set to 20s, it should be enough to not produce
+        // false positive error.
+        curl_easy_setopt(curl_session, CURLOPT_CONNECTTIMEOUT, 20);
+        curl_easy_setopt(curl_session, CURLOPT_LOW_SPEED_LIMIT, 10);
+        curl_easy_setopt(curl_session, CURLOPT_LOW_SPEED_TIME, 20);
+        CURLcode res = curl_easy_perform(curl_session);
+        if(res == CURLE_OK)
+        {
+            Log::info("online/http_functions", "Received : %s", readBuffer.c_str());
+            setProgress(1.0f);
+        }
+        else
+        {
+            Log::error("HTTPRequest::downloadPage", "curl_easy_perform() failed: %s", curl_easy_strerror(res));
+            setProgress(-1.0f);
+        }
+        curl_easy_cleanup(curl_session);
+        return readBuffer;
+    }
+
+
+    size_t HTTPRequest::WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
+    {
+        ((std::string*)userp)->append((char*)contents, size * nmemb);
+        return size * nmemb;
+    }
+
+    // ----------------------------------------------------------------------------
+    /** Callback function from curl: inform about progress.
+     *  \param clientp
+     *  \param download_total Total size of data to download.
+     *  \param download_now   How much has been downloaded so far.
+     *  \param upload_total   Total amount of upload.
+     *  \param upload_now     How muc has been uploaded so far.
+     */
+    int HTTPRequest::progressDownload(void *clientp,
+                                      double download_total, double download_now,
+                                      double upload_total,   double upload_now)
+    {
+        HTTPRequest *request = (HTTPRequest *)clientp;
+
+        HTTPManager* http_manager = HTTPManager::get();
+
+        // Check if we are asked to abort the download. If so, signal this
+        // back to libcurl by returning a non-zero status.
+        if(http_manager->getAbort() || request->isCancelled() )
+        {
+            // Indicates to abort the current download, which means that this
+            // thread will go back to the mainloop and handle the next request.
+            return 1;
+        }
+
+        float f;
+        if(download_now < download_total)
+        {
+            f = (float)download_now / (float)download_total;
+            // In case of floating point rouding errors make sure that
+            // 1.0 is only reached when downloadFileInternal is finished
+            if (f>=1.0f) f=0.99f;
+        }
+        else
+        {
+            // Don't set progress to 1.0f; this is done in loadFileInternal
+            // after checking curls return code!
+            f= download_total==0 ? 0 : 0.99f;
+        }
+        request->setProgress(f);
+        return 0;
+    }   // progressDownload
+
+
+
+    // =========================================================================================
+    XMLRequest::XMLRequest(const std::string &url)
+        : HTTPRequest(url)
+    {
+    }
+
+    void XMLRequest::operation()
+    {
+        m_result = file_manager->createXMLTreeFromString(downloadPage());
+    }
+} // namespace online
diff --git a/src/online/request.hpp b/src/online/request.hpp
new file mode 100644
index 000000000..3c6a41a40
--- /dev/null
+++ b/src/online/request.hpp
@@ -0,0 +1,182 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_ONLINE_REQUEST_HPP
+#define HEADER_ONLINE_REQUEST_HPP
+
+#include <string>
+
+#include "utils/leak_check.hpp"
+#include "utils/synchronised.hpp"
+#include "utils/cpp2011.h"
+#include "io/file_manager.hpp"
+#include "utils/string_utils.hpp"
+
+namespace online{
+
+    /**
+      * Stores a request for the http connector. They will be sorted by priorities.
+      * \ingroup online
+      */
+    class Request
+    {
+    protected:
+        /** The priority of this request. The higher the value the more
+        important this request is. */
+        int                 m_priority;
+        /** Cancel this request if it is active. */
+        bool                m_cancel;
+
+        bool                m_done;
+
+        /** True if the memory for this Request should be managed by
+        *  http connector (i.e. this object is freed once the request
+        *  is handled). Otherwise the memory is not freed, so it must
+        *  be freed by the calling function. */
+        bool                m_manage_memory;
+
+        virtual void beforeOperation() {}
+        virtual void operation() = 0;
+        virtual void afterOperation() { m_done = true;}
+
+    public:
+        LEAK_CHECK()
+
+        Request(int priority, bool manage_memory=true);
+        virtual ~Request();
+
+        void execute();
+
+        // ------------------------------------------------------------------------
+        /** Returns the priority of this request. */
+        int getPriority() const { return m_priority; }
+        // ------------------------------------------------------------------------
+        /** Signals that this request should be canceled. */
+        void cancel() { m_cancel = true; }
+        // ------------------------------------------------------------------------
+        /** Returns if this request is to be canceled. */
+        bool isCancelled() const { return m_cancel; }
+        // ------------------------------------------------------------------------
+        /** Specifies if the memory should be managed by network_http. */
+        void setManageMemory(bool m) { m_manage_memory = m; }
+        // ------------------------------------------------------------------------
+        /** Returns if the memory for this object should be managed by
+        *  by network_http (i.e. freed once the request is handled). */
+        bool manageMemory() const { return m_manage_memory; }
+
+        bool isDone() const { return m_done; }
+
+        virtual bool isAllowedToAdd() {return true;}
+
+        /** This class is used by the priority queue to sort requests by priority.
+         */
+        class Compare
+        {
+        public:
+            /** Compares two requests, returns if the first request has a lower
+             *  priority than the second one. */
+            bool operator() (const Request *a, const Request *b) const
+            { return a->getPriority() < b->getPriority(); }
+        };   // Compare
+    };   // Request
+
+
+    // ========================================================================
+
+
+    class QuitRequest : public Request
+    {
+    public :
+        QuitRequest();
+        virtual void operation() OVERRIDE {}
+    };
+
+
+    // ========================================================================
+
+
+    class HTTPRequest : public Request
+    {
+
+    protected :
+
+        typedef std::map<std::string, std::string> Parameters;
+        Parameters * m_parameters;
+
+        /** The progress indicator. 0 till it is started and the first
+        *  packet is downloaded. At the end eithe -1 (error) or 1
+        *  (everything ok) at the end. */
+        Synchronised<float> m_progress;
+        std::string         m_url;
+        bool                m_added;
+
+        std::string downloadPage();
+
+        static int progressDownload(void *clientp,
+                                    double dltotal,
+                                    double dlnow,
+                                    double ultotal,
+                                    double ulnow);
+
+        static size_t WriteCallback(void *contents,
+                                    size_t size,
+                                    size_t nmemb,
+                                    void *userp);
+
+    public :
+
+        HTTPRequest(const std::string &url);
+        virtual ~HTTPRequest();
+
+        void setParameter(const std::string & name, const std::string &value){
+            if(!m_added)
+                (*m_parameters)[name] = value;
+        };
+        void setParameter(const std::string & name, const irr::core::stringw &value){
+            if(!m_added)
+                (*m_parameters)[name] = irr::core::stringc(value.c_str()).c_str();
+        }
+        template <typename T>
+        void setParameter(const std::string & name, const T& value){
+            if(!m_added)
+            (   *m_parameters)[name] = StringUtils::toString(value);
+        }
+
+        /** Returns the current progress. */
+        float getProgress() const { return m_progress.getAtomic(); }
+        /** Sets the current progress. */
+        void setProgress(float f) { m_progress.setAtomic(f); }
+
+        const std::string &getURL() const {return m_url;}
+
+        virtual bool isAllowedToAdd() OVERRIDE;
+
+    };
+
+    class XMLRequest : public HTTPRequest
+    {
+    protected :
+        XMLNode * m_result;
+        virtual void operation() OVERRIDE;
+
+    public :
+        XMLRequest(const std::string &url);
+        XMLNode * getResult(){ return m_result; }
+    };
+} //namespace online
+
+#endif
+
diff --git a/src/online/online_user.cpp b/src/online/user.cpp
similarity index 77%
rename from src/online/online_user.cpp
rename to src/online/user.cpp
index e3063a2bb..2e3d0d3ac 100644
--- a/src/online/online_user.cpp
+++ b/src/online/user.cpp
@@ -17,15 +17,15 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#include "online/online_user.hpp"
+#include "online/user.hpp"
 
 #include <sstream>
 #include <stdlib.h>
 
-
-// ============================================================================
-OnlineUser::OnlineUser(const irr::core::stringw &username)
-{
-    m_name = username;
-}   // OnlineUser
-
+namespace online{
+    // ============================================================================
+    User::User(const irr::core::stringw &username)
+    {
+        m_name = username;
+    }   // OnlineUser
+} // namespace online
diff --git a/src/online/online_user.hpp b/src/online/user.hpp
similarity index 62%
rename from src/online/online_user.hpp
rename to src/online/user.hpp
index 6d67a12f6..e8e206b43 100644
--- a/src/online/online_user.hpp
+++ b/src/online/user.hpp
@@ -22,34 +22,34 @@
 #include <irrString.h>
 #include "utils/types.hpp"
 
-// ============================================================================
+namespace online{
 
-/**
-  * \brief Class that represents an online registered user
-  * \ingroup online
-  */
-class OnlineUser
-{
-    private:
+    /**
+      * \brief Class that represents an online registered user
+      * \ingroup online
+      */
+    class User
+    {
+        private:
 
-    protected:
+        protected:
 
-        bool                    m_is_server_host;
-        irr::core::stringw      m_name;
-        uint32_t                m_id;
-        OnlineUser(){}
+            bool                    m_is_server_host;
+            irr::core::stringw      m_name;
+            uint32_t                m_id;
+            User(){}
 
-    public:
+        public:
 
-        OnlineUser(const irr::core::stringw &username);
+            User(const irr::core::stringw &username);
 
 
-        irr::core::stringw getUserName() const { return m_name; }
-        uint32_t getUserID() const { return m_id; }
+            irr::core::stringw getUserName() const { return m_name; }
+            uint32_t getUserID() const { return m_id; }
 
 
-};   // class OnlineUser
-
+    };   // class User
+} // namespace online
 #endif
 
 /*EOF*/
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index c6cbe0ed8..01fa2ce09 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -25,7 +25,6 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/current_online_user.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 
 
@@ -40,6 +39,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
+    m_signin_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
     m_info_widget = getWidget<LabelWidget>("info");
@@ -103,17 +103,7 @@ void LoginDialog::login()
 {
     const stringw username = m_username_widget->getText().trim();
     const stringw password = m_password_widget->getText().trim();
-    stringw info = "";
-    if(CurrentOnlineUser::get()->signIn(username,password, m_remember_widget->getState(),info))
-    {
-        m_self_destroy = true;
-    }
-    else
-    {
-        sfx_manager->quickSound( "anvil" );
-        m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
-        m_message_widget->setText(info, false);
-    }
+    m_signin_request = online::CurrentUser::get()->signInRequest(username,password, m_remember_widget->getState());
 }
 
 // -----------------------------------------------------------------------------
@@ -158,6 +148,26 @@ void LoginDialog::onEnterPressedInternal()
 
 void LoginDialog::onUpdate(float dt)
 {
+    if(m_signin_request != NULL)
+    {
+        // load screen
+        if(m_signin_request->isDone())
+        {
+            stringw info = "";
+            if(online::CurrentUser::get()->signIn(m_signin_request->getResult(), info))
+            {
+                    m_self_destroy = true;
+            }
+            else
+            {
+                // error message
+                sfx_manager->quickSound( "anvil" );
+                m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
+                m_message_widget->setText(info, false);
+            }
+        }
+    }
+
     //If we want to open the registration dialog, we need to close this one first
     m_open_registration_dialog && (m_self_destroy = true);
 
@@ -169,6 +179,4 @@ void LoginDialog::onUpdate(float dt)
             new RegistrationDialog();
 
     }
-
-
 }
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 590289f8f..b3de375db 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -21,6 +21,8 @@
 
 #include <irrString.h>
 
+#include "online/current_user.hpp"
+
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/widgets/text_box_widget.hpp"
 #include "guiengine/widgets/check_box_widget.hpp"
@@ -39,6 +41,7 @@ private:
     
     bool m_self_destroy;
     bool m_open_registration_dialog;
+    online::XMLRequest * m_signin_request;
 
     GUIEngine::LabelWidget * m_info_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index eb0329997..3af68e652 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -29,7 +29,7 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/current_online_user.hpp"
+#include "online/current_user.hpp"
 
 
 using namespace GUIEngine;
@@ -192,7 +192,7 @@ bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
         {
             assert(getWidget<CheckBoxWidget>("accepted")->getState());
             m_agreement = true;
-            if(CurrentOnlineUser::get()->signUp(m_username, m_password, m_password_confirm, m_email, true, m_registration_error))
+            if(online::CurrentUser::get()->signUp(m_username, m_password, m_password_confirm, m_email, true, m_registration_error))
             {
                 m_show_registration_activation = true;
                 m_registration_error = "";
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 695dba9ef..495438b4a 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -25,7 +25,7 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/current_online_user.hpp"
+#include "online/current_user.hpp"
 #include "online/servers_manager.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/networking_lobby.hpp"
@@ -71,7 +71,7 @@ void ServerInfoDialog::requestJoin()
 {
     //FIXME totally not correct. Receiving an answer, not kept in mind.
     irr::core::stringw info;
-    if (CurrentOnlineUser::get()->requestJoin( m_server->getServerId(), info))
+    if (online::CurrentUser::get()->requestJoin( m_server->getServerId(), info))
     {
         ServersManager::get()->setJoinedServer(m_server);
         m_enter_lobby = true;
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 4b8d7da64..795d7bd7a 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -37,8 +37,6 @@
 #include "utils/translation.hpp"
 #include "online/servers_manager.hpp"
 
-#include "online/current_online_user.hpp"
-
 
 using namespace GUIEngine;
 
diff --git a/src/states_screens/networking_lobby_settings.cpp b/src/states_screens/networking_lobby_settings.cpp
index 7cc6a423b..cd5f26832 100644
--- a/src/states_screens/networking_lobby_settings.cpp
+++ b/src/states_screens/networking_lobby_settings.cpp
@@ -32,7 +32,7 @@
 #include "utils/translation.hpp"
 #include "states_screens/networking_lobby.hpp"
 
-#include "online/current_online_user.hpp"
+#include "online/current_user.hpp"
 
 
 using namespace GUIEngine;
@@ -70,7 +70,7 @@ void NetworkingLobbySettings::loadedFromFile()
 // ----------------------------------------------------------------------------
 bool NetworkingLobbySettings::hasLostConnection()
 {
-    return !CurrentOnlineUser::get()->isSignedIn();
+    return !online::CurrentUser::get()->isSignedIn();
 }
 
 // ----------------------------------------------------------------------------
@@ -100,7 +100,7 @@ void NetworkingLobbySettings::createServer()
     const stringw name = m_name_widget->getText().trim();
     int max_players = m_max_players_widget->getValue();
     stringw info = "";
-    if(CurrentOnlineUser::get()->createServer(name, max_players, info))
+    if(online::CurrentUser::get()->createServer(name, max_players, info))
     {
         StateManager::get()->escapePressed();
         StateManager::get()->pushScreen(NetworkingLobby::getInstance());
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 31d691c08..b7ebf37af 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -38,7 +38,7 @@
 #include "states_screens/server_selection.hpp"
 #include "modes/demo_world.hpp"
 #include "utils/translation.hpp"
-#include "online/current_online_user.hpp"
+#include "online/current_user.hpp"
 #include "online/servers_manager.hpp"
 
 
@@ -52,7 +52,7 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = Not;
-    CurrentOnlineUser::get()->trySavedSession();
+    online::CurrentUser::get()->trySavedSession();
 }   // OnlineScreen
 
 // ----------------------------------------------------------------------------
@@ -87,9 +87,9 @@ void OnlineScreen::loadedFromFile()
 bool OnlineScreen::hasStateChanged()
 {
     State previous_state = m_recorded_state;
-    if(CurrentOnlineUser::get()->isSignedIn())
+    if(online::CurrentUser::get()->isSignedIn())
     {
-        if(CurrentOnlineUser::get()->isGuest())
+        if(online::CurrentUser::get()->isGuest())
             m_recorded_state = Guest;
         else
             m_recorded_state = Registered;
@@ -137,7 +137,7 @@ void OnlineScreen::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime();
-    m_online_status_widget->setText(irr::core::stringw(_("Signed in as : ")) + CurrentOnlineUser::get()->getUserName() + ".", false);
+    m_online_status_widget->setText(irr::core::stringw(_("Signed in as : ")) + online::CurrentUser::get()->getUserName() + ".", false);
 }   // init
 
 // ----------------------------------------------------------------------------
@@ -168,7 +168,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     else if (selection == "sign_out")
     {
         irr::core::stringw info;
-        if (CurrentOnlineUser::get()->signOut(info))
+        if (online::CurrentUser::get()->signOut(info))
         {
             new MessageDialog(_("Signed out successfully."));
             //GUIEngine::reshowCurrentScreen();
@@ -193,7 +193,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
         //FIXME temporary and the request join + join sequence should be placed in one method somewhere
         Server * server = ServersManager::get()->getQuickPlay();
         irr::core::stringw info;
-        if (CurrentOnlineUser::get()->requestJoin( server->getServerId(), info))
+        if (online::CurrentUser::get()->requestJoin( server->getServerId(), info))
         {
             ServersManager::get()->setJoinedServer(server);
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());

From 8ec5adeec0ffee7ba8d3909999f185477d66dea1 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 18 Jul 2013 22:49:19 +0000
Subject: [PATCH 18/44] Signin in now fully uses asynchronous http requesting.
 Implemented a nice "loading dots" gimmick for loading.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13276 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/dialogs/login_dialog.cpp | 14 ++++++++++++--
 src/states_screens/dialogs/login_dialog.hpp |  8 +++-----
 src/utils/string_utils.cpp                  |  8 ++++++++
 src/utils/string_utils.hpp                  |  3 +++
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 01fa2ce09..c8055c289 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -39,6 +39,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
+    m_load_timer = 0.0f;
     m_signin_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
@@ -94,6 +95,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 
 LoginDialog::~LoginDialog()
 {
+    delete m_signin_request;
 }
 
 
@@ -115,6 +117,8 @@ GUIEngine::EventPropagation LoginDialog::processEvent(const std::string& eventSo
         const std::string& selection = m_options_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
         if (selection == m_cancel_widget->m_properties[PROP_ID])
         {
+            if(m_signin_request != NULL)
+                m_signin_request->cancel();
             m_self_destroy = true;
             return GUIEngine::EVENT_BLOCK;
         }
@@ -150,13 +154,12 @@ void LoginDialog::onUpdate(float dt)
 {
     if(m_signin_request != NULL)
     {
-        // load screen
         if(m_signin_request->isDone())
         {
             stringw info = "";
             if(online::CurrentUser::get()->signIn(m_signin_request->getResult(), info))
             {
-                    m_self_destroy = true;
+                m_self_destroy = true;
             }
             else
             {
@@ -165,6 +168,13 @@ void LoginDialog::onUpdate(float dt)
                 m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
                 m_message_widget->setText(info, false);
             }
+            delete m_signin_request;
+            m_signin_request = NULL;
+        }
+        else
+        {
+            m_load_timer += dt;
+            m_message_widget->setText(irr::core::stringw(_("Signing in")) + StringUtils::loadingDots(m_load_timer), false);
         }
     }
 
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index b3de375db..9e865734f 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -24,11 +24,7 @@
 #include "online/current_user.hpp"
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widgets/text_box_widget.hpp"
-#include "guiengine/widgets/check_box_widget.hpp"
-#include "guiengine/widgets/icon_button_widget.hpp"
-#include "guiengine/widgets/ribbon_widget.hpp"
-#include "guiengine/widgets/label_widget.hpp"
+#include "guiengine/widgets.hpp"
 
 /**
  * \brief Dialog that allows a user to sign in
@@ -58,6 +54,8 @@ private:
     
     void login();
 
+    float m_load_timer;
+
 public:
     
     enum Message
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index fbf460909..554a410e6 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -709,6 +709,14 @@ namespace StringUtils
 		    printf("Invalid version string '%s'.\n", s.c_str());
 	    return version;
     }   // versionToInt
+
+    // ------------------------------------------------------------------------
+
+    irr::core::stringw loadingDots(float time, bool spaces, float interval, int max_dots)
+    {
+        int nr_dots = int(floor(time * (1 / interval))) % (max_dots+1);
+        return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
+    }
 } // namespace StringUtils
 
 
diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp
index 73a20cd91..cbec8570e 100644
--- a/src/utils/string_utils.hpp
+++ b/src/utils/string_utils.hpp
@@ -413,6 +413,9 @@ namespace StringUtils
 
     /** Compute a simple hash of a string */
     unsigned int simpleHash(const char* input);
+
+
+    irr::core::stringw loadingDots(float time, bool spaces = true, float interval = 0.5f, int max_dots = 3);
 } // namespace StringUtils
 
 #endif

From ae6bc57b95c87af01dbdabd2a43b324c093c3818 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Thu, 18 Jul 2013 23:02:18 +0000
Subject: [PATCH 19/44] Added Server and ServersManager to the online namespace
 and edited everything that uses those.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13279 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/server.cpp                         |  86 ++++-----
 src/online/server.hpp                         | 171 +++++++++---------
 src/online/servers_manager.cpp                |  87 ++++-----
 src/online/servers_manager.hpp                |  56 +++---
 .../dialogs/server_info_dialog.cpp            |   1 +
 .../dialogs/server_info_dialog.hpp            |   6 +-
 src/states_screens/networking_lobby.cpp       |   2 +-
 src/states_screens/networking_lobby.hpp       |   2 +-
 src/states_screens/online_screen.cpp          |   1 +
 src/states_screens/server_selection.cpp       |   2 +
 10 files changed, 215 insertions(+), 199 deletions(-)

diff --git a/src/online/server.cpp b/src/online/server.cpp
index ad3b72984..8022e45af 100644
--- a/src/online/server.cpp
+++ b/src/online/server.cpp
@@ -24,49 +24,51 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
-Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
+namespace online{
+    Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
 
-Server::Server(const XMLNode & xml)
-{
-    assert(xml.getName() == "server");
-    m_name                      = "";
-    m_satisfaction_score        = 0;
-    m_server_id                 = 0;
-    m_current_players           = 0;
-    m_max_players               = 0;
-
-    xml.get("name", &m_lower_case_name);
-    m_name     = StringUtils::decodeFromHtmlEntities(m_lower_case_name);
-    m_lower_case_name = StringUtils::toLowerCase(m_lower_case_name);
-
-    xml.get("id",               &m_server_id);
-    xml.get("max_players",      &m_max_players);
-    xml.get("current_players",  &m_current_players);
-
-};   // Server(const XML&)
-
-// ----------------------------------------------------------------------------
-/** 
- * \brief Filter the add-on with a list of words.
- * \param words A list of words separated by ' '.
- * \return true if the add-on contains one of the words, otherwise false.
- */
-bool Server::filterByWords(const core::stringw words) const
-{
-    if (words == NULL || words.empty())
-        return true;
-
-    std::vector<core::stringw> list = StringUtils::split(words, ' ', false);
-
-    for (unsigned int i = 0; i < list.size(); i++)
+    Server::Server(const XMLNode & xml)
     {
-        list[i].make_lower();
-        
-        if ((core::stringw(m_name).make_lower()).find(list[i].c_str()) != -1)
-        {
+        assert(xml.getName() == "server");
+        m_name                      = "";
+        m_satisfaction_score        = 0;
+        m_server_id                 = 0;
+        m_current_players           = 0;
+        m_max_players               = 0;
+
+        xml.get("name", &m_lower_case_name);
+        m_name     = StringUtils::decodeFromHtmlEntities(m_lower_case_name);
+        m_lower_case_name = StringUtils::toLowerCase(m_lower_case_name);
+
+        xml.get("id",               &m_server_id);
+        xml.get("max_players",      &m_max_players);
+        xml.get("current_players",  &m_current_players);
+
+    };   // Server(const XML&)
+
+    // ----------------------------------------------------------------------------
+    /**
+     * \brief Filter the add-on with a list of words.
+     * \param words A list of words separated by ' '.
+     * \return true if the add-on contains one of the words, otherwise false.
+     */
+    bool Server::filterByWords(const core::stringw words) const
+    {
+        if (words == NULL || words.empty())
             return true;
+
+        std::vector<core::stringw> list = StringUtils::split(words, ' ', false);
+
+        for (unsigned int i = 0; i < list.size(); i++)
+        {
+            list[i].make_lower();
+
+            if ((core::stringw(m_name).make_lower()).find(list[i].c_str()) != -1)
+            {
+                return true;
+            }
         }
-    }
-    
-    return false;
-} // filterByWords
+
+        return false;
+    } // filterByWords
+} // namespace online
diff --git a/src/online/server.hpp b/src/online/server.hpp
index 80cdbe8f5..407cff648 100644
--- a/src/online/server.hpp
+++ b/src/online/server.hpp
@@ -31,104 +31,105 @@
 
 class XMLNode;
 
-/**
-  * \ingroup online
-  */
-class Server
-{
-public:
+namespace online{
+    /**
+      * \ingroup online
+      */
+    class Server
+    {
+    public:
 
-    /** Set the sort order used in the comparison function. */
-    enum SortOrder { SO_SCORE   = 1,    // Sorted on satisfaction score
-                     SO_NAME    = 2,    // Sorted alphabetically by name
-                     SO_PLAYERS = 4
-    };
+        /** Set the sort order used in the comparison function. */
+        enum SortOrder { SO_SCORE   = 1,    // Sorted on satisfaction score
+                         SO_NAME    = 2,    // Sorted alphabetically by name
+                         SO_PLAYERS = 4
+        };
 
-protected:
-    /** The name to be displayed. */
-    irr::core::stringw m_name;
-    std::string m_lower_case_name; //Used for comparison
+    protected:
+        /** The name to be displayed. */
+        irr::core::stringw m_name;
+        std::string m_lower_case_name; //Used for comparison
 
-    uint32_t m_server_id;
+        uint32_t m_server_id;
 
-    int m_max_players;
+        int m_max_players;
 
-    int m_current_players;
+        int m_current_players;
 
-    float m_satisfaction_score;
+        float m_satisfaction_score;
 
-    /** The sort order to be used in the comparison. */
-    static SortOrder m_sort_order;
+        /** The sort order to be used in the comparison. */
+        static SortOrder m_sort_order;
 
-    Server() {};
+        Server() {};
 
-public:
-
-     /** Initialises the object from an XML node. */
-     Server(const XMLNode & xml);
-    // ------------------------------------------------------------------------
-    /** Sets the sort order used in the comparison function. It is static, so
-     *  that each instance can access the sort order. */
-    static void setSortOrder(SortOrder so) { m_sort_order = so; }
-    // ------------------------------------------------------------------------
-    /** Returns the name of the server. */
-    const irr::core::stringw& getName() const { return m_name; }
-    const std::string & getLowerCaseName() const { return m_lower_case_name; }
-    // ------------------------------------------------------------------------
-    const float getScore() const { return m_satisfaction_score; }
-    // ------------------------------------------------------------------------
-    /** Returns the ID of this server. */
-    const uint32_t getServerId() const { return m_server_id; }
-    const int getMaxPlayers() const { return m_max_players; }
-    const int getCurrentPlayers() const { return m_current_players; }
-    // ------------------------------------------------------------------------
-    bool filterByWords(const irr::core::stringw words) const;
-    // ------------------------------------------------------------------------
+    public:
     
-    /** Compares two servers according to the sort order currently defined.
-     *  \param a The addon to compare this addon to.
-     */
-    bool operator<(const Server &server) const
-    {
-        switch(m_sort_order)
+         /** Initialises the object from an XML node. */
+         Server(const XMLNode & xml);
+        // ------------------------------------------------------------------------
+        /** Sets the sort order used in the comparison function. It is static, so
+         *  that each instance can access the sort order. */
+        static void setSortOrder(SortOrder so) { m_sort_order = so; }
+        // ------------------------------------------------------------------------
+        /** Returns the name of the server. */
+        const irr::core::stringw& getName() const { return m_name; }
+        const std::string & getLowerCaseName() const { return m_lower_case_name; }
+        // ------------------------------------------------------------------------
+        const float getScore() const { return m_satisfaction_score; }
+        // ------------------------------------------------------------------------
+        /** Returns the ID of this server. */
+        const uint32_t getServerId() const { return m_server_id; }
+        const int getMaxPlayers() const { return m_max_players; }
+        const int getCurrentPlayers() const { return m_current_players; }
+        // ------------------------------------------------------------------------
+        bool filterByWords(const irr::core::stringw words) const;
+        // ------------------------------------------------------------------------
+
+        /** Compares two servers according to the sort order currently defined.
+         *  \param a The addon to compare this addon to.
+         */
+        bool operator<(const Server &server) const
         {
-            case SO_SCORE:
-                return m_satisfaction_score < server.getScore();
-                break;
-            case SO_NAME:
-                // m_id is the lower case name
-                return m_name < server.getName();
-                break;
-            case SO_PLAYERS:
-                return m_current_players < server.getCurrentPlayers();
-                break;
-        }   // switch
-        return true;
-    }   // operator<
+            switch(m_sort_order)
+            {
+                case SO_SCORE:
+                    return m_satisfaction_score < server.getScore();
+                    break;
+                case SO_NAME:
+                    // m_id is the lower case name
+                    return m_name < server.getName();
+                    break;
+                case SO_PLAYERS:
+                    return m_current_players < server.getCurrentPlayers();
+                    break;
+            }   // switch
+            return true;
+        }   // operator<
 
-    // ------------------------------------------------------------------------
-    /** Compares two addons according to the sort order currently defined.
-     *  Comparison is done for sorting in descending order.
-     *  \param a The addon to compare this addon to.
-     */
-    bool operator>(const Server &server) const
-    {
-        switch(m_sort_order)
+        // ------------------------------------------------------------------------
+        /** Compares two addons according to the sort order currently defined.
+         *  Comparison is done for sorting in descending order.
+         *  \param a The addon to compare this addon to.
+         */
+        bool operator>(const Server &server) const
         {
-            case SO_SCORE:
-                return m_satisfaction_score > server.getScore();
-                break;
-            case SO_NAME:
-                return m_lower_case_name > server.getLowerCaseName();
-                break;
-            case SO_PLAYERS:
-                return m_current_players > server.getCurrentPlayers();
-                break;
-        }   // switch
-        return true;
-    }   // operator>
-
-};   // Server
+            switch(m_sort_order)
+            {
+                case SO_SCORE:
+                    return m_satisfaction_score > server.getScore();
+                    break;
+                case SO_NAME:
+                    return m_lower_case_name > server.getLowerCaseName();
+                    break;
+                case SO_PLAYERS:
+                    return m_current_players > server.getCurrentPlayers();
+                    break;
+            }   // switch
+            return true;
+        }   // operator>
 
+    };   // Server
+} // namespace online
 
 #endif
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index fb0ced8a4..fce355daf 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -26,54 +26,57 @@
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 
-static ServersManager* user_singleton = NULL;
+namespace online{
 
-ServersManager* ServersManager::get()
-{
-    if (user_singleton == NULL)
-        user_singleton = new ServersManager();
-    return user_singleton;
-}   // get
+    static ServersManager* user_singleton = NULL;
 
-void ServersManager::deallocate()
-{
-    delete user_singleton;
-    user_singleton = NULL;
-}   // deallocate
-
-// ============================================================================
-ServersManager::ServersManager(){
-    m_servers = new PtrVector<Server>;
-    refresh();
-}
-
-// ============================================================================
-void ServersManager::refresh()
-{
-    HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-    connector->setParameter("action",std::string("get_server_list"));
-
-    const XMLNode * result = connector->getXMLFromPage();
-    std::string rec_success = "";
-    if(result->get("success", &rec_success))
+    ServersManager* ServersManager::get()
     {
-        if (rec_success =="yes")
+        if (user_singleton == NULL)
+            user_singleton = new ServersManager();
+        return user_singleton;
+    }   // get
+
+    void ServersManager::deallocate()
+    {
+        delete user_singleton;
+        user_singleton = NULL;
+    }   // deallocate
+
+    // ============================================================================
+    ServersManager::ServersManager(){
+        m_servers = new PtrVector<Server>;
+        refresh();
+    }
+
+    // ============================================================================
+    void ServersManager::refresh()
+    {
+        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        connector->setParameter("action",std::string("get_server_list"));
+
+        const XMLNode * result = connector->getXMLFromPage();
+        std::string rec_success = "";
+        if(result->get("success", &rec_success))
         {
-            const XMLNode * servers_xml = result->getNode("servers");
-            m_servers->clearAndDeleteAll();
-            for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
+            if (rec_success =="yes")
             {
-                m_servers->push_back(new Server(*servers_xml->getNode(i)));
+                const XMLNode * servers_xml = result->getNode("servers");
+                m_servers->clearAndDeleteAll();
+                for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
+                {
+                    m_servers->push_back(new Server(*servers_xml->getNode(i)));
+                }
             }
         }
+        //FIXME error message
     }
-    //FIXME error message
-}
 
-// ============================================================================
-Server * ServersManager::getQuickPlay()
-{
-    if(m_servers->size() > 0)
-        return m_servers->get(0);
-    return NULL;
-}
+    // ============================================================================
+    Server * ServersManager::getQuickPlay()
+    {
+        if(m_servers->size() > 0)
+            return m_servers->get(0);
+        return NULL;
+    }
+} // namespace online
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index 912e0bda0..1b52dc4a2 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -23,35 +23,39 @@
 #include "online/server.hpp"
 
 
-// ============================================================================
+namespace online {
 
-/**
-  * \brief
-  * \ingroup online
-  */
-class ServersManager
-{
-    private:
-        ServersManager();
-        PtrVector<Server> * m_servers;
-        bool m_not_fetched;
-        Server * m_joined_server;
+    /**
+      * \brief
+      * \ingroup online
+      */
+    class ServersManager
+    {
+        private:
+            ServersManager();
+            PtrVector<Server> * m_servers;
+            bool m_not_fetched;
+            Server * m_joined_server;
 
-    public:
-        // singleton
-        static ServersManager* get();
-        static void deallocate();
+        public:
+            // singleton
+            static ServersManager* get();
+            static void deallocate();
+
+            void refresh();
+            PtrVector<Server> * getServers () const { return m_servers; };
+            int getNumServers () const { return m_servers->size(); };
+            Server * getServer (int index) const { return m_servers->get(index);};
+            void sort(bool sort_desc) { m_servers->insertionSort(0, sort_desc); };
+            void setJoinedServer(Server * server){ m_joined_server = server;};
+            Server * getJoinedServer(){ return m_joined_server;};
+            //Returns the best server to join
+            Server * getQuickPlay();
+    };   // class ServersManager
+
+
+} // namespace online
 
-        void refresh();
-        PtrVector<Server> * getServers () const { return m_servers; };
-        int getNumServers () const { return m_servers->size(); };
-        Server * getServer (int index) const { return m_servers->get(index);};
-        void sort(bool sort_desc) { m_servers->insertionSort(0, sort_desc); };
-        void setJoinedServer(Server * server){ m_joined_server = server;};
-        Server * getJoinedServer(){ return m_joined_server;};
-        //Returns the best server to join
-        Server * getQuickPlay();
-};   // class ServersManager
 
 #endif
 
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 495438b4a..ee235b1a7 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -34,6 +34,7 @@
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
+using namespace online;
 
 // -----------------------------------------------------------------------------
 
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 5ee68348c..e1cbfc50e 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -26,6 +26,8 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "online/server.hpp"
+
+
 /**
  * \brief Dialog that allows a user to sign in
  * \ingroup states_screens
@@ -38,7 +40,7 @@ private:
     bool m_self_destroy;
     bool m_enter_lobby;
 
-    Server * m_server;
+    online::Server * m_server;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
@@ -50,7 +52,7 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(Server * server);
+    ServerInfoDialog(online::Server * server);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 795d7bd7a..a610b35e6 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -37,7 +37,7 @@
 #include "utils/translation.hpp"
 #include "online/servers_manager.hpp"
 
-
+using namespace online;
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( NetworkingLobby );
diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp
index 12af31989..5e5d65dee 100644
--- a/src/states_screens/networking_lobby.hpp
+++ b/src/states_screens/networking_lobby.hpp
@@ -36,7 +36,7 @@ class NetworkingLobby :     public GUIEngine::Screen,
 private:
     friend class GUIEngine::ScreenSingleton<NetworkingLobby>;
 
-    Server * m_server;
+    online::Server * m_server;
 
     NetworkingLobby();
 
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index b7ebf37af..335b88f06 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -44,6 +44,7 @@
 
 
 using namespace GUIEngine;
+using namespace online;
 
 DEFINE_SCREEN_SINGLETON( OnlineScreen );
 
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 027bc202b..5fbf02235 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -29,6 +29,8 @@
 #include "utils/string_utils.hpp"
 #include "online/servers_manager.hpp"
 
+using namespace online;
+
 DEFINE_SCREEN_SINGLETON( ServerSelection );
 
 // ----------------------------------------------------------------------------

From ad198a6e7066025f6405fc89c5adf7323d0b25a0 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 19 Jul 2013 21:20:32 +0000
Subject: [PATCH 20/44] Temporary commit so that I can easily revert if shit
 goes down. And it will go down. Thread callbacks madness!

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13290 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/login_dialog.stkgui           |   2 +-
 sources.cmake                                 |   3 +
 src/online/current_user.cpp                   | 175 +++++++++++-------
 src/online/current_user.hpp                   |  54 ++++--
 src/online/http_listener.hpp                  |  41 ++++
 src/online/http_manager.cpp                   |  12 +-
 src/online/http_manager.hpp                   |  20 +-
 src/online/messages.cpp                       |  53 ++++++
 src/online/messages.hpp                       |  37 ++++
 src/online/request.cpp                        |  30 ++-
 src/online/request.hpp                        |  40 ++--
 src/online/server.cpp                         |   4 +-
 src/online/server.hpp                         |   4 +-
 src/online/servers_manager.cpp                |   4 +-
 src/online/servers_manager.hpp                |   4 +-
 src/online/user.cpp                           |   6 +-
 src/online/user.hpp                           |  11 +-
 src/states_screens/dialogs/login_dialog.cpp   |  34 +---
 src/states_screens/dialogs/login_dialog.hpp   |   3 -
 .../dialogs/registration_dialog.cpp           |   2 +-
 .../dialogs/server_info_dialog.cpp            |   4 +-
 .../dialogs/server_info_dialog.hpp            |   4 +-
 src/states_screens/networking_lobby.cpp       |   2 +-
 src/states_screens/networking_lobby.hpp       |   2 +-
 .../networking_lobby_settings.cpp             |   7 +-
 src/states_screens/online_screen.cpp          |  59 +++---
 src/states_screens/online_screen.hpp          |  10 +-
 src/states_screens/server_selection.cpp       |   2 +-
 src/utils/string_utils.cpp                    |   8 -
 src/utils/string_utils.hpp                    |   3 -
 30 files changed, 420 insertions(+), 220 deletions(-)
 create mode 100644 src/online/http_listener.hpp
 create mode 100644 src/online/messages.cpp
 create mode 100644 src/online/messages.hpp

diff --git a/data/gui/online/login_dialog.stkgui b/data/gui/online/login_dialog.stkgui
index 739a3d34f..6ba4d9619 100644
--- a/data/gui/online/login_dialog.stkgui
+++ b/data/gui/online/login_dialog.stkgui
@@ -56,7 +56,7 @@
                 <icon-button id="as_guest" width="64" height="64" icon="gui/main_about.png"
                              I18N="Login dialog" text="As guest" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
-                             I18N="Login dialog" text="Cancel" label_location="bottom"/>
+                             I18N="Login dialog" text="Close" label_location="bottom"/>
         </buttonbar>
         
     
diff --git a/sources.cmake b/sources.cmake
index db63c1dbb..0f4ff88a7 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -148,6 +148,7 @@ src/network/race_state.cpp
 src/online/current_user.cpp
 src/online/http_connector.cpp
 src/online/http_manager.cpp
+src/online/messages.cpp
 src/online/request.cpp
 src/online/server.cpp
 src/online/servers_manager.cpp
@@ -418,7 +419,9 @@ src/network/remote_kart_info.hpp
 src/network/world_loaded_message.hpp
 src/online/current_user.hpp
 src/online/http_connector.hpp
+src/online/http_listener.hpp
 src/online/http_manager.hpp
+src/online/messages.hpp
 src/online/request.hpp
 src/online/server.hpp
 src/online/servers_manager.hpp
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index f6a3e7fdf..b48d4eef0 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -27,27 +27,48 @@
 #include "utils/translation.hpp"
 #include "utils/log.hpp"
 
-namespace online{
-    static CurrentUser* user_singleton = NULL;
+namespace Online{
+    static Synchronised<CurrentUser*> user_singleton(NULL);
 
     CurrentUser* CurrentUser::get()
     {
-        if (user_singleton == NULL)
-            user_singleton = new CurrentUser();
-        return user_singleton;
+        CurrentUser* user = user_singleton.getData();
+        if (user == NULL)
+            user = new CurrentUser();
+        return user;
     }   // get
 
+    CurrentUser* CurrentUser::acquire()
+    {
+        user_singleton.lock();
+        CurrentUser * user = user_singleton.getData();
+        if (user == NULL)
+        {
+            user_singleton.unlock();
+            user = new CurrentUser();
+            user_singleton.setAtomic(user);
+            user_singleton.lock();
+        }
+        return user;
+    }
+
+    void CurrentUser::release()
+    {
+        user_singleton.unlock();
+    }
+
     void CurrentUser::deallocate()
     {
-        delete user_singleton;
-        user_singleton = NULL;
+        user_singleton.lock();
+        CurrentUser* user = user_singleton.getData();
+        delete user;
+        user = NULL;
+        user_singleton.unlock();
     }   // deallocate
 
     // ============================================================================
     CurrentUser::CurrentUser(){
-        m_is_signed_in = false;
-        m_is_guest = false;
-        m_is_server_host = false;
+        m_state = SIGNED_OUT;
         m_id = 0;
         m_name = "";
         m_token = "";
@@ -57,7 +78,8 @@ namespace online{
     // ============================================================================
     bool CurrentUser::trySavedSession()
     {
-        if (m_is_signed_in) return true;
+        if (m_state == SIGNED_IN) return true;
+        bool success = false;
         if(UserConfigParams::m_saved_session)
         {
             HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
@@ -76,11 +98,10 @@ namespace online{
                     int userid_fetched = result->get("userid", &m_id);
                     assert(token_fetched && username_fetched && userid_fetched);
                     UserConfigParams::m_saved_token = m_token;
-                    m_is_signed_in = true;
-                    m_is_guest = false;
+                    m_state = SIGNED_IN;
+                    success = true;
                 }
                 result->get("info", &info);
-                Log::info("trySavedSession","%s",info.c_str());
             }
             else
             {
@@ -88,19 +109,19 @@ namespace online{
                     _("Unable to connect to the server. Check your internet connection or try again later."));
             }
         }
-        return m_is_signed_in;
+        return success;
     }
 
     // ============================================================================
     // Register
-    bool CurrentUser::signUp( const irr::core::stringw &username,
-                                    const irr::core::stringw &password,
-                                    const irr::core::stringw &password_ver,
-                                    const irr::core::stringw &email,
-                                    bool terms,
-                                    irr::core::stringw &info)
+    bool CurrentUser::signUp(   const irr::core::stringw &username,
+                                const irr::core::stringw &password,
+                                const irr::core::stringw &password_ver,
+                                const irr::core::stringw &email,
+                                bool terms,
+                                irr::core::stringw &info)
     {
-        assert(m_is_signed_in == false);
+        assert(m_state == SIGNED_OUT || m_state == GUEST);
         HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         connector->setParameter("action",std::string("register"));
         connector->setParameter("username",username);
@@ -117,7 +138,7 @@ namespace online{
         }
         else
         {
-                info = _("Unable to connect to the server. Check your internet connection or try again later.");
+            info = _("Unable to connect to the server. Check your internet connection or try again later.");
         }
         return success;
     }
@@ -125,34 +146,40 @@ namespace online{
 
     // ============================================================================
 
-    XMLRequest * CurrentUser::signInRequest(  const irr::core::stringw &username,
-                                            const irr::core::stringw &password,
-                                            bool save_session)
+    void CurrentUser::requestSignIn(    const irr::core::stringw &username,
+                                        const irr::core::stringw &password,
+                                        bool save_session)
     {
-        assert(m_is_signed_in == false);
+        assert(m_state == SIGNED_OUT);
         m_save_session = save_session;
         XMLRequest * request = new XMLRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        request->setListener(this, CurrentUser::SIGN_IN_REQUEST);
         request->setParameter("action",std::string("connect"));
         request->setParameter("username",username);
         request->setParameter("password",password);
         if(!HTTPManager::get()->addRequest(request))
+        {
             assert(false);
-        return request;
+        }
+        m_state = SIGNING_IN;
     }
 
-    bool CurrentUser::signIn(const XMLNode * input, irr::core::stringw &info)
+    bool CurrentUser::signIn(XMLRequest * input)
     {
-        std::string rec_success = "";
-        if(input->get("success", &rec_success))
+        const XMLNode * xml = input->getResult();
+        bool success = false;
+        irr::core::stringw info;
+        std::string rec_success;
+        if(xml->get("success", &rec_success))
         {
             if (rec_success =="yes")
             {
-                int token_fetched = input->get("token", &m_token);
-                int username_fetched = input->get("username", &m_name);
-                int userid_fetched = input->get("userid", &m_id);
+                int token_fetched       = xml->get("token", &m_token);
+                int username_fetched    = xml->get("username", &m_name);
+                int userid_fetched      = xml->get("userid", &m_id);
                 assert(token_fetched && username_fetched && userid_fetched);
-                m_is_signed_in = true;
-                m_is_guest = false;
+                m_state = SIGNED_IN;
+                success = true;
                 if(m_save_session)
                 {
                     UserConfigParams::m_saved_user = m_id;
@@ -160,58 +187,64 @@ namespace online{
                     UserConfigParams::m_saved_session = true;
                 }
             }
-            input->get("info", &info);
+            xml->get("info", &info);
         }
         else
         {
             info = _("Unable to connect to the server. Check your internet connection or try again later.");
         }
-
-        return m_is_signed_in;
+        input->setInfo(info);
+        if(!success) m_state = SIGNED_OUT;
+        return success;
     }
 
     // ============================================================================
 
-    bool CurrentUser::createServer(  const irr::core::stringw &name,
-                                            int max_players,
-                                            irr::core::stringw &info)
+    XMLRequest * CurrentUser::createServerRequest ( const irr::core::stringw &name, int max_players)
     {
-        assert(m_is_signed_in && !m_is_guest);
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",           std::string("create_server"));
-        connector->setParameter("token",            m_token);
-        connector->setParameter("userid",           m_id);
-        connector->setParameter("name",             name);
-        connector->setParameter("max_players",      max_players);
-        const XMLNode * result = connector->getXMLFromPage();
+        assert(m_state == SIGNED_IN);
+        XMLRequest * request = new XMLRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        request->setParameter("action",           std::string("create_server"));
+        request->setParameter("token",            m_token);
+        request->setParameter("userid",           m_id);
+        request->setParameter("name",             name);
+        request->setParameter("max_players",      max_players);
+        if(!HTTPManager::get()->addRequest(request))
+            assert(false);
+        return request;
+    }
+
+    bool CurrentUser::createServer( const XMLNode * input , irr::core::stringw &info)
+    {
+        bool success = false;
         std::string rec_success = "";
-        if(result->get("success", &rec_success))
+        if(input->get("success", &rec_success))
         {
            if (rec_success =="yes")
            {
                // FIXME
-               m_is_server_host = true;
+               success = true;
            }
-           result->get("info", &info);
+           input->get("info", &info);
         }
         else
         {
            info = _("Unable to connect to the server. Check your internet connection or try again later.");
         }
 
-        return m_is_server_host;
+        return success;
     }
 
 
     // ============================================================================
     bool CurrentUser::signOut(irr::core::stringw &info){
-        assert(m_is_signed_in == true);
+        assert(m_state == SIGNED_IN || m_state == GUEST);
         HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         connector->setParameter("action",std::string("disconnect"));
         connector->setParameter("token",m_token);
         connector->setParameter("userid",m_id);
 
-
+        bool success = false;
         const XMLNode * result = connector->getXMLFromPage();
         std::string rec_success = "";
         if(result->get("success", &rec_success))
@@ -221,11 +254,11 @@ namespace online{
                 m_token = "";
                 m_name = "";
                 m_id = 0;
-                m_is_signed_in = false;
-                m_is_guest = false;
+                m_state = SIGNED_OUT;
                 UserConfigParams::m_saved_user = 0;
                 UserConfigParams::m_saved_token = "";
                 UserConfigParams::m_saved_session = false;
+                success = true;
             }
             result->get("info", &info);
         }
@@ -233,13 +266,13 @@ namespace online{
         {
             info = _("Unable to connect to the server. Check your internet connection or try again later.");
         }
-        return !m_is_signed_in;
+        return success;
     }
 
     // ============================================================================
 
     bool CurrentUser::requestJoin(uint32_t server_id, irr::core::stringw &info){
-        assert(m_is_signed_in == true);
+        assert(m_state == SIGNED_IN || m_state == GUEST);
         HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
         connector->setParameter("action",std::string("request-connection"));
         connector->setParameter("token", m_token);
@@ -271,9 +304,27 @@ namespace online{
 
     irr::core::stringw CurrentUser::getUserName() const
     {
-        if(m_is_signed_in)
+        if((m_state == SIGNED_IN ) || (m_state == GUEST))
             return m_name;
         else
             return _("Currently not signed in");
     }
-} // namespace online
+
+
+    // ============================================================================
+
+
+    void CurrentUser::onHTTPCallback(HTTPRequest * finished_request)
+    {
+        XMLRequest * input = (XMLRequest *) finished_request;
+
+        switch(finished_request->getListenerTarget())
+        {
+            case CurrentUser::SIGN_IN_REQUEST:
+                 signIn(input);
+                 break;
+            default:
+                 break;
+        }
+    }
+} // namespace Online
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 07bac1b3f..827374a7d 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -27,35 +27,52 @@
 #include "http_manager.hpp"
 
 
-namespace online{
+namespace Online{
     // ============================================================================
 
     /**
       * \brief Class that represents an online registered user
       * \ingroup online
       */
-    class CurrentUser : public User
+    class CurrentUser : public User, HTTPListener
     {
+        public:
 
-        protected:
+            enum UserState
+            {
+                SIGNED_OUT,
+                SIGNED_IN,
+                GUEST,
+                SIGNING_IN,
+                SIGNING_OUT
+            };
+
+        private:
+            enum RequestType{
+                SIGN_IN_REQUEST
+            };
+            std::map<int, std::pair<bool, irr::core::stringw> > m_http_results;
             std::string m_token;
-            bool m_is_signed_in;
-            bool m_is_guest;
             bool m_save_session;
+            UserState m_state;
             CurrentUser();
 
+            bool signIn(XMLRequest * input);
+
+
         public:
             // singleton
             static CurrentUser* get();
             static void deallocate();
 
+            static CurrentUser* acquire();
+            static void release();
+
             bool trySavedSession();
             // Login
-            XMLRequest * signInRequest(     const irr::core::stringw &username,
-                                            const irr::core::stringw &password,
-                                            bool save_session);
-
-            bool signIn( const XMLNode * input, irr::core::stringw &info);
+            void requestSignIn(     const irr::core::stringw &username,
+                                    const irr::core::stringw &password,
+                                    bool save_session);
 
             // Register
             bool signUp(    const irr::core::stringw &username,
@@ -67,20 +84,25 @@ namespace online{
             // Logout - Best to be followed by CurrentOnlineUser::deallocate
             bool signOut(   irr::core::stringw &info);
 
-            bool createServer(  const irr::core::stringw &name,
-                                int max_players,
-                                irr::core::stringw &info);
+            XMLRequest * createServerRequest(  const irr::core::stringw &name,
+                                        int max_players);
+
+            bool createServer ( const XMLNode * input, irr::core::stringw &info);
 
             bool requestJoin(   uint32_t server_id,
                                 irr::core::stringw &info);
 
             /** Returns the username if signed in. */
             irr::core::stringw getUserName() const;
-            bool isSignedIn(){ return m_is_signed_in; }
-            bool isGuest(){ return m_is_guest; }
+            bool isSignedIn() const { return m_state == SIGNED_IN; }
+            bool isGuest() const { return m_state == GUEST; }
+            bool isSigningIn() const { return m_state == SIGNING_IN; }
+            UserState getUserState() {return m_state;}
+            void onHTTPCallback(HTTPRequest * finished_request);
 
     };   // class CurrentUser
-} // namespace online
+
+} // namespace Online
 
 #endif
 
diff --git a/src/online/http_listener.hpp b/src/online/http_listener.hpp
new file mode 100644
index 000000000..36cf97f2b
--- /dev/null
+++ b/src/online/http_listener.hpp
@@ -0,0 +1,41 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HTTP_LISTENER_HPP
+#define HTTP_LISTENER_HPP
+
+#include <string>
+#include <curl/curl.h>
+#include <irrString.h>
+
+
+namespace Online{
+
+    class HTTPRequest;
+
+    class HTTPListener
+    {
+    public :
+        virtual ~HTTPListener() {}
+        virtual void onHTTPCallback(HTTPRequest * finished_request) {};
+    }; //class HTTPListener
+} // namespace Online
+
+#endif // HTTP_LISTENER_HPP
+
+/*EOF*/
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index 6b2bc479a..0afc703b0 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -39,7 +39,7 @@
 #  include <unistd.h>
 #endif
 
-namespace online{
+namespace Online{
 
     static HTTPManager * http_singleton = NULL;
 
@@ -119,7 +119,7 @@ namespace online{
         // thread here to cancel properly.
         cancelAllDownloads();
 
-        online::QuitRequest * request = new online::QuitRequest();
+        QuitRequest * request = new QuitRequest();
         addRequest(request);
     }   // stopNetworkThread
 
@@ -140,7 +140,7 @@ namespace online{
      *  sorted by priority.
      *  \param request The pointer to the new request to insert.
      */
-    bool HTTPManager::addRequest(online::Request *request)
+    bool HTTPManager::addRequest(Online::Request *request)
     {
         if (request->isAllowedToAdd())
         {
@@ -174,7 +174,7 @@ namespace online{
 
         me->m_current_request = NULL;
         me->m_request_queue.lock();
-        while(  me->m_request_queue.getData().empty() || !dynamic_cast<online::QuitRequest*>(me->m_request_queue.getData().top()) )
+        while(  me->m_request_queue.getData().empty() || !dynamic_cast<Online::QuitRequest*>(me->m_request_queue.getData().top()) )
         {
             bool empty = me->m_request_queue.getData().empty();
             // Wait in cond_wait for a request to arrive. The 'while' is necessary
@@ -201,7 +201,7 @@ namespace online{
         // At this stage we have the lock for m_request_queue
         while(!me->m_request_queue.getData().empty())
         {
-            online::Request * request = me->m_request_queue.getData().top();
+            Online::Request * request = me->m_request_queue.getData().top();
             me->m_request_queue.getData().pop();
             // Manage memory can be ignored here, all requests
             // need to be freed.
@@ -212,7 +212,7 @@ namespace online{
         pthread_exit(NULL);
         return 0;
     }   // mainLoop
-} // namespace online
+} // namespace Online
 
 
 
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index 35f6717a5..f59998216 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -1,6 +1,6 @@
 //
 //  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 SuperTuxKart-Team
+//  Copyright (C) 2013 Glenn De Jonghe
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU General Public License
@@ -34,7 +34,7 @@
 #include "utils/synchronised.hpp"
 #include "online/request.hpp"
 
-namespace online{
+namespace Online{
 
     /**
       * \brief Class to connect with a server over HTTP
@@ -45,7 +45,7 @@ namespace online{
         protected:
 
             /** The current requested being worked on. */
-            online::Request                  *m_current_request;
+            Online::Request                  *m_current_request;
 
             /** A conditional variable to wake up the main loop. */
             pthread_cond_t            m_cond_request;
@@ -58,9 +58,9 @@ namespace online{
 
             /** The list of pointes to all requests. */
             Synchronised< std::priority_queue <
-                                                online::Request*,
-                                                std::vector<online::Request*>,
-                                                online::Request::Compare
+                                                Online::Request*,
+                                                std::vector<Online::Request*>,
+                                                Online::Request::Compare
                                                >
                         >  m_request_queue;
 
@@ -79,16 +79,16 @@ namespace online{
             static void deallocate();
 
             //Execute
-            std::string getPage(online::Request * request);
-            XMLNode * getXMLFromPage(online::Request * request);
+            std::string getPage(Online::Request * request);
+            XMLNode * getXMLFromPage(Online::Request * request);
 
-            bool addRequest(online::Request *request);
+            bool addRequest(Online::Request *request);
             void cancelAllDownloads();
 
             bool getAbort(){ return m_abort.getAtomic(); };
 
     }; //class HTTPManager
-} // namespace online
+} // namespace Online
 
 #endif // HTTP_MANAGER_HPP
 
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
new file mode 100644
index 000000000..cd1055886
--- /dev/null
+++ b/src/online/messages.cpp
@@ -0,0 +1,53 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#include "online/messages.hpp"
+#include "utils/translation.hpp"
+
+namespace Online
+{
+    namespace Messages
+    {
+        irr::core::stringw loadingDots(float timer, bool spaces, float interval, int max_dots)
+        {
+            int nr_dots = int(floor(timer * (1 / interval))) % (max_dots+1);
+            return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
+        }
+        // ------------------------------------------------------------------------
+
+        irr::core::stringw signingIn(float timer)
+        {
+            return irr::core::stringw(_("Signing in")) + loadingDots(timer);
+        }
+        // ------------------------------------------------------------------------
+
+        irr::core::stringw signingOut(float timer)
+        {
+            return irr::core::stringw(_("Signing out")) + loadingDots(timer);
+        }
+        // ------------------------------------------------------------------------
+
+        irr::core::stringw signedInAs(const irr::core::stringw & name)
+        {
+            return irr::core::stringw(_("Signed in as : ")) + name + ".";
+        }
+    } // namespace messages
+} // namespace Online
+
+
+/* EOF */
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
new file mode 100644
index 000000000..800f22e03
--- /dev/null
+++ b/src/online/messages.hpp
@@ -0,0 +1,37 @@
+//
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#ifndef HEADER_ONLINE_MESSAGES_HPP
+#define HEADER_ONLINE_MESSAGES_HPP
+
+#include <string>
+#include <irrString.h>
+
+namespace Online
+{
+    namespace Messages
+    {
+        irr::core::stringw loadingDots(float timer, bool spaces = true, float interval = 0.5f, int max_dots = 3);
+        irr::core::stringw signingIn  (float timer);
+        irr::core::stringw signingOut (float timer);
+        irr::core::stringw signedInAs (const irr::core::stringw & name);
+    } // namespace Messages
+}// namespace Online
+#endif
+
+/* EOF */
diff --git a/src/online/request.cpp b/src/online/request.cpp
index eaffa1469..8dab69927 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -21,7 +21,7 @@
 #include <online/http_manager.hpp>
 
 
-namespace online{
+namespace Online{
 
     class HTTPManager;
 
@@ -32,7 +32,6 @@ namespace online{
         m_priority      = priority;
         m_manage_memory = manage_memory;
         m_cancel        = false;
-        m_done          = false;
     }   // Request
 
     Request::~Request()
@@ -63,14 +62,29 @@ namespace online{
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
         m_added = false;
+        m_done.setAtomic(false);
+        m_listener.setAtomic(NULL);
+        m_listener_target = 0;
     }
 
     HTTPRequest::~HTTPRequest()
     {
         delete m_parameters;
+        m_listener.lock();
+        if (m_listener.getData() != NULL)
+        {
+            delete m_listener.getData();
+        }
+        m_listener.unlock();
+    }
+    void HTTPRequest::setListener(Synchronised<HTTPListener *> listener, int target)
+    {
+        m_listener = listener;
+        m_listener_target = 0;
     }
 
-    bool HTTPRequest::isAllowedToAdd(){
+    bool HTTPRequest::isAllowedToAdd()
+    {
         if (m_url.size() > 5 && ( m_url.substr(0, 5) != "http:"))
         {
             Log::info("HTTPRequest::isAllowedToAdd", "Invalid URL.");
@@ -79,6 +93,14 @@ namespace online{
         return true;
     }
 
+    void HTTPRequest::afterOperation()
+    {
+        if (m_listener != NULL)
+        {
+            m_listener->onHTTPCallback(this);
+        }
+    }
+
     std::string HTTPRequest::downloadPage()
     {
         CURL * curl_session;
@@ -198,4 +220,4 @@ namespace online{
     {
         m_result = file_manager->createXMLTreeFromString(downloadPage());
     }
-} // namespace online
+} // namespace Online
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 3c6a41a40..979180aa6 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -19,13 +19,13 @@
 
 #include <string>
 
-#include "utils/leak_check.hpp"
-#include "utils/synchronised.hpp"
 #include "utils/cpp2011.h"
-#include "io/file_manager.hpp"
 #include "utils/string_utils.hpp"
+#include "utils/synchronised.hpp"
+#include "io/file_manager.hpp"
+#include "online/http_listener.hpp"
 
-namespace online{
+namespace Online{
 
     /**
       * Stores a request for the http connector. They will be sorted by priorities.
@@ -40,7 +40,6 @@ namespace online{
         /** Cancel this request if it is active. */
         bool                m_cancel;
 
-        bool                m_done;
 
         /** True if the memory for this Request should be managed by
         *  http connector (i.e. this object is freed once the request
@@ -50,10 +49,9 @@ namespace online{
 
         virtual void beforeOperation() {}
         virtual void operation() = 0;
-        virtual void afterOperation() { m_done = true;}
+        virtual void afterOperation() {}
 
     public:
-        LEAK_CHECK()
 
         Request(int priority, bool manage_memory=true);
         virtual ~Request();
@@ -77,8 +75,6 @@ namespace online{
         *  by network_http (i.e. freed once the request is handled). */
         bool manageMemory() const { return m_manage_memory; }
 
-        bool isDone() const { return m_done; }
-
         virtual bool isAllowedToAdd() {return true;}
 
         /** This class is used by the priority queue to sort requests by priority.
@@ -119,10 +115,18 @@ namespace online{
         /** The progress indicator. 0 till it is started and the first
         *  packet is downloaded. At the end eithe -1 (error) or 1
         *  (everything ok) at the end. */
-        Synchronised<float> m_progress;
-        std::string         m_url;
-        bool                m_added;
+        Synchronised<float>             m_progress;
+        Synchronised<bool>              m_done;
+        std::string                     m_url;
+        bool                            m_added;
+        Synchronised<HTTPListener *>    m_listener;
+        int                             m_listener_target;
+        /**
+         * info to show on screen if necessary
+         */
+        irr::core::stringw  m_info;
 
+        virtual void afterOperation();
         std::string downloadPage();
 
         static int progressDownload(void *clientp,
@@ -152,7 +156,7 @@ namespace online{
         template <typename T>
         void setParameter(const std::string & name, const T& value){
             if(!m_added)
-            (   *m_parameters)[name] = StringUtils::toString(value);
+                (*m_parameters)[name] = StringUtils::toString(value);
         }
 
         /** Returns the current progress. */
@@ -160,10 +164,16 @@ namespace online{
         /** Sets the current progress. */
         void setProgress(float f) { m_progress.setAtomic(f); }
 
+        void setInfo(const irr::core::stringw & info) {m_info = info;}
+        const irr::core::stringw & getInfo() {return m_info;}
+
         const std::string &getURL() const {return m_url;}
 
         virtual bool isAllowedToAdd() OVERRIDE;
 
+        virtual void setListener(Synchronised<HTTPListener *> listener, int target = 0);
+        int getListenerTarget(){ return m_listener_target; }
+
     };
 
     class XMLRequest : public HTTPRequest
@@ -174,9 +184,9 @@ namespace online{
 
     public :
         XMLRequest(const std::string &url);
-        XMLNode * getResult(){ return m_result; }
+        virtual XMLNode * getResult() OVERRIDE { return m_result; }
     };
-} //namespace online
+} //namespace Online
 
 #endif
 
diff --git a/src/online/server.cpp b/src/online/server.cpp
index 8022e45af..ff2df3238 100644
--- a/src/online/server.cpp
+++ b/src/online/server.cpp
@@ -24,7 +24,7 @@
 #include "utils/constants.hpp"
 #include "utils/string_utils.hpp"
 
-namespace online{
+namespace Online{
     Server::SortOrder Server::m_sort_order=Server::SO_NAME; //FIXME change to some other default
 
     Server::Server(const XMLNode & xml)
@@ -71,4 +71,4 @@ namespace online{
 
         return false;
     } // filterByWords
-} // namespace online
+} // namespace Online
diff --git a/src/online/server.hpp b/src/online/server.hpp
index 407cff648..bb4d8b3d1 100644
--- a/src/online/server.hpp
+++ b/src/online/server.hpp
@@ -31,7 +31,7 @@
 
 class XMLNode;
 
-namespace online{
+namespace Online{
     /**
       * \ingroup online
       */
@@ -130,6 +130,6 @@ namespace online{
         }   // operator>
 
     };   // Server
-} // namespace online
+} // namespace Online
 
 #endif
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index fce355daf..3bd57e53c 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -26,7 +26,7 @@
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 
-namespace online{
+namespace Online{
 
     static ServersManager* user_singleton = NULL;
 
@@ -79,4 +79,4 @@ namespace online{
             return m_servers->get(0);
         return NULL;
     }
-} // namespace online
+} // namespace Online
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index 1b52dc4a2..716f6d4a2 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -23,7 +23,7 @@
 #include "online/server.hpp"
 
 
-namespace online {
+namespace Online {
 
     /**
       * \brief
@@ -54,7 +54,7 @@ namespace online {
     };   // class ServersManager
 
 
-} // namespace online
+} // namespace Online
 
 
 #endif
diff --git a/src/online/user.cpp b/src/online/user.cpp
index 2e3d0d3ac..69d5a6765 100644
--- a/src/online/user.cpp
+++ b/src/online/user.cpp
@@ -22,10 +22,10 @@
 #include <sstream>
 #include <stdlib.h>
 
-namespace online{
+namespace Online{
     // ============================================================================
     User::User(const irr::core::stringw &username)
     {
         m_name = username;
-    }   // OnlineUser
-} // namespace online
+    }
+} // namespace Online
diff --git a/src/online/user.hpp b/src/online/user.hpp
index e8e206b43..f125612f7 100644
--- a/src/online/user.hpp
+++ b/src/online/user.hpp
@@ -21,8 +21,9 @@
 
 #include <irrString.h>
 #include "utils/types.hpp"
+#include "utils/synchronised.hpp"
 
-namespace online{
+namespace Online{
 
     /**
       * \brief Class that represents an online registered user
@@ -33,10 +34,8 @@ namespace online{
         private:
 
         protected:
-
-            bool                    m_is_server_host;
-            irr::core::stringw      m_name;
-            uint32_t                m_id;
+            irr::core::stringw        m_name;
+            uint32_t                  m_id;
             User(){}
 
         public:
@@ -49,7 +48,7 @@ namespace online{
 
 
     };   // class User
-} // namespace online
+} // namespace Online
 #endif
 
 /*EOF*/
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index c8055c289..9edcd46bc 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -39,8 +39,6 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
-    m_load_timer = 0.0f;
-    m_signin_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
     m_info_widget = getWidget<LabelWidget>("info");
@@ -95,7 +93,6 @@ LoginDialog::LoginDialog(const Message message_type) :
 
 LoginDialog::~LoginDialog()
 {
-    delete m_signin_request;
 }
 
 
@@ -105,7 +102,9 @@ void LoginDialog::login()
 {
     const stringw username = m_username_widget->getText().trim();
     const stringw password = m_password_widget->getText().trim();
-    m_signin_request = online::CurrentUser::get()->signInRequest(username,password, m_remember_widget->getState());
+    Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
+    Online::CurrentUser::release();
+    m_self_destroy = true;
 }
 
 // -----------------------------------------------------------------------------
@@ -117,8 +116,6 @@ GUIEngine::EventPropagation LoginDialog::processEvent(const std::string& eventSo
         const std::string& selection = m_options_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
         if (selection == m_cancel_widget->m_properties[PROP_ID])
         {
-            if(m_signin_request != NULL)
-                m_signin_request->cancel();
             m_self_destroy = true;
             return GUIEngine::EVENT_BLOCK;
         }
@@ -152,31 +149,6 @@ void LoginDialog::onEnterPressedInternal()
 
 void LoginDialog::onUpdate(float dt)
 {
-    if(m_signin_request != NULL)
-    {
-        if(m_signin_request->isDone())
-        {
-            stringw info = "";
-            if(online::CurrentUser::get()->signIn(m_signin_request->getResult(), info))
-            {
-                m_self_destroy = true;
-            }
-            else
-            {
-                // error message
-                sfx_manager->quickSound( "anvil" );
-                m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
-                m_message_widget->setText(info, false);
-            }
-            delete m_signin_request;
-            m_signin_request = NULL;
-        }
-        else
-        {
-            m_load_timer += dt;
-            m_message_widget->setText(irr::core::stringw(_("Signing in")) + StringUtils::loadingDots(m_load_timer), false);
-        }
-    }
 
     //If we want to open the registration dialog, we need to close this one first
     m_open_registration_dialog && (m_self_destroy = true);
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 9e865734f..171b4f934 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -37,7 +37,6 @@ private:
     
     bool m_self_destroy;
     bool m_open_registration_dialog;
-    online::XMLRequest * m_signin_request;
 
     GUIEngine::LabelWidget * m_info_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
@@ -54,8 +53,6 @@ private:
     
     void login();
 
-    float m_load_timer;
-
 public:
     
     enum Message
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 3af68e652..d041e783b 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -192,7 +192,7 @@ bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
         {
             assert(getWidget<CheckBoxWidget>("accepted")->getState());
             m_agreement = true;
-            if(online::CurrentUser::get()->signUp(m_username, m_password, m_password_confirm, m_email, true, m_registration_error))
+            if(Online::CurrentUser::get()->signUp(m_username, m_password, m_password_confirm, m_email, true, m_registration_error))
             {
                 m_show_registration_activation = true;
                 m_registration_error = "";
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index ee235b1a7..34ae384b8 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -34,7 +34,7 @@
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
-using namespace online;
+using namespace Online;
 
 // -----------------------------------------------------------------------------
 
@@ -72,7 +72,7 @@ void ServerInfoDialog::requestJoin()
 {
     //FIXME totally not correct. Receiving an answer, not kept in mind.
     irr::core::stringw info;
-    if (online::CurrentUser::get()->requestJoin( m_server->getServerId(), info))
+    if (Online::CurrentUser::get()->requestJoin( m_server->getServerId(), info))
     {
         ServersManager::get()->setJoinedServer(m_server);
         m_enter_lobby = true;
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index e1cbfc50e..200240501 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -40,7 +40,7 @@ private:
     bool m_self_destroy;
     bool m_enter_lobby;
 
-    online::Server * m_server;
+    Online::Server * m_server;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
@@ -52,7 +52,7 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(online::Server * server);
+    ServerInfoDialog(Online::Server * server);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index a610b35e6..dd0c1ba54 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -37,7 +37,7 @@
 #include "utils/translation.hpp"
 #include "online/servers_manager.hpp"
 
-using namespace online;
+using namespace Online;
 using namespace GUIEngine;
 
 DEFINE_SCREEN_SINGLETON( NetworkingLobby );
diff --git a/src/states_screens/networking_lobby.hpp b/src/states_screens/networking_lobby.hpp
index 5e5d65dee..b33b01d55 100644
--- a/src/states_screens/networking_lobby.hpp
+++ b/src/states_screens/networking_lobby.hpp
@@ -36,7 +36,7 @@ class NetworkingLobby :     public GUIEngine::Screen,
 private:
     friend class GUIEngine::ScreenSingleton<NetworkingLobby>;
 
-    online::Server * m_server;
+    Online::Server * m_server;
 
     NetworkingLobby();
 
diff --git a/src/states_screens/networking_lobby_settings.cpp b/src/states_screens/networking_lobby_settings.cpp
index cd5f26832..9909ff45c 100644
--- a/src/states_screens/networking_lobby_settings.cpp
+++ b/src/states_screens/networking_lobby_settings.cpp
@@ -36,6 +36,7 @@
 
 
 using namespace GUIEngine;
+using namespace Online;
 
 DEFINE_SCREEN_SINGLETON( NetworkingLobbySettings );
 
@@ -70,7 +71,7 @@ void NetworkingLobbySettings::loadedFromFile()
 // ----------------------------------------------------------------------------
 bool NetworkingLobbySettings::hasLostConnection()
 {
-    return !online::CurrentUser::get()->isSignedIn();
+    return !CurrentUser::get()->isSignedIn();
 }
 
 // ----------------------------------------------------------------------------
@@ -100,7 +101,7 @@ void NetworkingLobbySettings::createServer()
     const stringw name = m_name_widget->getText().trim();
     int max_players = m_max_players_widget->getValue();
     stringw info = "";
-    if(online::CurrentUser::get()->createServer(name, max_players, info))
+    /*if(online::CurrentUser::get()->createServer(name, max_players, info))
     {
         StateManager::get()->escapePressed();
         StateManager::get()->pushScreen(NetworkingLobby::getInstance());
@@ -110,7 +111,7 @@ void NetworkingLobbySettings::createServer()
         sfx_manager->quickSound( "anvil" );
         m_info_widget->setColor(irr::video::SColor(255, 255, 0, 0));
         m_info_widget->setText(info, false);
-    }
+    }*/
 }
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 335b88f06..890b6b377 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -37,14 +37,13 @@
 #include "states_screens/networking_lobby_settings.hpp"
 #include "states_screens/server_selection.hpp"
 #include "modes/demo_world.hpp"
-#include "utils/translation.hpp"
-#include "online/current_user.hpp"
 #include "online/servers_manager.hpp"
+#include "online/messages.hpp"
 
 
 
 using namespace GUIEngine;
-using namespace online;
+using namespace Online;
 
 DEFINE_SCREEN_SINGLETON( OnlineScreen );
 
@@ -52,8 +51,9 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
-    m_recorded_state = Not;
-    online::CurrentUser::get()->trySavedSession();
+    m_recorded_state = CurrentUser::SIGNED_OUT;
+    CurrentUser::acquire()->trySavedSession();
+    CurrentUser::release();
 }   // OnlineScreen
 
 // ----------------------------------------------------------------------------
@@ -87,16 +87,9 @@ void OnlineScreen::loadedFromFile()
 // ----------------------------------------------------------------------------
 bool OnlineScreen::hasStateChanged()
 {
-    State previous_state = m_recorded_state;
-    if(online::CurrentUser::get()->isSignedIn())
-    {
-        if(online::CurrentUser::get()->isGuest())
-            m_recorded_state = Guest;
-        else
-            m_recorded_state = Registered;
-    }
-    else
-        m_recorded_state = Not;
+    CurrentUser::UserState previous_state = m_recorded_state;
+    m_recorded_state = CurrentUser::acquire()->getUserState();
+    CurrentUser::release();
     if (previous_state != m_recorded_state)
         return true;
     return false;
@@ -109,19 +102,24 @@ void OnlineScreen::beforeAddingWidget()
     m_bottom_menu_widget->setVisible(true);
     m_top_menu_widget->setVisible(true);
     hasStateChanged();
-    if (m_recorded_state == Registered)
+    if (m_recorded_state == CurrentUser::SIGNED_IN)
     {
         m_register_widget->setVisible(false);
         m_sign_in_widget->setVisible(false);
     }
-    else if (m_recorded_state == Not)
+    else if (m_recorded_state == CurrentUser::SIGNED_OUT || CurrentUser::SIGNING_IN || CurrentUser::SIGNING_OUT)
     {
         m_quick_play_widget->setDeactivated();
         m_find_server_widget->setDeactivated();
         m_create_server_widget->setDeactivated();
         m_sign_out_widget->setVisible(false);
+        if(CurrentUser::SIGNING_IN || CurrentUser::SIGNING_OUT)
+        {
+            m_register_widget->setDeactivated();
+            m_sign_in_widget->setDeactivated();
+        }
     }
-    else if (m_recorded_state == Guest)
+    else if (m_recorded_state == CurrentUser::GUEST)
     {
         m_find_server_widget->setDeactivated();
         m_create_server_widget->setDeactivated();
@@ -138,12 +136,20 @@ void OnlineScreen::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime();
-    m_online_status_widget->setText(irr::core::stringw(_("Signed in as : ")) + online::CurrentUser::get()->getUserName() + ".", false);
+    m_load_timer = 0.0f;
+    m_online_status_widget->setText(Messages::signedInAs(CurrentUser::acquire()->getUserName()), false);
+    CurrentUser::release();
+
 }   // init
 
 // ----------------------------------------------------------------------------
 void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
+    if (m_recorded_state == CurrentUser::SIGNING_IN)
+    {
+        m_load_timer += delta;
+        m_online_status_widget->setText(Messages::signingIn(m_load_timer), false);
+    }
     if (hasStateChanged())
         GUIEngine::reshowCurrentScreen();
 }   // onUpdate
@@ -169,7 +175,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     else if (selection == "sign_out")
     {
         irr::core::stringw info;
-        if (online::CurrentUser::get()->signOut(info))
+        if (Online::CurrentUser::get()->signOut(info))
         {
             new MessageDialog(_("Signed out successfully."));
             //GUIEngine::reshowCurrentScreen();
@@ -194,7 +200,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
         //FIXME temporary and the request join + join sequence should be placed in one method somewhere
         Server * server = ServersManager::get()->getQuickPlay();
         irr::core::stringw info;
-        if (online::CurrentUser::get()->requestJoin( server->getServerId(), info))
+        if (Online::CurrentUser::get()->requestJoin( server->getServerId(), info))
         {
             ServersManager::get()->setJoinedServer(server);
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());
@@ -233,17 +239,18 @@ void OnlineScreen::onDisabledItemClicked(const std::string& item)
 // ----------------------------------------------------------------------------
 void OnlineScreen::setInitialFocus()
 {
-    if(m_recorded_state == Not)
-        m_bottom_menu_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
-    else
+    if(m_recorded_state == CurrentUser::SIGNED_IN)
         m_top_menu_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+    else
+        m_bottom_menu_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+
 }   // setInitialFocus
 
 // ----------------------------------------------------------------------------
 void OnlineScreen::onDialogClose()
 {
-    if (hasStateChanged())
+    /*if (hasStateChanged())
         GUIEngine::reshowCurrentScreen();
-    else
+    else*/
         setInitialFocus();
 }   // onDialogClose()
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index 055c5b092..7ecec0afb 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -22,6 +22,7 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
+#include "online/current_user.hpp"
 
 namespace GUIEngine { class Widget; class ListWidget; }
 
@@ -49,14 +50,9 @@ private:
     GUIEngine::IconButtonWidget * m_register_widget;
     GUIEngine::IconButtonWidget * m_sign_out_widget;
 
-    enum State
-    {
-        Not = 1,
-        Guest = 2,
-        Registered = 4
-    };
+    Online::CurrentUser::UserState m_recorded_state;
 
-    State m_recorded_state;
+    float m_load_timer;
 
     /** \brief Checks if the recorded state differs from the actual state and sets it. */
     bool hasStateChanged();
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 5fbf02235..a01983ef3 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -29,7 +29,7 @@
 #include "utils/string_utils.hpp"
 #include "online/servers_manager.hpp"
 
-using namespace online;
+using namespace Online;
 
 DEFINE_SCREEN_SINGLETON( ServerSelection );
 
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 554a410e6..fbf460909 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -709,14 +709,6 @@ namespace StringUtils
 		    printf("Invalid version string '%s'.\n", s.c_str());
 	    return version;
     }   // versionToInt
-
-    // ------------------------------------------------------------------------
-
-    irr::core::stringw loadingDots(float time, bool spaces, float interval, int max_dots)
-    {
-        int nr_dots = int(floor(time * (1 / interval))) % (max_dots+1);
-        return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
-    }
 } // namespace StringUtils
 
 
diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp
index cbec8570e..73a20cd91 100644
--- a/src/utils/string_utils.hpp
+++ b/src/utils/string_utils.hpp
@@ -413,9 +413,6 @@ namespace StringUtils
 
     /** Compute a simple hash of a string */
     unsigned int simpleHash(const char* input);
-
-
-    irr::core::stringw loadingDots(float time, bool spaces = true, float interval = 0.5f, int max_dots = 3);
 } // namespace StringUtils
 
 #endif

From 54333c17b005ae465a72d8eeccb3b4f0767a6539 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 19 Jul 2013 22:12:36 +0000
Subject: [PATCH 21/44] Fix. Asynchronous calls can now have callbacks.
 Thead-safeness improved.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13291 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp                 | 37 ++++++++-------------
 src/online/current_user.hpp                 | 22 +++++++-----
 src/online/request.cpp                      | 28 ++++++----------
 src/online/request.hpp                      | 18 +++++-----
 src/states_screens/dialogs/login_dialog.cpp | 31 +++++++++++++++--
 src/states_screens/dialogs/login_dialog.hpp |  2 ++
 src/states_screens/online_screen.cpp        |  4 +--
 7 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index b48d4eef0..dd65150b0 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -146,14 +146,13 @@ namespace Online{
 
     // ============================================================================
 
-    void CurrentUser::requestSignIn(    const irr::core::stringw &username,
-                                        const irr::core::stringw &password,
-                                        bool save_session)
+    CurrentUser::SignInRequest * CurrentUser::requestSignIn( const irr::core::stringw &username,
+                                                const irr::core::stringw &password,
+                                                bool save_session)
     {
         assert(m_state == SIGNED_OUT);
         m_save_session = save_session;
-        XMLRequest * request = new XMLRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        request->setListener(this, CurrentUser::SIGN_IN_REQUEST);
+        CurrentUser::SignInRequest * request = new CurrentUser::SignInRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("connect"));
         request->setParameter("username",username);
         request->setParameter("password",password);
@@ -162,9 +161,10 @@ namespace Online{
             assert(false);
         }
         m_state = SIGNING_IN;
+        return request;
     }
 
-    bool CurrentUser::signIn(XMLRequest * input)
+    void CurrentUser::signIn(SignInRequest * input)
     {
         const XMLNode * xml = input->getResult();
         bool success = false;
@@ -194,8 +194,14 @@ namespace Online{
             info = _("Unable to connect to the server. Check your internet connection or try again later.");
         }
         input->setInfo(info);
+        input->setSuccess(success);
         if(!success) m_state = SIGNED_OUT;
-        return success;
+    }
+
+    void CurrentUser::SignInRequest::callback()
+    {
+        CurrentUser::acquire()->signIn(this);
+        CurrentUser::release();
     }
 
     // ============================================================================
@@ -310,21 +316,4 @@ namespace Online{
             return _("Currently not signed in");
     }
 
-
-    // ============================================================================
-
-
-    void CurrentUser::onHTTPCallback(HTTPRequest * finished_request)
-    {
-        XMLRequest * input = (XMLRequest *) finished_request;
-
-        switch(finished_request->getListenerTarget())
-        {
-            case CurrentUser::SIGN_IN_REQUEST:
-                 signIn(input);
-                 break;
-            default:
-                 break;
-        }
-    }
 } // namespace Online
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 827374a7d..7bf0bc003 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -34,7 +34,7 @@ namespace Online{
       * \brief Class that represents an online registered user
       * \ingroup online
       */
-    class CurrentUser : public User, HTTPListener
+    class CurrentUser : public User
     {
         public:
 
@@ -47,17 +47,21 @@ namespace Online{
                 SIGNING_OUT
             };
 
-        private:
-            enum RequestType{
-                SIGN_IN_REQUEST
+            class SignInRequest : public XMLRequest
+            {
+            protected :
+                virtual void callback ();
+            public :
+                SignInRequest(const std::string &url) : XMLRequest(url) {}
             };
-            std::map<int, std::pair<bool, irr::core::stringw> > m_http_results;
+
+        private:
             std::string m_token;
             bool m_save_session;
             UserState m_state;
             CurrentUser();
 
-            bool signIn(XMLRequest * input);
+            void signIn(SignInRequest * input);
 
 
         public:
@@ -70,9 +74,9 @@ namespace Online{
 
             bool trySavedSession();
             // Login
-            void requestSignIn(     const irr::core::stringw &username,
-                                    const irr::core::stringw &password,
-                                    bool save_session);
+            SignInRequest * requestSignIn(  const irr::core::stringw &username,
+                                            const irr::core::stringw &password,
+                                            bool save_session);
 
             // Register
             bool signUp(    const irr::core::stringw &username,
diff --git a/src/online/request.cpp b/src/online/request.cpp
index 8dab69927..729f52474 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -32,6 +32,7 @@ namespace Online{
         m_priority      = priority;
         m_manage_memory = manage_memory;
         m_cancel        = false;
+        m_done.setAtomic(false);
     }   // Request
 
     Request::~Request()
@@ -45,6 +46,11 @@ namespace Online{
         afterOperation();
     }
 
+    void Request::afterOperation()
+    {
+        m_done.setAtomic(true);
+    }
+
     // =========================================================================================
 
     QuitRequest::QuitRequest()
@@ -62,25 +68,13 @@ namespace Online{
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
         m_added = false;
-        m_done.setAtomic(false);
-        m_listener.setAtomic(NULL);
-        m_listener_target = 0;
+        m_info = "";
+        m_success = false;
     }
 
     HTTPRequest::~HTTPRequest()
     {
         delete m_parameters;
-        m_listener.lock();
-        if (m_listener.getData() != NULL)
-        {
-            delete m_listener.getData();
-        }
-        m_listener.unlock();
-    }
-    void HTTPRequest::setListener(Synchronised<HTTPListener *> listener, int target)
-    {
-        m_listener = listener;
-        m_listener_target = 0;
     }
 
     bool HTTPRequest::isAllowedToAdd()
@@ -95,10 +89,8 @@ namespace Online{
 
     void HTTPRequest::afterOperation()
     {
-        if (m_listener != NULL)
-        {
-            m_listener->onHTTPCallback(this);
-        }
+        callback();
+        Request::afterOperation();
     }
 
     std::string HTTPRequest::downloadPage()
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 979180aa6..8dff0b480 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -23,7 +23,6 @@
 #include "utils/string_utils.hpp"
 #include "utils/synchronised.hpp"
 #include "io/file_manager.hpp"
-#include "online/http_listener.hpp"
 
 namespace Online{
 
@@ -47,9 +46,11 @@ namespace Online{
         *  be freed by the calling function. */
         bool                m_manage_memory;
 
+        Synchronised<bool>              m_done;
+
         virtual void beforeOperation() {}
         virtual void operation() = 0;
-        virtual void afterOperation() {}
+        virtual void afterOperation();
 
     public:
 
@@ -75,6 +76,8 @@ namespace Online{
         *  by network_http (i.e. freed once the request is handled). */
         bool manageMemory() const { return m_manage_memory; }
 
+        bool isDone(){return m_done.getAtomic();}
+
         virtual bool isAllowedToAdd() {return true;}
 
         /** This class is used by the priority queue to sort requests by priority.
@@ -116,11 +119,9 @@ namespace Online{
         *  packet is downloaded. At the end eithe -1 (error) or 1
         *  (everything ok) at the end. */
         Synchronised<float>             m_progress;
-        Synchronised<bool>              m_done;
         std::string                     m_url;
         bool                            m_added;
-        Synchronised<HTTPListener *>    m_listener;
-        int                             m_listener_target;
+        bool                            m_success;
         /**
          * info to show on screen if necessary
          */
@@ -139,6 +140,7 @@ namespace Online{
                                     size_t size,
                                     size_t nmemb,
                                     void *userp);
+        virtual void callback() {}
 
     public :
 
@@ -167,13 +169,13 @@ namespace Online{
         void setInfo(const irr::core::stringw & info) {m_info = info;}
         const irr::core::stringw & getInfo() {return m_info;}
 
+        void setSuccess(bool success = true){ m_success = success; }
+        bool isSuccess(){ return m_success; }
+
         const std::string &getURL() const {return m_url;}
 
         virtual bool isAllowedToAdd() OVERRIDE;
 
-        virtual void setListener(Synchronised<HTTPListener *> listener, int target = 0);
-        int getListenerTarget(){ return m_listener_target; }
-
     };
 
     class XMLRequest : public HTTPRequest
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 9edcd46bc..c332ee12d 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -26,6 +26,7 @@
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
+#include "online/messages.hpp"
 
 
 using namespace GUIEngine;
@@ -39,6 +40,8 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
+    m_load_timer = 0;
+    m_sign_in_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
     m_info_widget = getWidget<LabelWidget>("info");
@@ -93,6 +96,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 
 LoginDialog::~LoginDialog()
 {
+    delete m_sign_in_request;
 }
 
 
@@ -102,9 +106,8 @@ void LoginDialog::login()
 {
     const stringw username = m_username_widget->getText().trim();
     const stringw password = m_password_widget->getText().trim();
-    Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
+    m_sign_in_request = Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
     Online::CurrentUser::release();
-    m_self_destroy = true;
 }
 
 // -----------------------------------------------------------------------------
@@ -149,7 +152,29 @@ void LoginDialog::onEnterPressedInternal()
 
 void LoginDialog::onUpdate(float dt)
 {
-
+    if(m_sign_in_request != NULL)
+    {
+        if(m_sign_in_request->isDone())
+        {
+            if(m_sign_in_request->isSuccess())
+            {
+                m_self_destroy = true;
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
+                m_message_widget->setText(m_sign_in_request->getInfo(), false);
+            }
+            delete m_sign_in_request;
+            m_sign_in_request = NULL;
+        }
+        else
+        {
+            m_load_timer += dt;
+            m_message_widget->setText(Online::Messages::signingIn(m_load_timer), false);
+        }
+    }
     //If we want to open the registration dialog, we need to close this one first
     m_open_registration_dialog && (m_self_destroy = true);
 
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 171b4f934..347f0f955 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -37,6 +37,8 @@ private:
     
     bool m_self_destroy;
     bool m_open_registration_dialog;
+    float m_load_timer;
+    Online::CurrentUser::SignInRequest * m_sign_in_request;
 
     GUIEngine::LabelWidget * m_info_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 890b6b377..097594939 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -107,13 +107,13 @@ void OnlineScreen::beforeAddingWidget()
         m_register_widget->setVisible(false);
         m_sign_in_widget->setVisible(false);
     }
-    else if (m_recorded_state == CurrentUser::SIGNED_OUT || CurrentUser::SIGNING_IN || CurrentUser::SIGNING_OUT)
+    else if (m_recorded_state == CurrentUser::SIGNED_OUT || m_recorded_state == CurrentUser::SIGNING_IN || m_recorded_state == CurrentUser::SIGNING_OUT)
     {
         m_quick_play_widget->setDeactivated();
         m_find_server_widget->setDeactivated();
         m_create_server_widget->setDeactivated();
         m_sign_out_widget->setVisible(false);
-        if(CurrentUser::SIGNING_IN || CurrentUser::SIGNING_OUT)
+        if(m_recorded_state == CurrentUser::SIGNING_IN || m_recorded_state == CurrentUser::SIGNING_OUT)
         {
             m_register_widget->setDeactivated();
             m_sign_in_widget->setDeactivated();

From 8c9834a236a1d3a28507238ada420dce6ab91807 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 19 Jul 2013 22:41:54 +0000
Subject: [PATCH 22/44] Automatically signing in, is now very smooth.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13292 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp          | 63 ++++++++++------------------
 src/online/current_user.hpp          |  3 +-
 src/online/http_listener.hpp         | 41 ------------------
 src/states_screens/online_screen.cpp | 34 ++++++++++++---
 src/states_screens/online_screen.hpp |  2 +
 5 files changed, 55 insertions(+), 88 deletions(-)
 delete mode 100644 src/online/http_listener.hpp

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index dd65150b0..c7651dc4c 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -75,43 +75,6 @@ namespace Online{
         m_save_session = false;
     }
 
-    // ============================================================================
-    bool CurrentUser::trySavedSession()
-    {
-        if (m_state == SIGNED_IN) return true;
-        bool success = false;
-        if(UserConfigParams::m_saved_session)
-        {
-            HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-            connector->setParameter("action",std::string("saved-session"));
-            connector->setParameter("userid", UserConfigParams::m_saved_user);
-            connector->setParameter("token", UserConfigParams::m_saved_token.c_str());
-            const XMLNode * result = connector->getXMLFromPage();
-            std::string rec_success = "";
-            std::string info;
-            if(result->get("success", &rec_success))
-            {
-                if (rec_success =="yes")
-                {
-                    int token_fetched = result->get("token", &m_token);
-                    int username_fetched = result->get("username", &m_name);
-                    int userid_fetched = result->get("userid", &m_id);
-                    assert(token_fetched && username_fetched && userid_fetched);
-                    UserConfigParams::m_saved_token = m_token;
-                    m_state = SIGNED_IN;
-                    success = true;
-                }
-                result->get("info", &info);
-            }
-            else
-            {
-                Log::error("trySavedSession","%s",
-                    _("Unable to connect to the server. Check your internet connection or try again later."));
-            }
-        }
-        return success;
-    }
-
     // ============================================================================
     // Register
     bool CurrentUser::signUp(   const irr::core::stringw &username,
@@ -143,12 +106,31 @@ namespace Online{
         return success;
     }
 
+    // ============================================================================
+    CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
+    {
+        CurrentUser::SignInRequest * request = NULL;
+        if(m_state != SIGNED_IN  && UserConfigParams::m_saved_session)
+        {
+            request = new CurrentUser::SignInRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+            request->setParameter("action",std::string("saved-session"));
+            request->setParameter("userid", UserConfigParams::m_saved_user);
+            request->setParameter("token", UserConfigParams::m_saved_token.c_str());
+            if(!HTTPManager::get()->addRequest(request))
+            {
+                assert(false);
+            }
+            m_state = SIGNING_IN;
+        }
+        return request;
+    }
+
 
     // ============================================================================
 
-    CurrentUser::SignInRequest * CurrentUser::requestSignIn( const irr::core::stringw &username,
-                                                const irr::core::stringw &password,
-                                                bool save_session)
+    CurrentUser::SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
+                                                                const irr::core::stringw &password,
+                                                                bool save_session)
     {
         assert(m_state == SIGNED_OUT);
         m_save_session = save_session;
@@ -185,6 +167,7 @@ namespace Online{
                     UserConfigParams::m_saved_user = m_id;
                     UserConfigParams::m_saved_token = m_token;
                     UserConfigParams::m_saved_session = true;
+                    m_save_session = false;
                 }
             }
             xml->get("info", &info);
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 7bf0bc003..59ff59d18 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -72,8 +72,8 @@ namespace Online{
             static CurrentUser* acquire();
             static void release();
 
-            bool trySavedSession();
             // Login
+            SignInRequest * requestSavedSession();
             SignInRequest * requestSignIn(  const irr::core::stringw &username,
                                             const irr::core::stringw &password,
                                             bool save_session);
@@ -102,7 +102,6 @@ namespace Online{
             bool isGuest() const { return m_state == GUEST; }
             bool isSigningIn() const { return m_state == SIGNING_IN; }
             UserState getUserState() {return m_state;}
-            void onHTTPCallback(HTTPRequest * finished_request);
 
     };   // class CurrentUser
 
diff --git a/src/online/http_listener.hpp b/src/online/http_listener.hpp
deleted file mode 100644
index 36cf97f2b..000000000
--- a/src/online/http_listener.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HTTP_LISTENER_HPP
-#define HTTP_LISTENER_HPP
-
-#include <string>
-#include <curl/curl.h>
-#include <irrString.h>
-
-
-namespace Online{
-
-    class HTTPRequest;
-
-    class HTTPListener
-    {
-    public :
-        virtual ~HTTPListener() {}
-        virtual void onHTTPCallback(HTTPRequest * finished_request) {};
-    }; //class HTTPListener
-} // namespace Online
-
-#endif // HTTP_LISTENER_HPP
-
-/*EOF*/
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 097594939..c78ea4008 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -52,12 +52,19 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = CurrentUser::SIGNED_OUT;
-    CurrentUser::acquire()->trySavedSession();
+    m_sign_in_request = CurrentUser::acquire()->requestSavedSession();
     CurrentUser::release();
 }   // OnlineScreen
 
 // ----------------------------------------------------------------------------
 
+OnlineScreen::~OnlineScreen()
+{
+    delete m_sign_in_request;
+}
+
+// ----------------------------------------------------------------------------
+
 void OnlineScreen::loadedFromFile()
 {
     //Box ? FIXME
@@ -145,13 +152,30 @@ void OnlineScreen::init()
 // ----------------------------------------------------------------------------
 void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
+    if (hasStateChanged())
+        GUIEngine::reshowCurrentScreen();
     if (m_recorded_state == CurrentUser::SIGNING_IN)
     {
         m_load_timer += delta;
         m_online_status_widget->setText(Messages::signingIn(m_load_timer), false);
     }
-    if (hasStateChanged())
-        GUIEngine::reshowCurrentScreen();
+    if(m_sign_in_request != NULL)
+    {
+        if(m_sign_in_request->isDone())
+        {
+            if(m_sign_in_request->isSuccess())
+            {
+                new MessageDialog(_("Automatically signed in."));
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                new MessageDialog(m_sign_in_request->getInfo());
+            }
+            delete m_sign_in_request;
+            m_sign_in_request = NULL;
+        }
+    }
 }   // onUpdate
 
 // ----------------------------------------------------------------------------
@@ -249,8 +273,8 @@ void OnlineScreen::setInitialFocus()
 // ----------------------------------------------------------------------------
 void OnlineScreen::onDialogClose()
 {
-    /*if (hasStateChanged())
+    if (hasStateChanged())
         GUIEngine::reshowCurrentScreen();
-    else*/
+    else
         setInitialFocus();
 }   // onDialogClose()
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index 7ecec0afb..8814944cd 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -37,6 +37,7 @@ private:
     friend class GUIEngine::ScreenSingleton<OnlineScreen>;
 
     OnlineScreen();
+    ~OnlineScreen();
 
     GUIEngine::RibbonWidget * m_top_menu_widget;
     GUIEngine::IconButtonWidget * m_quick_play_widget;
@@ -53,6 +54,7 @@ private:
     Online::CurrentUser::UserState m_recorded_state;
 
     float m_load_timer;
+    Online::CurrentUser::SignInRequest * m_sign_in_request;
 
     /** \brief Checks if the recorded state differs from the actual state and sets it. */
     bool hasStateChanged();

From ebc3696de139ee518e8aff5fee28e6d6402628ae Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Jul 2013 01:38:44 +0000
Subject: [PATCH 23/44] Signing out is now also asynchronous. Made the
 extending of the requests easier.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13293 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp          | 78 +++++++++++++++-------------
 src/online/current_user.hpp          | 16 ++++--
 src/online/http_manager.cpp          | 25 +++------
 src/online/http_manager.hpp          |  2 +-
 src/online/request.cpp               |  9 +---
 src/online/request.hpp               |  5 +-
 src/states_screens/online_screen.cpp | 61 ++++++++++++++--------
 src/states_screens/online_screen.hpp |  3 +-
 8 files changed, 107 insertions(+), 92 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index c7651dc4c..55e4188dd 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -112,14 +112,12 @@ namespace Online{
         CurrentUser::SignInRequest * request = NULL;
         if(m_state != SIGNED_IN  && UserConfigParams::m_saved_session)
         {
-            request = new CurrentUser::SignInRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+            request = new CurrentUser::SignInRequest();
+            request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
             request->setParameter("action",std::string("saved-session"));
             request->setParameter("userid", UserConfigParams::m_saved_user);
             request->setParameter("token", UserConfigParams::m_saved_token.c_str());
-            if(!HTTPManager::get()->addRequest(request))
-            {
-                assert(false);
-            }
+            HTTPManager::get()->addRequest(request);
             m_state = SIGNING_IN;
         }
         return request;
@@ -134,14 +132,12 @@ namespace Online{
     {
         assert(m_state == SIGNED_OUT);
         m_save_session = save_session;
-        CurrentUser::SignInRequest * request = new CurrentUser::SignInRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        CurrentUser::SignInRequest * request = new CurrentUser::SignInRequest();
+        request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("connect"));
         request->setParameter("username",username);
         request->setParameter("password",password);
-        if(!HTTPManager::get()->addRequest(request))
-        {
-            assert(false);
-        }
+        HTTPManager::get()->addRequest(request);
         m_state = SIGNING_IN;
         return request;
     }
@@ -192,14 +188,14 @@ namespace Online{
     XMLRequest * CurrentUser::createServerRequest ( const irr::core::stringw &name, int max_players)
     {
         assert(m_state == SIGNED_IN);
-        XMLRequest * request = new XMLRequest((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        XMLRequest * request = NULL;//new XMLRequest();
+        request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",           std::string("create_server"));
         request->setParameter("token",            m_token);
         request->setParameter("userid",           m_id);
         request->setParameter("name",             name);
         request->setParameter("max_players",      max_players);
-        if(!HTTPManager::get()->addRequest(request))
-            assert(false);
+        HTTPManager::get()->addRequest(request);
         return request;
     }
 
@@ -226,36 +222,46 @@ namespace Online{
 
 
     // ============================================================================
-    bool CurrentUser::signOut(irr::core::stringw &info){
+    CurrentUser::SignOutRequest * CurrentUser::requestSignOut(){
         assert(m_state == SIGNED_IN || m_state == GUEST);
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",std::string("disconnect"));
-        connector->setParameter("token",m_token);
-        connector->setParameter("userid",m_id);
+        CurrentUser::SignOutRequest * request = new CurrentUser::SignOutRequest();
+        request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        request->setParameter("action",std::string("disconnect"));
+        request->setParameter("token",m_token);
+        request->setParameter("userid",m_id);
+        HTTPManager::get()->addRequest(request);
+        m_state = SIGNING_OUT;
+        return request;
+    }
 
-        bool success = false;
-        const XMLNode * result = connector->getXMLFromPage();
-        std::string rec_success = "";
-        if(result->get("success", &rec_success))
+    void CurrentUser::signOut(SignOutRequest * input)
+    {
+        const XMLNode * xml = input->getResult();
+        irr::core::stringw info;
+        std::string rec_success;
+        if(xml->get("success", &rec_success) && (rec_success =="yes"))
         {
-            if (rec_success =="yes")
-            {
-                m_token = "";
-                m_name = "";
-                m_id = 0;
-                m_state = SIGNED_OUT;
-                UserConfigParams::m_saved_user = 0;
-                UserConfigParams::m_saved_token = "";
-                UserConfigParams::m_saved_session = false;
-                success = true;
-            }
-            result->get("info", &info);
+            xml->get("info", &info);
         }
         else
         {
-            info = _("Unable to connect to the server. Check your internet connection or try again later.");
+            Log::warn("CurrentUser::signOut", "%s", _("There were some connection issues while signing out. Report a bug if this caused issues."));
         }
-        return success;
+        m_token = "";
+        m_name = "";
+        m_id = 0;
+        m_state = SIGNED_OUT;
+        UserConfigParams::m_saved_user = 0;
+        UserConfigParams::m_saved_token = "";
+        UserConfigParams::m_saved_session = false;
+        input->setInfo(info);
+        input->setSuccess(true);
+    }
+
+    void CurrentUser::SignOutRequest::callback()
+    {
+        CurrentUser::acquire()->signOut(this);
+        CurrentUser::release();
     }
 
     // ============================================================================
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 59ff59d18..b25b21138 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -49,10 +49,12 @@ namespace Online{
 
             class SignInRequest : public XMLRequest
             {
-            protected :
                 virtual void callback ();
-            public :
-                SignInRequest(const std::string &url) : XMLRequest(url) {}
+            };
+
+            class SignOutRequest : public XMLRequest
+            {
+                virtual void callback ();
             };
 
         private:
@@ -62,6 +64,7 @@ namespace Online{
             CurrentUser();
 
             void signIn(SignInRequest * input);
+            void signOut(SignOutRequest * input);
 
 
         public:
@@ -78,6 +81,10 @@ namespace Online{
                                             const irr::core::stringw &password,
                                             bool save_session);
 
+            // Logout - Best to be followed by CurrentUser::deallocate
+            SignOutRequest * requestSignOut();
+
+
             // Register
             bool signUp(    const irr::core::stringw &username,
                             const irr::core::stringw &password,
@@ -85,8 +92,7 @@ namespace Online{
                             const irr::core::stringw &email,
                             bool terms,
                             irr::core::stringw &info);
-            // Logout - Best to be followed by CurrentOnlineUser::deallocate
-            bool signOut(   irr::core::stringw &info);
+
 
             XMLRequest * createServerRequest(  const irr::core::stringw &name,
                                         int max_players);
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index 0afc703b0..65a48227c 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -63,6 +63,7 @@ namespace Online{
     HTTPManager::HTTPManager(){
         curl_global_init(CURL_GLOBAL_DEFAULT);
         pthread_cond_init(&m_cond_request, NULL);
+        m_abort.setAtomic(false);
     }
 
     // ============================================================================
@@ -140,24 +141,14 @@ namespace Online{
      *  sorted by priority.
      *  \param request The pointer to the new request to insert.
      */
-    bool HTTPManager::addRequest(Online::Request *request)
+    void HTTPManager::addRequest(Online::Request *request)
     {
-        if (request->isAllowedToAdd())
-        {
-            m_request_queue.lock();
-
-            m_request_queue.getData().push(request);
-            // Wake up the network http thread
-            pthread_cond_signal(&m_cond_request);
-
-            m_request_queue.unlock();
-            return true;
-        }
-        else
-        {
-            Log::info("HTTPManager::addrequest", "Did not add request.");
-            return false;
-        }
+        assert(request->isAllowedToAdd());
+        m_request_queue.lock();
+        m_request_queue.getData().push(request);
+        // Wake up the network http thread
+        pthread_cond_signal(&m_cond_request);
+        m_request_queue.unlock();
     }   // insertRequest
 
     // ---------------------------------------------------------------------------
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index f59998216..156cbcc60 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -82,7 +82,7 @@ namespace Online{
             std::string getPage(Online::Request * request);
             XMLNode * getXMLFromPage(Online::Request * request);
 
-            bool addRequest(Online::Request *request);
+            void addRequest(Online::Request *request);
             void cancelAllDownloads();
 
             bool getAbort(){ return m_abort.getAtomic(); };
diff --git a/src/online/request.cpp b/src/online/request.cpp
index 729f52474..e392fc4c5 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -61,7 +61,7 @@ namespace Online{
 
     // =========================================================================================
 
-    HTTPRequest::HTTPRequest(const std::string &url)
+    HTTPRequest::HTTPRequest(const std::string & url)
         : Request(1,false)
     {
         m_url = url;
@@ -80,10 +80,7 @@ namespace Online{
     bool HTTPRequest::isAllowedToAdd()
     {
         if (m_url.size() > 5 && ( m_url.substr(0, 5) != "http:"))
-        {
-            Log::info("HTTPRequest::isAllowedToAdd", "Invalid URL.");
             return false;
-        }
         return true;
     }
 
@@ -203,10 +200,6 @@ namespace Online{
 
 
     // =========================================================================================
-    XMLRequest::XMLRequest(const std::string &url)
-        : HTTPRequest(url)
-    {
-    }
 
     void XMLRequest::operation()
     {
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 8dff0b480..059b8f84f 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -144,7 +144,7 @@ namespace Online{
 
     public :
 
-        HTTPRequest(const std::string &url);
+        HTTPRequest(const std::string & url = "");
         virtual ~HTTPRequest();
 
         void setParameter(const std::string & name, const std::string &value){
@@ -173,6 +173,7 @@ namespace Online{
         bool isSuccess(){ return m_success; }
 
         const std::string &getURL() const {return m_url;}
+        void setURL(const std::string & url) { m_url = url;}
 
         virtual bool isAllowedToAdd() OVERRIDE;
 
@@ -185,7 +186,7 @@ namespace Online{
         virtual void operation() OVERRIDE;
 
     public :
-        XMLRequest(const std::string &url);
+        XMLRequest(const std::string & url = "") : HTTPRequest(url) {};
         virtual XMLNode * getResult() OVERRIDE { return m_result; }
     };
 } //namespace Online
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index c78ea4008..e59132997 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -52,7 +52,9 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = CurrentUser::SIGNED_OUT;
-    m_sign_in_request = CurrentUser::acquire()->requestSavedSession();
+    CurrentUser::SignInRequest * request = CurrentUser::acquire()->requestSavedSession();
+    if(request != NULL)
+        m_requests.push_back(request);
     CurrentUser::release();
 }   // OnlineScreen
 
@@ -60,7 +62,7 @@ OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 
 OnlineScreen::~OnlineScreen()
 {
-    delete m_sign_in_request;
+    m_requests.clearAndDeleteAll();
 }
 
 // ----------------------------------------------------------------------------
@@ -159,23 +161,44 @@ void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
         m_load_timer += delta;
         m_online_status_widget->setText(Messages::signingIn(m_load_timer), false);
     }
-    if(m_sign_in_request != NULL)
+    else if (m_recorded_state == CurrentUser::SIGNING_OUT)
     {
-        if(m_sign_in_request->isDone())
+        m_load_timer += delta;
+        m_online_status_widget->setText(Messages::signingOut(m_load_timer), false);
+    }
+
+    for(int i = m_requests.size()-1; i>=0; --i)
+    {
+        if(m_requests[i].isDone())
         {
-            if(m_sign_in_request->isSuccess())
+            if( dynamic_cast<CurrentUser::SignInRequest*>(m_requests.get(i)))
             {
-                new MessageDialog(_("Automatically signed in."));
-            }
-            else
+                if(m_requests[i].isSuccess())
+                {
+                    new MessageDialog(_("Automatically signed in."));
+                }
+                else
+                {
+                    sfx_manager->quickSound( "anvil" );
+                    new MessageDialog(m_requests[i].getInfo());
+                }
+            }else if( dynamic_cast<CurrentUser::SignOutRequest*>(m_requests.get(i)))
             {
-                sfx_manager->quickSound( "anvil" );
-                new MessageDialog(m_sign_in_request->getInfo());
+                if(m_requests[i].isSuccess())
+                {
+                    new MessageDialog(_("Signed out successfully."));
+                }
+                else
+                {
+                    sfx_manager->quickSound( "anvil" );
+                    new MessageDialog(m_requests[i].getInfo());
+                }
             }
-            delete m_sign_in_request;
-            m_sign_in_request = NULL;
+
+            m_requests.erase(i);
         }
     }
+
 }   // onUpdate
 
 // ----------------------------------------------------------------------------
@@ -198,14 +221,8 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
     else if (selection == "sign_out")
     {
-        irr::core::stringw info;
-        if (Online::CurrentUser::get()->signOut(info))
-        {
-            new MessageDialog(_("Signed out successfully."));
-            //GUIEngine::reshowCurrentScreen();
-        }
-        else
-            new MessageDialog(info);
+        m_requests.push_back(CurrentUser::acquire()->requestSignOut());
+        CurrentUser::release();
     }
     else if (selection == "register")
     {
@@ -238,10 +255,9 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
 }   // eventCallback
 
 // ----------------------------------------------------------------------------
-
 void OnlineScreen::tearDown()
 {
-}   // tearDown
+}
 
 // ----------------------------------------------------------------------------
 void OnlineScreen::onDisabledItemClicked(const std::string& item)
@@ -278,3 +294,4 @@ void OnlineScreen::onDialogClose()
     else
         setInitialFocus();
 }   // onDialogClose()
+
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index 8814944cd..7acfa6dee 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -54,7 +54,8 @@ private:
     Online::CurrentUser::UserState m_recorded_state;
 
     float m_load_timer;
-    Online::CurrentUser::SignInRequest * m_sign_in_request;
+
+    PtrVector<Online::XMLRequest> m_requests;
 
     /** \brief Checks if the recorded state differs from the actual state and sets it. */
     bool hasStateChanged();

From ac40b8111b395c5f1499ab8b78bd880b66cbf0ff Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Jul 2013 02:14:36 +0000
Subject: [PATCH 24/44] Decent killing of the network singleton and thread.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13294 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/main.cpp                | 3 +++
 src/online/http_manager.cpp | 5 +++++
 src/online/http_manager.hpp | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 9af900f6b..c1789f6e3 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -169,6 +169,7 @@
 #include "modes/demo_world.hpp"
 #include "modes/profile_world.hpp"
 #include "network/network_manager.hpp"
+#include "online/http_manager.hpp"
 #include "race/grand_prix_manager.hpp"
 #include "race/highscore_manager.hpp"
 #include "race/history.hpp"
@@ -1211,6 +1212,8 @@ void cleanSuperTuxKart()
 
     if(INetworkHttp::get())
         INetworkHttp::get()->stopNetworkThread();
+    if(Online::HTTPManager::isRunning())
+        Online::HTTPManager::get()->stopNetworkThread();
     //delete in reverse order of what they were created in.
     //see InitTuxkart()
     Referee::cleanup();
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index 65a48227c..c85f3b897 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -59,6 +59,11 @@ namespace Online{
         http_singleton = NULL;
     }   // deallocate
 
+    bool HTTPManager::isRunning()
+    {
+        return http_singleton != NULL;
+    }
+
 
     HTTPManager::HTTPManager(){
         curl_global_init(CURL_GLOBAL_DEFAULT);
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index 156cbcc60..575f71094 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -45,7 +45,7 @@ namespace Online{
         protected:
 
             /** The current requested being worked on. */
-            Online::Request                  *m_current_request;
+            Online::Request *         m_current_request;
 
             /** A conditional variable to wake up the main loop. */
             pthread_cond_t            m_cond_request;
@@ -66,8 +66,6 @@ namespace Online{
 
             static void  *mainLoop(void *obj);
             void startNetworkThread();
-            void stopNetworkThread();
-
 
             HTTPManager(); //const std::string &url
             ~HTTPManager();
@@ -77,6 +75,7 @@ namespace Online{
             // singleton
             static HTTPManager* get();
             static void deallocate();
+            static bool isRunning();
 
             //Execute
             std::string getPage(Online::Request * request);
@@ -84,6 +83,7 @@ namespace Online{
 
             void addRequest(Online::Request *request);
             void cancelAllDownloads();
+            void stopNetworkThread();
 
             bool getAbort(){ return m_abort.getAtomic(); };
 

From e0658700370cc2fbb7bfe851fef1d8c16753d716 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Jul 2013 14:21:17 +0000
Subject: [PATCH 25/44] Server joining and creating is now asynchronous.
 Enhanced LabelWidget to use (error) colors.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13295 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/login_dialog.stkgui           |   4 +-
 src/guiengine/widgets/label_widget.cpp        |  38 +++++-
 src/guiengine/widgets/label_widget.hpp        |  11 +-
 src/online/current_user.cpp                   | 119 +++++-------------
 src/online/current_user.hpp                   |  77 ++++++------
 src/online/messages.cpp                       |  10 ++
 src/online/messages.hpp                       |  10 +-
 src/online/request.cpp                        |  31 ++++-
 src/online/request.hpp                        |  28 ++---
 src/states_screens/dialogs/login_dialog.cpp   |  29 ++---
 src/states_screens/dialogs/login_dialog.hpp   |   4 +-
 .../dialogs/registration_dialog.cpp           |  12 +-
 .../dialogs/registration_dialog.hpp           |   4 +
 .../dialogs/server_info_dialog.cpp            |  47 +++++--
 .../dialogs/server_info_dialog.hpp            |   4 +
 src/states_screens/online_screen.cpp          |   3 +-
 16 files changed, 236 insertions(+), 195 deletions(-)

diff --git a/data/gui/online/login_dialog.stkgui b/data/gui/online/login_dialog.stkgui
index 6ba4d9619..5547e293a 100644
--- a/data/gui/online/login_dialog.stkgui
+++ b/data/gui/online/login_dialog.stkgui
@@ -7,7 +7,7 @@
        
        <spacer height="20" width="50">
        
-        <label id="info" proportion="2" width="90%" align="center" text_align="left" word_wrap="true" text=""/>
+        <label id="message" proportion="2" width="90%" align="center" text_align="left" word_wrap="true" text=""/>
     
         <spacer height="40" width="50">
         
@@ -42,7 +42,7 @@
         
         <spacer height="20" width="50">
         
-        <label id="message" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
+        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
            
         <spacer height="20" width="50"> 
         
diff --git a/src/guiengine/widgets/label_widget.cpp b/src/guiengine/widgets/label_widget.cpp
index cd88dcfe0..0dcfd1dc0 100644
--- a/src/guiengine/widgets/label_widget.cpp
+++ b/src/guiengine/widgets/label_widget.cpp
@@ -39,15 +39,17 @@ using namespace irr;
 LabelWidget::LabelWidget(bool title, bool bright) : Widget(WTYPE_LABEL)
 {
     m_title_font   = title;
-    m_has_color    = false;
     m_scroll_speed = 0;
     m_scroll_offset = 0;
+    m_bright = bright;
 
-    if (bright)
+    if (m_bright)
     {
         m_has_color = true;
         m_color = Skin::getColor("brighttext::neutral");
     }
+    else
+        m_has_color = false;
 }   // LabelWidget
 
 // ----------------------------------------------------------------------------
@@ -126,11 +128,11 @@ void LabelWidget::add()
 
 void LabelWidget::setText(const wchar_t *text, bool expandIfNeeded)
 {
+    assert(m_element != NULL);
     m_scroll_offset = 0;
 
     if (expandIfNeeded)
     {
-        assert(m_element != NULL);
 
         const int fwidth = (m_title_font ? GUIEngine::getTitleFont() : GUIEngine::getFont())->getDimension(text).Width;
         core::rect<s32> rect = m_element->getRelativePosition();
@@ -173,7 +175,6 @@ bool LabelWidget::scrolledOff() const
 {
     // This method may only be called after this widget has been add()ed
     assert(m_element != NULL);
-
     return m_scroll_offset <= -m_element->getAbsolutePosition().getWidth();
 }
 
@@ -189,9 +190,34 @@ void LabelWidget::setScrollSpeed(float speed)
 
 void LabelWidget::setColor(const irr::video::SColor& color)
 {
+    assert(m_element != NULL);
     m_color = color;
     m_has_color = true;
-    if (m_element != NULL)
-        ((IGUIStaticText*)m_element)->setOverrideColor(m_color);
+    ((IGUIStaticText*)m_element)->setOverrideColor(m_color);
+}
+// ----------------------------------------------------------------------------
+
+void LabelWidget::setErrorColor()
+{
+    setColor(irr::video::SColor(255, 255, 0, 0));
 }
 
+// ----------------------------------------------------------------------------
+
+void LabelWidget::setDefaultColor()
+{
+    if (m_bright)
+    {
+        setColor(Skin::getColor("brighttext::neutral"));
+    }
+    else
+    {
+        if(m_has_color)
+        {
+            assert(m_element != NULL);
+            m_has_color = false;
+            ((IGUIStaticText*)m_element)->enableOverrideColor(false);
+        }
+    }
+}
+// ----------------------------------------------------------------------------
diff --git a/src/guiengine/widgets/label_widget.hpp b/src/guiengine/widgets/label_widget.hpp
index fe6a46de3..5e94b39fd 100644
--- a/src/guiengine/widgets/label_widget.hpp
+++ b/src/guiengine/widgets/label_widget.hpp
@@ -34,6 +34,7 @@ namespace GUIEngine
       */
     class LabelWidget : public Widget
     {
+        bool               m_bright;
         bool               m_has_color;
         irr::video::SColor m_color;
 
@@ -58,10 +59,12 @@ namespace GUIEngine
         
         /** \brief Callback from base class Widget */
         virtual void add();
-                
-        /** Sets the color of the widget. 
+
+        /** Sets the color of the widget.
          *  \param color The color to use for this widget. */
         void     setColor(const irr::video::SColor& color);
+        void     setErrorColor();
+        void     setDefaultColor();
         
         /** \brief Callback from base class Widget */
         virtual void update(float dt);
@@ -83,11 +86,11 @@ namespace GUIEngine
         virtual void setText(const wchar_t *text, bool expandAsNeeded);
         
         /** Overloaded function which takes a stringw. */
-        virtual void setText(const irr::core::stringw &s, bool expandAsNeeded) 
+        virtual void setText(const irr::core::stringw &s, bool expandAsNeeded)
         {
             setText(s.c_str(), expandAsNeeded); 
         }
-        
+
         // --------------------------------------------------------------------
         
         /** Sets horizontal scroll speed. */
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 55e4188dd..eb8833924 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -123,9 +123,6 @@ namespace Online{
         return request;
     }
 
-
-    // ============================================================================
-
     CurrentUser::SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
                                                                 const irr::core::stringw &password,
                                                                 bool save_session)
@@ -142,39 +139,25 @@ namespace Online{
         return request;
     }
 
-    void CurrentUser::signIn(SignInRequest * input)
+    void CurrentUser::signIn(const SignInRequest * input)
     {
-        const XMLNode * xml = input->getResult();
-        bool success = false;
-        irr::core::stringw info;
-        std::string rec_success;
-        if(xml->get("success", &rec_success))
+        if (input->isSuccess())
         {
-            if (rec_success =="yes")
+            int token_fetched       = input->getResult()->get("token", &m_token);
+            int username_fetched    = input->getResult()->get("username", &m_name);
+            int userid_fetched      = input->getResult()->get("userid", &m_id);
+            assert(token_fetched && username_fetched && userid_fetched);
+            m_state = SIGNED_IN;
+            if(m_save_session)
             {
-                int token_fetched       = xml->get("token", &m_token);
-                int username_fetched    = xml->get("username", &m_name);
-                int userid_fetched      = xml->get("userid", &m_id);
-                assert(token_fetched && username_fetched && userid_fetched);
-                m_state = SIGNED_IN;
-                success = true;
-                if(m_save_session)
-                {
-                    UserConfigParams::m_saved_user = m_id;
-                    UserConfigParams::m_saved_token = m_token;
-                    UserConfigParams::m_saved_session = true;
-                    m_save_session = false;
-                }
+                UserConfigParams::m_saved_user = m_id;
+                UserConfigParams::m_saved_token = m_token;
+                UserConfigParams::m_saved_session = true;
+                m_save_session = false;
             }
-            xml->get("info", &info);
         }
         else
-        {
-            info = _("Unable to connect to the server. Check your internet connection or try again later.");
-        }
-        input->setInfo(info);
-        input->setSuccess(success);
-        if(!success) m_state = SIGNED_OUT;
+            m_state = SIGNED_OUT;
     }
 
     void CurrentUser::SignInRequest::callback()
@@ -185,10 +168,10 @@ namespace Online{
 
     // ============================================================================
 
-    XMLRequest * CurrentUser::createServerRequest ( const irr::core::stringw &name, int max_players)
+    CurrentUser::ServerCreationRequest * CurrentUser::requestServerCreation(const irr::core::stringw &name, int max_players)
     {
         assert(m_state == SIGNED_IN);
-        XMLRequest * request = NULL;//new XMLRequest();
+        ServerCreationRequest * request = new ServerCreationRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",           std::string("create_server"));
         request->setParameter("token",            m_token);
@@ -199,25 +182,9 @@ namespace Online{
         return request;
     }
 
-    bool CurrentUser::createServer( const XMLNode * input , irr::core::stringw &info)
+    void CurrentUser::ServerCreationRequest::callback()
     {
-        bool success = false;
-        std::string rec_success = "";
-        if(input->get("success", &rec_success))
-        {
-           if (rec_success =="yes")
-           {
-               // FIXME
-               success = true;
-           }
-           input->get("info", &info);
-        }
-        else
-        {
-           info = _("Unable to connect to the server. Check your internet connection or try again later.");
-        }
-
-        return success;
+        //FIXME To be filled in
     }
 
 
@@ -234,16 +201,9 @@ namespace Online{
         return request;
     }
 
-    void CurrentUser::signOut(SignOutRequest * input)
+    void CurrentUser::signOut(const SignOutRequest * input)
     {
-        const XMLNode * xml = input->getResult();
-        irr::core::stringw info;
-        std::string rec_success;
-        if(xml->get("success", &rec_success) && (rec_success =="yes"))
-        {
-            xml->get("info", &info);
-        }
-        else
+        if(!input->isSuccess())
         {
             Log::warn("CurrentUser::signOut", "%s", _("There were some connection issues while signing out. Report a bug if this caused issues."));
         }
@@ -254,8 +214,6 @@ namespace Online{
         UserConfigParams::m_saved_user = 0;
         UserConfigParams::m_saved_token = "";
         UserConfigParams::m_saved_session = false;
-        input->setInfo(info);
-        input->setSuccess(true);
     }
 
     void CurrentUser::SignOutRequest::callback()
@@ -266,33 +224,20 @@ namespace Online{
 
     // ============================================================================
 
-    bool CurrentUser::requestJoin(uint32_t server_id, irr::core::stringw &info){
+    CurrentUser::ServerJoinRequest *  CurrentUser::requestServerJoin(uint32_t server_id){
         assert(m_state == SIGNED_IN || m_state == GUEST);
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
-        connector->setParameter("action",std::string("request-connection"));
-        connector->setParameter("token", m_token);
-        connector->setParameter("id", m_id);
-        connector->setParameter("server_id", server_id);
-        bool success = false;
-        const XMLNode * result = connector->getXMLFromPage();
-        std::string rec_success = "";
-        if(result->get("success", &rec_success))
-        {
-            if (rec_success =="yes")
-            {
-                success = true;
-            }
-            else
-            {
-                success = false;
-            }
-            result->get("info", &info);
-        }
-        else
-        {
-            info = _("Unable to connect to the server. Check your internet connection or try again later.");
-        }
-        return success;
+        CurrentUser::ServerJoinRequest * request = new CurrentUser::ServerJoinRequest();
+        request->setURL((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
+        request->setParameter("action",std::string("request-connection"));
+        request->setParameter("token", m_token);
+        request->setParameter("id", m_id);
+        request->setParameter("server_id", server_id);
+        return request;
+    }
+
+    void CurrentUser::ServerJoinRequest::callback()
+    {
+        //FIXME To be filled in
     }
 
     // ============================================================================
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index b25b21138..5558df5fa 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -37,7 +37,6 @@ namespace Online{
     class CurrentUser : public User
     {
         public:
-
             enum UserState
             {
                 SIGNED_OUT,
@@ -57,57 +56,61 @@ namespace Online{
                 virtual void callback ();
             };
 
+            class ServerCreationRequest : public XMLRequest
+            {
+                virtual void callback ();
+            };
+
+            class ServerJoinRequest : public XMLRequest
+            {
+                virtual void callback ();
+            };
+
         private:
-            std::string m_token;
-            bool m_save_session;
-            UserState m_state;
+            std::string                 m_token;
+            bool                        m_save_session;
+            UserState                   m_state;
+
             CurrentUser();
 
-            void signIn(SignInRequest * input);
-            void signOut(SignOutRequest * input);
+            void signIn                 (const SignInRequest            * input);
+            void signOut                (const SignOutRequest           * input);
+            void createServer           (const ServerCreationRequest    * input);
 
 
         public:
-            // singleton
-            static CurrentUser* get();
-            static void deallocate();
+            static CurrentUser*         get(); //FIXME To be removed
 
-            static CurrentUser* acquire();
-            static void release();
+            //Singleton methods
+            static CurrentUser*         acquire();
+            static void                 release();
+            static void                 deallocate();
 
-            // Login
-            SignInRequest * requestSavedSession();
-            SignInRequest * requestSignIn(  const irr::core::stringw &username,
-                                            const irr::core::stringw &password,
-                                            bool save_session);
-
-            // Logout - Best to be followed by CurrentUser::deallocate
-            SignOutRequest * requestSignOut();
+            SignInRequest *             requestSavedSession();
+            SignInRequest *             requestSignIn(          const irr::core::stringw &username,
+                                                                const irr::core::stringw &password,
+                                                                bool save_session);
+            SignOutRequest *            requestSignOut();
+            ServerCreationRequest *     requestServerCreation(  const irr::core::stringw &name, int max_players);
+            ServerJoinRequest *         requestServerJoin(      uint32_t server_id);
 
 
             // Register
-            bool signUp(    const irr::core::stringw &username,
-                            const irr::core::stringw &password,
-                            const irr::core::stringw &password_ver,
-                            const irr::core::stringw &email,
-                            bool terms,
-                            irr::core::stringw &info);
+            bool                        signUp(                 const irr::core::stringw &username,
+                                                                const irr::core::stringw &password,
+                                                                const irr::core::stringw &password_ver,
+                                                                const irr::core::stringw &email,
+                                                                bool terms,
+                                                                irr::core::stringw &info);
 
 
-            XMLRequest * createServerRequest(  const irr::core::stringw &name,
-                                        int max_players);
-
-            bool createServer ( const XMLNode * input, irr::core::stringw &info);
-
-            bool requestJoin(   uint32_t server_id,
-                                irr::core::stringw &info);
 
             /** Returns the username if signed in. */
-            irr::core::stringw getUserName() const;
-            bool isSignedIn() const { return m_state == SIGNED_IN; }
-            bool isGuest() const { return m_state == GUEST; }
-            bool isSigningIn() const { return m_state == SIGNING_IN; }
-            UserState getUserState() {return m_state;}
+            irr::core::stringw          getUserName()   const;
+            bool                        isSignedIn()    const   { return m_state == SIGNED_IN; }
+            bool                        isGuest()       const   { return m_state == GUEST; }
+            bool                        isSigningIn()   const   { return m_state == SIGNING_IN; }
+            UserState                   getUserState()          { return m_state; }
 
     };   // class CurrentUser
 
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
index cd1055886..570454bb4 100644
--- a/src/online/messages.cpp
+++ b/src/online/messages.cpp
@@ -46,6 +46,16 @@ namespace Online
         {
             return irr::core::stringw(_("Signed in as : ")) + name + ".";
         }
+
+        irr::core::stringw joiningServer(float timer)
+        {
+            return irr::core::stringw(_("Joining server")) + loadingDots(timer);
+        }
+
+        irr::core::stringw creatingServer(float timer)
+        {
+            return irr::core::stringw(_("Creating server")) + loadingDots(timer);
+        }
     } // namespace messages
 } // namespace Online
 
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
index 800f22e03..717527f63 100644
--- a/src/online/messages.hpp
+++ b/src/online/messages.hpp
@@ -26,10 +26,12 @@ namespace Online
 {
     namespace Messages
     {
-        irr::core::stringw loadingDots(float timer, bool spaces = true, float interval = 0.5f, int max_dots = 3);
-        irr::core::stringw signingIn  (float timer);
-        irr::core::stringw signingOut (float timer);
-        irr::core::stringw signedInAs (const irr::core::stringw & name);
+        irr::core::stringw loadingDots          (float timer, bool spaces = true, float interval = 0.5f, int max_dots = 3);
+        irr::core::stringw signingIn            (float timer);
+        irr::core::stringw signingOut           (float timer);
+        irr::core::stringw joiningServer        (float timer);
+        irr::core::stringw creatingServer       (float timer);
+        irr::core::stringw signedInAs           (const irr::core::stringw & name);
     } // namespace Messages
 }// namespace Online
 #endif
diff --git a/src/online/request.cpp b/src/online/request.cpp
index e392fc4c5..787ea3416 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -19,6 +19,7 @@
 #include <curl/curl.h>
 #include <assert.h>
 #include <online/http_manager.hpp>
+#include <utils/translation.hpp>
 
 
 namespace Online{
@@ -68,8 +69,6 @@ namespace Online{
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
         m_added = false;
-        m_info = "";
-        m_success = false;
     }
 
     HTTPRequest::~HTTPRequest()
@@ -201,8 +200,36 @@ namespace Online{
 
     // =========================================================================================
 
+    XMLRequest::XMLRequest(const std::string & url)
+        : HTTPRequest(url)
+    {
+        m_info = "";
+        m_success = false;
+        m_result = NULL;
+    }
+
+
     void XMLRequest::operation()
     {
         m_result = file_manager->createXMLTreeFromString(downloadPage());
     }
+
+    void XMLRequest::afterOperation()
+    {
+        const XMLNode * xml = this->getResult();
+        bool success = false;
+        irr::core::stringw info;
+        std::string rec_success;
+        if(xml->get("success", &rec_success))
+        {
+            if (rec_success =="yes")
+                success = true;
+            xml->get("info", &info);
+        }
+        else
+            info = _("Unable to connect to the server. Check your internet connection or try again later.");
+        m_info = info;
+        m_success = success;
+        HTTPRequest::afterOperation();
+    }
 } // namespace Online
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 059b8f84f..b2dc05b33 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -121,11 +121,6 @@ namespace Online{
         Synchronised<float>             m_progress;
         std::string                     m_url;
         bool                            m_added;
-        bool                            m_success;
-        /**
-         * info to show on screen if necessary
-         */
-        irr::core::stringw  m_info;
 
         virtual void afterOperation();
         std::string downloadPage();
@@ -166,12 +161,6 @@ namespace Online{
         /** Sets the current progress. */
         void setProgress(float f) { m_progress.setAtomic(f); }
 
-        void setInfo(const irr::core::stringw & info) {m_info = info;}
-        const irr::core::stringw & getInfo() {return m_info;}
-
-        void setSuccess(bool success = true){ m_success = success; }
-        bool isSuccess(){ return m_success; }
-
         const std::string &getURL() const {return m_url;}
         void setURL(const std::string & url) { m_url = url;}
 
@@ -182,12 +171,21 @@ namespace Online{
     class XMLRequest : public HTTPRequest
     {
     protected :
-        XMLNode * m_result;
-        virtual void operation() OVERRIDE;
+
+        XMLNode *                       m_result;
+        irr::core::stringw              m_info;
+        bool                            m_success;
+
+        virtual void                    operation() OVERRIDE;
+        virtual void                    afterOperation() OVERRIDE;
 
     public :
-        XMLRequest(const std::string & url = "") : HTTPRequest(url) {};
-        virtual XMLNode * getResult() OVERRIDE { return m_result; }
+        XMLRequest(const std::string & url = "");
+
+        virtual XMLNode *               getResult() const       { return m_result; }
+        const irr::core::stringw &      getInfo()   const       { return m_info; }
+        bool                            isSuccess() const       { return m_success; }
+
     };
 } //namespace Online
 
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index c332ee12d..10f15c7c7 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -44,22 +44,22 @@ LoginDialog::LoginDialog(const Message message_type) :
     m_sign_in_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
-    m_info_widget = getWidget<LabelWidget>("info");
-    assert(m_info_widget != NULL);
-    irr::core::stringw info;
+    m_message_widget = getWidget<LabelWidget>("message");
+    assert(m_message_widget != NULL);
+    irr::core::stringw message;
     if (message_type == Normal)
-        info =  _("Fill in your username and password. ");
+        message =  _("Fill in your username and password. ");
     else if (message_type == Signing_In_Required)
-        info =  _("You need to sign in to be able to use this feature. ");
+        message =  _("You need to sign in to be able to use this feature. ");
     else if (message_type == Registration_Required)
-        info =  _("You need to be a registered user to enjoy this feature! "
+        message =  _("You need to be a registered user to enjoy this feature! "
                   "If you do not have an account yet, you can sign up using the register icon at the bottom.");
     else
-        info = "";
+        message = "";
     if (message_type == Normal || message_type == Signing_In_Required)
-        info += _("If you do not have an account yet, you can choose to sign in as a guest "
+        message += _("If you do not have an account yet, you can choose to sign in as a guest "
                   "or press the register icon at the bottom to gain access to all the features!");
-    m_info_widget->setText(info, false);
+    m_message_widget->setText(message, false);
 
     m_username_widget = getWidget<TextBoxWidget>("username");
     assert(m_username_widget != NULL);
@@ -73,8 +73,8 @@ LoginDialog::LoginDialog(const Message message_type) :
     assert(m_remember_widget != NULL);
     m_remember_widget->setState(false);
 
-    m_message_widget = getWidget<LabelWidget>("message");
-    assert(m_message_widget != NULL);
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
 
     m_options_widget = getWidget<RibbonWidget>("options");
     assert(m_options_widget != NULL);
@@ -163,8 +163,8 @@ void LoginDialog::onUpdate(float dt)
             else
             {
                 sfx_manager->quickSound( "anvil" );
-                m_message_widget->setColor(irr::video::SColor(255, 255, 0, 0));
-                m_message_widget->setText(m_sign_in_request->getInfo(), false);
+                m_info_widget->setErrorColor();
+                m_info_widget->setText(m_sign_in_request->getInfo(), false);
             }
             delete m_sign_in_request;
             m_sign_in_request = NULL;
@@ -172,7 +172,8 @@ void LoginDialog::onUpdate(float dt)
         else
         {
             m_load_timer += dt;
-            m_message_widget->setText(Online::Messages::signingIn(m_load_timer), false);
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::signingIn(m_load_timer), false);
         }
     }
     //If we want to open the registration dialog, we need to close this one first
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 347f0f955..21a2dcc27 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -40,11 +40,11 @@ private:
     float m_load_timer;
     Online::CurrentUser::SignInRequest * m_sign_in_request;
 
-    GUIEngine::LabelWidget * m_info_widget;
+    GUIEngine::LabelWidget * m_message_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
     GUIEngine::TextBoxWidget * m_password_widget;
     GUIEngine::CheckBoxWidget * m_remember_widget;
-    GUIEngine::LabelWidget * m_message_widget;
+    GUIEngine::LabelWidget * m_info_widget;
 
     GUIEngine::RibbonWidget * m_options_widget;
     GUIEngine::IconButtonWidget * m_sign_in_widget;
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index d041e783b..7784f93e6 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -22,10 +22,6 @@
 #include "audio/sfx_manager.hpp"
 #include "config/player.hpp"
 #include "guiengine/engine.hpp"
-#include "guiengine/widgets/button_widget.hpp"
-#include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/text_box_widget.hpp"
-#include "guiengine/widgets/check_box_widget.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
@@ -97,10 +93,10 @@ void RegistrationDialog::showRegistrationInfo(){
     assert(textBox != NULL);
     textBox->setText(m_email_confirm);
 
-    LabelWidget * label = getWidget<LabelWidget>("info");
-    assert(label != NULL);
-    label->setColor(irr::video::SColor(255, 255, 0, 0));
-    label->setText(m_registration_error, false);
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+    m_info_widget->setErrorColor();
+    m_info_widget->setText(m_registration_error, false);
 
     ButtonWidget * button = getWidget<ButtonWidget>("next");
     assert(button != NULL);
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index 2fe24d5d4..ed3298722 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -22,6 +22,7 @@
 #include <irrString.h>
 
 #include "guiengine/modaldialog.hpp"
+#include "guiengine/widgets.hpp"
 /**
  * \brief Dialog that allows a user to register
  * \ingroup states_screens
@@ -46,6 +47,9 @@ public:
     virtual void onUpdate(float dt);
 
 private:
+
+    GUIEngine::LabelWidget * m_info_widget;
+
     Phase m_phase;
     bool m_self_destroy;
     bool m_show_registration_info;
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 34ae384b8..d4bda7b8e 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -27,10 +27,12 @@
 #include "utils/string_utils.hpp"
 #include "online/current_user.hpp"
 #include "online/servers_manager.hpp"
+#include "online/messages.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/networking_lobby.hpp"
 
 
+
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
@@ -44,6 +46,8 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
     m_server = server;
     m_self_destroy = false;
     m_enter_lobby = false;
+    m_server_join_request = NULL;
+    m_load_timer = 0;
 
     loadFromFile("online/server_info_dialog.stkgui");
 
@@ -66,23 +70,13 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
 // -----------------------------------------------------------------------------
 ServerInfoDialog::~ServerInfoDialog()
 {
+    delete m_server_join_request;
 }
 // -----------------------------------------------------------------------------
 void ServerInfoDialog::requestJoin()
 {
-    //FIXME totally not correct. Receiving an answer, not kept in mind.
-    irr::core::stringw info;
-    if (Online::CurrentUser::get()->requestJoin( m_server->getServerId(), info))
-    {
-        ServersManager::get()->setJoinedServer(m_server);
-        m_enter_lobby = true;
-    }
-    else
-    {
-        sfx_manager->quickSound( "anvil" );
-        m_info_widget->setColor(irr::video::SColor(255, 255, 0, 0));
-        m_info_widget->setText(info, false);
-    }
+    m_server_join_request = Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
+    Online::CurrentUser::release();
 }
 
 // -----------------------------------------------------------------------------
@@ -122,6 +116,33 @@ void ServerInfoDialog::onEnterPressedInternal()
 
 void ServerInfoDialog::onUpdate(float dt)
 {
+    if(m_server_join_request != NULL)
+    {
+        if(m_server_join_request->isDone())
+        {
+            if(m_server_join_request->isSuccess())
+            {
+                ServersManager::get()->setJoinedServer(m_server);
+                m_enter_lobby = true;
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_info_widget->setErrorColor();
+                m_info_widget->setText(m_server_join_request->getInfo(), false);
+            }
+            delete m_server_join_request;
+            m_server_join_request = NULL;
+        }
+        else
+        {
+            m_load_timer += dt;
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::joiningServer(m_load_timer), false);
+        }
+    }
+
+
     //If we want to open the registration dialog, we need to close this one first
     m_enter_lobby && (m_self_destroy = true);
 
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 200240501..2839c1c87 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -26,6 +26,7 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/label_widget.hpp"
 #include "online/server.hpp"
+#include "online/current_user.hpp"
 
 
 /**
@@ -40,7 +41,10 @@ private:
     bool m_self_destroy;
     bool m_enter_lobby;
 
+    float m_load_timer;
+
     Online::Server * m_server;
+    Online::CurrentUser::ServerJoinRequest * m_server_join_request;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index e59132997..40688d2bb 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -239,6 +239,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     else if (selection == "quick_play")
     {
         //FIXME temporary and the request join + join sequence should be placed in one method somewhere
+            /*
         Server * server = ServersManager::get()->getQuickPlay();
         irr::core::stringw info;
         if (Online::CurrentUser::get()->requestJoin( server->getServerId(), info))
@@ -249,7 +250,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
         else
         {
             sfx_manager->quickSound( "anvil" );
-        }
+        }*/
     }
 
 }   // eventCallback

From 4a96c676972c5c2613ef52392c90eaca0b30232f Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Jul 2013 15:46:25 +0000
Subject: [PATCH 26/44] Added method to check if a widget is active or not

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13296 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/widget.cpp | 9 +++++++++
 src/guiengine/widget.hpp | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/guiengine/widget.cpp b/src/guiengine/widget.cpp
index eb59c6a83..f9ba2fcf9 100644
--- a/src/guiengine/widget.cpp
+++ b/src/guiengine/widget.cpp
@@ -327,6 +327,15 @@ bool Widget::isVisible() const
 
 // -----------------------------------------------------------------------------
 
+bool Widget::isActivated() const
+{
+    if (isVisible())
+        return !m_deactivated;
+    return false;
+}
+
+// -----------------------------------------------------------------------------
+
 void Widget::setVisible(bool visible)
 {
     if (m_element != NULL)
diff --git a/src/guiengine/widget.hpp b/src/guiengine/widget.hpp
index 889a502f2..ce812de61 100644
--- a/src/guiengine/widget.hpp
+++ b/src/guiengine/widget.hpp
@@ -326,6 +326,8 @@ namespace GUIEngine
         /** Returns if the element is visible. */
         bool isVisible() const;
 
+        bool isActivated() const;
+
         /**
          * Call to resize/move the widget. Not all widgets can resize gracefully.
          */

From eafcbc71033efb7fa4517376d1690404e85485c2 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sat, 20 Jul 2013 15:52:59 +0000
Subject: [PATCH 27/44] Client side checking for the client and deactivating
 actions during sign in request.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13297 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/dialogs/login_dialog.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 10f15c7c7..4fa138cfd 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -106,8 +106,18 @@ void LoginDialog::login()
 {
     const stringw username = m_username_widget->getText().trim();
     const stringw password = m_password_widget->getText().trim();
-    m_sign_in_request = Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
-    Online::CurrentUser::release();
+    if (username.size() < 4 || username.size() > 30 || password.size() < 8 || password.size() > 30)
+    {
+        sfx_manager->quickSound("anvil");
+        m_info_widget->setErrorColor();
+        m_info_widget->setText(_("Username and/or password invalid."), false);
+    }
+    else
+    {
+        m_options_widget->setDeactivated();
+        m_sign_in_request = Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
+        Online::CurrentUser::release();
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -145,7 +155,8 @@ void LoginDialog::onEnterPressedInternal()
     const int playerID = PLAYER_ID_GAME_MASTER;
     if (GUIEngine::isFocusedForPlayer(m_options_widget, playerID))
         return;
-    login();
+    if (m_sign_in_widget->isActivated())
+        login();
 }
 
 // -----------------------------------------------------------------------------
@@ -166,6 +177,7 @@ void LoginDialog::onUpdate(float dt)
                 m_info_widget->setErrorColor();
                 m_info_widget->setText(m_sign_in_request->getInfo(), false);
             }
+            m_options_widget->setActivated();
             delete m_sign_in_request;
             m_sign_in_request = NULL;
         }

From e84159f0c99b1b6e7f4656ceaf4b1a4040f2ae41 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 00:47:48 +0000
Subject: [PATCH 28/44] Made a response queue for the http manager. Adapted
 everything to use it. Enhanced registration process. Loading messages use the
 global timer.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13302 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/registration_terms.stkgui     |  5 ++
 src/online/current_user.cpp                   | 72 ++++++++-----------
 src/online/current_user.hpp                   | 69 +++++++++---------
 src/online/http_manager.cpp                   | 39 +++++++++-
 src/online/http_manager.hpp                   | 12 +++-
 src/online/messages.cpp                       | 21 +++---
 src/online/messages.hpp                       | 10 +--
 src/online/request.cpp                        | 14 ++--
 src/online/request.hpp                        | 51 +++++++------
 src/states_screens/dialogs/login_dialog.cpp   | 42 ++++++-----
 src/states_screens/dialogs/login_dialog.hpp   |  4 +-
 .../dialogs/registration_dialog.cpp           | 72 ++++++++++++-------
 .../dialogs/registration_dialog.hpp           |  6 +-
 .../dialogs/server_info_dialog.cpp            | 42 +++++------
 .../dialogs/server_info_dialog.hpp            |  2 +-
 src/states_screens/online_screen.cpp          | 66 ++++++++---------
 src/states_screens/online_screen.hpp          |  4 --
 17 files changed, 290 insertions(+), 241 deletions(-)

diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui
index 25b94f392..5ad1bf667 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/online/registration_terms.stkgui
@@ -17,6 +17,11 @@
         </div>
         
         <spacer height="20" width="50">
+        
+        <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true"
+           I18N="In the registration dialog' dialog" text=""/>
+           
+        <spacer height="20" width="50"> 
                 
         <div id="options" width="fit" proportion="1" align="center" layout="horizontal-row">
             <button id="previous" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Previous"/>
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index eb8833924..1bfdcd04e 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -76,43 +76,30 @@ namespace Online{
     }
 
     // ============================================================================
-    // Register
-    bool CurrentUser::signUp(   const irr::core::stringw &username,
-                                const irr::core::stringw &password,
-                                const irr::core::stringw &password_ver,
-                                const irr::core::stringw &email,
-                                bool terms,
-                                irr::core::stringw &info)
+    XMLRequest * CurrentUser::requestSignUp(    const irr::core::stringw &username,
+                                                const irr::core::stringw &password,
+                                                const irr::core::stringw &password_confirm,
+                                                const irr::core::stringw &email,
+                                                bool terms)
     {
         assert(m_state == SIGNED_OUT || m_state == GUEST);
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",std::string("register"));
-        connector->setParameter("username",username);
-        connector->setParameter("password",password);
-
-        const XMLNode * result = connector->getXMLFromPage();
-        std::string rec_success;
-
-        bool success = false;
-        if(result->get("success", &rec_success))
-        {
-            success = (rec_success == "yes");
-            assert(result->get("info", &info));
-        }
-        else
-        {
-            info = _("Unable to connect to the server. Check your internet connection or try again later.");
-        }
-        return success;
+        XMLRequest * request = new XMLRequest(Request::RT_SIGN_UP);
+        request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+        request->setParameter("action",std::string("register"));
+        request->setParameter("username",username);
+        request->setParameter("password",password);
+        request->setParameter("password_confirm",password_confirm);
+        HTTPManager::get()->addRequest(request);
+        return request;
     }
 
     // ============================================================================
-    CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
+    SignInRequest * CurrentUser::requestSavedSession()
     {
-        CurrentUser::SignInRequest * request = NULL;
+        SignInRequest * request = NULL;
         if(m_state != SIGNED_IN  && UserConfigParams::m_saved_session)
         {
-            request = new CurrentUser::SignInRequest();
+            request = new SignInRequest();
             request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
             request->setParameter("action",std::string("saved-session"));
             request->setParameter("userid", UserConfigParams::m_saved_user);
@@ -123,13 +110,13 @@ namespace Online{
         return request;
     }
 
-    CurrentUser::SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
+    SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
                                                                 const irr::core::stringw &password,
                                                                 bool save_session)
     {
         assert(m_state == SIGNED_OUT);
         m_save_session = save_session;
-        CurrentUser::SignInRequest * request = new CurrentUser::SignInRequest();
+        SignInRequest * request = new SignInRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("connect"));
         request->setParameter("username",username);
@@ -160,7 +147,7 @@ namespace Online{
             m_state = SIGNED_OUT;
     }
 
-    void CurrentUser::SignInRequest::callback()
+    void SignInRequest::callback()
     {
         CurrentUser::acquire()->signIn(this);
         CurrentUser::release();
@@ -168,7 +155,7 @@ namespace Online{
 
     // ============================================================================
 
-    CurrentUser::ServerCreationRequest * CurrentUser::requestServerCreation(const irr::core::stringw &name, int max_players)
+    ServerCreationRequest * CurrentUser::requestServerCreation(const irr::core::stringw &name, int max_players)
     {
         assert(m_state == SIGNED_IN);
         ServerCreationRequest * request = new ServerCreationRequest();
@@ -182,16 +169,15 @@ namespace Online{
         return request;
     }
 
-    void CurrentUser::ServerCreationRequest::callback()
+    void ServerCreationRequest::callback()
     {
-        //FIXME To be filled in
+        //FIXME
     }
 
-
     // ============================================================================
-    CurrentUser::SignOutRequest * CurrentUser::requestSignOut(){
+    SignOutRequest * CurrentUser::requestSignOut(){
         assert(m_state == SIGNED_IN || m_state == GUEST);
-        CurrentUser::SignOutRequest * request = new CurrentUser::SignOutRequest();
+        SignOutRequest * request = new SignOutRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("disconnect"));
         request->setParameter("token",m_token);
@@ -216,7 +202,7 @@ namespace Online{
         UserConfigParams::m_saved_session = false;
     }
 
-    void CurrentUser::SignOutRequest::callback()
+    void SignOutRequest::callback()
     {
         CurrentUser::acquire()->signOut(this);
         CurrentUser::release();
@@ -224,9 +210,9 @@ namespace Online{
 
     // ============================================================================
 
-    CurrentUser::ServerJoinRequest *  CurrentUser::requestServerJoin(uint32_t server_id){
+    ServerJoinRequest *  CurrentUser::requestServerJoin(uint32_t server_id){
         assert(m_state == SIGNED_IN || m_state == GUEST);
-        CurrentUser::ServerJoinRequest * request = new CurrentUser::ServerJoinRequest();
+        ServerJoinRequest * request = new ServerJoinRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
         request->setParameter("action",std::string("request-connection"));
         request->setParameter("token", m_token);
@@ -235,9 +221,9 @@ namespace Online{
         return request;
     }
 
-    void CurrentUser::ServerJoinRequest::callback()
+    void ServerJoinRequest::callback()
     {
-        //FIXME To be filled in
+        //FIXME
     }
 
     // ============================================================================
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 5558df5fa..7f27e9456 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -28,6 +28,33 @@
 
 
 namespace Online{
+
+    class SignInRequest : public XMLRequest
+    {
+        virtual void callback ();
+    public :
+        SignInRequest() : XMLRequest(RT_SIGN_IN) {}
+    };
+
+    class SignOutRequest : public XMLRequest
+    {
+        virtual void callback ();
+    public :
+        SignOutRequest() : XMLRequest(RT_SIGN_OUT) {}
+    };
+
+    class ServerCreationRequest : public XMLRequest {
+        virtual void callback ();
+    public :
+        ServerCreationRequest() : XMLRequest(RT_SERVER_JOIN) {}
+    };
+
+    class ServerJoinRequest : public XMLRequest {
+        virtual void callback ();
+    public :
+        ServerJoinRequest() : XMLRequest(RT_SERVER_JOIN) {}
+    };
+
     // ============================================================================
 
     /**
@@ -46,26 +73,6 @@ namespace Online{
                 SIGNING_OUT
             };
 
-            class SignInRequest : public XMLRequest
-            {
-                virtual void callback ();
-            };
-
-            class SignOutRequest : public XMLRequest
-            {
-                virtual void callback ();
-            };
-
-            class ServerCreationRequest : public XMLRequest
-            {
-                virtual void callback ();
-            };
-
-            class ServerJoinRequest : public XMLRequest
-            {
-                virtual void callback ();
-            };
-
         private:
             std::string                 m_token;
             bool                        m_save_session;
@@ -73,11 +80,6 @@ namespace Online{
 
             CurrentUser();
 
-            void signIn                 (const SignInRequest            * input);
-            void signOut                (const SignOutRequest           * input);
-            void createServer           (const ServerCreationRequest    * input);
-
-
         public:
             static CurrentUser*         get(); //FIXME To be removed
 
@@ -96,21 +98,22 @@ namespace Online{
 
 
             // Register
-            bool                        signUp(                 const irr::core::stringw &username,
+            XMLRequest *                 requestSignUp(         const irr::core::stringw &username,
                                                                 const irr::core::stringw &password,
                                                                 const irr::core::stringw &password_ver,
                                                                 const irr::core::stringw &email,
-                                                                bool terms,
-                                                                irr::core::stringw &info);
-
+                                                                bool terms);
 
+            void signIn                 (const SignInRequest            * input);
+            void signOut                (const SignOutRequest           * input);
+            void createServer           (const ServerCreationRequest    * input);
 
             /** Returns the username if signed in. */
             irr::core::stringw          getUserName()   const;
-            bool                        isSignedIn()    const   { return m_state == SIGNED_IN; }
-            bool                        isGuest()       const   { return m_state == GUEST; }
-            bool                        isSigningIn()   const   { return m_state == SIGNING_IN; }
-            UserState                   getUserState()          { return m_state; }
+            bool                        isSignedIn()    const { return m_state == SIGNED_IN; }
+            bool                        isGuest()       const { return m_state == GUEST; }
+            bool                        isSigningIn()   const { return m_state == SIGNING_IN; }
+            UserState                   getUserState()        { return m_state; }
 
     };   // class CurrentUser
 
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index c85f3b897..1adf5ccac 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -146,7 +146,7 @@ namespace Online{
      *  sorted by priority.
      *  \param request The pointer to the new request to insert.
      */
-    void HTTPManager::addRequest(Online::Request *request)
+    void HTTPManager::addRequest(Request *request)
     {
         assert(request->isAllowedToAdd());
         m_request_queue.lock();
@@ -156,6 +156,36 @@ namespace Online{
         m_request_queue.unlock();
     }   // insertRequest
 
+    // ----------------------------------------------------------------------------
+    /**
+     *  \param request The pointer to the finished request to insert.
+     */
+    void HTTPManager::addResponse(Request *request)
+    {
+        m_response_queue.lock();
+        m_response_queue.getData()[request->getType()] = request;
+        m_response_queue.unlock();
+    }   // insertRequest
+
+    Request * HTTPManager::getResponse(Request::RequestType type)
+    {
+        Request * response = NULL;
+        m_response_queue.lock();
+        if (m_response_queue.getData().count(type))
+            response = m_response_queue.getData()[type];
+        m_response_queue.getData().erase(type);
+        m_response_queue.unlock();
+        return response;
+    }
+
+    XMLRequest * HTTPManager::getXMLResponse(Request::RequestType type)
+    {
+        Request * response = getResponse(type);
+        if(response != NULL)
+            return (XMLRequest *) response;
+        return NULL;
+    }
+
     // ---------------------------------------------------------------------------
     /** The actual main loop, which is started as a separate thread from the
      *  constructor. After testing for a new server, fetching news, the list
@@ -170,7 +200,7 @@ namespace Online{
 
         me->m_current_request = NULL;
         me->m_request_queue.lock();
-        while(  me->m_request_queue.getData().empty() || !dynamic_cast<Online::QuitRequest*>(me->m_request_queue.getData().top()) )
+        while(  me->m_request_queue.getData().empty() || me->m_request_queue.getData().top()->getType() != Request::RT_QUIT )
         {
             bool empty = me->m_request_queue.getData().empty();
             // Wait in cond_wait for a request to arrive. The 'while' is necessary
@@ -185,12 +215,15 @@ namespace Online{
             me->m_request_queue.getData().pop();
             me->m_request_queue.unlock();
             me->m_current_request->execute();
-
             if(me->m_current_request->manageMemory())
             {
                 delete me->m_current_request;
                 me->m_current_request = NULL;
             }
+            else
+            {
+                me->addResponse(me->m_current_request);
+            }
             me->m_request_queue.lock();
         }   // while
 
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index 575f71094..97a9dbde9 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -44,6 +44,8 @@ namespace Online{
     {
         protected:
 
+            /** Ment for networking threads */
+
             /** The current requested being worked on. */
             Online::Request *         m_current_request;
 
@@ -56,7 +58,7 @@ namespace Online{
             /** Thread id of the thread running in this object. */
             Synchronised<pthread_t *> m_thread_id;
 
-            /** The list of pointes to all requests. */
+            /** The list of pointers to all requests that still need to be handled. */
             Synchronised< std::priority_queue <
                                                 Online::Request*,
                                                 std::vector<Online::Request*>,
@@ -64,6 +66,11 @@ namespace Online{
                                                >
                         >  m_request_queue;
 
+            /** The list of pointers to all requests that are already handled but didn't need to be deleted. */
+            Synchronised< std::map  < Online::Request::RequestType, Online::Request* > > m_response_queue;
+
+            void addResponse(Online::Request*);
+
             static void  *mainLoop(void *obj);
             void startNetworkThread();
 
@@ -84,6 +91,9 @@ namespace Online{
             void addRequest(Online::Request *request);
             void cancelAllDownloads();
             void stopNetworkThread();
+            Request * getResponse(Online::Request::RequestType type);
+            /** Same as getResponse but with a cast to XMLRequest */
+            XMLRequest * getXMLResponse(Online::Request::RequestType type);
 
             bool getAbort(){ return m_abort.getAtomic(); };
 
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
index 570454bb4..339a7e109 100644
--- a/src/online/messages.cpp
+++ b/src/online/messages.cpp
@@ -18,27 +18,28 @@
 
 #include "online/messages.hpp"
 #include "utils/translation.hpp"
+#include "utils/time.hpp"
 
 namespace Online
 {
     namespace Messages
     {
-        irr::core::stringw loadingDots(float timer, bool spaces, float interval, int max_dots)
+        irr::core::stringw loadingDots(bool spaces, float interval, int max_dots)
         {
-            int nr_dots = int(floor(timer * (1 / interval))) % (max_dots+1);
+            int nr_dots = int(floor(Time::getRealTime() * (1 / interval))) % (max_dots+1);
             return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
         }
         // ------------------------------------------------------------------------
 
-        irr::core::stringw signingIn(float timer)
+        irr::core::stringw signingIn()
         {
-            return irr::core::stringw(_("Signing in")) + loadingDots(timer);
+            return irr::core::stringw(_("Signing in")) + loadingDots();
         }
         // ------------------------------------------------------------------------
 
-        irr::core::stringw signingOut(float timer)
+        irr::core::stringw signingOut()
         {
-            return irr::core::stringw(_("Signing out")) + loadingDots(timer);
+            return irr::core::stringw(_("Signing out")) + loadingDots();
         }
         // ------------------------------------------------------------------------
 
@@ -47,14 +48,14 @@ namespace Online
             return irr::core::stringw(_("Signed in as : ")) + name + ".";
         }
 
-        irr::core::stringw joiningServer(float timer)
+        irr::core::stringw joiningServer()
         {
-            return irr::core::stringw(_("Joining server")) + loadingDots(timer);
+            return irr::core::stringw(_("Joining server")) + loadingDots();
         }
 
-        irr::core::stringw creatingServer(float timer)
+        irr::core::stringw creatingServer()
         {
-            return irr::core::stringw(_("Creating server")) + loadingDots(timer);
+            return irr::core::stringw(_("Creating server")) + loadingDots();
         }
     } // namespace messages
 } // namespace Online
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
index 717527f63..c02de0d6a 100644
--- a/src/online/messages.hpp
+++ b/src/online/messages.hpp
@@ -26,11 +26,11 @@ namespace Online
 {
     namespace Messages
     {
-        irr::core::stringw loadingDots          (float timer, bool spaces = true, float interval = 0.5f, int max_dots = 3);
-        irr::core::stringw signingIn            (float timer);
-        irr::core::stringw signingOut           (float timer);
-        irr::core::stringw joiningServer        (float timer);
-        irr::core::stringw creatingServer       (float timer);
+        irr::core::stringw loadingDots          (bool spaces = true, float interval = 0.5f, int max_dots = 3);
+        irr::core::stringw signingIn            ();
+        irr::core::stringw signingOut           ();
+        irr::core::stringw joiningServer        ();
+        irr::core::stringw creatingServer       ();
         irr::core::stringw signedInAs           (const irr::core::stringw & name);
     } // namespace Messages
 }// namespace Online
diff --git a/src/online/request.cpp b/src/online/request.cpp
index 787ea3416..d2f880a2f 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -28,7 +28,8 @@ namespace Online{
 
     // =========================================================================================
 
-    Request::Request(int priority, bool manage_memory)
+    Request::Request(RequestType type, int priority, bool manage_memory)
+        :m_type(type)
     {
         m_priority      = priority;
         m_manage_memory = manage_memory;
@@ -55,20 +56,19 @@ namespace Online{
     // =========================================================================================
 
     QuitRequest::QuitRequest()
-        : Request(9999,true)
+        : Request(RT_QUIT,9999,true)
     {
     }
 
 
     // =========================================================================================
 
-    HTTPRequest::HTTPRequest(const std::string & url)
-        : Request(1,false)
+    HTTPRequest::HTTPRequest(RequestType type, const std::string & url)
+        : Request(type, 1,false)
     {
         m_url = url;
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
-        m_added = false;
     }
 
     HTTPRequest::~HTTPRequest()
@@ -200,8 +200,8 @@ namespace Online{
 
     // =========================================================================================
 
-    XMLRequest::XMLRequest(const std::string & url)
-        : HTTPRequest(url)
+    XMLRequest::XMLRequest(RequestType type, const std::string & url)
+        : HTTPRequest(type, url)
     {
         m_info = "";
         m_success = false;
diff --git a/src/online/request.hpp b/src/online/request.hpp
index b2dc05b33..90d396ff6 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -32,6 +32,18 @@ namespace Online{
       */
     class Request
     {
+    public:
+        /** List of different types of requests which are used as key in the response map
+         */
+        enum RequestType {
+            RT_QUIT,
+            RT_SIGN_IN,
+            RT_SIGN_OUT,
+            RT_SIGN_UP,
+            RT_SERVER_CREATION,
+            RT_SERVER_JOIN
+        };
+
     protected:
         /** The priority of this request. The higher the value the more
         important this request is. */
@@ -39,6 +51,8 @@ namespace Online{
         /** Cancel this request if it is active. */
         bool                m_cancel;
 
+        const RequestType   m_type;
+
 
         /** True if the memory for this Request should be managed by
         *  http connector (i.e. this object is freed once the request
@@ -46,7 +60,7 @@ namespace Online{
         *  be freed by the calling function. */
         bool                m_manage_memory;
 
-        Synchronised<bool>              m_done;
+        Synchronised<bool>  m_done;
 
         virtual void beforeOperation() {}
         virtual void operation() = 0;
@@ -54,31 +68,33 @@ namespace Online{
 
     public:
 
-        Request(int priority, bool manage_memory=true);
+        Request(RequestType type, int priority, bool manage_memory=true);
         virtual ~Request();
 
         void execute();
 
         // ------------------------------------------------------------------------
         /** Returns the priority of this request. */
-        int getPriority() const { return m_priority; }
+        int getPriority() const         { return m_priority; }
         // ------------------------------------------------------------------------
         /** Signals that this request should be canceled. */
-        void cancel() { m_cancel = true; }
+        void cancel()                   { m_cancel = true; }
         // ------------------------------------------------------------------------
         /** Returns if this request is to be canceled. */
-        bool isCancelled() const { return m_cancel; }
+        bool isCancelled() const        { return m_cancel; }
         // ------------------------------------------------------------------------
-        /** Specifies if the memory should be managed by network_http. */
-        void setManageMemory(bool m) { m_manage_memory = m; }
+        /** Specifies if the memory should be managed by http manager. */
+        void setManageMemory(bool m)    { m_manage_memory = m; }
         // ------------------------------------------------------------------------
         /** Returns if the memory for this object should be managed by
         *  by network_http (i.e. freed once the request is handled). */
-        bool manageMemory() const { return m_manage_memory; }
+        bool manageMemory() const       { return m_manage_memory; }
 
-        bool isDone(){return m_done.getAtomic();}
+        bool isDone() const             { return m_done.getAtomic(); }
 
-        virtual bool isAllowedToAdd() {return true;}
+        RequestType getType() const     { return m_type; }
+
+        virtual bool isAllowedToAdd()   { return true; }
 
         /** This class is used by the priority queue to sort requests by priority.
          */
@@ -120,7 +136,6 @@ namespace Online{
         *  (everything ok) at the end. */
         Synchronised<float>             m_progress;
         std::string                     m_url;
-        bool                            m_added;
 
         virtual void afterOperation();
         std::string downloadPage();
@@ -138,22 +153,18 @@ namespace Online{
         virtual void callback() {}
 
     public :
-
-        HTTPRequest(const std::string & url = "");
+        HTTPRequest(RequestType type, const std::string & url = "");
         virtual ~HTTPRequest();
 
         void setParameter(const std::string & name, const std::string &value){
-            if(!m_added)
-                (*m_parameters)[name] = value;
+            (*m_parameters)[name] = value;
         };
         void setParameter(const std::string & name, const irr::core::stringw &value){
-            if(!m_added)
-                (*m_parameters)[name] = irr::core::stringc(value.c_str()).c_str();
+            (*m_parameters)[name] = irr::core::stringc(value.c_str()).c_str();
         }
         template <typename T>
         void setParameter(const std::string & name, const T& value){
-            if(!m_added)
-                (*m_parameters)[name] = StringUtils::toString(value);
+            (*m_parameters)[name] = StringUtils::toString(value);
         }
 
         /** Returns the current progress. */
@@ -180,7 +191,7 @@ namespace Online{
         virtual void                    afterOperation() OVERRIDE;
 
     public :
-        XMLRequest(const std::string & url = "");
+        XMLRequest(RequestType type, const std::string & url = "");
 
         virtual XMLNode *               getResult() const       { return m_result; }
         const irr::core::stringw &      getInfo()   const       { return m_info; }
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 4fa138cfd..51d3f50fd 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -32,6 +32,7 @@
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
+using namespace Online;
 
 // -----------------------------------------------------------------------------
 
@@ -40,8 +41,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
-    m_load_timer = 0;
-    m_sign_in_request = NULL;
+    m_signing_in = false;
     loadFromFile("online/login_dialog.stkgui");
 
     m_message_widget = getWidget<LabelWidget>("message");
@@ -96,7 +96,6 @@ LoginDialog::LoginDialog(const Message message_type) :
 
 LoginDialog::~LoginDialog()
 {
-    delete m_sign_in_request;
 }
 
 
@@ -115,8 +114,9 @@ void LoginDialog::login()
     else
     {
         m_options_widget->setDeactivated();
-        m_sign_in_request = Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
+        Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
         Online::CurrentUser::release();
+        m_signing_in = true;
     }
 }
 
@@ -163,30 +163,22 @@ void LoginDialog::onEnterPressedInternal()
 
 void LoginDialog::onUpdate(float dt)
 {
-    if(m_sign_in_request != NULL)
+    XMLRequest * sign_in_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_IN);
+    if(sign_in_request != NULL)
     {
-        if(m_sign_in_request->isDone())
+        if(sign_in_request->isSuccess())
         {
-            if(m_sign_in_request->isSuccess())
-            {
-                m_self_destroy = true;
-            }
-            else
-            {
-                sfx_manager->quickSound( "anvil" );
-                m_info_widget->setErrorColor();
-                m_info_widget->setText(m_sign_in_request->getInfo(), false);
-            }
-            m_options_widget->setActivated();
-            delete m_sign_in_request;
-            m_sign_in_request = NULL;
+            m_self_destroy = true;
         }
         else
         {
-            m_load_timer += dt;
-            m_info_widget->setDefaultColor();
-            m_info_widget->setText(Online::Messages::signingIn(m_load_timer), false);
+            sfx_manager->quickSound( "anvil" );
+            m_info_widget->setErrorColor();
+            m_info_widget->setText(sign_in_request->getInfo(), false);
         }
+        delete sign_in_request;
+        m_signing_in = false;
+        m_options_widget->setActivated();
     }
     //If we want to open the registration dialog, we need to close this one first
     m_open_registration_dialog && (m_self_destroy = true);
@@ -197,6 +189,12 @@ void LoginDialog::onUpdate(float dt)
         ModalDialog::dismiss();
         if (m_open_registration_dialog)
             new RegistrationDialog();
+        return;
+    }
 
+    if (m_signing_in)
+    {
+        m_info_widget->setDefaultColor();
+        m_info_widget->setText(Online::Messages::signingIn(), false);
     }
 }
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 21a2dcc27..40ca543db 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -37,9 +37,7 @@ private:
     
     bool m_self_destroy;
     bool m_open_registration_dialog;
-    float m_load_timer;
-    Online::CurrentUser::SignInRequest * m_sign_in_request;
-
+    bool m_signing_in;
     GUIEngine::LabelWidget * m_message_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
     GUIEngine::TextBoxWidget * m_password_widget;
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 7784f93e6..6b6266a6b 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -25,18 +25,19 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/current_user.hpp"
 
 
 using namespace GUIEngine;
 using namespace irr;
 using namespace irr::gui;
+using namespace Online;
 
 // -----------------------------------------------------------------------------
 
 RegistrationDialog::RegistrationDialog(const Phase phase) :
         ModalDialog(0.8f,0.9f)
 {
+    m_sign_up_request = NULL;
     m_self_destroy = false;
     m_show_registration_info = false;
     m_show_registration_terms = false;
@@ -93,10 +94,10 @@ void RegistrationDialog::showRegistrationInfo(){
     assert(textBox != NULL);
     textBox->setText(m_email_confirm);
 
-    m_info_widget = getWidget<LabelWidget>("info");
-    assert(m_info_widget != NULL);
-    m_info_widget->setErrorColor();
-    m_info_widget->setText(m_registration_error, false);
+    LabelWidget* label = getWidget<LabelWidget>("info");
+    assert(label != NULL);
+    label->setErrorColor();
+    label->setText(m_registration_error, false);
 
     ButtonWidget * button = getWidget<ButtonWidget>("next");
     assert(button != NULL);
@@ -143,36 +144,38 @@ bool RegistrationDialog::processInfoEvent(const std::string& eventSource){
             m_password_confirm =  getWidget<TextBoxWidget>("password_confirm")->getText().trim();
             m_email = getWidget<TextBoxWidget>("email")->getText().trim();
             m_email_confirm = getWidget<TextBoxWidget>("email_confirm")->getText().trim();
+            LabelWidget * info_widget = getWidget<LabelWidget>("info");
             //FIXME More validation of registration information
             if (m_password != m_password_confirm)
             {
-                getWidget<LabelWidget>("info")->setText(_("Passwords don't match!"), false);
+                info_widget->setText(_("Passwords don't match!"), false);
                 sfx_manager->quickSound( "anvil" );
             }
             else if (m_email != m_email_confirm)
             {
-                getWidget<LabelWidget>("info")->setText(_("Emails don't match!"), false);
+                info_widget->setText(_("Emails don't match!"), false);
                 sfx_manager->quickSound( "anvil" );
             }
-            else if (m_username.size() < 5 || m_username.size() > 30)
+            else if (m_username.size() < 4 || m_username.size() > 30)
             {
-                getWidget<LabelWidget>("info")->setText(_("Username has to be between 5 and 30 characters long!"), false);
+                info_widget->setText(_("Username has to be between 5 and 30 characters long!"), false);
                 sfx_manager->quickSound( "anvil" );
             }
             else if (m_password.size() < 8 || m_password.size() > 30)
             {
-                getWidget<LabelWidget>("info")->setText(_("Password has to be between 5 and 30 characters long!"), false);
+                info_widget->setText(_("Password has to be between 5 and 30 characters long!"), false);
                 sfx_manager->quickSound( "anvil" );
             }
-            else if (m_email.size() < 5 || m_email.size() > 50)
+            else if (m_email.size() < 4 || m_email.size() > 50)
             {
-                getWidget<LabelWidget>("info")->setText(_("Email has to be between 5 and 50 characters long!"), false);
-                sfx_manager->quickSound( "anvil" );
+                info_widget->setText(_("Email has to be between 5 and 50 characters long!"), false);
             }
             else
             {
                 m_show_registration_terms = true;
+                return true;
             }
+            sfx_manager->quickSound( "anvil" );
             return true;
         }
     }
@@ -188,15 +191,7 @@ bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
         {
             assert(getWidget<CheckBoxWidget>("accepted")->getState());
             m_agreement = true;
-            if(Online::CurrentUser::get()->signUp(m_username, m_password, m_password_confirm, m_email, true, m_registration_error))
-            {
-                m_show_registration_activation = true;
-                m_registration_error = "";
-            }
-            else
-            {
-                m_show_registration_info = true;
-            }
+            m_sign_up_request = CurrentUser::acquire()->requestSignUp(m_username, m_password, m_password_confirm, m_email, m_agreement);
             return true;
         }
         else if (eventSource == "accepted")
@@ -279,15 +274,38 @@ void RegistrationDialog::onEnterPressedInternal()
 
 void RegistrationDialog::onUpdate(float dt)
 {
+    /*
+    if(m_sign_up_request != NULL)
+    {
+        if(m_sign_up_request->isDone())
+        {
+            if(m_sign_up_request->isSuccess())
+            {
+                m_show_registration_activation = true;
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_show_registration_info = true;
+            }
+            m_options_widget->setActivated();
+            delete m_sign_in_request;
+            m_sign_in_request = NULL;
+        }
+        else
+        {
+            m_load_timer += dt;
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::signingIn(m_load_timer), false);
+        }
+    }*/
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)
-    {
         ModalDialog::dismiss();
-    }
-    if (m_show_registration_info)
+    else if (m_show_registration_info)
         showRegistrationInfo();
-    if (m_show_registration_terms)
+    else if (m_show_registration_terms)
         showRegistrationTerms();
-    if (m_show_registration_activation)
+    else if (m_show_registration_activation)
         showRegistrationActivation();
 }
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index ed3298722..04fefe70b 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -23,6 +23,7 @@
 
 #include "guiengine/modaldialog.hpp"
 #include "guiengine/widgets.hpp"
+#include "online/current_user.hpp"
 /**
  * \brief Dialog that allows a user to register
  * \ingroup states_screens
@@ -48,14 +49,14 @@ public:
 
 private:
 
-    GUIEngine::LabelWidget * m_info_widget;
-
     Phase m_phase;
     bool m_self_destroy;
     bool m_show_registration_info;
     bool m_show_registration_terms;
     bool m_show_registration_activation;
 
+    Online::XMLRequest * m_sign_up_request;
+
     //Saved user input :
     irr::core::stringw m_username;
     irr::core::stringw m_password;
@@ -65,6 +66,7 @@ private:
     irr::core::stringw m_registration_error;
     bool m_agreement;
 
+
     void showRegistrationInfo();
     void showRegistrationTerms();
     void showRegistrationActivation();
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index d4bda7b8e..22758576c 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -46,8 +46,7 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
     m_server = server;
     m_self_destroy = false;
     m_enter_lobby = false;
-    m_server_join_request = NULL;
-    m_load_timer = 0;
+    m_joining_server = false;
 
     loadFromFile("online/server_info_dialog.stkgui");
 
@@ -70,13 +69,13 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
 // -----------------------------------------------------------------------------
 ServerInfoDialog::~ServerInfoDialog()
 {
-    delete m_server_join_request;
 }
 // -----------------------------------------------------------------------------
 void ServerInfoDialog::requestJoin()
 {
-    m_server_join_request = Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
+    Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
     Online::CurrentUser::release();
+    m_joining_server = true;
 }
 
 // -----------------------------------------------------------------------------
@@ -116,33 +115,23 @@ void ServerInfoDialog::onEnterPressedInternal()
 
 void ServerInfoDialog::onUpdate(float dt)
 {
-    if(m_server_join_request != NULL)
+    XMLRequest * request = HTTPManager::get()->getXMLResponse(Request::RT_SERVER_JOIN);
+    if(request != NULL)
     {
-        if(m_server_join_request->isDone())
+        if(request->isSuccess())
         {
-            if(m_server_join_request->isSuccess())
-            {
-                ServersManager::get()->setJoinedServer(m_server);
-                m_enter_lobby = true;
-            }
-            else
-            {
-                sfx_manager->quickSound( "anvil" );
-                m_info_widget->setErrorColor();
-                m_info_widget->setText(m_server_join_request->getInfo(), false);
-            }
-            delete m_server_join_request;
-            m_server_join_request = NULL;
+            m_self_destroy = true;
         }
         else
         {
-            m_load_timer += dt;
-            m_info_widget->setDefaultColor();
-            m_info_widget->setText(Online::Messages::joiningServer(m_load_timer), false);
+            sfx_manager->quickSound( "anvil" );
+            m_info_widget->setErrorColor();
+            m_info_widget->setText(request->getInfo(), false);
         }
+        delete request;
+        m_joining_server = false;
     }
 
-
     //If we want to open the registration dialog, we need to close this one first
     m_enter_lobby && (m_self_destroy = true);
 
@@ -152,5 +141,12 @@ void ServerInfoDialog::onUpdate(float dt)
         ModalDialog::dismiss();
         if (m_enter_lobby)
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());
+        return;
+    }
+
+    if (m_joining_server)
+    {
+        m_info_widget->setDefaultColor();
+        m_info_widget->setText(Online::Messages::joiningServer(), false);
     }
 }
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 2839c1c87..7fafd0770 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -40,11 +40,11 @@ private:
     
     bool m_self_destroy;
     bool m_enter_lobby;
+    bool m_joining_server;
 
     float m_load_timer;
 
     Online::Server * m_server;
-    Online::CurrentUser::ServerJoinRequest * m_server_join_request;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 40688d2bb..e2f91d21c 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -52,9 +52,7 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
     m_recorded_state = CurrentUser::SIGNED_OUT;
-    CurrentUser::SignInRequest * request = CurrentUser::acquire()->requestSavedSession();
-    if(request != NULL)
-        m_requests.push_back(request);
+    CurrentUser::acquire()->requestSavedSession();
     CurrentUser::release();
 }   // OnlineScreen
 
@@ -62,7 +60,6 @@ OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 
 OnlineScreen::~OnlineScreen()
 {
-    m_requests.clearAndDeleteAll();
 }
 
 // ----------------------------------------------------------------------------
@@ -145,7 +142,6 @@ void OnlineScreen::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime();
-    m_load_timer = 0.0f;
     m_online_status_widget->setText(Messages::signedInAs(CurrentUser::acquire()->getUserName()), false);
     CurrentUser::release();
 
@@ -158,46 +154,42 @@ void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
         GUIEngine::reshowCurrentScreen();
     if (m_recorded_state == CurrentUser::SIGNING_IN)
     {
-        m_load_timer += delta;
-        m_online_status_widget->setText(Messages::signingIn(m_load_timer), false);
+        m_online_status_widget->setText(Messages::signingIn(), false);
     }
     else if (m_recorded_state == CurrentUser::SIGNING_OUT)
     {
-        m_load_timer += delta;
-        m_online_status_widget->setText(Messages::signingOut(m_load_timer), false);
+        m_online_status_widget->setText(Messages::signingOut(), false);
     }
 
-    for(int i = m_requests.size()-1; i>=0; --i)
+    XMLRequest * sign_in_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_IN);
+    if(sign_in_request != NULL)
     {
-        if(m_requests[i].isDone())
+        if(sign_in_request->isSuccess())
         {
-            if( dynamic_cast<CurrentUser::SignInRequest*>(m_requests.get(i)))
-            {
-                if(m_requests[i].isSuccess())
-                {
-                    new MessageDialog(_("Automatically signed in."));
-                }
-                else
-                {
-                    sfx_manager->quickSound( "anvil" );
-                    new MessageDialog(m_requests[i].getInfo());
-                }
-            }else if( dynamic_cast<CurrentUser::SignOutRequest*>(m_requests.get(i)))
-            {
-                if(m_requests[i].isSuccess())
-                {
-                    new MessageDialog(_("Signed out successfully."));
-                }
-                else
-                {
-                    sfx_manager->quickSound( "anvil" );
-                    new MessageDialog(m_requests[i].getInfo());
-                }
-            }
-
-            m_requests.erase(i);
+            new MessageDialog(_("Signed in."));
         }
+        else
+        {
+            sfx_manager->quickSound( "anvil" );
+            new MessageDialog(sign_in_request->getInfo());
+        }
+        delete sign_in_request;
     }
+    XMLRequest * sign_out_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_OUT);
+    if(sign_out_request != NULL)
+    {
+        if(sign_out_request->isSuccess())
+        {
+            new MessageDialog(_("Signed out successfully."));
+        }
+        else
+        {
+            sfx_manager->quickSound( "anvil" );
+            new MessageDialog(sign_out_request->getInfo());
+        }
+        delete sign_out_request;
+    }
+
 
 }   // onUpdate
 
@@ -221,7 +213,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
     else if (selection == "sign_out")
     {
-        m_requests.push_back(CurrentUser::acquire()->requestSignOut());
+        CurrentUser::acquire()->requestSignOut();
         CurrentUser::release();
     }
     else if (selection == "register")
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index 7acfa6dee..e445eea79 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -53,10 +53,6 @@ private:
 
     Online::CurrentUser::UserState m_recorded_state;
 
-    float m_load_timer;
-
-    PtrVector<Online::XMLRequest> m_requests;
-
     /** \brief Checks if the recorded state differs from the actual state and sets it. */
     bool hasStateChanged();
     /** \brief Sets which widget has to be focused. Depends on the user state. */

From 3a630d4985c246435cf0f0b5791abd3b97e16157 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 01:17:00 +0000
Subject: [PATCH 29/44] Some memory management

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13303 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/http_manager.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index 1adf5ccac..0d52aa8c1 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -74,6 +74,11 @@ namespace Online{
     // ============================================================================
     HTTPManager::~HTTPManager(){
         curl_global_cleanup();
+        m_response_queue.lock();
+        //FIXME should all be deleted
+        m_response_queue.getData().clear();
+        m_response_queue.unlock();
+        //FIXME empty and delete request queue?
     }
 
 
@@ -163,6 +168,11 @@ namespace Online{
     void HTTPManager::addResponse(Request *request)
     {
         m_response_queue.lock();
+        if (m_response_queue.getData().count(request->getType()))
+        {
+            delete m_response_queue.getData()[request->getType()];
+            m_response_queue.getData().erase(request->getType());
+        }
         m_response_queue.getData()[request->getType()] = request;
         m_response_queue.unlock();
     }   // insertRequest

From dea145952b953962da5c0705088c9c360e759dc8 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 15:19:15 +0000
Subject: [PATCH 30/44] Apparently the onEscapePressed callback for a dialog
 didn't operate as advertised. I fiex.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/modaldialog.hpp        | 2 +-
 src/states_screens/state_manager.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/guiengine/modaldialog.hpp b/src/guiengine/modaldialog.hpp
index 731749a94..dfdf3fd8e 100644
--- a/src/guiengine/modaldialog.hpp
+++ b/src/guiengine/modaldialog.hpp
@@ -105,7 +105,7 @@ namespace GUIEngine
         static bool isADialogActive();
 
         /** Override to change what happens on escape pressed */
-        virtual void escapePressed() { dismiss(); }
+        virtual bool onEscapePressed() { return true; }
 
         /** Override to be notified of updates */
         virtual void onUpdate(float dt) { }
diff --git a/src/states_screens/state_manager.cpp b/src/states_screens/state_manager.cpp
index e787d1b2c..d3f7858a3 100644
--- a/src/states_screens/state_manager.cpp
+++ b/src/states_screens/state_manager.cpp
@@ -167,7 +167,8 @@ void StateManager::escapePressed()
     // when another modal dialog is visible
     else if(ModalDialog::isADialogActive())
     {
-        ModalDialog::getCurrent()->escapePressed();
+        if(ModalDialog::getCurrent()->onEscapePressed())
+            ModalDialog::getCurrent()->dismiss();
     }
     // In-game
     else if(m_game_mode == GAME)

From 1cdad60b1702cc3ece7c92b0fe92b9c098cddaba Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 15:21:48 +0000
Subject: [PATCH 31/44] Another enhancement for my HTTPManager which needed a
 lot of changes.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13307 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp                   | 48 ++++++------
 src/online/current_user.hpp                   | 78 +++++++++++--------
 src/online/http_manager.cpp                   | 50 +-----------
 src/online/http_manager.hpp                   |  8 --
 src/online/messages.cpp                       | 21 +++--
 src/online/messages.hpp                       |  1 +
 src/online/request.cpp                        | 24 +++---
 src/online/request.hpp                        | 48 ++++--------
 src/states_screens/dialogs/login_dialog.cpp   | 44 ++++++-----
 src/states_screens/dialogs/login_dialog.hpp   |  4 +-
 .../dialogs/registration_dialog.cpp           | 63 +++++++++++----
 .../dialogs/registration_dialog.hpp           |  1 +
 .../dialogs/server_info_dialog.cpp            | 35 +++++----
 .../dialogs/server_info_dialog.hpp            |  2 +-
 src/states_screens/online_screen.cpp          | 69 ++++++++--------
 src/states_screens/online_screen.hpp          |  3 +
 16 files changed, 236 insertions(+), 263 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 1bfdcd04e..42acd7481 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -68,7 +68,7 @@ namespace Online{
 
     // ============================================================================
     CurrentUser::CurrentUser(){
-        m_state = SIGNED_OUT;
+        m_state = US_SIGNED_OUT;
         m_id = 0;
         m_name = "";
         m_token = "";
@@ -82,8 +82,8 @@ namespace Online{
                                                 const irr::core::stringw &email,
                                                 bool terms)
     {
-        assert(m_state == SIGNED_OUT || m_state == GUEST);
-        XMLRequest * request = new XMLRequest(Request::RT_SIGN_UP);
+        assert(m_state == US_SIGNED_OUT || m_state == US_GUEST);
+        XMLRequest * request = new XMLRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("register"));
         request->setParameter("username",username);
@@ -94,10 +94,10 @@ namespace Online{
     }
 
     // ============================================================================
-    SignInRequest * CurrentUser::requestSavedSession()
+    CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
     {
         SignInRequest * request = NULL;
-        if(m_state != SIGNED_IN  && UserConfigParams::m_saved_session)
+        if(m_state != US_SIGNED_IN  && UserConfigParams::m_saved_session)
         {
             request = new SignInRequest();
             request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
@@ -105,16 +105,16 @@ namespace Online{
             request->setParameter("userid", UserConfigParams::m_saved_user);
             request->setParameter("token", UserConfigParams::m_saved_token.c_str());
             HTTPManager::get()->addRequest(request);
-            m_state = SIGNING_IN;
+            m_state = US_SIGNING_IN;
         }
         return request;
     }
 
-    SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
+    CurrentUser::SignInRequest * CurrentUser::requestSignIn(    const irr::core::stringw &username,
                                                                 const irr::core::stringw &password,
                                                                 bool save_session)
     {
-        assert(m_state == SIGNED_OUT);
+        assert(m_state == US_SIGNED_OUT);
         m_save_session = save_session;
         SignInRequest * request = new SignInRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
@@ -122,7 +122,7 @@ namespace Online{
         request->setParameter("username",username);
         request->setParameter("password",password);
         HTTPManager::get()->addRequest(request);
-        m_state = SIGNING_IN;
+        m_state = US_SIGNING_IN;
         return request;
     }
 
@@ -134,7 +134,7 @@ namespace Online{
             int username_fetched    = input->getResult()->get("username", &m_name);
             int userid_fetched      = input->getResult()->get("userid", &m_id);
             assert(token_fetched && username_fetched && userid_fetched);
-            m_state = SIGNED_IN;
+            m_state = US_SIGNED_IN;
             if(m_save_session)
             {
                 UserConfigParams::m_saved_user = m_id;
@@ -144,10 +144,10 @@ namespace Online{
             }
         }
         else
-            m_state = SIGNED_OUT;
+            m_state = US_SIGNED_OUT;
     }
 
-    void SignInRequest::callback()
+    void CurrentUser::SignInRequest::callback()
     {
         CurrentUser::acquire()->signIn(this);
         CurrentUser::release();
@@ -155,9 +155,9 @@ namespace Online{
 
     // ============================================================================
 
-    ServerCreationRequest * CurrentUser::requestServerCreation(const irr::core::stringw &name, int max_players)
+    CurrentUser::ServerCreationRequest * CurrentUser::requestServerCreation(const irr::core::stringw &name, int max_players)
     {
-        assert(m_state == SIGNED_IN);
+        assert(m_state == US_SIGNED_IN);
         ServerCreationRequest * request = new ServerCreationRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",           std::string("create_server"));
@@ -169,21 +169,21 @@ namespace Online{
         return request;
     }
 
-    void ServerCreationRequest::callback()
+    void CurrentUser::ServerCreationRequest::callback()
     {
         //FIXME
     }
 
     // ============================================================================
-    SignOutRequest * CurrentUser::requestSignOut(){
-        assert(m_state == SIGNED_IN || m_state == GUEST);
+    CurrentUser::SignOutRequest * CurrentUser::requestSignOut(){
+        assert(m_state == US_SIGNED_IN || m_state == US_GUEST);
         SignOutRequest * request = new SignOutRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
         request->setParameter("action",std::string("disconnect"));
         request->setParameter("token",m_token);
         request->setParameter("userid",m_id);
         HTTPManager::get()->addRequest(request);
-        m_state = SIGNING_OUT;
+        m_state = US_SIGNING_OUT;
         return request;
     }
 
@@ -196,13 +196,13 @@ namespace Online{
         m_token = "";
         m_name = "";
         m_id = 0;
-        m_state = SIGNED_OUT;
+        m_state = US_SIGNED_OUT;
         UserConfigParams::m_saved_user = 0;
         UserConfigParams::m_saved_token = "";
         UserConfigParams::m_saved_session = false;
     }
 
-    void SignOutRequest::callback()
+    void CurrentUser::SignOutRequest::callback()
     {
         CurrentUser::acquire()->signOut(this);
         CurrentUser::release();
@@ -210,8 +210,8 @@ namespace Online{
 
     // ============================================================================
 
-    ServerJoinRequest *  CurrentUser::requestServerJoin(uint32_t server_id){
-        assert(m_state == SIGNED_IN || m_state == GUEST);
+    CurrentUser::ServerJoinRequest *  CurrentUser::requestServerJoin(uint32_t server_id){
+        assert(m_state == US_SIGNED_IN || m_state == US_GUEST);
         ServerJoinRequest * request = new ServerJoinRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "address-management.php");
         request->setParameter("action",std::string("request-connection"));
@@ -221,7 +221,7 @@ namespace Online{
         return request;
     }
 
-    void ServerJoinRequest::callback()
+    void CurrentUser::ServerJoinRequest::callback()
     {
         //FIXME
     }
@@ -230,7 +230,7 @@ namespace Online{
 
     irr::core::stringw CurrentUser::getUserName() const
     {
-        if((m_state == SIGNED_IN ) || (m_state == GUEST))
+        if((m_state == US_SIGNED_IN ) || (m_state == US_GUEST))
             return m_name;
         else
             return _("Currently not signed in");
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 7f27e9456..c2b4d75a2 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -29,32 +29,6 @@
 
 namespace Online{
 
-    class SignInRequest : public XMLRequest
-    {
-        virtual void callback ();
-    public :
-        SignInRequest() : XMLRequest(RT_SIGN_IN) {}
-    };
-
-    class SignOutRequest : public XMLRequest
-    {
-        virtual void callback ();
-    public :
-        SignOutRequest() : XMLRequest(RT_SIGN_OUT) {}
-    };
-
-    class ServerCreationRequest : public XMLRequest {
-        virtual void callback ();
-    public :
-        ServerCreationRequest() : XMLRequest(RT_SERVER_JOIN) {}
-    };
-
-    class ServerJoinRequest : public XMLRequest {
-        virtual void callback ();
-    public :
-        ServerJoinRequest() : XMLRequest(RT_SERVER_JOIN) {}
-    };
-
     // ============================================================================
 
     /**
@@ -66,13 +40,49 @@ namespace Online{
         public:
             enum UserState
             {
-                SIGNED_OUT,
-                SIGNED_IN,
-                GUEST,
-                SIGNING_IN,
-                SIGNING_OUT
+                US_SIGNED_OUT,
+                US_SIGNED_IN,
+                US_GUEST,
+                US_SIGNING_IN,
+                US_SIGNING_OUT
             };
 
+            enum RequestType
+            {
+                RT_SIGN_IN = 1,
+                RT_SIGN_OUT,
+                RT_SIGN_UP,
+                RT_SERVER_JOIN,
+                RT_SERVER_CREATION
+            };
+
+            class SignInRequest : public XMLRequest
+            {
+                virtual void callback ();
+            public:
+                SignInRequest() : XMLRequest(RT_SIGN_IN) {}
+            };
+
+            class SignOutRequest : public XMLRequest
+            {
+                virtual void callback ();
+            public:
+                SignOutRequest() : XMLRequest(RT_SIGN_OUT) {}
+            };
+
+            class ServerCreationRequest : public XMLRequest {
+                virtual void callback ();
+            public:
+                ServerCreationRequest() : XMLRequest(RT_SERVER_CREATION) {}
+            };
+
+            class ServerJoinRequest : public XMLRequest {
+                virtual void callback ();
+            public:
+                ServerJoinRequest() : XMLRequest(RT_SERVER_JOIN) {}
+            };
+
+
         private:
             std::string                 m_token;
             bool                        m_save_session;
@@ -110,9 +120,9 @@ namespace Online{
 
             /** Returns the username if signed in. */
             irr::core::stringw          getUserName()   const;
-            bool                        isSignedIn()    const { return m_state == SIGNED_IN; }
-            bool                        isGuest()       const { return m_state == GUEST; }
-            bool                        isSigningIn()   const { return m_state == SIGNING_IN; }
+            bool                        isSignedIn()    const { return m_state == US_SIGNED_IN; }
+            bool                        isGuest()       const { return m_state == US_GUEST; }
+            bool                        isSigningIn()   const { return m_state == US_SIGNING_IN; }
             UserState                   getUserState()        { return m_state; }
 
     };   // class CurrentUser
diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index 0d52aa8c1..a4296bb50 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -74,11 +74,6 @@ namespace Online{
     // ============================================================================
     HTTPManager::~HTTPManager(){
         curl_global_cleanup();
-        m_response_queue.lock();
-        //FIXME should all be deleted
-        m_response_queue.getData().clear();
-        m_response_queue.unlock();
-        //FIXME empty and delete request queue?
     }
 
 
@@ -129,9 +124,7 @@ namespace Online{
         // a download, which mean we can get the mutex and ask the service
         // thread here to cancel properly.
         cancelAllDownloads();
-
-        QuitRequest * request = new QuitRequest();
-        addRequest(request);
+        addRequest(new Request(true, 9999, Request::RT_QUIT));
     }   // stopNetworkThread
 
 
@@ -161,41 +154,6 @@ namespace Online{
         m_request_queue.unlock();
     }   // insertRequest
 
-    // ----------------------------------------------------------------------------
-    /**
-     *  \param request The pointer to the finished request to insert.
-     */
-    void HTTPManager::addResponse(Request *request)
-    {
-        m_response_queue.lock();
-        if (m_response_queue.getData().count(request->getType()))
-        {
-            delete m_response_queue.getData()[request->getType()];
-            m_response_queue.getData().erase(request->getType());
-        }
-        m_response_queue.getData()[request->getType()] = request;
-        m_response_queue.unlock();
-    }   // insertRequest
-
-    Request * HTTPManager::getResponse(Request::RequestType type)
-    {
-        Request * response = NULL;
-        m_response_queue.lock();
-        if (m_response_queue.getData().count(type))
-            response = m_response_queue.getData()[type];
-        m_response_queue.getData().erase(type);
-        m_response_queue.unlock();
-        return response;
-    }
-
-    XMLRequest * HTTPManager::getXMLResponse(Request::RequestType type)
-    {
-        Request * response = getResponse(type);
-        if(response != NULL)
-            return (XMLRequest *) response;
-        return NULL;
-    }
-
     // ---------------------------------------------------------------------------
     /** The actual main loop, which is started as a separate thread from the
      *  constructor. After testing for a new server, fetching news, the list
@@ -210,7 +168,7 @@ namespace Online{
 
         me->m_current_request = NULL;
         me->m_request_queue.lock();
-        while(  me->m_request_queue.getData().empty() || me->m_request_queue.getData().top()->getType() != Request::RT_QUIT )
+        while(  me->m_request_queue.getData().empty() || me->m_request_queue.getData().top()->getType() != Request::RT_QUIT)
         {
             bool empty = me->m_request_queue.getData().empty();
             // Wait in cond_wait for a request to arrive. The 'while' is necessary
@@ -230,10 +188,6 @@ namespace Online{
                 delete me->m_current_request;
                 me->m_current_request = NULL;
             }
-            else
-            {
-                me->addResponse(me->m_current_request);
-            }
             me->m_request_queue.lock();
         }   // while
 
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index 97a9dbde9..42bf0d6d0 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -66,11 +66,6 @@ namespace Online{
                                                >
                         >  m_request_queue;
 
-            /** The list of pointers to all requests that are already handled but didn't need to be deleted. */
-            Synchronised< std::map  < Online::Request::RequestType, Online::Request* > > m_response_queue;
-
-            void addResponse(Online::Request*);
-
             static void  *mainLoop(void *obj);
             void startNetworkThread();
 
@@ -91,9 +86,6 @@ namespace Online{
             void addRequest(Online::Request *request);
             void cancelAllDownloads();
             void stopNetworkThread();
-            Request * getResponse(Online::Request::RequestType type);
-            /** Same as getResponse but with a cast to XMLRequest */
-            XMLRequest * getXMLResponse(Online::Request::RequestType type);
 
             bool getAbort(){ return m_abort.getAtomic(); };
 
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
index 339a7e109..5055e355c 100644
--- a/src/online/messages.cpp
+++ b/src/online/messages.cpp
@@ -24,13 +24,6 @@ namespace Online
 {
     namespace Messages
     {
-        irr::core::stringw loadingDots(bool spaces, float interval, int max_dots)
-        {
-            int nr_dots = int(floor(Time::getRealTime() * (1 / interval))) % (max_dots+1);
-            return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
-        }
-        // ------------------------------------------------------------------------
-
         irr::core::stringw signingIn()
         {
             return irr::core::stringw(_("Signing in")) + loadingDots();
@@ -42,21 +35,35 @@ namespace Online
             return irr::core::stringw(_("Signing out")) + loadingDots();
         }
         // ------------------------------------------------------------------------
+        irr::core::stringw signingUp()
+        {
+            return irr::core::stringw(_("Validating registration info")) + loadingDots();
+        }
+        // ------------------------------------------------------------------------
 
         irr::core::stringw signedInAs(const irr::core::stringw & name)
         {
             return irr::core::stringw(_("Signed in as : ")) + name + ".";
         }
+        // ------------------------------------------------------------------------
 
         irr::core::stringw joiningServer()
         {
             return irr::core::stringw(_("Joining server")) + loadingDots();
         }
+        // ------------------------------------------------------------------------
 
         irr::core::stringw creatingServer()
         {
             return irr::core::stringw(_("Creating server")) + loadingDots();
         }
+
+        // ------------------------------------------------------------------------
+        irr::core::stringw loadingDots(bool spaces, float interval, int max_dots)
+        {
+            int nr_dots = int(floor(Time::getRealTime() * (1 / interval))) % (max_dots+1);
+            return irr::core::stringw((std::string(nr_dots,'.') + std::string(max_dots-nr_dots,' ')).c_str());
+        }
     } // namespace messages
 } // namespace Online
 
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
index c02de0d6a..64b427754 100644
--- a/src/online/messages.hpp
+++ b/src/online/messages.hpp
@@ -29,6 +29,7 @@ namespace Online
         irr::core::stringw loadingDots          (bool spaces = true, float interval = 0.5f, int max_dots = 3);
         irr::core::stringw signingIn            ();
         irr::core::stringw signingOut           ();
+        irr::core::stringw signingUp           ();
         irr::core::stringw joiningServer        ();
         irr::core::stringw creatingServer       ();
         irr::core::stringw signedInAs           (const irr::core::stringw & name);
diff --git a/src/online/request.cpp b/src/online/request.cpp
index d2f880a2f..a2c3cb12c 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -28,8 +28,8 @@ namespace Online{
 
     // =========================================================================================
 
-    Request::Request(RequestType type, int priority, bool manage_memory)
-        :m_type(type)
+    Request::Request(int type, bool manage_memory, int priority)
+        : m_type(type)
     {
         m_priority      = priority;
         m_manage_memory = manage_memory;
@@ -55,18 +55,12 @@ namespace Online{
 
     // =========================================================================================
 
-    QuitRequest::QuitRequest()
-        : Request(RT_QUIT,9999,true)
+    HTTPRequest::HTTPRequest(int type, bool manage_memory, int priority)
+        : Request(priority, manage_memory, type)
     {
-    }
-
-
-    // =========================================================================================
-
-    HTTPRequest::HTTPRequest(RequestType type, const std::string & url)
-        : Request(type, 1,false)
-    {
-        m_url = url;
+        //Negative numbers are reserved for special requests ment for the HTTP Manager
+        assert(type >= 0);
+        m_url = "";
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
     }
@@ -200,8 +194,8 @@ namespace Online{
 
     // =========================================================================================
 
-    XMLRequest::XMLRequest(RequestType type, const std::string & url)
-        : HTTPRequest(type, url)
+    XMLRequest::XMLRequest(int type, bool manage_memory, int priority)
+        : HTTPRequest(priority, manage_memory, type)
     {
         m_info = "";
         m_success = false;
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 90d396ff6..feb1247e6 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -32,18 +32,8 @@ namespace Online{
       */
     class Request
     {
-    public:
-        /** List of different types of requests which are used as key in the response map
-         */
-        enum RequestType {
-            RT_QUIT,
-            RT_SIGN_IN,
-            RT_SIGN_OUT,
-            RT_SIGN_UP,
-            RT_SERVER_CREATION,
-            RT_SERVER_JOIN
-        };
-
+    private:
+        const int           m_type;
     protected:
         /** The priority of this request. The higher the value the more
         important this request is. */
@@ -51,9 +41,6 @@ namespace Online{
         /** Cancel this request if it is active. */
         bool                m_cancel;
 
-        const RequestType   m_type;
-
-
         /** True if the memory for this Request should be managed by
         *  http connector (i.e. this object is freed once the request
         *  is handled). Otherwise the memory is not freed, so it must
@@ -63,12 +50,17 @@ namespace Online{
         Synchronised<bool>  m_done;
 
         virtual void beforeOperation() {}
-        virtual void operation() = 0;
+        virtual void operation() {};
         virtual void afterOperation();
 
     public:
+        /** Negative numbers are reserved for requests that are special for the HTTP Manager*/
+        enum RequestType
+        {
+            RT_QUIT = -1
+        };
 
-        Request(RequestType type, int priority, bool manage_memory=true);
+        Request(int type, bool manage_memory, int priority);
         virtual ~Request();
 
         void execute();
@@ -83,19 +75,16 @@ namespace Online{
         /** Returns if this request is to be canceled. */
         bool isCancelled() const        { return m_cancel; }
         // ------------------------------------------------------------------------
-        /** Specifies if the memory should be managed by http manager. */
-        void setManageMemory(bool m)    { m_manage_memory = m; }
-        // ------------------------------------------------------------------------
         /** Returns if the memory for this object should be managed by
         *  by network_http (i.e. freed once the request is handled). */
         bool manageMemory() const       { return m_manage_memory; }
 
         bool isDone() const             { return m_done.getAtomic(); }
 
-        RequestType getType() const     { return m_type; }
-
         virtual bool isAllowedToAdd()   { return true; }
 
+        int getType() const             { return m_type; }
+
         /** This class is used by the priority queue to sort requests by priority.
          */
         class Compare
@@ -112,17 +101,6 @@ namespace Online{
     // ========================================================================
 
 
-    class QuitRequest : public Request
-    {
-    public :
-        QuitRequest();
-        virtual void operation() OVERRIDE {}
-    };
-
-
-    // ========================================================================
-
-
     class HTTPRequest : public Request
     {
 
@@ -153,7 +131,7 @@ namespace Online{
         virtual void callback() {}
 
     public :
-        HTTPRequest(RequestType type, const std::string & url = "");
+        HTTPRequest(int type = 0, bool manage_memory = false, int priority = 1);
         virtual ~HTTPRequest();
 
         void setParameter(const std::string & name, const std::string &value){
@@ -191,7 +169,7 @@ namespace Online{
         virtual void                    afterOperation() OVERRIDE;
 
     public :
-        XMLRequest(RequestType type, const std::string & url = "");
+        XMLRequest(int type = 0, bool manage_memory = false, int priority = 1);
 
         virtual XMLNode *               getResult() const       { return m_result; }
         const irr::core::stringw &      getInfo()   const       { return m_info; }
diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 51d3f50fd..99c8e2db3 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -41,7 +41,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 {
     m_self_destroy = false;
     m_open_registration_dialog = false;
-    m_signing_in = false;
+    m_sign_in_request = NULL;
     loadFromFile("online/login_dialog.stkgui");
 
     m_message_widget = getWidget<LabelWidget>("message");
@@ -96,6 +96,7 @@ LoginDialog::LoginDialog(const Message message_type) :
 
 LoginDialog::~LoginDialog()
 {
+    delete m_sign_in_request;
 }
 
 
@@ -114,9 +115,8 @@ void LoginDialog::login()
     else
     {
         m_options_widget->setDeactivated();
-        Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
+        m_sign_in_request = Online::CurrentUser::acquire()->requestSignIn(username,password, m_remember_widget->getState());
         Online::CurrentUser::release();
-        m_signing_in = true;
     }
 }
 
@@ -161,24 +161,36 @@ void LoginDialog::onEnterPressedInternal()
 
 // -----------------------------------------------------------------------------
 
+bool LoginDialog::onEscapePressed()
+{
+    return false;
+}
+
 void LoginDialog::onUpdate(float dt)
 {
-    XMLRequest * sign_in_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_IN);
-    if(sign_in_request != NULL)
+    if(m_sign_in_request != NULL)
     {
-        if(sign_in_request->isSuccess())
+        if(m_sign_in_request->isDone())
         {
-            m_self_destroy = true;
+            if(m_sign_in_request->isSuccess())
+            {
+                m_self_destroy = true;
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_info_widget->setErrorColor();
+                m_info_widget->setText(m_sign_in_request->getInfo(), false);
+            }
+            delete m_sign_in_request;
+            m_sign_in_request = NULL;
+            m_options_widget->setActivated();
         }
         else
         {
-            sfx_manager->quickSound( "anvil" );
-            m_info_widget->setErrorColor();
-            m_info_widget->setText(sign_in_request->getInfo(), false);
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::signingIn(), false);
         }
-        delete sign_in_request;
-        m_signing_in = false;
-        m_options_widget->setActivated();
     }
     //If we want to open the registration dialog, we need to close this one first
     m_open_registration_dialog && (m_self_destroy = true);
@@ -191,10 +203,4 @@ void LoginDialog::onUpdate(float dt)
             new RegistrationDialog();
         return;
     }
-
-    if (m_signing_in)
-    {
-        m_info_widget->setDefaultColor();
-        m_info_widget->setText(Online::Messages::signingIn(), false);
-    }
 }
diff --git a/src/states_screens/dialogs/login_dialog.hpp b/src/states_screens/dialogs/login_dialog.hpp
index 40ca543db..8c83e9b22 100644
--- a/src/states_screens/dialogs/login_dialog.hpp
+++ b/src/states_screens/dialogs/login_dialog.hpp
@@ -37,7 +37,7 @@ private:
     
     bool m_self_destroy;
     bool m_open_registration_dialog;
-    bool m_signing_in;
+    Online::CurrentUser::SignInRequest * m_sign_in_request;
     GUIEngine::LabelWidget * m_message_widget;
     GUIEngine::TextBoxWidget * m_username_widget;
     GUIEngine::TextBoxWidget * m_password_widget;
@@ -69,8 +69,10 @@ public:
     ~LoginDialog();
 
     void onEnterPressedInternal();
+
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
     
+    virtual bool onEscapePressed();
     virtual void onUpdate(float dt);
     //virtual void onTextUpdated();
 };
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 6b6266a6b..4f3799276 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -25,6 +25,7 @@
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
+#include "online/messages.hpp"
 
 
 using namespace GUIEngine;
@@ -38,6 +39,7 @@ RegistrationDialog::RegistrationDialog(const Phase phase) :
         ModalDialog(0.8f,0.9f)
 {
     m_sign_up_request = NULL;
+    m_activation_request = NULL;
     m_self_destroy = false;
     m_show_registration_info = false;
     m_show_registration_terms = false;
@@ -59,6 +61,8 @@ RegistrationDialog::RegistrationDialog(const Phase phase) :
 
 RegistrationDialog::~RegistrationDialog()
 {
+    delete m_sign_up_request;
+    delete m_activation_request;
 }
 
 // -----------------------------------------------------------------------------
@@ -190,8 +194,8 @@ bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
         if (eventSource == "next")
         {
             assert(getWidget<CheckBoxWidget>("accepted")->getState());
-            m_agreement = true;
-            m_sign_up_request = CurrentUser::acquire()->requestSignUp(m_username, m_password, m_password_confirm, m_email, m_agreement);
+            m_sign_up_request = CurrentUser::acquire()->requestSignUp(m_username, m_password, m_password_confirm, m_email, true);
+            CurrentUser::release();
             return true;
         }
         else if (eventSource == "accepted")
@@ -274,12 +278,42 @@ void RegistrationDialog::onEnterPressedInternal()
 
 void RegistrationDialog::onUpdate(float dt)
 {
-    /*
-    if(m_sign_up_request != NULL)
+    if (m_phase == Terms)
     {
-        if(m_sign_up_request->isDone())
+        if(m_sign_up_request  != NULL)
         {
-            if(m_sign_up_request->isSuccess())
+            if(m_sign_up_request->isDone())
+            {
+                if(m_sign_up_request->isSuccess())
+                {
+                    m_show_registration_activation = true;
+                }
+                else
+                {
+                    sfx_manager->quickSound( "anvil" );
+                    m_show_registration_info = true;
+                    m_registration_error = m_sign_up_request->getInfo();
+                }
+                delete m_sign_up_request;
+                m_sign_up_request = NULL;
+                //FIXME m_options_widget->setActivated();
+            }
+            else
+            {
+                LabelWidget* label = getWidget<LabelWidget>("info");
+                assert(label != NULL);
+                label->setDefaultColor();
+                label->setText(Messages::signingUp(), false);
+            }
+        }
+    }
+    else if (m_phase == Activation)
+    {
+        /*
+        XMLRequest * sign_up_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_UP);
+        if(sign_up_request != NULL)
+        {
+            if(sign_up_request->isSuccess())
             {
                 m_show_registration_activation = true;
             }
@@ -287,18 +321,13 @@ void RegistrationDialog::onUpdate(float dt)
             {
                 sfx_manager->quickSound( "anvil" );
                 m_show_registration_info = true;
+                m_registration_error = sign_up_request->getInfo();
             }
-            m_options_widget->setActivated();
-            delete m_sign_in_request;
-            m_sign_in_request = NULL;
-        }
-        else
-        {
-            m_load_timer += dt;
-            m_info_widget->setDefaultColor();
-            m_info_widget->setText(Online::Messages::signingIn(m_load_timer), false);
-        }
-    }*/
+            delete sign_up_request;
+            m_signing_up = false;
+            //FIXME m_options_widget->setActivated();
+        }*/
+    }
     // It's unsafe to delete from inside the event handler so we do it here
     if (m_self_destroy)
         ModalDialog::dismiss();
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index 04fefe70b..ecf6cbaa9 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -56,6 +56,7 @@ private:
     bool m_show_registration_activation;
 
     Online::XMLRequest * m_sign_up_request;
+    Online::XMLRequest * m_activation_request;
 
     //Saved user input :
     irr::core::stringw m_username;
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 22758576c..7eff55b31 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -46,7 +46,7 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
     m_server = server;
     m_self_destroy = false;
     m_enter_lobby = false;
-    m_joining_server = false;
+    m_server_join_request = NULL;
 
     loadFromFile("online/server_info_dialog.stkgui");
 
@@ -69,13 +69,13 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
 // -----------------------------------------------------------------------------
 ServerInfoDialog::~ServerInfoDialog()
 {
+    delete m_server_join_request;
 }
 // -----------------------------------------------------------------------------
 void ServerInfoDialog::requestJoin()
 {
     Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
     Online::CurrentUser::release();
-    m_joining_server = true;
 }
 
 // -----------------------------------------------------------------------------
@@ -115,21 +115,28 @@ void ServerInfoDialog::onEnterPressedInternal()
 
 void ServerInfoDialog::onUpdate(float dt)
 {
-    XMLRequest * request = HTTPManager::get()->getXMLResponse(Request::RT_SERVER_JOIN);
-    if(request != NULL)
+    if(m_server_join_request != NULL)
     {
-        if(request->isSuccess())
+        if(m_server_join_request->isDone())
         {
-            m_self_destroy = true;
+            if(m_server_join_request->isSuccess())
+            {
+                m_self_destroy = true;
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_info_widget->setErrorColor();
+                m_info_widget->setText(m_server_join_request->getInfo(), false);
+            }
+            delete m_server_join_request;
+            m_server_join_request = NULL;
         }
         else
         {
-            sfx_manager->quickSound( "anvil" );
-            m_info_widget->setErrorColor();
-            m_info_widget->setText(request->getInfo(), false);
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::joiningServer(), false);
         }
-        delete request;
-        m_joining_server = false;
     }
 
     //If we want to open the registration dialog, we need to close this one first
@@ -143,10 +150,4 @@ void ServerInfoDialog::onUpdate(float dt)
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());
         return;
     }
-
-    if (m_joining_server)
-    {
-        m_info_widget->setDefaultColor();
-        m_info_widget->setText(Online::Messages::joiningServer(), false);
-    }
 }
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 7fafd0770..84ff6e64d 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -40,7 +40,7 @@ private:
     
     bool m_self_destroy;
     bool m_enter_lobby;
-    bool m_joining_server;
+    Online::CurrentUser::ServerJoinRequest * m_server_join_request;
 
     float m_load_timer;
 
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index e2f91d21c..6d5b3d859 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -51,8 +51,10 @@ DEFINE_SCREEN_SINGLETON( OnlineScreen );
 
 OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 {
-    m_recorded_state = CurrentUser::SIGNED_OUT;
-    CurrentUser::acquire()->requestSavedSession();
+    m_recorded_state = CurrentUser::US_SIGNED_OUT;
+    CurrentUser::SignInRequest * request = CurrentUser::acquire()->requestSavedSession();
+    if(request != NULL)
+        m_requests.push_back(request);
     CurrentUser::release();
 }   // OnlineScreen
 
@@ -60,6 +62,7 @@ OnlineScreen::OnlineScreen() : Screen("online/main.stkgui")
 
 OnlineScreen::~OnlineScreen()
 {
+    m_requests.clearAndDeleteAll();
 }
 
 // ----------------------------------------------------------------------------
@@ -108,24 +111,24 @@ void OnlineScreen::beforeAddingWidget()
     m_bottom_menu_widget->setVisible(true);
     m_top_menu_widget->setVisible(true);
     hasStateChanged();
-    if (m_recorded_state == CurrentUser::SIGNED_IN)
+    if (m_recorded_state == CurrentUser::US_SIGNED_IN)
     {
         m_register_widget->setVisible(false);
         m_sign_in_widget->setVisible(false);
     }
-    else if (m_recorded_state == CurrentUser::SIGNED_OUT || m_recorded_state == CurrentUser::SIGNING_IN || m_recorded_state == CurrentUser::SIGNING_OUT)
+    else if (m_recorded_state == CurrentUser::US_SIGNED_OUT || m_recorded_state == CurrentUser::US_SIGNING_IN || m_recorded_state == CurrentUser::US_SIGNING_OUT)
     {
         m_quick_play_widget->setDeactivated();
         m_find_server_widget->setDeactivated();
         m_create_server_widget->setDeactivated();
         m_sign_out_widget->setVisible(false);
-        if(m_recorded_state == CurrentUser::SIGNING_IN || m_recorded_state == CurrentUser::SIGNING_OUT)
+        if(m_recorded_state == CurrentUser::US_SIGNING_IN || m_recorded_state == CurrentUser::US_SIGNING_OUT)
         {
             m_register_widget->setDeactivated();
             m_sign_in_widget->setDeactivated();
         }
     }
-    else if (m_recorded_state == CurrentUser::GUEST)
+    else if (m_recorded_state == CurrentUser::US_GUEST)
     {
         m_find_server_widget->setDeactivated();
         m_create_server_widget->setDeactivated();
@@ -150,47 +153,39 @@ void OnlineScreen::init()
 // ----------------------------------------------------------------------------
 void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
-    if (hasStateChanged())
-        GUIEngine::reshowCurrentScreen();
-    if (m_recorded_state == CurrentUser::SIGNING_IN)
+    if (m_recorded_state == CurrentUser::US_SIGNING_IN)
     {
         m_online_status_widget->setText(Messages::signingIn(), false);
     }
-    else if (m_recorded_state == CurrentUser::SIGNING_OUT)
+    else if (m_recorded_state == CurrentUser::US_SIGNING_OUT)
     {
         m_online_status_widget->setText(Messages::signingOut(), false);
     }
 
-    XMLRequest * sign_in_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_IN);
-    if(sign_in_request != NULL)
+    for(int i = m_requests.size()-1; i>=0; --i)
     {
-        if(sign_in_request->isSuccess())
+        if(m_requests[i].isDone())
         {
-            new MessageDialog(_("Signed in."));
+            if(m_requests[i].getType() == CurrentUser::RT_SIGN_IN)
+            {
+                if(m_requests[i].isSuccess())
+                {
+                    new MessageDialog(_("Signed in."));
+                }
+                else
+                {
+                    sfx_manager->quickSound( "anvil" );
+                    new MessageDialog(m_requests[i].getInfo());
+                }
+            }else if(m_requests[i].getType() == CurrentUser::RT_SIGN_OUT)
+            {
+                new MessageDialog(_("Signed out successfully."));
+            }
+            m_requests.erase(i);
         }
-        else
-        {
-            sfx_manager->quickSound( "anvil" );
-            new MessageDialog(sign_in_request->getInfo());
-        }
-        delete sign_in_request;
     }
-    XMLRequest * sign_out_request = HTTPManager::get()->getXMLResponse(Request::RT_SIGN_OUT);
-    if(sign_out_request != NULL)
-    {
-        if(sign_out_request->isSuccess())
-        {
-            new MessageDialog(_("Signed out successfully."));
-        }
-        else
-        {
-            sfx_manager->quickSound( "anvil" );
-            new MessageDialog(sign_out_request->getInfo());
-        }
-        delete sign_out_request;
-    }
-
-
+    if (hasStateChanged())
+        GUIEngine::reshowCurrentScreen();
 }   // onUpdate
 
 // ----------------------------------------------------------------------------
@@ -272,7 +267,7 @@ void OnlineScreen::onDisabledItemClicked(const std::string& item)
 // ----------------------------------------------------------------------------
 void OnlineScreen::setInitialFocus()
 {
-    if(m_recorded_state == CurrentUser::SIGNED_IN)
+    if(m_recorded_state == CurrentUser::US_SIGNED_IN)
         m_top_menu_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
     else
         m_bottom_menu_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
diff --git a/src/states_screens/online_screen.hpp b/src/states_screens/online_screen.hpp
index e445eea79..09e18c760 100644
--- a/src/states_screens/online_screen.hpp
+++ b/src/states_screens/online_screen.hpp
@@ -23,6 +23,7 @@
 #include "guiengine/widgets/ribbon_widget.hpp"
 #include "guiengine/widgets/icon_button_widget.hpp"
 #include "online/current_user.hpp"
+#include "utils/ptr_vector.hpp"
 
 namespace GUIEngine { class Widget; class ListWidget; }
 
@@ -53,6 +54,8 @@ private:
 
     Online::CurrentUser::UserState m_recorded_state;
 
+    PtrVector<Online::XMLRequest> m_requests;
+
     /** \brief Checks if the recorded state differs from the actual state and sets it. */
     bool hasStateChanged();
     /** \brief Sets which widget has to be focused. Depends on the user state. */

From af12be28fa11fa038fed1794469366e77126b7c3 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 15:25:17 +0000
Subject: [PATCH 32/44] Login dialog can't be closed now during a sign in
 request.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13308 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/states_screens/dialogs/login_dialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/states_screens/dialogs/login_dialog.cpp b/src/states_screens/dialogs/login_dialog.cpp
index 99c8e2db3..1ca50076c 100644
--- a/src/states_screens/dialogs/login_dialog.cpp
+++ b/src/states_screens/dialogs/login_dialog.cpp
@@ -163,7 +163,7 @@ void LoginDialog::onEnterPressedInternal()
 
 bool LoginDialog::onEscapePressed()
 {
-    return false;
+    return m_cancel_widget->isActivated();
 }
 
 void LoginDialog::onUpdate(float dt)

From 8360c06b15c024a6fa2faac0480cbb1b44a461ae Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 17:41:02 +0000
Subject: [PATCH 33/44] Deprecated old internet access method. Adapted my
 servers_manager and users to the new system.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13310 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 sources.cmake                                 |  3 -
 src/guiengine/widgets/list_widget.cpp         |  8 ++
 src/guiengine/widgets/list_widget.hpp         |  1 +
 src/online/current_user.cpp                   | 11 +--
 src/online/current_user.hpp                   | 12 ++-
 src/online/http_connector.cpp                 | 88 -------------------
 src/online/http_connector.hpp                 | 66 --------------
 src/online/messages.cpp                       |  7 ++
 src/online/messages.hpp                       |  3 +-
 src/online/servers_manager.cpp                | 83 +++++++++++------
 src/online/servers_manager.hpp                | 55 ++++++++----
 src/states_screens/networking_lobby.cpp       |  3 +-
 .../networking_lobby_settings.cpp             |  6 --
 .../networking_lobby_settings.hpp             |  2 -
 src/states_screens/server_selection.cpp       | 85 ++++++++++--------
 src/states_screens/server_selection.hpp       | 17 ++--
 16 files changed, 173 insertions(+), 277 deletions(-)
 delete mode 100644 src/online/http_connector.cpp
 delete mode 100644 src/online/http_connector.hpp

diff --git a/sources.cmake b/sources.cmake
index 0f4ff88a7..a214a603a 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -146,7 +146,6 @@ src/network/race_info_message.cpp
 src/network/race_result_message.cpp
 src/network/race_state.cpp
 src/online/current_user.cpp
-src/online/http_connector.cpp
 src/online/http_manager.cpp
 src/online/messages.cpp
 src/online/request.cpp
@@ -418,8 +417,6 @@ src/network/race_state.hpp
 src/network/remote_kart_info.hpp
 src/network/world_loaded_message.hpp
 src/online/current_user.hpp
-src/online/http_connector.hpp
-src/online/http_listener.hpp
 src/online/http_manager.hpp
 src/online/messages.hpp
 src/online/request.hpp
diff --git a/src/guiengine/widgets/list_widget.cpp b/src/guiengine/widgets/list_widget.cpp
index 3d82cd5f5..7aad575f0 100644
--- a/src/guiengine/widgets/list_widget.cpp
+++ b/src/guiengine/widgets/list_widget.cpp
@@ -253,6 +253,14 @@ void ListWidget::renameItem(const int row_index, const irr::core::stringw newNam
     renameCell(row_index, 0, newName, icon);
 }
 
+// -----------------------------------------------------------------------------
+void ListWidget::renameItem(const std::string & internal_name, const irr::core::stringw newName, const int icon)
+{
+    CGUISTKListBox* list = getIrrlichtElement<CGUISTKListBox>();
+    assert(list != NULL);
+    renameCell(list->getRowByInternalName(internal_name), 0, newName, icon);
+}
+
 // -----------------------------------------------------------------------------
 
 std::string ListWidget::getSelectionInternalName()
diff --git a/src/guiengine/widgets/list_widget.hpp b/src/guiengine/widgets/list_widget.hpp
index d74937a77..c56cd450a 100644
--- a/src/guiengine/widgets/list_widget.hpp
+++ b/src/guiengine/widgets/list_widget.hpp
@@ -178,6 +178,7 @@ namespace GUIEngine
          * renames first cell only
          */
         void renameItem(const int row_num, const irr::core::stringw newName, const int icon=-1);
+        void renameItem(const std::string  & internal_name, const irr::core::stringw newName, const int icon=-1);
 
         /**
           * \brief rename an item and/or change its icon based on its internal name
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 42acd7481..7878f1387 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -22,7 +22,6 @@
 #include <sstream>
 #include <stdlib.h>
 #include <assert.h>
-#include "online/http_connector.hpp"
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 #include "utils/log.hpp"
@@ -30,14 +29,6 @@
 namespace Online{
     static Synchronised<CurrentUser*> user_singleton(NULL);
 
-    CurrentUser* CurrentUser::get()
-    {
-        CurrentUser* user = user_singleton.getData();
-        if (user == NULL)
-            user = new CurrentUser();
-        return user;
-    }   // get
-
     CurrentUser* CurrentUser::acquire()
     {
         user_singleton.lock();
@@ -97,8 +88,10 @@ namespace Online{
     CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
     {
         SignInRequest * request = NULL;
+        Log::info("CurrentUser::requestSavedSession","1");
         if(m_state != US_SIGNED_IN  && UserConfigParams::m_saved_session)
         {
+                Log::info("CurrentUser::requestSavedSession","2");
             request = new SignInRequest();
             request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
             request->setParameter("action",std::string("saved-session"));
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index c2b4d75a2..87af2262b 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -90,10 +90,12 @@ namespace Online{
 
             CurrentUser();
 
-        public:
-            static CurrentUser*         get(); //FIXME To be removed
+            void signIn                 (const SignInRequest            * input);
+            void signOut                (const SignOutRequest           * input);
+            void createServer           (const ServerCreationRequest    * input);
 
-            //Singleton methods
+        public:
+            //Singleton
             static CurrentUser*         acquire();
             static void                 release();
             static void                 deallocate();
@@ -114,10 +116,6 @@ namespace Online{
                                                                 const irr::core::stringw &email,
                                                                 bool terms);
 
-            void signIn                 (const SignInRequest            * input);
-            void signOut                (const SignOutRequest           * input);
-            void createServer           (const ServerCreationRequest    * input);
-
             /** Returns the username if signed in. */
             irr::core::stringw          getUserName()   const;
             bool                        isSignedIn()    const { return m_state == US_SIGNED_IN; }
diff --git a/src/online/http_connector.cpp b/src/online/http_connector.cpp
deleted file mode 100644
index 832b2d5c9..000000000
--- a/src/online/http_connector.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "http_connector.hpp"
-
-#include <iostream>
-#include <stdio.h>
-#include <memory.h>
-#include "io/file_manager.hpp"
-
-
-HTTPConnector::HTTPConnector(const std::string &url){
-    curl_global_init(CURL_GLOBAL_DEFAULT);
-    curl = curl_easy_init();
-    if(!curl)
-        Log::error("online/http_functions", "Error while loading cURL library.");
-    curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
-    if (url.substr(0, 5)!="http:")
-    {
-        Log::error("online/http_functions", "Invalid URL.");
-    }
-}
-
-// ============================================================================
-
-
-HTTPConnector::~HTTPConnector(){
-    curl_easy_cleanup(curl);
-    curl_global_cleanup();
-}
-
-// ============================================================================
-
-static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp)
-{
-    ((std::string*)userp)->append((char*)contents, size * nmemb);
-    return size * nmemb;
-}
-
-XMLNode * HTTPConnector::getXMLFromPage()
-{
-    return file_manager->createXMLTreeFromString(getPage());
-}
-
-std::string HTTPConnector::getPage()
-{
-
-    Parameters::iterator iter;
-    std::string postString = "";
-    for (iter = m_parameters.begin(); iter != m_parameters.end(); ++iter)
-    {
-       if(iter != m_parameters.begin())
-           postString.append("&");
-       char * escaped = curl_easy_escape(this->curl , iter->first.c_str(), iter->first.size());
-       postString.append(escaped);
-       curl_free(escaped);
-       postString.append("=");
-       escaped = curl_easy_escape(this->curl , iter->second.c_str(), iter->second.size());
-       postString.append(escaped);
-       curl_free(escaped);
-    }
-    curl_easy_setopt(this->curl, CURLOPT_POSTFIELDS, postString.c_str());
-    std::string readBuffer;
-    curl_easy_setopt(this->curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-    curl_easy_setopt(this->curl, CURLOPT_FILE, &readBuffer);
-    res = curl_easy_perform(this->curl);
-    if(res != CURLE_OK)
-        Log::error("online/http_functions", "curl_easy_perform() failed: %s", curl_easy_strerror(res));
-    else
-        Log::info("online/http_functions", "Received : %s", readBuffer.c_str());
-    m_parameters.clear();
-    return readBuffer;
-}
diff --git a/src/online/http_connector.hpp b/src/online/http_connector.hpp
deleted file mode 100644
index f221f7f06..000000000
--- a/src/online/http_connector.hpp
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef HTTP_CONNECTOR_HPP
-#define HTTP_CONNECTOR_HPP
-
-#include <string>
-#include "io/xml_node.hpp"
-#include <curl/curl.h>
-#include <irrString.h>
-#include "utils/string_utils.hpp"
-
-/**
-  * \brief Class to connect with a server over HTTP
-  * \ingroup online
-  */
-class HTTPConnector
-{
-    protected:
-        CURL *curl;
-        CURLcode res;
-        typedef std::map<std::string, std::string> Parameters;
-        Parameters m_parameters;
-
-    public:
-
-        HTTPConnector(const std::string &url);
-        ~HTTPConnector();
-
-        //Execute
-        std::string getPage();
-        XMLNode * getXMLFromPage();
-
-        //Setting parameters to be send with the next request
-        void setParameter(const std::string & name, const std::string &value){
-            m_parameters[name] = value;
-        };
-        void setParameter(const std::string & name, const irr::core::stringw &value){
-            m_parameters[name] = irr::core::stringc(value.c_str()).c_str();
-        }
-        template <typename T>
-        void setParameter(const std::string & name, const T& value){
-            m_parameters[name] = StringUtils::toString(value);
-        }
-
-}; //class HTTPConnector
-
-
-#endif // HTTP_CONNECTOR_HPP
-
-/*EOF*/
diff --git a/src/online/messages.cpp b/src/online/messages.cpp
index 5055e355c..0b1e61448 100644
--- a/src/online/messages.cpp
+++ b/src/online/messages.cpp
@@ -58,6 +58,13 @@ namespace Online
             return irr::core::stringw(_("Creating server")) + loadingDots();
         }
 
+        // ------------------------------------------------------------------------
+
+        irr::core::stringw fetchingServers()
+        {
+            return irr::core::stringw(_("Fetching servers")) + loadingDots();
+        }
+
         // ------------------------------------------------------------------------
         irr::core::stringw loadingDots(bool spaces, float interval, int max_dots)
         {
diff --git a/src/online/messages.hpp b/src/online/messages.hpp
index 64b427754..36a936d79 100644
--- a/src/online/messages.hpp
+++ b/src/online/messages.hpp
@@ -29,9 +29,10 @@ namespace Online
         irr::core::stringw loadingDots          (bool spaces = true, float interval = 0.5f, int max_dots = 3);
         irr::core::stringw signingIn            ();
         irr::core::stringw signingOut           ();
-        irr::core::stringw signingUp           ();
+        irr::core::stringw signingUp            ();
         irr::core::stringw joiningServer        ();
         irr::core::stringw creatingServer       ();
+        irr::core::stringw fetchingServers      ();
         irr::core::stringw signedInAs           (const irr::core::stringw & name);
     } // namespace Messages
 }// namespace Online
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index 3bd57e53c..aa26e9bf0 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -22,56 +22,87 @@
 #include <string>
 #include <irrString.h>
 #include <assert.h>
-#include "online/http_connector.hpp"
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
+#include "utils/time.hpp"
+
+#define SERVER_REFRESH_INTERVAL 5.0f
 
 namespace Online{
 
-    static ServersManager* user_singleton = NULL;
+    static Synchronised<ServersManager*> manager_singleton(NULL);
 
-    ServersManager* ServersManager::get()
+    ServersManager* ServersManager::acquire()
     {
-        if (user_singleton == NULL)
-            user_singleton = new ServersManager();
-        return user_singleton;
-    }   // get
+        manager_singleton.lock();
+        ServersManager * manager = manager_singleton.getData();
+        if (manager == NULL)
+        {
+            manager_singleton.unlock();
+            manager = new ServersManager();
+            manager_singleton.setAtomic(manager);
+            manager_singleton.lock();
+        }
+        return manager;
+    }
+
+    void ServersManager::release()
+    {
+        manager_singleton.unlock();
+    }
 
     void ServersManager::deallocate()
     {
-        delete user_singleton;
-        user_singleton = NULL;
+        manager_singleton.lock();
+        ServersManager* manager = manager_singleton.getData();
+        delete manager;
+        manager = NULL;
+        manager_singleton.unlock();
     }   // deallocate
 
     // ============================================================================
     ServersManager::ServersManager(){
         m_servers = new PtrVector<Server>;
-        refresh();
+        m_info_message = "";
+        m_last_load_time = 0.0f;
     }
 
     // ============================================================================
-    void ServersManager::refresh()
+    ServersManager::RefreshRequest * ServersManager::refreshRequest()
     {
-        HTTPConnector * connector = new HTTPConnector((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        connector->setParameter("action",std::string("get_server_list"));
-
-        const XMLNode * result = connector->getXMLFromPage();
-        std::string rec_success = "";
-        if(result->get("success", &rec_success))
+        RefreshRequest * request = NULL;
+        if(Time::getRealTime() - m_last_load_time > SERVER_REFRESH_INTERVAL)
         {
-            if (rec_success =="yes")
-            {
-                const XMLNode * servers_xml = result->getNode("servers");
-                m_servers->clearAndDeleteAll();
-                for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
-                {
-                    m_servers->push_back(new Server(*servers_xml->getNode(i)));
-                }
-            }
+            request = new RefreshRequest();
+            request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
+            request->setParameter("action",std::string("get_server_list"));
+            HTTPManager::get()->addRequest(request);
         }
+        return request;
+    }
+
+    void ServersManager::refresh(const RefreshRequest * input)
+    {
+        if (input->isSuccess())
+        {
+            const XMLNode * servers_xml = input->getResult()->getNode("servers");
+            m_servers->clearAndDeleteAll();
+            for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
+            {
+                m_servers->push_back(new Server(*servers_xml->getNode(i)));
+            }
+            m_last_load_time += Time::getRealTime();
+        }
+        m_info_message = input->getInfo();
         //FIXME error message
     }
 
+    void ServersManager::RefreshRequest::callback()
+    {
+        ServersManager::acquire()->refresh(this);
+        ServersManager::release();
+    }
+
     // ============================================================================
     Server * ServersManager::getQuickPlay()
     {
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index 716f6d4a2..03a5768b8 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -17,10 +17,12 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifndef HEADER_SERVERS_MANAGER_HPP
-#define HEADER_CURRENT_ONLINE_USER_HPP
+#define HEADER_SERVERS_MANAGER_HPP
 
 #include "utils/ptr_vector.hpp"
 #include "online/server.hpp"
+#include "http_manager.hpp"
+
 
 
 namespace Online {
@@ -31,26 +33,43 @@ namespace Online {
       */
     class ServersManager
     {
-        private:
-            ServersManager();
-            PtrVector<Server> * m_servers;
-            bool m_not_fetched;
-            Server * m_joined_server;
+    public:
+        enum RequestType
+        {
+            RT_REFRESH = 1
+        };
 
+        class RefreshRequest : public XMLRequest
+        {
+            virtual void callback ();
         public:
-            // singleton
-            static ServersManager* get();
-            static void deallocate();
+            RefreshRequest() : XMLRequest(RT_REFRESH) {}
+        };
 
-            void refresh();
-            PtrVector<Server> * getServers () const { return m_servers; };
-            int getNumServers () const { return m_servers->size(); };
-            Server * getServer (int index) const { return m_servers->get(index);};
-            void sort(bool sort_desc) { m_servers->insertionSort(0, sort_desc); };
-            void setJoinedServer(Server * server){ m_joined_server = server;};
-            Server * getJoinedServer(){ return m_joined_server;};
-            //Returns the best server to join
-            Server * getQuickPlay();
+    private:
+        ServersManager();
+        PtrVector<Server> *             m_servers;
+        bool                            m_not_fetched;
+        Server *                        m_joined_server;
+        irr::core::stringw              m_info_message;
+        float                           m_last_load_time;
+        void                            refresh(const RefreshRequest * input);
+
+    public:
+        // Singleton
+        static ServersManager*          acquire();
+        static void                     release();
+        static void                     deallocate();
+
+        RefreshRequest *                refreshRequest();
+        PtrVector<Server> *             getServers ()           const   { return m_servers;                             }
+        int                             getNumServers ()        const   { return m_servers->size();                     }
+        Server *                        getServer (int index)   const   { return m_servers->get(index);                 }
+        void                            sort(bool sort_desc)            { m_servers->insertionSort(0, sort_desc);       }
+        void                            setJoinedServer(Server * server){ m_joined_server = server;                     }
+        Server *                        getJoinedServer()               { return m_joined_server;                       }
+        //Returns the best server to join
+        Server *                        getQuickPlay();
     };   // class ServersManager
 
 
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index dd0c1ba54..16a3ede61 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -46,7 +46,8 @@ DEFINE_SCREEN_SINGLETON( NetworkingLobby );
 
 NetworkingLobby::NetworkingLobby() : Screen("online/lobby.stkgui")
 {
-    m_server = ServersManager::get()->getJoinedServer();
+    m_server = ServersManager::acquire()->getJoinedServer();
+    ServersManager::release();
 }   // NetworkingLobby
 
 // ----------------------------------------------------------------------------
diff --git a/src/states_screens/networking_lobby_settings.cpp b/src/states_screens/networking_lobby_settings.cpp
index 9909ff45c..296cdd1d5 100644
--- a/src/states_screens/networking_lobby_settings.cpp
+++ b/src/states_screens/networking_lobby_settings.cpp
@@ -68,12 +68,6 @@ void NetworkingLobbySettings::loadedFromFile()
 
 }   // loadedFromFile
 
-// ----------------------------------------------------------------------------
-bool NetworkingLobbySettings::hasLostConnection()
-{
-    return !CurrentUser::get()->isSignedIn();
-}
-
 // ----------------------------------------------------------------------------
 void NetworkingLobbySettings::beforeAddingWidget()
 {
diff --git a/src/states_screens/networking_lobby_settings.hpp b/src/states_screens/networking_lobby_settings.hpp
index d27718b12..c478954b6 100644
--- a/src/states_screens/networking_lobby_settings.hpp
+++ b/src/states_screens/networking_lobby_settings.hpp
@@ -46,8 +46,6 @@ private:
     GUIEngine::ButtonWidget * m_create_widget;
     GUIEngine::ButtonWidget * m_cancel_widget;
 
-    /** \brief Checks if the user is still signed in. */
-    bool hasLostConnection();
     /** \brief Sets which widget has to be focused. Depends on the user state. */
     void setInitialFocus();
 
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index a01983ef3..947a55ab0 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -21,13 +21,13 @@
 #include <assert.h>
 
 #include "guiengine/modaldialog.hpp"
-#include "guiengine/widget.hpp"
 #include "states_screens/dialogs/message_dialog.hpp"
 #include "states_screens/dialogs/server_info_dialog.hpp"
 #include "states_screens/state_manager.hpp"
 #include "utils/translation.hpp"
 #include "utils/string_utils.hpp"
-#include "online/servers_manager.hpp"
+#include "online/messages.hpp"
+#include "audio/sfx_manager.hpp"
 
 using namespace Online;
 
@@ -38,14 +38,34 @@ DEFINE_SCREEN_SINGLETON( ServerSelection );
 ServerSelection::ServerSelection() : Screen("online/server_selection.stkgui")
 {
     m_selected_index = -1;
-    m_reload_timer = 0.0f;
+    m_refresh_request = NULL;
+
 }   // ServerSelection
 
+// ----------------------------------------------------------------------------
+
+ServerSelection::~ServerSelection()
+{
+    delete m_refresh_request;
+}   // ServerSelection
+
+
+// ----------------------------------------------------------------------------
+
+void ServerSelection::refresh()
+{
+    m_refresh_request = ServersManager::acquire()->refreshRequest();
+    ServersManager::release();
+    m_server_list_widget->clear();
+    m_server_list_widget->addItem("spacer", L"");
+    m_server_list_widget->addItem("loading", Messages::fetchingServers());
+}
+
+
 // ----------------------------------------------------------------------------
 
 void ServerSelection::loadedFromFile()
 {
-
     m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
     m_reload_widget = getWidget<GUIEngine::IconButtonWidget>("reload");
 
@@ -68,40 +88,24 @@ void ServerSelection::beforeAddingWidget()
 void ServerSelection::init()
 {
     Screen::init();
-    m_reloading = false;
     m_sort_desc = true;
     m_reload_widget->setActivated();
 
     // Set the default sort order
     Server::setSortOrder(Server::SO_NAME);
-    loadList();
+    refresh();
 }   // init
 
-// ----------------------------------------------------------------------------
-
-void ServerSelection::unloaded()
-{
-}
-
-// ----------------------------------------------------------------------------
-
-void ServerSelection::tearDown()
-{
-}
-
 // ----------------------------------------------------------------------------
 /** Loads the list of all servers. The gui element will be
  *  updated.
  *  \param type Must be 'kart' or 'track'.
  */
-void ServerSelection::loadList(bool refresh)
+void ServerSelection::loadList()
 {
     m_server_list_widget->clear();
-    ServersManager * manager = ServersManager::get();
-    if (refresh)
-        manager->refresh();
+    ServersManager * manager = ServersManager::acquire();
     manager->sort(m_sort_desc);
-
     for(int i=0; i <  manager->getNumServers(); i++)
     {
         Server * server = manager->getServer(i);
@@ -114,7 +118,7 @@ void ServerSelection::loadList(bool refresh)
         row->push_back(new GUIEngine::ListWidget::ListCell(num_players,-1,1,true));
         m_server_list_widget->addItem("server", row);
     }
-
+    ServersManager::release();
 }   // loadList
 
 // ----------------------------------------------------------------------------
@@ -143,19 +147,14 @@ void ServerSelection::eventCallback( GUIEngine::Widget* widget,
 
     else if (name == "reload")
     {
-        if (!m_reloading)
-        {
-            m_reloading = true;
-            m_server_list_widget->clear();
-            m_server_list_widget->addItem("spacer", L"");
-            m_server_list_widget->addItem("loading", _("Please wait while the list is being updated."));
-        }
+        refresh();
     }
 
     else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID])
     {
         m_selected_index = m_server_list_widget->getSelectionID();
-        new ServerInfoDialog(ServersManager::get()->getServer(m_selected_index));
+        new ServerInfoDialog(ServersManager::acquire()->getServer(m_selected_index));
+        ServersManager::release();
     }
 
 }   // eventCallback
@@ -180,18 +179,26 @@ void ServerSelection::setLastSelected()
 
 void ServerSelection::onUpdate(float dt, irr::video::IVideoDriver*)
 {
-    m_reload_timer += dt;
-    if (m_reloading)
+    if(m_refresh_request != NULL)
     {
-        m_reloading = false;
-        if(m_reload_timer > 5000.0f)
+        if(m_refresh_request->isDone())
         {
-            loadList(true);
-            m_reload_timer = 0.0f;
+            if(m_refresh_request->isSuccess())
+            {
+                loadList();
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                new MessageDialog(m_refresh_request->getInfo());
+            }
+            delete m_refresh_request;
+            m_refresh_request = NULL;
+            //m_options_widget->setActivated();
         }
         else
         {
-            loadList(false);
+            m_server_list_widget->renameItem("loading", Messages::fetchingServers());
         }
     }
 }   // onUpdate
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
index ea698da6c..7c603c9b8 100644
--- a/src/states_screens/server_selection.hpp
+++ b/src/states_screens/server_selection.hpp
@@ -19,10 +19,8 @@
 #define HEADER_SERVER_SELECTION_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/ribbon_widget.hpp"
-#include "guiengine/widgets/list_widget.hpp"
-#include "guiengine/widgets/icon_button_widget.hpp"
+#include "guiengine/widgets.hpp"
+#include "online/servers_manager.hpp"
 
 namespace GUIEngine { class Widget; }
 
@@ -38,6 +36,7 @@ class ServerSelection :  public GUIEngine::Screen,
 
 private:
     ServerSelection();
+    ~ServerSelection();
 
     GUIEngine::IconButtonWidget * m_back_widget;
     GUIEngine::IconButtonWidget * m_reload_widget;
@@ -51,23 +50,20 @@ private:
      *  addons_loading is being displayed. */
     int              m_selected_index;
 
-    bool             m_reloading;
-
     /** \brief To check (and set) if sort order is descending **/
     bool             m_sort_desc;
 
-    float            m_reload_timer;
+    Online::ServersManager::RefreshRequest * m_refresh_request;
+    void refresh();
 
 public:
 
     /** Load the addons into the main list.*/
-    void loadList(bool refresh = false);
+    void loadList();
 
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void loadedFromFile() OVERRIDE;
 
-    virtual void unloaded() OVERRIDE;
-
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
                                const int playerID) OVERRIDE;
@@ -78,7 +74,6 @@ public:
     virtual void onColumnClicked(int columnId);
 
     virtual void init() OVERRIDE;
-    virtual void tearDown() OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;

From c2159306e8b403780f58cbe5e00a7349f5c6119c Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 20:26:27 +0000
Subject: [PATCH 34/44] Some documentation and thread-safeness. ___Remind me to
 ask some questions about mutex___!

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp          |   2 -
 src/online/request.cpp               |   6 +-
 src/online/request.hpp               | 108 +++++++++++++++------------
 src/states_screens/online_screen.cpp |   5 +-
 4 files changed, 65 insertions(+), 56 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 7878f1387..2cd524e54 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -88,10 +88,8 @@ namespace Online{
     CurrentUser::SignInRequest * CurrentUser::requestSavedSession()
     {
         SignInRequest * request = NULL;
-        Log::info("CurrentUser::requestSavedSession","1");
         if(m_state != US_SIGNED_IN  && UserConfigParams::m_saved_session)
         {
-                Log::info("CurrentUser::requestSavedSession","2");
             request = new SignInRequest();
             request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
             request->setParameter("action",std::string("saved-session"));
diff --git a/src/online/request.cpp b/src/online/request.cpp
index a2c3cb12c..f884ed0d6 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -29,11 +29,9 @@ namespace Online{
     // =========================================================================================
 
     Request::Request(int type, bool manage_memory, int priority)
-        : m_type(type)
+        : m_type(type), m_manage_memory(manage_memory), m_priority(priority)
     {
-        m_priority      = priority;
-        m_manage_memory = manage_memory;
-        m_cancel        = false;
+        m_cancel.setAtomic(false);
         m_done.setAtomic(false);
     }   // Request
 
diff --git a/src/online/request.hpp b/src/online/request.hpp
index feb1247e6..4887f2c02 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -27,27 +27,32 @@
 namespace Online{
 
     /**
-      * Stores a request for the http connector. They will be sorted by priorities.
+      * Stores a request for the HTTP Manager. They will be sorted by priorities.
       * \ingroup online
       */
     class Request
     {
     private:
-        const int           m_type;
-    protected:
-        /** The priority of this request. The higher the value the more
-        important this request is. */
-        int                 m_priority;
-        /** Cancel this request if it is active. */
-        bool                m_cancel;
-
+        /** Can be used as identifier for the user.
+         *  Has 0 as default value.
+         *  Only requests ment to control the HTTP Manager should use negative values, for all other uses positive values are obliged
+         *  */
+        const int              m_type;
         /** True if the memory for this Request should be managed by
         *  http connector (i.e. this object is freed once the request
         *  is handled). Otherwise the memory is not freed, so it must
         *  be freed by the calling function. */
-        bool                m_manage_memory;
+        const bool             m_manage_memory;
+        /** The priority of this request. The higher the value the more
+        important this request is. */
+        const int              m_priority;
 
-        Synchronised<bool>  m_done;
+    protected:
+
+        /** Cancel this request if it is active. */
+        Synchronised<bool>              m_cancel;
+        /** Set to though if the reply of the request is in and callbacks are executed */
+        Synchronised<bool>              m_done;
 
         virtual void beforeOperation() {}
         virtual void operation() {};
@@ -64,26 +69,26 @@ namespace Online{
         virtual ~Request();
 
         void execute();
-
-        // ------------------------------------------------------------------------
-        /** Returns the priority of this request. */
-        int getPriority() const         { return m_priority; }
-        // ------------------------------------------------------------------------
-        /** Signals that this request should be canceled. */
-        void cancel()                   { m_cancel = true; }
-        // ------------------------------------------------------------------------
-        /** Returns if this request is to be canceled. */
-        bool isCancelled() const        { return m_cancel; }
+        int getType()                   const   { return m_type; }
         // ------------------------------------------------------------------------
         /** Returns if the memory for this object should be managed by
         *  by network_http (i.e. freed once the request is handled). */
-        bool manageMemory() const       { return m_manage_memory; }
-
-        bool isDone() const             { return m_done.getAtomic(); }
-
-        virtual bool isAllowedToAdd()   { return true; }
-
-        int getType() const             { return m_type; }
+        bool manageMemory()             const   { return m_manage_memory; }
+        // ------------------------------------------------------------------------
+        /** Returns the priority of this request. */
+        int getPriority()               const   { return m_priority; }
+        // ------------------------------------------------------------------------
+        /** Signals that this request should be canceled. */
+        void cancel()                           { m_cancel.setAtomic(true); }
+        // ------------------------------------------------------------------------
+        /** Returns if this request is to be canceled. */
+        bool isCancelled()              const   { return m_cancel.getAtomic(); }
+        // ------------------------------------------------------------------------
+        /** Returns if this request is done. */
+        bool isDone()                   const   { return m_done.getAtomic(); }
+        // ------------------------------------------------------------------------
+        /** Virtual method to check if a request has initialized all needed members to a valid value. */
+        virtual bool isAllowedToAdd()   const   { return true; }
 
         /** This class is used by the priority queue to sort requests by priority.
          */
@@ -93,7 +98,9 @@ namespace Online{
             /** Compares two requests, returns if the first request has a lower
              *  priority than the second one. */
             bool operator() (const Request *a, const Request *b) const
-            { return a->getPriority() < b->getPriority(); }
+            {
+                return a->getPriority() < b->getPriority();
+            }
         };   // Compare
     };   // Request
 
@@ -106,29 +113,36 @@ namespace Online{
 
     protected :
 
-        typedef std::map<std::string, std::string> Parameters;
-        Parameters * m_parameters;
+        typedef std::map<std::string, std::string>      Parameters;
 
-        /** The progress indicator. 0 till it is started and the first
-        *  packet is downloaded. At the end eithe -1 (error) or 1
+
+        /** The progress indicator. 0 untill it is started and the first
+        *  packet is downloaded. At the end either -1 (error) or 1
         *  (everything ok) at the end. */
-        Synchronised<float>             m_progress;
-        std::string                     m_url;
+        Synchronised<float>                             m_progress;
+        std::string                            m_url;
+        Parameters *                           m_parameters;
 
-        virtual void afterOperation();
-        std::string downloadPage();
+        virtual void                                    afterOperation() OVERRIDE;
+        /** Executed when a request has finished. */
+        virtual void                                    callback() {}
+        /**
+         * Performs a POST request to the website with URL m_url using the parameters given in m_parameters.
+         * Returns the page as a string.
+         **/
+        std::string                                     downloadPage();
 
-        static int progressDownload(void *clientp,
-                                    double dltotal,
-                                    double dlnow,
-                                    double ultotal,
-                                    double ulnow);
+        static int                                      progressDownload(   void *clientp,
+                                                                            double dltotal,
+                                                                            double dlnow,
+                                                                            double ultotal,
+                                                                            double ulnow);
+
+        static size_t                                   WriteCallback(      void *contents,
+                                                                            size_t size,
+                                                                            size_t nmemb,
+                                                                            void *userp);
 
-        static size_t WriteCallback(void *contents,
-                                    size_t size,
-                                    size_t nmemb,
-                                    void *userp);
-        virtual void callback() {}
 
     public :
         HTTPRequest(int type = 0, bool manage_memory = false, int priority = 1);
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index 6d5b3d859..c0b5a3c6e 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -153,6 +153,8 @@ void OnlineScreen::init()
 // ----------------------------------------------------------------------------
 void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
 {
+    if (hasStateChanged())
+        GUIEngine::reshowCurrentScreen();
     if (m_recorded_state == CurrentUser::US_SIGNING_IN)
     {
         m_online_status_widget->setText(Messages::signingIn(), false);
@@ -161,7 +163,6 @@ void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
     {
         m_online_status_widget->setText(Messages::signingOut(), false);
     }
-
     for(int i = m_requests.size()-1; i>=0; --i)
     {
         if(m_requests[i].isDone())
@@ -184,8 +185,6 @@ void OnlineScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
             m_requests.erase(i);
         }
     }
-    if (hasStateChanged())
-        GUIEngine::reshowCurrentScreen();
 }   // onUpdate
 
 // ----------------------------------------------------------------------------

From 20e6fe74b2e5c4919cd14bc70e721c0a6d149c68 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 21 Jul 2013 23:30:04 +0000
Subject: [PATCH 35/44] server creating and joining. (server side code not
 complete)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13313 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 ...y_settings.stkgui => create_server.stkgui} |  13 +-
 sources.cmake                                 |   4 +-
 src/online/current_user.cpp                   |   1 -
 src/online/request.hpp                        |   5 +-
 src/online/server.cpp                         |   1 +
 src/online/server.hpp                         |   1 +
 src/states_screens/create_server_screen.cpp   | 191 ++++++++++++++++++
 ..._settings.hpp => create_server_screen.hpp} |  32 +--
 .../dialogs/registration_dialog.cpp           |  12 +-
 .../dialogs/server_info_dialog.cpp            |   5 +-
 .../dialogs/server_info_dialog.hpp            |   2 +-
 .../networking_lobby_settings.cpp             | 145 -------------
 src/states_screens/online_screen.cpp          |   6 +-
 13 files changed, 236 insertions(+), 182 deletions(-)
 rename data/gui/online/{lobby_settings.stkgui => create_server.stkgui} (73%)
 create mode 100644 src/states_screens/create_server_screen.cpp
 rename src/states_screens/{networking_lobby_settings.hpp => create_server_screen.hpp} (77%)
 delete mode 100644 src/states_screens/networking_lobby_settings.cpp

diff --git a/data/gui/online/lobby_settings.stkgui b/data/gui/online/create_server.stkgui
similarity index 73%
rename from data/gui/online/lobby_settings.stkgui
rename to data/gui/online/create_server.stkgui
index 27bba564c..218d4a04f 100644
--- a/data/gui/online/lobby_settings.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -19,13 +19,16 @@
             </div>
             
             <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
+            
+            <buttonbar id="options" x="0" y="0" width="100%" height="10%" align="center">
+                <icon-button id="create" width="64" height="64" icon="gui/tutorial.png"  extend_label="75"
+                             I18N="Main menu button" text="Create" label_location="hover"/>
+                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
+                             I18N="Main menu button" text="Cancel" label_location="hover"/>
+            </buttonbar>
         </box>
         
-        <spacer width="10" height="7%"/>
-    
-        <bottombar x="2%" width="96%" height="10%" layout="horizontal-row">
-            
-        </bottombar>
+
         
     </div>
     
diff --git a/sources.cmake b/sources.cmake
index a214a603a..41e1673ea 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -170,6 +170,7 @@ src/replay/replay_play.cpp
 src/replay/replay_recorder.cpp
 src/states_screens/addons_screen.cpp
 src/states_screens/arenas_screen.cpp
+src/states_screens/create_server_screen.cpp
 src/states_screens/credits.cpp
 src/states_screens/cutscene_gui.cpp
 src/states_screens/dialogs/add_device_dialog.cpp
@@ -198,7 +199,6 @@ src/states_screens/help_screen_4.cpp
 src/states_screens/kart_selection.cpp
 src/states_screens/main_menu_screen.cpp
 src/states_screens/networking_lobby.cpp
-src/states_screens/networking_lobby_settings.cpp
 src/states_screens/online_screen.cpp
 src/states_screens/options_screen_audio.cpp
 src/states_screens/options_screen_input2.cpp
@@ -444,6 +444,7 @@ src/replay/replay_play.hpp
 src/replay/replay_recorder.hpp
 src/states_screens/addons_screen.hpp
 src/states_screens/arenas_screen.hpp
+src/states_screens/create_server_screen.hpp
 src/states_screens/credits.hpp
 src/states_screens/cutscene_gui.hpp
 src/states_screens/dialogs/add_device_dialog.hpp
@@ -472,7 +473,6 @@ src/states_screens/help_screen_4.hpp
 src/states_screens/kart_selection.hpp
 src/states_screens/main_menu_screen.hpp
 src/states_screens/networking_lobby.hpp
-src/states_screens/networking_lobby_settings.hpp
 src/states_screens/online_screen.hpp
 src/states_screens/options_screen_audio.hpp
 src/states_screens/options_screen_input2.hpp
diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 2cd524e54..0515e6fe0 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -214,7 +214,6 @@ namespace Online{
 
     void CurrentUser::ServerJoinRequest::callback()
     {
-        //FIXME
     }
 
     // ============================================================================
diff --git a/src/online/request.hpp b/src/online/request.hpp
index 4887f2c02..ab293e012 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -120,8 +120,8 @@ namespace Online{
         *  packet is downloaded. At the end either -1 (error) or 1
         *  (everything ok) at the end. */
         Synchronised<float>                             m_progress;
-        std::string                            m_url;
-        Parameters *                           m_parameters;
+        std::string                                     m_url;
+        Parameters *                                    m_parameters;
 
         virtual void                                    afterOperation() OVERRIDE;
         /** Executed when a request has finished. */
@@ -184,6 +184,7 @@ namespace Online{
 
     public :
         XMLRequest(int type = 0, bool manage_memory = false, int priority = 1);
+        virtual ~XMLRequest() {delete m_result;}
 
         virtual XMLNode *               getResult() const       { return m_result; }
         const irr::core::stringw &      getInfo()   const       { return m_info; }
diff --git a/src/online/server.cpp b/src/online/server.cpp
index ff2df3238..24ec5ff63 100644
--- a/src/online/server.cpp
+++ b/src/online/server.cpp
@@ -41,6 +41,7 @@ namespace Online{
         m_lower_case_name = StringUtils::toLowerCase(m_lower_case_name);
 
         xml.get("id",               &m_server_id);
+        xml.get("hostid",           &m_host_id);
         xml.get("max_players",      &m_max_players);
         xml.get("current_players",  &m_current_players);
 
diff --git a/src/online/server.hpp b/src/online/server.hpp
index bb4d8b3d1..6e0e49dc6 100644
--- a/src/online/server.hpp
+++ b/src/online/server.hpp
@@ -51,6 +51,7 @@ namespace Online{
         std::string m_lower_case_name; //Used for comparison
 
         uint32_t m_server_id;
+        uint32_t m_host_id;
 
         int m_max_players;
 
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
new file mode 100644
index 000000000..e5ed1e56f
--- /dev/null
+++ b/src/states_screens/create_server_screen.cpp
@@ -0,0 +1,191 @@
+//  SuperTuxKart - a fun racing game with go-kart
+//  Copyright (C) 2013 Glenn De Jonghe
+//
+//  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 3
+//  of the License, or (at your option) any later version.
+//
+//  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 this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+#define DEBUG_MENU_ITEM 0
+
+#include "states_screens/create_server_screen.hpp"
+
+#include <string>
+#include <iostream>
+
+#include "challenges/game_slot.hpp"
+#include "challenges/unlock_manager.hpp"
+#include "audio/sfx_manager.hpp"
+#include "states_screens/online_screen.hpp"
+#include "states_screens/state_manager.hpp"
+#include "states_screens/dialogs/message_dialog.hpp"
+#include "modes/demo_world.hpp"
+#include "utils/translation.hpp"
+#include "states_screens/networking_lobby.hpp"
+#include "states_screens/dialogs/server_info_dialog.hpp"
+#include "online/servers_manager.hpp"
+#include "online/messages.hpp"
+
+
+using namespace GUIEngine;
+using namespace Online;
+
+DEFINE_SCREEN_SINGLETON( CreateServerScreen );
+
+// ----------------------------------------------------------------------------
+
+CreateServerScreen::CreateServerScreen() : Screen("online/create_server.stkgui")
+{
+    m_server_creation_request = NULL;
+    m_enter_server = true;
+}   // CreateServerScreen
+
+// ----------------------------------------------------------------------------
+
+void CreateServerScreen::loadedFromFile()
+{
+
+
+    m_name_widget = getWidget<TextBoxWidget>("name");
+    assert(m_name_widget != NULL);
+    m_max_players_widget = getWidget<SpinnerWidget>("max_players");
+    assert(m_max_players_widget != NULL);
+
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+
+    m_options_widget = getWidget<RibbonWidget>("options");
+    assert(m_options_widget != NULL);
+    m_create_widget = getWidget<IconButtonWidget>("create");
+    assert(m_create_widget != NULL);
+    m_cancel_widget = getWidget<IconButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
+
+}   // loadedFromFile
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::beforeAddingWidget()
+{
+
+} // beforeAddingWidget
+
+
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::init()
+{
+    Screen::init();
+    setInitialFocus();
+    DemoWorld::resetIdleTime();
+}
+// ----------------------------------------------------------------------------
+void CreateServerScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
+{
+    if(m_server_creation_request != NULL)
+    {
+        if(m_server_creation_request->isDone())
+        {
+            if(m_server_creation_request->isSuccess())
+            {
+                if (m_enter_server){
+                    Server * server = new Server(*m_server_creation_request->getResult()->getNode("server"));
+                    new ServerInfoDialog(server,true);
+                }
+                else
+                {
+                    StateManager::get()->escapePressed();
+                }
+            }
+            else
+            {
+                sfx_manager->quickSound( "anvil" );
+                m_info_widget->setErrorColor();
+                m_info_widget->setText(m_server_creation_request->getInfo(), false);
+            }
+            delete m_server_creation_request;
+            m_server_creation_request = NULL;
+            //m_options_widget->setActivated();
+        }
+        else
+        {
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Online::Messages::creatingServer(), false);
+        }
+    }
+}   // onUpdate
+
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::serverCreationRequest()
+{
+    const stringw name = m_name_widget->getText().trim();
+    const int max_players = m_max_players_widget->getValue();
+    m_info_widget->setErrorColor();
+    if (name.size() < 4 || name.size() > 30)
+    {
+        m_info_widget->setText(_("Name has to be between 4 and 30 characters long!"), false);
+    }
+    else if (max_players < 2 || max_players > 12)
+    {
+        m_info_widget->setText(_("The maxinum number of players has to be between 2 and 12."), false);
+    }
+    else
+    {
+        //m_options_widget->setDeactivated();
+        m_server_creation_request = Online::CurrentUser::acquire()->requestServerCreation(name, max_players);
+        Online::CurrentUser::release();
+        return;
+    }
+    sfx_manager->quickSound("anvil");
+}
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::eventCallback(Widget* widget, const std::string& name, const int playerID)
+{
+    if (name == m_options_widget->m_properties[PROP_ID])
+    {
+        const std::string& selection = m_options_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+        if (selection == m_cancel_widget->m_properties[PROP_ID])
+        {
+            StateManager::get()->escapePressed();
+        }
+        else if (selection == m_create_widget->m_properties[PROP_ID])
+        {
+            serverCreationRequest();
+        }
+    }
+}   // eventCallback
+
+// ----------------------------------------------------------------------------
+
+void CreateServerScreen::tearDown()
+{
+    delete m_server_creation_request;
+    m_server_creation_request = NULL;
+}   // tearDown
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::onDisabledItemClicked(const std::string& item)
+{
+
+}   // onDisabledItemClicked
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::setInitialFocus()
+{
+}   // setInitialFocus
+
+// ----------------------------------------------------------------------------
+void CreateServerScreen::onDialogClose()
+{
+    setInitialFocus();
+}   // onDialogClose()
diff --git a/src/states_screens/networking_lobby_settings.hpp b/src/states_screens/create_server_screen.hpp
similarity index 77%
rename from src/states_screens/networking_lobby_settings.hpp
rename to src/states_screens/create_server_screen.hpp
index c478954b6..c70b5f931 100644
--- a/src/states_screens/networking_lobby_settings.hpp
+++ b/src/states_screens/create_server_screen.hpp
@@ -15,14 +15,13 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#ifndef HEADER_NETWORKING_LOBBY_SETTINGS_HPP
-#define HEADER_NETWORKING_LOBBY_SETTINGS_HPP
+#ifndef HEADER_CREATE_SERVER_SCREEN_HPP
+#define HEADER_CREATE_SERVER_SCREEN_HPP
 
 #include "guiengine/screen.hpp"
-#include "guiengine/widgets/button_widget.hpp"
-#include "guiengine/widgets/label_widget.hpp"
-#include "guiengine/widgets/text_box_widget.hpp"
-#include "guiengine/widgets/spinner_widget.hpp"
+#include "guiengine/widgets.hpp"
+#include "online/current_user.hpp"
+
 
 namespace GUIEngine { class Widget; class ListWidget; }
 
@@ -30,26 +29,33 @@ namespace GUIEngine { class Widget; class ListWidget; }
   * \brief Handles the main menu
   * \ingroup states_screens
   */
-class NetworkingLobbySettings :     public GUIEngine::Screen,
-                                    public GUIEngine::ScreenSingleton<NetworkingLobbySettings>
+class CreateServerScreen :      public GUIEngine::Screen,
+                                public GUIEngine::ScreenSingleton<CreateServerScreen>
 {
 private:
-    friend class GUIEngine::ScreenSingleton<NetworkingLobbySettings>;
+    friend class GUIEngine::ScreenSingleton<CreateServerScreen>;
 
-    NetworkingLobbySettings();
+    CreateServerScreen();
+
+    bool m_enter_server;
 
     GUIEngine::TextBoxWidget * m_name_widget;
     GUIEngine::SpinnerWidget * m_max_players_widget;
 
     GUIEngine::LabelWidget * m_info_widget;
 
-    GUIEngine::ButtonWidget * m_create_widget;
-    GUIEngine::ButtonWidget * m_cancel_widget;
+    GUIEngine::RibbonWidget * m_options_widget;
+    GUIEngine::IconButtonWidget * m_create_widget;
+    GUIEngine::IconButtonWidget * m_cancel_widget;
+
+
+
+    Online::CurrentUser::ServerCreationRequest * m_server_creation_request;
 
     /** \brief Sets which widget has to be focused. Depends on the user state. */
     void setInitialFocus();
 
-    void createServer();
+    void serverCreationRequest();
 
 public:
 
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 4f3799276..edcf35e83 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -100,7 +100,6 @@ void RegistrationDialog::showRegistrationInfo(){
 
     LabelWidget* label = getWidget<LabelWidget>("info");
     assert(label != NULL);
-    label->setErrorColor();
     label->setText(m_registration_error, false);
 
     ButtonWidget * button = getWidget<ButtonWidget>("next");
@@ -150,29 +149,26 @@ bool RegistrationDialog::processInfoEvent(const std::string& eventSource){
             m_email_confirm = getWidget<TextBoxWidget>("email_confirm")->getText().trim();
             LabelWidget * info_widget = getWidget<LabelWidget>("info");
             //FIXME More validation of registration information
+            info_widget->setErrorColor();
             if (m_password != m_password_confirm)
             {
                 info_widget->setText(_("Passwords don't match!"), false);
-                sfx_manager->quickSound( "anvil" );
             }
             else if (m_email != m_email_confirm)
             {
                 info_widget->setText(_("Emails don't match!"), false);
-                sfx_manager->quickSound( "anvil" );
             }
             else if (m_username.size() < 4 || m_username.size() > 30)
             {
-                info_widget->setText(_("Username has to be between 5 and 30 characters long!"), false);
-                sfx_manager->quickSound( "anvil" );
+                info_widget->setText(_("Username has to be between 4 and 30 characters long!"), false);
             }
             else if (m_password.size() < 8 || m_password.size() > 30)
             {
-                info_widget->setText(_("Password has to be between 5 and 30 characters long!"), false);
-                sfx_manager->quickSound( "anvil" );
+                info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
             }
             else if (m_email.size() < 4 || m_email.size() > 50)
             {
-                info_widget->setText(_("Email has to be between 5 and 50 characters long!"), false);
+                info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
             }
             else
             {
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 7eff55b31..fc2c65d40 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -40,7 +40,7 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-ServerInfoDialog::ServerInfoDialog(Server * server) :
+ServerInfoDialog::ServerInfoDialog(Server * server, bool join) :
         ModalDialog(0.8f,0.8f)
 {
     m_server = server;
@@ -64,6 +64,7 @@ ServerInfoDialog::ServerInfoDialog(Server * server) :
     m_cancel_widget = getWidget<IconButtonWidget>("cancel");
     assert(m_cancel_widget != NULL);
     m_options_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+    requestJoin();
 }
 
 // -----------------------------------------------------------------------------
@@ -121,7 +122,7 @@ void ServerInfoDialog::onUpdate(float dt)
         {
             if(m_server_join_request->isSuccess())
             {
-                m_self_destroy = true;
+                m_enter_lobby = true;
             }
             else
             {
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 84ff6e64d..59616d3e8 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -56,7 +56,7 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(Online::Server * server);
+    ServerInfoDialog(Online::Server * server, bool join = false);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();
diff --git a/src/states_screens/networking_lobby_settings.cpp b/src/states_screens/networking_lobby_settings.cpp
deleted file mode 100644
index 296cdd1d5..000000000
--- a/src/states_screens/networking_lobby_settings.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//  SuperTuxKart - a fun racing game with go-kart
-//  Copyright (C) 2013 Glenn De Jonghe
-//
-//  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 3
-//  of the License, or (at your option) any later version.
-//
-//  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 this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#define DEBUG_MENU_ITEM 0
-
-#include "states_screens/networking_lobby_settings.hpp"
-
-#include <string>
-#include <iostream>
-
-#include "challenges/game_slot.hpp"
-#include "challenges/unlock_manager.hpp"
-#include "audio/sfx_manager.hpp"
-#include "states_screens/online_screen.hpp"
-#include "states_screens/state_manager.hpp"
-#include "states_screens/dialogs/message_dialog.hpp"
-#include "modes/demo_world.hpp"
-#include "utils/translation.hpp"
-#include "states_screens/networking_lobby.hpp"
-
-#include "online/current_user.hpp"
-
-
-using namespace GUIEngine;
-using namespace Online;
-
-DEFINE_SCREEN_SINGLETON( NetworkingLobbySettings );
-
-// ----------------------------------------------------------------------------
-
-NetworkingLobbySettings::NetworkingLobbySettings() : Screen("online/lobby_settings.stkgui")
-{
-
-}   // NetworkingLobbySettings
-
-// ----------------------------------------------------------------------------
-
-void NetworkingLobbySettings::loadedFromFile()
-{
-
-
-    m_name_widget = getWidget<TextBoxWidget>("name");
-    assert(m_name_widget != NULL);
-    m_max_players_widget = getWidget<SpinnerWidget>("max_players");
-    assert(m_max_players_widget != NULL);
-
-    m_info_widget = getWidget<LabelWidget>("info");
-    assert(m_info_widget != NULL);
-
-    m_create_widget = getWidget<ButtonWidget>("create");
-    assert(m_create_widget != NULL);
-    m_cancel_widget = getWidget<ButtonWidget>("cancel");
-    assert(m_cancel_widget != NULL);
-
-}   // loadedFromFile
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::beforeAddingWidget()
-{
-
-} // beforeAddingWidget
-
-
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::init()
-{
-    Screen::init();
-    setInitialFocus();
-    DemoWorld::resetIdleTime();
-}
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::onUpdate(float delta,  irr::video::IVideoDriver* driver)
-{
-}   // onUpdate
-
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::createServer()
-{
-    const stringw name = m_name_widget->getText().trim();
-    int max_players = m_max_players_widget->getValue();
-    stringw info = "";
-    /*if(online::CurrentUser::get()->createServer(name, max_players, info))
-    {
-        StateManager::get()->escapePressed();
-        StateManager::get()->pushScreen(NetworkingLobby::getInstance());
-    }
-    else
-    {
-        sfx_manager->quickSound( "anvil" );
-        m_info_widget->setColor(irr::video::SColor(255, 255, 0, 0));
-        m_info_widget->setText(info, false);
-    }*/
-}
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::eventCallback(Widget* widget, const std::string& name, const int playerID)
-{
-    if (name == m_cancel_widget->m_properties[PROP_ID])
-    {
-        StateManager::get()->escapePressed();
-    }
-    else if (name == m_create_widget->m_properties[PROP_ID])
-    {
-        createServer();
-    }
-}   // eventCallback
-
-// ----------------------------------------------------------------------------
-
-void NetworkingLobbySettings::tearDown()
-{
-}   // tearDown
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::onDisabledItemClicked(const std::string& item)
-{
-
-}   // onDisabledItemClicked
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::setInitialFocus()
-{
-}   // setInitialFocus
-
-// ----------------------------------------------------------------------------
-void NetworkingLobbySettings::onDialogClose()
-{
-    setInitialFocus();
-}   // onDialogClose()
diff --git a/src/states_screens/online_screen.cpp b/src/states_screens/online_screen.cpp
index c0b5a3c6e..c240ed587 100644
--- a/src/states_screens/online_screen.cpp
+++ b/src/states_screens/online_screen.cpp
@@ -34,8 +34,8 @@
 #include "states_screens/dialogs/login_dialog.hpp"
 #include "states_screens/dialogs/registration_dialog.hpp"
 #include "states_screens/networking_lobby.hpp"
-#include "states_screens/networking_lobby_settings.hpp"
 #include "states_screens/server_selection.hpp"
+#include "states_screens/create_server_screen.hpp"
 #include "modes/demo_world.hpp"
 #include "online/servers_manager.hpp"
 #include "online/messages.hpp"
@@ -198,7 +198,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
 
     RibbonWidget* ribbon = dynamic_cast<RibbonWidget*>(widget);
-    if (ribbon == NULL) return; // what's that event??
+    if (ribbon == NULL) return;
     std::string selection = ribbon->getSelectionIDString(PLAYER_ID_GAME_MASTER);
 
     if (selection == "sign_in")
@@ -220,7 +220,7 @@ void OnlineScreen::eventCallback(Widget* widget, const std::string& name, const
     }
     else if (selection == "create_server")
     {
-        StateManager::get()->pushScreen(NetworkingLobbySettings::getInstance());
+        StateManager::get()->pushScreen(CreateServerScreen::getInstance());
     }
     else if (selection == "quick_play")
     {

From bf2d907ccf4efbf65633e6cfe5b20cbc06c9a375 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 22 Jul 2013 00:23:42 +0000
Subject: [PATCH 36/44] small fixes to let server joining work. (temporary
 version though.)

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13315 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp                       | 2 ++
 src/states_screens/dialogs/server_info_dialog.cpp | 9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 0515e6fe0..2eeb69cc6 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -25,6 +25,7 @@
 #include "config/user_config.hpp"
 #include "utils/translation.hpp"
 #include "utils/log.hpp"
+#include "online/servers_manager.hpp"
 
 namespace Online{
     static Synchronised<CurrentUser*> user_singleton(NULL);
@@ -209,6 +210,7 @@ namespace Online{
         request->setParameter("token", m_token);
         request->setParameter("id", m_id);
         request->setParameter("server_id", server_id);
+        HTTPManager::get()->addRequest(request);
         return request;
     }
 
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index fc2c65d40..06639bf57 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -64,7 +64,8 @@ ServerInfoDialog::ServerInfoDialog(Server * server, bool join) :
     m_cancel_widget = getWidget<IconButtonWidget>("cancel");
     assert(m_cancel_widget != NULL);
     m_options_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
-    requestJoin();
+    if (join)
+        requestJoin();
 }
 
 // -----------------------------------------------------------------------------
@@ -75,7 +76,7 @@ ServerInfoDialog::~ServerInfoDialog()
 // -----------------------------------------------------------------------------
 void ServerInfoDialog::requestJoin()
 {
-    Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
+    m_server_join_request = Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
     Online::CurrentUser::release();
 }
 
@@ -122,6 +123,8 @@ void ServerInfoDialog::onUpdate(float dt)
         {
             if(m_server_join_request->isSuccess())
             {
+                ServersManager::acquire()->setJoinedServer(m_server);
+                ServersManager::release();
                 m_enter_lobby = true;
             }
             else
@@ -148,7 +151,9 @@ void ServerInfoDialog::onUpdate(float dt)
     {
         ModalDialog::dismiss();
         if (m_enter_lobby)
+        {
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());
+        }
         return;
     }
 }

From 311fb7bf4b33fd1060fea0c74358ca30650a9302 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Mon, 22 Jul 2013 20:00:08 +0000
Subject: [PATCH 37/44] Fixed reloading bug in server selection

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13320 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/create_server.stkgui    |  6 +++---
 data/gui/online/main.stkgui             |  2 +-
 src/online/servers_manager.cpp          |  8 +++++++-
 src/online/servers_manager.hpp          |  1 +
 src/states_screens/server_selection.cpp | 15 ++++++++++++---
 src/states_screens/server_selection.hpp | 17 +++++++++--------
 6 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui
index 218d4a04f..31dfd0a8a 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -1,19 +1,19 @@
 <stkgui>
     <div x="0" y="0" width="100%" height="100%" layout="vertical-row" >
     
-        <header text_align="center" width="80%" align="center" I18N="In the lobby settings screen" text="Lobby Settings"/>
+        <header text_align="center" width="80%" align="center" I18N="In the create server screen" text="Server Creation"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
             <div width="90%" align="center" layout="vertical-row" height="fit" >
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" text_align="left" I18N="In the lobby settings screen" text="Name of the server"/>
+                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
                     <textbox proportion="2" id="name" I18N="In the login dialog"/>
                 </div>
                 
                 <spacer height="20" width="20">
                 
                 <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" text_align="left" I18N="In the lobby settings screen" text="Max. number of players"/>
+                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
                     <gauge id="max_players" proportion="2" min_value="2" max_value="12"/>
                 </div>
             </div>
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui
index d1e438d0f..7d1b356d9 100644
--- a/data/gui/online/main.stkgui
+++ b/data/gui/online/main.stkgui
@@ -31,7 +31,7 @@
             
             <spacer width="10" height="10" />                         
             
-            <buttonbar id="menu_bottomrow" x="0" y="0" width="20%" height="100%" align="center">
+            <buttonbar id="menu_bottomrow" x="0" y="0" width="10%" height="100%" align="center">
                 <icon-button id="sign_in" width="64" height="64" icon="gui/main_about.png" extend_label="50"
                              I18N="Main menu button" text="Sign In" label_location="hover"/>
                 <icon-button id="register" width="64" height="64" icon="gui/tutorial.png"  extend_label="75"
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index aa26e9bf0..186802ee9 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -65,6 +65,12 @@ namespace Online{
         m_servers = new PtrVector<Server>;
         m_info_message = "";
         m_last_load_time = 0.0f;
+        m_joined_server = NULL;
+    }
+
+    ServersManager::~ServersManager(){
+        m_servers->clearAndDeleteAll();
+        delete m_joined_server;
     }
 
     // ============================================================================
@@ -91,7 +97,7 @@ namespace Online{
             {
                 m_servers->push_back(new Server(*servers_xml->getNode(i)));
             }
-            m_last_load_time += Time::getRealTime();
+            m_last_load_time = Time::getRealTime();
         }
         m_info_message = input->getInfo();
         //FIXME error message
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index 03a5768b8..dc8ebc0a1 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -48,6 +48,7 @@ namespace Online {
 
     private:
         ServersManager();
+        ~ServersManager();
         PtrVector<Server> *             m_servers;
         bool                            m_not_fetched;
         Server *                        m_joined_server;
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index 947a55ab0..e61c92cd7 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -56,9 +56,11 @@ void ServerSelection::refresh()
 {
     m_refresh_request = ServersManager::acquire()->refreshRequest();
     ServersManager::release();
+    m_fake_refresh = (m_refresh_request == NULL ? true : false);
     m_server_list_widget->clear();
     m_server_list_widget->addItem("spacer", L"");
     m_server_list_widget->addItem("loading", Messages::fetchingServers());
+    m_reload_widget->setDeactivated();
 }
 
 
@@ -67,8 +69,9 @@ void ServerSelection::refresh()
 void ServerSelection::loadedFromFile()
 {
     m_back_widget = getWidget<GUIEngine::IconButtonWidget>("back");
+    assert(m_back_widget != NULL);
     m_reload_widget = getWidget<GUIEngine::IconButtonWidget>("reload");
-
+    assert(m_reload_widget != NULL);
     m_server_list_widget = getWidget<GUIEngine::ListWidget>("server_list");
     assert(m_server_list_widget != NULL);
     m_server_list_widget->setColumnListener(this);
@@ -89,7 +92,7 @@ void ServerSelection::init()
 {
     Screen::init();
     m_sort_desc = true;
-    m_reload_widget->setActivated();
+
 
     // Set the default sort order
     Server::setSortOrder(Server::SO_NAME);
@@ -194,11 +197,17 @@ void ServerSelection::onUpdate(float dt, irr::video::IVideoDriver*)
             }
             delete m_refresh_request;
             m_refresh_request = NULL;
-            //m_options_widget->setActivated();
+            m_reload_widget->setActivated();
         }
         else
         {
             m_server_list_widget->renameItem("loading", Messages::fetchingServers());
         }
     }
+    else if(m_fake_refresh)
+    {
+        loadList();
+        m_fake_refresh = false;
+        m_reload_widget->setActivated();
+    }
 }   // onUpdate
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
index 7c603c9b8..1bbdad8bd 100644
--- a/src/states_screens/server_selection.hpp
+++ b/src/states_screens/server_selection.hpp
@@ -38,22 +38,23 @@ private:
     ServerSelection();
     ~ServerSelection();
 
-    GUIEngine::IconButtonWidget * m_back_widget;
-    GUIEngine::IconButtonWidget * m_reload_widget;
-    GUIEngine::LabelWidget * m_update_status;
-    GUIEngine::ListWidget *  m_server_list_widget;
+    GUIEngine::IconButtonWidget *               m_back_widget;
+    GUIEngine::IconButtonWidget *               m_reload_widget;
+    GUIEngine::LabelWidget *                    m_update_status;
+    GUIEngine::ListWidget *                     m_server_list_widget;
 
     /** Currently selected type. */
-    std::string      m_type;
+    std::string                                 m_type;
 
     /** The currently selected index, used to re-select this item after
      *  addons_loading is being displayed. */
-    int              m_selected_index;
+    int                                         m_selected_index;
 
     /** \brief To check (and set) if sort order is descending **/
-    bool             m_sort_desc;
+    bool                                        m_sort_desc;
 
-    Online::ServersManager::RefreshRequest * m_refresh_request;
+    Online::ServersManager::RefreshRequest *    m_refresh_request;
+    bool                                        m_fake_refresh;
     void refresh();
 
 public:

From 182cd1547792c261e3b3926a70b6fffa8559388a Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 23 Jul 2013 01:37:49 +0000
Subject: [PATCH 38/44] Fixed the bug in rejoining a lobby. Added a lot of
 mutex stuff, which wasn't actually related to the problem at all.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13323 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/request.cpp                  | 27 ++++++++++++++---------
 src/online/request.hpp                  | 29 +++++++++++++++++--------
 src/online/servers_manager.cpp          |  2 +-
 src/online/servers_manager.hpp          |  2 +-
 src/states_screens/networking_lobby.cpp |  5 +++--
 src/states_screens/server_selection.cpp |  8 ++++++-
 src/states_screens/server_selection.hpp |  2 ++
 7 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/online/request.cpp b/src/online/request.cpp
index f884ed0d6..e129c1e0c 100644
--- a/src/online/request.cpp
+++ b/src/online/request.cpp
@@ -58,7 +58,7 @@ namespace Online{
     {
         //Negative numbers are reserved for special requests ment for the HTTP Manager
         assert(type >= 0);
-        m_url = "";
+        m_url.setAtomic("");
         m_parameters = new Parameters;
         m_progress.setAtomic(0);
     }
@@ -70,9 +70,12 @@ namespace Online{
 
     bool HTTPRequest::isAllowedToAdd()
     {
-        if (m_url.size() > 5 && ( m_url.substr(0, 5) != "http:"))
-            return false;
-        return true;
+        bool ok = true;
+        m_url.lock();
+        if (m_url.getData().size() > 5 && ( m_url.getData().substr(0, 5) != "http:"))
+            ok = false;
+        m_url.unlock();
+        return ok;
     }
 
     void HTTPRequest::afterOperation()
@@ -90,8 +93,7 @@ namespace Online{
             Log::error("online/http_functions", "Error while initialising libCurl session");
             return "";
         }
-
-        curl_easy_setopt(curl_session, CURLOPT_URL, m_url.c_str());
+        curl_easy_setopt(curl_session, CURLOPT_URL, m_url.getAtomic().c_str());
         Parameters::iterator iter;
         std::string postString = "";
         for (iter = m_parameters->begin(); iter != m_parameters->end(); ++iter)
@@ -195,11 +197,16 @@ namespace Online{
     XMLRequest::XMLRequest(int type, bool manage_memory, int priority)
         : HTTPRequest(priority, manage_memory, type)
     {
-        m_info = "";
-        m_success = false;
+        m_info.setAtomic("");
+        m_success.setAtomic(false);
         m_result = NULL;
     }
 
+    XMLRequest::~XMLRequest()
+    {
+        delete m_result;
+    }
+
 
     void XMLRequest::operation()
     {
@@ -220,8 +227,8 @@ namespace Online{
         }
         else
             info = _("Unable to connect to the server. Check your internet connection or try again later.");
-        m_info = info;
-        m_success = success;
+        m_info.setAtomic(info);
+        m_success.setAtomic(success);
         HTTPRequest::afterOperation();
     }
 } // namespace Online
diff --git a/src/online/request.hpp b/src/online/request.hpp
index ab293e012..2dd3bc214 100644
--- a/src/online/request.hpp
+++ b/src/online/request.hpp
@@ -120,7 +120,7 @@ namespace Online{
         *  packet is downloaded. At the end either -1 (error) or 1
         *  (everything ok) at the end. */
         Synchronised<float>                             m_progress;
-        std::string                                     m_url;
+        Synchronised<std::string>                       m_url;
         Parameters *                                    m_parameters;
 
         virtual void                                    afterOperation() OVERRIDE;
@@ -164,8 +164,14 @@ namespace Online{
         /** Sets the current progress. */
         void setProgress(float f) { m_progress.setAtomic(f); }
 
-        const std::string &getURL() const {return m_url;}
-        void setURL(const std::string & url) { m_url = url;}
+        const std::string getURL()     {
+                                            m_url.lock();
+                                            const std::string url = m_url.getData();
+                                            m_url.unlock();
+                                            return url;
+                                        }
+
+        void setURL(const std::string & url) { m_url.setAtomic(url);}
 
         virtual bool isAllowedToAdd() OVERRIDE;
 
@@ -175,20 +181,25 @@ namespace Online{
     {
     protected :
 
-        XMLNode *                       m_result;
-        irr::core::stringw              m_info;
-        bool                            m_success;
+        XMLNode *                                       m_result;
+        Synchronised<irr::core::stringw>                m_info;
+        Synchronised<bool>                              m_success;
 
         virtual void                    operation() OVERRIDE;
         virtual void                    afterOperation() OVERRIDE;
 
     public :
         XMLRequest(int type = 0, bool manage_memory = false, int priority = 1);
-        virtual ~XMLRequest() {delete m_result;}
+        virtual ~XMLRequest();
 
         virtual XMLNode *               getResult() const       { return m_result; }
-        const irr::core::stringw &      getInfo()   const       { return m_info; }
-        bool                            isSuccess() const       { return m_success; }
+        const irr::core::stringw        getInfo()               {
+                                                                    m_info.lock();
+                                                                    const irr::core::stringw info = m_info.getData();
+                                                                    m_info.unlock();
+                                                                    return info;
+                                                                }
+        bool                            isSuccess() const       { return m_success.getAtomic(); }
 
     };
 } //namespace Online
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index 186802ee9..d7cc8531a 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -87,7 +87,7 @@ namespace Online{
         return request;
     }
 
-    void ServersManager::refresh(const RefreshRequest * input)
+    void ServersManager::refresh(RefreshRequest * input)
     {
         if (input->isSuccess())
         {
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index dc8ebc0a1..9f172af78 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -54,7 +54,7 @@ namespace Online {
         Server *                        m_joined_server;
         irr::core::stringw              m_info_message;
         float                           m_last_load_time;
-        void                            refresh(const RefreshRequest * input);
+        void                            refresh(RefreshRequest * input);
 
     public:
         // Singleton
diff --git a/src/states_screens/networking_lobby.cpp b/src/states_screens/networking_lobby.cpp
index 16a3ede61..b427730be 100644
--- a/src/states_screens/networking_lobby.cpp
+++ b/src/states_screens/networking_lobby.cpp
@@ -46,8 +46,7 @@ DEFINE_SCREEN_SINGLETON( NetworkingLobby );
 
 NetworkingLobby::NetworkingLobby() : Screen("online/lobby.stkgui")
 {
-    m_server = ServersManager::acquire()->getJoinedServer();
-    ServersManager::release();
+    m_server = NULL;
 }   // NetworkingLobby
 
 // ----------------------------------------------------------------------------
@@ -85,6 +84,8 @@ void NetworkingLobby::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime(); //FIXME : what's this?
+    m_server = ServersManager::acquire()->getJoinedServer();
+    ServersManager::release();
     m_server_name_widget->setText(m_server->getName(),false);
 
 }   // init
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index e61c92cd7..d980297ad 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -46,9 +46,15 @@ ServerSelection::ServerSelection() : Screen("online/server_selection.stkgui")
 
 ServerSelection::~ServerSelection()
 {
-    delete m_refresh_request;
 }   // ServerSelection
 
+// ----------------------------------------------------------------------------
+
+void ServerSelection::tearDown()
+{
+    delete m_refresh_request;
+}   // tearDown
+
 
 // ----------------------------------------------------------------------------
 
diff --git a/src/states_screens/server_selection.hpp b/src/states_screens/server_selection.hpp
index 1bbdad8bd..757df5f55 100644
--- a/src/states_screens/server_selection.hpp
+++ b/src/states_screens/server_selection.hpp
@@ -76,6 +76,8 @@ public:
 
     virtual void init() OVERRIDE;
 
+    virtual void tearDown() OVERRIDE;
+
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void onUpdate(float dt, irr::video::IVideoDriver*) OVERRIDE;
 

From cdab5caf350e428269a4264705ab37d66baffd7e Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 23 Jul 2013 16:34:38 +0000
Subject: [PATCH 39/44] Replaced all non-related GUI code actions done after a
 reply to request callbacks. Servers manager now allows getting by ID and sort
 index.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13326 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp                   | 16 ++++-
 src/online/current_user.hpp                   |  2 +
 src/online/servers_manager.cpp                | 58 +++++++++++++++++--
 src/online/servers_manager.hpp                | 23 +++++---
 src/states_screens/create_server_screen.cpp   |  3 +-
 .../dialogs/server_info_dialog.cpp            | 11 ++--
 .../dialogs/server_info_dialog.hpp            |  5 +-
 src/states_screens/server_selection.cpp       |  5 +-
 8 files changed, 97 insertions(+), 26 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 2eeb69cc6..8010ae248 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -163,7 +163,13 @@ namespace Online{
 
     void CurrentUser::ServerCreationRequest::callback()
     {
-        //FIXME
+        if(isSuccess())
+        {
+            Server * server = new Server(*getResult()->getNode("server"));
+            ServersManager::acquire()->addServer(server);
+            ServersManager::release();
+            m_created_server_id.setAtomic(server->getServerId());
+        }
     }
 
     // ============================================================================
@@ -216,6 +222,14 @@ namespace Online{
 
     void CurrentUser::ServerJoinRequest::callback()
     {
+        if(isSuccess())
+        {
+            uint32_t server_id;
+            getResult()->get("serverid", &server_id);
+            ServersManager::acquire()->setJoinedServer(server_id);
+            ServersManager::release();
+        }
+        //FIXME needs changes for actual valid joining
     }
 
     // ============================================================================
diff --git a/src/online/current_user.hpp b/src/online/current_user.hpp
index 87af2262b..3f24dcc2d 100644
--- a/src/online/current_user.hpp
+++ b/src/online/current_user.hpp
@@ -72,8 +72,10 @@ namespace Online{
 
             class ServerCreationRequest : public XMLRequest {
                 virtual void callback ();
+                Synchronised<uint32_t> m_created_server_id;
             public:
                 ServerCreationRequest() : XMLRequest(RT_SERVER_CREATION) {}
+                uint32_t getCreatedServerID() {return m_created_server_id.getAtomic();}
             };
 
             class ServerJoinRequest : public XMLRequest {
diff --git a/src/online/servers_manager.cpp b/src/online/servers_manager.cpp
index d7cc8531a..29d2c9d9e 100644
--- a/src/online/servers_manager.cpp
+++ b/src/online/servers_manager.cpp
@@ -62,17 +62,23 @@ namespace Online{
 
     // ============================================================================
     ServersManager::ServersManager(){
-        m_servers = new PtrVector<Server>;
         m_info_message = "";
         m_last_load_time = 0.0f;
         m_joined_server = NULL;
     }
 
     ServersManager::~ServersManager(){
-        m_servers->clearAndDeleteAll();
+        cleanUpServers();
         delete m_joined_server;
     }
 
+    // ============================================================================
+    void ServersManager::cleanUpServers()
+    {
+        m_sorted_servers.clearAndDeleteAll();
+        m_mapped_servers.clear();
+    }
+
     // ============================================================================
     ServersManager::RefreshRequest * ServersManager::refreshRequest()
     {
@@ -92,10 +98,10 @@ namespace Online{
         if (input->isSuccess())
         {
             const XMLNode * servers_xml = input->getResult()->getNode("servers");
-            m_servers->clearAndDeleteAll();
+            cleanUpServers();
             for (unsigned int i = 0; i < servers_xml->getNumNodes(); i++)
             {
-                m_servers->push_back(new Server(*servers_xml->getNode(i)));
+                addServer(new Server(*servers_xml->getNode(i)));
             }
             m_last_load_time = Time::getRealTime();
         }
@@ -112,8 +118,48 @@ namespace Online{
     // ============================================================================
     Server * ServersManager::getQuickPlay()
     {
-        if(m_servers->size() > 0)
-            return m_servers->get(0);
+        if(m_sorted_servers.size() > 0)
+            return getServerBySort(0);
         return NULL;
     }
+
+    // ============================================================================
+    void ServersManager::setJoinedServer(uint32_t id)
+    {
+        delete m_joined_server;
+        //It's a copy!
+        m_joined_server = new Server(*getServerByID(id));
+    }
+
+    // ============================================================================
+    void ServersManager::unsetJoinedServer()
+    {
+        delete m_joined_server;
+        m_joined_server = NULL;
+    }
+
+    // ============================================================================
+    void ServersManager::addServer(Server * server)
+    {
+        m_sorted_servers.push_back(server);
+        m_mapped_servers[server->getServerId()] = server;
+    }
+
+    // ============================================================================
+    int ServersManager::getNumServers ()
+    {
+        return m_sorted_servers.size();
+    }
+
+    // ============================================================================
+    Server * ServersManager::getServerBySort (int index)
+    {
+        return m_sorted_servers.get(index);
+    }
+
+    // ============================================================================
+    Server * ServersManager::getServerByID (uint32_t id)
+    {
+        return m_mapped_servers[id];
+    }
 } // namespace Online
diff --git a/src/online/servers_manager.hpp b/src/online/servers_manager.hpp
index 9f172af78..af2d175e7 100644
--- a/src/online/servers_manager.hpp
+++ b/src/online/servers_manager.hpp
@@ -20,6 +20,7 @@
 #define HEADER_SERVERS_MANAGER_HPP
 
 #include "utils/ptr_vector.hpp"
+#include "utils/types.hpp"
 #include "online/server.hpp"
 #include "http_manager.hpp"
 
@@ -49,12 +50,18 @@ namespace Online {
     private:
         ServersManager();
         ~ServersManager();
-        PtrVector<Server> *             m_servers;
-        bool                            m_not_fetched;
+        /** Sorted vector of servers */
+        PtrVector<Server>               m_sorted_servers;
+        /** Maps server id's to the same servers*/
+        std::map<uint32_t, Server*>     m_mapped_servers;
+        /** This is a pointer to a copy of the server, the moment it got joined */
         Server *                        m_joined_server;
+
+        bool                            m_not_fetched;
         irr::core::stringw              m_info_message;
         float                           m_last_load_time;
         void                            refresh(RefreshRequest * input);
+        void                            cleanUpServers();
 
     public:
         // Singleton
@@ -63,11 +70,13 @@ namespace Online {
         static void                     deallocate();
 
         RefreshRequest *                refreshRequest();
-        PtrVector<Server> *             getServers ()           const   { return m_servers;                             }
-        int                             getNumServers ()        const   { return m_servers->size();                     }
-        Server *                        getServer (int index)   const   { return m_servers->get(index);                 }
-        void                            sort(bool sort_desc)            { m_servers->insertionSort(0, sort_desc);       }
-        void                            setJoinedServer(Server * server){ m_joined_server = server;                     }
+        void                            setJoinedServer(uint32_t server_id);
+        void                            unsetJoinedServer();
+        void                            addServer(Server * server);
+        int                             getNumServers ();
+        Server *                        getServerByID (uint32_t server_id);
+        Server *                        getServerBySort (int index);
+        void                            sort(bool sort_desc)            { m_sorted_servers.insertionSort(0, sort_desc); }
         Server *                        getJoinedServer()               { return m_joined_server;                       }
         //Returns the best server to join
         Server *                        getQuickPlay();
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
index e5ed1e56f..7b9e3275d 100644
--- a/src/states_screens/create_server_screen.cpp
+++ b/src/states_screens/create_server_screen.cpp
@@ -97,8 +97,7 @@ void CreateServerScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver
             if(m_server_creation_request->isSuccess())
             {
                 if (m_enter_server){
-                    Server * server = new Server(*m_server_creation_request->getResult()->getNode("server"));
-                    new ServerInfoDialog(server,true);
+                    new ServerInfoDialog(m_server_creation_request->getCreatedServerID(),true);
                 }
                 else
                 {
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 06639bf57..2c467750c 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -40,10 +40,10 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-ServerInfoDialog::ServerInfoDialog(Server * server, bool join) :
+ServerInfoDialog::ServerInfoDialog(uint32_t server_id, bool join) :
         ModalDialog(0.8f,0.8f)
 {
-    m_server = server;
+    m_server_id = server_id;
     m_self_destroy = false;
     m_enter_lobby = false;
     m_server_join_request = NULL;
@@ -52,8 +52,9 @@ ServerInfoDialog::ServerInfoDialog(Server * server, bool join) :
 
     m_name_widget = getWidget<LabelWidget>("name");
     assert(m_name_widget != NULL);
+    Server * server = ServersManager::acquire()->getServerByID(m_server_id);
     m_name_widget->setText(server->getName(),false);
-
+    ServersManager::release();
     m_info_widget = getWidget<LabelWidget>("info");
     assert(m_info_widget != NULL);
 
@@ -76,7 +77,7 @@ ServerInfoDialog::~ServerInfoDialog()
 // -----------------------------------------------------------------------------
 void ServerInfoDialog::requestJoin()
 {
-    m_server_join_request = Online::CurrentUser::acquire()->requestServerJoin(m_server->getServerId());
+    m_server_join_request = Online::CurrentUser::acquire()->requestServerJoin(m_server_id);
     Online::CurrentUser::release();
 }
 
@@ -123,8 +124,6 @@ void ServerInfoDialog::onUpdate(float dt)
         {
             if(m_server_join_request->isSuccess())
             {
-                ServersManager::acquire()->setJoinedServer(m_server);
-                ServersManager::release();
                 m_enter_lobby = true;
             }
             else
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 59616d3e8..4df591722 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -27,6 +27,7 @@
 #include "guiengine/widgets/label_widget.hpp"
 #include "online/server.hpp"
 #include "online/current_user.hpp"
+#include "utils/types.hpp"
 
 
 /**
@@ -44,7 +45,7 @@ private:
 
     float m_load_timer;
 
-    Online::Server * m_server;
+    uint32_t m_server_id;
 
     GUIEngine::LabelWidget * m_name_widget;
     GUIEngine::LabelWidget * m_info_widget;
@@ -56,7 +57,7 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(Online::Server * server, bool join = false);
+    ServerInfoDialog(uint32_t server_id, bool join = false);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();
diff --git a/src/states_screens/server_selection.cpp b/src/states_screens/server_selection.cpp
index d980297ad..128ee489b 100644
--- a/src/states_screens/server_selection.cpp
+++ b/src/states_screens/server_selection.cpp
@@ -117,7 +117,7 @@ void ServerSelection::loadList()
     manager->sort(m_sort_desc);
     for(int i=0; i <  manager->getNumServers(); i++)
     {
-        Server * server = manager->getServer(i);
+        Server * server = manager->getServerBySort(i);
         core::stringw num_players;
         num_players.append(StringUtils::toWString(server->getCurrentPlayers()));
         num_players.append("/");
@@ -162,8 +162,9 @@ void ServerSelection::eventCallback( GUIEngine::Widget* widget,
     else if (name == m_server_list_widget->m_properties[GUIEngine::PROP_ID])
     {
         m_selected_index = m_server_list_widget->getSelectionID();
-        new ServerInfoDialog(ServersManager::acquire()->getServer(m_selected_index));
+        uint32_t server_id = ServersManager::acquire()->getServerBySort(m_selected_index)->getServerId();
         ServersManager::release();
+        new ServerInfoDialog(server_id);
     }
 
 }   // eventCallback

From a632aca9c98a8c09fd9ee986d5d812b654ecf605 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 23 Jul 2013 20:58:24 +0000
Subject: [PATCH 40/44] Some "create server" improvements in both screen and
 flow. Creating one doesn't actually let you join the server, but pops up the
 server info dialog of it, which gives you the option to join.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13329 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/create_server.stkgui          | 51 +++++++++----------
 src/states_screens/create_server_screen.cpp   | 13 ++---
 src/states_screens/create_server_screen.hpp   |  4 --
 .../dialogs/server_info_dialog.cpp            | 13 ++---
 .../dialogs/server_info_dialog.hpp            |  4 +-
 5 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui
index 31dfd0a8a..f319b2df4 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -4,34 +4,33 @@
         <header text_align="center" width="80%" align="center" I18N="In the create server screen" text="Server Creation"/>
         <spacer height="15" width="10"/>
         <box proportion="4" width="90%" layout="vertical-row" align="center">
-            <div width="90%" align="center" layout="vertical-row" height="fit" >
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
-                    <textbox proportion="2" id="name" I18N="In the login dialog"/>
-                </div>
-                
-                <spacer height="20" width="20">
-                
-                <div width="100%" height="fit" layout="horizontal-row" >
-                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
-                    <gauge id="max_players" proportion="2" min_value="2" max_value="12"/>
-                </div>
-            </div>
-            
-            <label id="info" proportion="1" width="90%" align="center" text_align="center" word_wrap="true" text=""/>
-            
-            <buttonbar id="options" x="0" y="0" width="100%" height="10%" align="center">
-                <icon-button id="create" width="64" height="64" icon="gui/tutorial.png"  extend_label="75"
-                             I18N="Main menu button" text="Create" label_location="hover"/>
-                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"  extend_label="70"
-                             I18N="Main menu button" text="Cancel" label_location="hover"/>
-            </buttonbar>
+        	<div width="90%" align="center" layout="vertical-row" y="2%" height="96%">
+	            <div width="100%" align="center" layout="vertical-row"  height="fit" >
+	                <div width="100%" height="fit" layout="horizontal-row" >
+	                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Name of the server"/>
+	                    <textbox proportion="1" id="name" I18N="In the create server screen"/>
+	                </div>
+	                
+	                <spacer height="20" width="20">
+	                
+	                <div width="100%" height="fit" layout="horizontal-row" >
+	                    <label proportion="1" text_align="left" I18N="In the create server screen" text="Max. number of players"/>
+	                    <gauge id="max_players" proportion="1" min_value="2" max_value="12"/>
+	                </div>
+	            </div>
+	            
+	            <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
+	            
+	            <buttonbar id="options" x="0" y="0" width="30%" height="12%" align="center">
+	                <icon-button id="create" width="64" height="64" icon="gui/tutorial.png"
+	                             I18N="Main menu button" text="Create" label_location="bottom"/>
+	                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+	                             I18N="Main menu button" text="Cancel" label_location="bottom"/>
+	            </buttonbar>
+	        </div>
         </box>
-        
+        <spacer height="15" width="10"/>
 
         
     </div>
-    
-    <icon-button id="back" x="0" y="0" height="8%" icon="gui/back.png"/>
-
 </stkgui>
diff --git a/src/states_screens/create_server_screen.cpp b/src/states_screens/create_server_screen.cpp
index 7b9e3275d..11777c624 100644
--- a/src/states_screens/create_server_screen.cpp
+++ b/src/states_screens/create_server_screen.cpp
@@ -46,7 +46,6 @@ DEFINE_SCREEN_SINGLETON( CreateServerScreen );
 CreateServerScreen::CreateServerScreen() : Screen("online/create_server.stkgui")
 {
     m_server_creation_request = NULL;
-    m_enter_server = true;
 }   // CreateServerScreen
 
 // ----------------------------------------------------------------------------
@@ -57,8 +56,11 @@ void CreateServerScreen::loadedFromFile()
 
     m_name_widget = getWidget<TextBoxWidget>("name");
     assert(m_name_widget != NULL);
+    m_name_widget->setText(CurrentUser::acquire()->getUserName() + _("'s server"));
+    CurrentUser::release();
     m_max_players_widget = getWidget<SpinnerWidget>("max_players");
     assert(m_max_players_widget != NULL);
+    m_max_players_widget->setValue(8);
 
     m_info_widget = getWidget<LabelWidget>("info");
     assert(m_info_widget != NULL);
@@ -86,6 +88,7 @@ void CreateServerScreen::init()
     Screen::init();
     setInitialFocus();
     DemoWorld::resetIdleTime();
+    m_info_widget->setText("", false);
 }
 // ----------------------------------------------------------------------------
 void CreateServerScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver)
@@ -96,13 +99,7 @@ void CreateServerScreen::onUpdate(float delta,  irr::video::IVideoDriver* driver
         {
             if(m_server_creation_request->isSuccess())
             {
-                if (m_enter_server){
-                    new ServerInfoDialog(m_server_creation_request->getCreatedServerID(),true);
-                }
-                else
-                {
-                    StateManager::get()->escapePressed();
-                }
+                new ServerInfoDialog(m_server_creation_request->getCreatedServerID(), true);
             }
             else
             {
diff --git a/src/states_screens/create_server_screen.hpp b/src/states_screens/create_server_screen.hpp
index c70b5f931..2b28ac229 100644
--- a/src/states_screens/create_server_screen.hpp
+++ b/src/states_screens/create_server_screen.hpp
@@ -37,8 +37,6 @@ private:
 
     CreateServerScreen();
 
-    bool m_enter_server;
-
     GUIEngine::TextBoxWidget * m_name_widget;
     GUIEngine::SpinnerWidget * m_max_players_widget;
 
@@ -48,8 +46,6 @@ private:
     GUIEngine::IconButtonWidget * m_create_widget;
     GUIEngine::IconButtonWidget * m_cancel_widget;
 
-
-
     Online::CurrentUser::ServerCreationRequest * m_server_creation_request;
 
     /** \brief Sets which widget has to be focused. Depends on the user state. */
diff --git a/src/states_screens/dialogs/server_info_dialog.cpp b/src/states_screens/dialogs/server_info_dialog.cpp
index 2c467750c..8371a4a40 100644
--- a/src/states_screens/dialogs/server_info_dialog.cpp
+++ b/src/states_screens/dialogs/server_info_dialog.cpp
@@ -40,12 +40,13 @@ using namespace Online;
 
 // -----------------------------------------------------------------------------
 
-ServerInfoDialog::ServerInfoDialog(uint32_t server_id, bool join) :
+ServerInfoDialog::ServerInfoDialog(uint32_t server_id, bool from_server_creation) :
         ModalDialog(0.8f,0.8f)
 {
     m_server_id = server_id;
     m_self_destroy = false;
     m_enter_lobby = false;
+    m_from_server_creation = from_server_creation;
     m_server_join_request = NULL;
 
     loadFromFile("online/server_info_dialog.stkgui");
@@ -57,7 +58,8 @@ ServerInfoDialog::ServerInfoDialog(uint32_t server_id, bool join) :
     ServersManager::release();
     m_info_widget = getWidget<LabelWidget>("info");
     assert(m_info_widget != NULL);
-
+    if (m_from_server_creation)
+        m_info_widget->setText(_("Server successfully created. You can now join it."), true);
     m_options_widget = getWidget<RibbonWidget>("options");
     assert(m_options_widget != NULL);
     m_join_widget = getWidget<IconButtonWidget>("join");
@@ -65,8 +67,7 @@ ServerInfoDialog::ServerInfoDialog(uint32_t server_id, bool join) :
     m_cancel_widget = getWidget<IconButtonWidget>("cancel");
     assert(m_cancel_widget != NULL);
     m_options_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
-    if (join)
-        requestJoin();
+
 }
 
 // -----------------------------------------------------------------------------
@@ -149,10 +150,10 @@ void ServerInfoDialog::onUpdate(float dt)
     if (m_self_destroy)
     {
         ModalDialog::dismiss();
+        if (m_from_server_creation)
+            StateManager::get()->popMenu();
         if (m_enter_lobby)
-        {
             StateManager::get()->pushScreen(NetworkingLobby::getInstance());
-        }
         return;
     }
 }
diff --git a/src/states_screens/dialogs/server_info_dialog.hpp b/src/states_screens/dialogs/server_info_dialog.hpp
index 4df591722..ea8b903c3 100644
--- a/src/states_screens/dialogs/server_info_dialog.hpp
+++ b/src/states_screens/dialogs/server_info_dialog.hpp
@@ -41,6 +41,7 @@ private:
     
     bool m_self_destroy;
     bool m_enter_lobby;
+    bool m_from_server_creation;
     Online::CurrentUser::ServerJoinRequest * m_server_join_request;
 
     float m_load_timer;
@@ -57,14 +58,13 @@ private:
     void requestJoin();
 
 public:
-    ServerInfoDialog(uint32_t server_id, bool join = false);
+    ServerInfoDialog(uint32_t server_id, bool just_created = false);
     ~ServerInfoDialog();
 
     void onEnterPressedInternal();
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
     
     virtual void onUpdate(float dt);
-    //virtual void onTextUpdated();
 };
 
 #endif

From 7bd614ab12b7528c27a93a9221ee01d44fbbb677 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 23 Jul 2013 22:29:05 +0000
Subject: [PATCH 41/44] Registration process fine-tuned. Using icons now and
 the asynchronous layer. Still TODO : activation and recovery.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13331 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 data/gui/online/create_server.stkgui          |   4 +-
 data/gui/online/login_dialog.stkgui           |   2 +-
 data/gui/online/main.stkgui                   |   2 +-
 .../gui/online/registration_activation.stkgui |  11 +-
 data/gui/online/registration_info.stkgui      |  12 +-
 data/gui/online/registration_terms.stkgui     |  19 +-
 data/gui/online/server_info_dialog.stkgui     |   2 +-
 .../dialogs/registration_dialog.cpp           | 176 ++++++++++--------
 .../dialogs/registration_dialog.hpp           |  15 ++
 9 files changed, 140 insertions(+), 103 deletions(-)

diff --git a/data/gui/online/create_server.stkgui b/data/gui/online/create_server.stkgui
index f319b2df4..2043beed4 100644
--- a/data/gui/online/create_server.stkgui
+++ b/data/gui/online/create_server.stkgui
@@ -21,8 +21,8 @@
 	            
 	            <label id="info" proportion="1" width="100%" align="center" text_align="center" word_wrap="true" text=""/>
 	            
-	            <buttonbar id="options" x="0" y="0" width="30%" height="12%" align="center">
-	                <icon-button id="create" width="64" height="64" icon="gui/tutorial.png"
+	            <buttonbar id="options" x="0" y="0" width="25%" height="12%" align="center">
+	                <icon-button id="create" width="64" height="64" icon="gui/green_check.png"
 	                             I18N="Main menu button" text="Create" label_location="bottom"/>
 	                <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
 	                             I18N="Main menu button" text="Cancel" label_location="bottom"/>
diff --git a/data/gui/online/login_dialog.stkgui b/data/gui/online/login_dialog.stkgui
index 5547e293a..94efda43e 100644
--- a/data/gui/online/login_dialog.stkgui
+++ b/data/gui/online/login_dialog.stkgui
@@ -47,7 +47,7 @@
         <spacer height="20" width="50"> 
         
         <buttonbar id="options" width="90%" proportion="1" align="center">
-                <icon-button id="sign_in" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="sign_in" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog"  text="Sign In" label_location="bottom"/>
                 <icon-button id="recovery" width="64" height="64" icon="gui/main_help.png"
                              I18N="Login dialog" text="Recovery" label_location="bottom"/>
diff --git a/data/gui/online/main.stkgui b/data/gui/online/main.stkgui
index 7d1b356d9..a500db436 100644
--- a/data/gui/online/main.stkgui
+++ b/data/gui/online/main.stkgui
@@ -31,7 +31,7 @@
             
             <spacer width="10" height="10" />                         
             
-            <buttonbar id="menu_bottomrow" x="0" y="0" width="10%" height="100%" align="center">
+            <buttonbar id="menu_bottomrow" x="0" y="0" width="12%" height="100%" align="center">
                 <icon-button id="sign_in" width="64" height="64" icon="gui/main_about.png" extend_label="50"
                              I18N="Main menu button" text="Sign In" label_location="hover"/>
                 <icon-button id="register" width="64" height="64" icon="gui/tutorial.png"  extend_label="75"
diff --git a/data/gui/online/registration_activation.stkgui b/data/gui/online/registration_activation.stkgui
index 2511e050f..a7d5ec82c 100644
--- a/data/gui/online/registration_activation.stkgui
+++ b/data/gui/online/registration_activation.stkgui
@@ -15,11 +15,12 @@
            
         <spacer height="20" width="50"> 
         
-        <div id="options" width="fit" proportion="1" align="center" layout="horizontal-row">
-            <button id="next" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Activate"/>
-            <spacer height="50" width="50">
-            <button id="cancel" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Close"/>
-        </div>
+        <buttonbar id="options" width="25%" proportion="1" align="center">
+    		<icon-button id="next" width="64" height="64" icon="gui/green_check.png"
+            	I18N="Registration dialog" text="Next" label_location="none"/>
+            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            	I18N="Registration dialog"  text="Cancel" label_location="none"/>
+        </buttonbar>
         
     
     </div>
diff --git a/data/gui/online/registration_info.stkgui b/data/gui/online/registration_info.stkgui
index fda900ba8..0617b87bc 100644
--- a/data/gui/online/registration_info.stkgui
+++ b/data/gui/online/registration_info.stkgui
@@ -49,12 +49,12 @@
            
         <spacer height="20" width="50"> 
         
-        <div id="options" width="fit" proportion="1" align="center" layout="horizontal-row">
-            <button id="next" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Next"/>
-            <spacer height="50" width="50">
-            <button id="cancel" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Cancel"/>
-        </div>
-        
+        <buttonbar id="options" width="25%" proportion="1" align="center">
+    		<icon-button id="next" width="64" height="64" icon="gui/green_check.png"
+            	I18N="Registration dialog" text="Next" label_location="none"/>
+            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            	I18N="Registration dialog"  text="Cancel" label_location="none"/>
+        </buttonbar>
     
     </div>
 
diff --git a/data/gui/online/registration_terms.stkgui b/data/gui/online/registration_terms.stkgui
index 5ad1bf667..edda8527b 100644
--- a/data/gui/online/registration_terms.stkgui
+++ b/data/gui/online/registration_terms.stkgui
@@ -7,7 +7,7 @@
     
         <spacer height="20" width="50">
         
-        <label id="terms" proportion="6" width="90%" align="center" text_align="center" word_wrap="true"
+        <label id="terms" proportion="5" width="90%" align="center" text_align="center" word_wrap="true"
            I18N="In the registration dialog' dialog" text="The terms will come here. In a fancy scroll box."/>
         
         <div align="center" width="fit" height="fit" layout="horizontal-row" >
@@ -22,14 +22,15 @@
            I18N="In the registration dialog' dialog" text=""/>
            
         <spacer height="20" width="50"> 
-                
-        <div id="options" width="fit" proportion="1" align="center" layout="horizontal-row">
-            <button id="previous" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Previous"/>
-            <spacer height="50" width="50">
-            <button id="next" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Submit"/>
-            <spacer height="50" width="50">
-            <button id="cancel" height="fit" align="center" width="fit" I18N="In the registration dialog" text="Cancel"/>
-        </div>
+        
+        <buttonbar id="options" width="45%" proportion="1" align="center">
+    		<icon-button id="previous" width="64" height="64" icon="gui/back.png"
+            	I18N="Registration dialog" text="Previous" label_location="bottom"/>
+            <icon-button id="next" width="64" height="64" icon="gui/green_check.png"
+            	I18N="Registration dialog" text="Submit" label_location="bottom"/>
+            <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
+            	I18N="Registration dialog"  text="Cancel" label_location="bottom"/>
+        </buttonbar>
         
     
     </div>
diff --git a/data/gui/online/server_info_dialog.stkgui b/data/gui/online/server_info_dialog.stkgui
index bed82f815..9ce39b949 100644
--- a/data/gui/online/server_info_dialog.stkgui
+++ b/data/gui/online/server_info_dialog.stkgui
@@ -21,7 +21,7 @@
         <spacer height="20" width="50"> 
         
         <buttonbar id="options" width="90%" height="20%" align="center">
-                <icon-button id="join" width="64" height="64" icon="gui/main_options.png"
+                <icon-button id="join" width="64" height="64" icon="gui/green_check.png"
                              I18N="Login dialog"  text="Join" label_location="bottom"/>
                 <icon-button id="cancel" width="64" height="64" icon="gui/main_quit.png"
                              I18N="Login dialog" text="Cancel" label_location="bottom"/>
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index edcf35e83..051698426 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -77,37 +77,38 @@ void RegistrationDialog::showRegistrationInfo(){
     m_password = "";
     m_password_confirm = "";
 
-    TextBoxWidget* textBox = getWidget<TextBoxWidget>("username");
-    assert(textBox != NULL);
-    textBox->setText(m_username);
-    textBox->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
+    m_username_widget = getWidget<TextBoxWidget>("username");
+    assert(m_username_widget != NULL);
+    m_username_widget->setText(m_username);
+    m_username_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER);
 
-    textBox = getWidget<TextBoxWidget>("password");
-    assert(textBox != NULL);
-    textBox->setPasswordBox(true,L'*');
+    m_password_widget = getWidget<TextBoxWidget>("password");
+    assert(m_password_widget != NULL);
+    m_password_widget->setPasswordBox(true,L'*');
 
-    textBox = getWidget<TextBoxWidget>("password_confirm");
-    assert(textBox != NULL);
-    textBox->setPasswordBox(true,L'*');
+    m_password_confirm_widget = getWidget<TextBoxWidget>("password_confirm");
+    assert(m_password_confirm_widget != NULL);
+    m_password_confirm_widget->setPasswordBox(true,L'*');
 
-    textBox = getWidget<TextBoxWidget>("email");
-    assert(textBox != NULL);
-    textBox->setText(m_email);
+    m_email_widget = getWidget<TextBoxWidget>("email");
+    assert(m_email_widget != NULL);
+    m_email_widget->setText(m_email);
 
-    textBox = getWidget<TextBoxWidget>("email_confirm");
-    assert(textBox != NULL);
-    textBox->setText(m_email_confirm);
+    m_email_confirm_widget = getWidget<TextBoxWidget>("email_confirm");
+    assert(m_email_confirm_widget != NULL);
+    m_email_confirm_widget->setText(m_email_confirm);
 
-    LabelWidget* label = getWidget<LabelWidget>("info");
-    assert(label != NULL);
-    label->setText(m_registration_error, false);
-
-    ButtonWidget * button = getWidget<ButtonWidget>("next");
-    assert(button != NULL);
-
-    button = getWidget<ButtonWidget>("cancel");
-    assert(button != NULL);
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+    m_info_widget->setErrorColor();
+    m_info_widget->setText(m_registration_error, false);
 
+    m_options_widget = getWidget<RibbonWidget>("options");
+    assert(m_options_widget != NULL);
+    m_next_widget = getWidget<IconButtonWidget>("next");
+    assert(m_next_widget != NULL);
+    m_cancel_widget = getWidget<IconButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
 }
 
 // -----------------------------------------------------------------------------
@@ -117,13 +118,24 @@ void RegistrationDialog::showRegistrationTerms(){
     clearWindow();
     m_phase = Terms;
     loadFromFile("online/registration_terms.stkgui");
-    CheckBoxWidget * checkbox = getWidget<CheckBoxWidget>("accepted");
-    assert(checkbox != NULL);
-    checkbox->setState(false);
-    checkbox->setFocusForPlayer(PLAYER_ID_GAME_MASTER); //FIXME set focus on the terms
-    ButtonWidget * submitButton = getWidget<ButtonWidget>("next");
-    assert(submitButton != NULL);
-    submitButton->setDeactivated();
+    m_accept_terms_widget = getWidget<CheckBoxWidget>("accepted");
+    assert(m_accept_terms_widget != NULL);
+    m_accept_terms_widget->setState(false);
+    m_accept_terms_widget->setFocusForPlayer(PLAYER_ID_GAME_MASTER); //FIXME set focus on the terms
+
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+    m_info_widget->setText(m_registration_error, false);
+
+    m_options_widget = getWidget<RibbonWidget>("options");
+    assert(m_options_widget != NULL);
+    m_previous_widget = getWidget<IconButtonWidget>("previous");
+    assert(m_previous_widget != NULL);
+    m_next_widget = getWidget<IconButtonWidget>("next");
+    assert(m_next_widget != NULL);
+    m_cancel_widget = getWidget<IconButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
+    m_next_widget->setDeactivated();
 }
 
 // -----------------------------------------------------------------------------
@@ -133,6 +145,17 @@ void RegistrationDialog::showRegistrationActivation(){
     clearWindow();
     m_phase = Activation;
     loadFromFile("online/registration_activation.stkgui");
+
+    m_info_widget = getWidget<LabelWidget>("info");
+    assert(m_info_widget != NULL);
+    m_info_widget->setText(m_registration_error, false);
+
+    m_options_widget = getWidget<RibbonWidget>("options");
+    assert(m_options_widget != NULL);
+    m_next_widget = getWidget<IconButtonWidget>("next");
+    assert(m_next_widget != NULL);
+    m_cancel_widget = getWidget<IconButtonWidget>("cancel");
+    assert(m_cancel_widget != NULL);
 }
 
 // -----------------------------------------------------------------------------
@@ -140,35 +163,34 @@ void RegistrationDialog::showRegistrationActivation(){
 bool RegistrationDialog::processInfoEvent(const std::string& eventSource){
     if (m_phase == Info)
     {
-        if (eventSource == "next")
+        if (eventSource == m_next_widget->m_properties[PROP_ID])
         {
-            m_username = getWidget<TextBoxWidget>("username")->getText().trim();
-            m_password = getWidget<TextBoxWidget>("password")->getText().trim();
-            m_password_confirm =  getWidget<TextBoxWidget>("password_confirm")->getText().trim();
-            m_email = getWidget<TextBoxWidget>("email")->getText().trim();
-            m_email_confirm = getWidget<TextBoxWidget>("email_confirm")->getText().trim();
-            LabelWidget * info_widget = getWidget<LabelWidget>("info");
+            m_username = m_username_widget->getText().trim();
+            m_password = m_password_widget->getText().trim();
+            m_password_confirm =  m_password_confirm_widget->getText().trim();
+            m_email = m_email_widget->getText().trim();
+            m_email_confirm = m_email_confirm_widget->getText().trim();
             //FIXME More validation of registration information
-            info_widget->setErrorColor();
+            m_info_widget->setErrorColor();
             if (m_password != m_password_confirm)
             {
-                info_widget->setText(_("Passwords don't match!"), false);
+                m_info_widget->setText(_("Passwords don't match!"), false);
             }
             else if (m_email != m_email_confirm)
             {
-                info_widget->setText(_("Emails don't match!"), false);
+                m_info_widget->setText(_("Emails don't match!"), false);
             }
             else if (m_username.size() < 4 || m_username.size() > 30)
             {
-                info_widget->setText(_("Username has to be between 4 and 30 characters long!"), false);
+                m_info_widget->setText(_("Username has to be between 4 and 30 characters long!"), false);
             }
             else if (m_password.size() < 8 || m_password.size() > 30)
             {
-                info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
+                m_info_widget->setText(_("Password has to be between 8 and 30 characters long!"), false);
             }
             else if (m_email.size() < 4 || m_email.size() > 50)
             {
-                info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
+                m_info_widget->setText(_("Email has to be between 4 and 50 characters long!"), false);
             }
             else
             {
@@ -187,26 +209,27 @@ bool RegistrationDialog::processInfoEvent(const std::string& eventSource){
 bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
     if (m_phase == Terms)
     {
-        if (eventSource == "next")
+        if (eventSource == m_next_widget->m_properties[PROP_ID])
         {
-            assert(getWidget<CheckBoxWidget>("accepted")->getState());
+            assert(m_accept_terms_widget->getState());
+            m_options_widget->setDeactivated();
+            m_info_widget->setDefaultColor();
+            m_info_widget->setText(Messages::signingUp(), false);
             m_sign_up_request = CurrentUser::acquire()->requestSignUp(m_username, m_password, m_password_confirm, m_email, true);
             CurrentUser::release();
             return true;
         }
-        else if (eventSource == "accepted")
+        else if (eventSource == m_accept_terms_widget->m_properties[PROP_ID])
         {
-            CheckBoxWidget * checkbox = getWidget<CheckBoxWidget>("accepted");
-            bool new_state = !checkbox->getState();
-            checkbox->setState(new_state);
-            ButtonWidget * submitButton = getWidget<ButtonWidget>("next");
+            bool new_state = !m_accept_terms_widget->getState();
+            m_accept_terms_widget->setState(new_state);
             if(new_state)
-                submitButton->setActivated();
+                m_next_widget->setActivated();
             else
-                submitButton->setDeactivated();
+                m_next_widget->setDeactivated();
             return true;
         }
-        else if (eventSource == "previous")
+        else if (eventSource == m_previous_widget->m_properties[PROP_ID])
         {
             m_show_registration_info = true;
             return true;
@@ -220,7 +243,7 @@ bool RegistrationDialog::processTermsEvent(const std::string& eventSource){
 bool RegistrationDialog::processActivationEvent(const std::string& eventSource){
     if (m_phase == Activation)
     {
-        if (eventSource == "next")
+        if (eventSource == m_next_widget->m_properties[PROP_ID])
         {
             //FIXME : activate
             m_self_destroy = true;
@@ -230,17 +253,28 @@ bool RegistrationDialog::processActivationEvent(const std::string& eventSource){
     return false;
 }
 
+// -----------------------------------------------------------------------------
+
+bool RegistrationDialog::onEscapePressed()
+{
+    return m_cancel_widget->isActivated();
+}
 
 // -----------------------------------------------------------------------------
 
 GUIEngine::EventPropagation RegistrationDialog::processEvent(const std::string& eventSource)
 {
-    if (eventSource == "cancel")
+    std::string selection;
+    if (eventSource == m_options_widget->m_properties[PROP_ID])
+        selection = m_options_widget->getSelectionIDString(PLAYER_ID_GAME_MASTER);
+    else
+        selection = eventSource;
+    if (selection == m_cancel_widget->m_properties[PROP_ID])
     {
         m_self_destroy = true;
         return GUIEngine::EVENT_BLOCK;
     }
-    else if (processInfoEvent(eventSource) || processTermsEvent(eventSource) || processActivationEvent(eventSource))
+    else if (processInfoEvent(selection) || processTermsEvent(selection) || processActivationEvent(selection))
     {
         return GUIEngine::EVENT_BLOCK;
     }
@@ -251,23 +285,11 @@ GUIEngine::EventPropagation RegistrationDialog::processEvent(const std::string&
 
 void RegistrationDialog::onEnterPressedInternal()
 {
-    //If enter was pressed while no button was focused, then interpret as "next" press.
-    const int playerID = PLAYER_ID_GAME_MASTER;
-    bool interpret_as_next = true;
-    ButtonWidget * cancel_widget = getWidget<ButtonWidget>("cancel");
-    ButtonWidget * next_widget = getWidget<ButtonWidget>("next");
-    interpret_as_next = interpret_as_next &&
-                        !GUIEngine::isFocusedForPlayer(next_widget, playerID) &&
-                        !GUIEngine::isFocusedForPlayer(cancel_widget, playerID);
-    if (interpret_as_next && m_phase == Terms)
-    {
-        ButtonWidget * previous_widget = getWidget<ButtonWidget>("previous");
-        interpret_as_next = interpret_as_next && !GUIEngine::isFocusedForPlayer(previous_widget, playerID);
-    }
-    if (interpret_as_next)
-    {
+
+    if (GUIEngine::isFocusedForPlayer(m_options_widget, PLAYER_ID_GAME_MASTER))
+        return;
+    if (m_next_widget->isActivated())
         processEvent("next");
-    }
 }
 
 // -----------------------------------------------------------------------------
@@ -296,10 +318,8 @@ void RegistrationDialog::onUpdate(float dt)
             }
             else
             {
-                LabelWidget* label = getWidget<LabelWidget>("info");
-                assert(label != NULL);
-                label->setDefaultColor();
-                label->setText(Messages::signingUp(), false);
+                m_info_widget->setDefaultColor();
+                m_info_widget->setText(Messages::signingUp(), false);
             }
         }
     }
diff --git a/src/states_screens/dialogs/registration_dialog.hpp b/src/states_screens/dialogs/registration_dialog.hpp
index ecf6cbaa9..aa2757eb4 100644
--- a/src/states_screens/dialogs/registration_dialog.hpp
+++ b/src/states_screens/dialogs/registration_dialog.hpp
@@ -46,6 +46,7 @@ public:
     GUIEngine::EventPropagation processEvent(const std::string& eventSource);
     
     virtual void onUpdate(float dt);
+    virtual bool onEscapePressed();
 
 private:
 
@@ -67,6 +68,20 @@ private:
     irr::core::stringw m_registration_error;
     bool m_agreement;
 
+    GUIEngine::TextBoxWidget * m_username_widget;
+    GUIEngine::TextBoxWidget * m_password_widget;
+    GUIEngine::TextBoxWidget * m_password_confirm_widget;
+    GUIEngine::TextBoxWidget * m_email_widget;
+    GUIEngine::TextBoxWidget * m_email_confirm_widget;
+
+    GUIEngine::LabelWidget * m_info_widget;
+
+    GUIEngine::RibbonWidget * m_options_widget;
+    GUIEngine::IconButtonWidget * m_previous_widget;
+    GUIEngine::IconButtonWidget * m_next_widget;
+    GUIEngine::IconButtonWidget * m_cancel_widget;
+
+    GUIEngine::CheckBoxWidget * m_accept_terms_widget;
 
     void showRegistrationInfo();
     void showRegistrationTerms();

From 85579c3d9b4044ad344465c74cc46a4688721332 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Tue, 23 Jul 2013 23:54:55 +0000
Subject: [PATCH 42/44] Client-side code related to previous commit

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13334 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/current_user.cpp                        | 10 ++++++----
 src/states_screens/dialogs/registration_dialog.cpp |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/online/current_user.cpp b/src/online/current_user.cpp
index 8010ae248..f32c4f82f 100644
--- a/src/online/current_user.cpp
+++ b/src/online/current_user.cpp
@@ -77,10 +77,12 @@ namespace Online{
         assert(m_state == US_SIGNED_OUT || m_state == US_GUEST);
         XMLRequest * request = new XMLRequest();
         request->setURL((std::string)UserConfigParams::m_server_multiplayer + "client-user.php");
-        request->setParameter("action",std::string("register"));
-        request->setParameter("username",username);
-        request->setParameter("password",password);
-        request->setParameter("password_confirm",password_confirm);
+        request->setParameter("action", std::string("register"));
+        request->setParameter("username", username);
+        request->setParameter("password", password);
+        request->setParameter("password_confirm", password_confirm);
+        request->setParameter("email", email);
+        request->setParameter("terms", std::string("on"));
         HTTPManager::get()->addRequest(request);
         return request;
     }
diff --git a/src/states_screens/dialogs/registration_dialog.cpp b/src/states_screens/dialogs/registration_dialog.cpp
index 051698426..77f1f2662 100644
--- a/src/states_screens/dialogs/registration_dialog.cpp
+++ b/src/states_screens/dialogs/registration_dialog.cpp
@@ -125,7 +125,6 @@ void RegistrationDialog::showRegistrationTerms(){
 
     m_info_widget = getWidget<LabelWidget>("info");
     assert(m_info_widget != NULL);
-    m_info_widget->setText(m_registration_error, false);
 
     m_options_widget = getWidget<RibbonWidget>("options");
     assert(m_options_widget != NULL);

From 0979eb009cf3c8464f9dc60b68405eaa30f64c39 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 24 Jul 2013 12:53:19 +0000
Subject: [PATCH 43/44] WillemS had a compilation error concerning the
 namespace os of irrlicht. Tried a fix, waiting for confirmation.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13335 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/guiengine/widgets/CGUISTKListBox.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/guiengine/widgets/CGUISTKListBox.cpp b/src/guiengine/widgets/CGUISTKListBox.cpp
index f73d1de0a..5e236cbdf 100644
--- a/src/guiengine/widgets/CGUISTKListBox.cpp
+++ b/src/guiengine/widgets/CGUISTKListBox.cpp
@@ -11,7 +11,9 @@
 #include "IGUIFont.h"
 #include "IGUISpriteBank.h"
 #include "CGUIScrollBar.h"
-#include "os.h"
+//#include "os.h"
+#include "utils/time.hpp"
+
 
 namespace irr
 {
@@ -113,7 +115,7 @@ void CGUISTKListBox::removeItem(u32 id)
 	else if ((u32)Selected > id)
 	{
 		Selected -= 1;
-		selectTime = os::Timer::getTime();
+		selectTime = Time::getTimeSinceEpoch();
 	}
 
 	Items.erase(id);
@@ -203,7 +205,7 @@ void CGUISTKListBox::setSelected(s32 id)
 	else
 		Selected = id;
 
-	selectTime = os::Timer::getTime();
+	selectTime = Time::getTimeSinceEpoch();
 
 	recalculateScrollPos();
 }
@@ -395,7 +397,7 @@ bool CGUISTKListBox::OnEvent(const SEvent& event)
 
 void CGUISTKListBox::selectNew(s32 ypos, bool onlyHover)
 {
-	u32 now = os::Timer::getTime();
+	u32 now = Time::getTimeSinceEpoch();
 	s32 oldSelected = Selected;
 
 	Selected = getItemAt(AbsoluteRect.UpperLeftCorner.X, ypos);
@@ -509,7 +511,7 @@ void CGUISTKListBox::draw()
                                 iconPos, &clientClip,
                                 hasItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) ?
                                 getItemOverrideColor(i, EGUI_LBC_ICON_HIGHLIGHT) : getItemDefaultColor(EGUI_LBC_ICON_HIGHLIGHT),
-                                selectTime, os::Timer::getTime(), false, true);
+                                selectTime, Time::getTimeSinceEpoch(), false, true);
                         }
                         else
                         {
@@ -518,7 +520,7 @@ void CGUISTKListBox::draw()
                                 iconPos,
                                 &clientClip,
                                 hasItemOverrideColor(i, EGUI_LBC_ICON) ? getItemOverrideColor(i, EGUI_LBC_ICON) : getItemDefaultColor(EGUI_LBC_ICON),
-                                0 , (i==Selected) ? os::Timer::getTime() : 0, false, true);
+                                0 , (i==Selected) ? Time::getTimeSinceEpoch() : 0, false, true);
                         }
                         textRect.UpperLeftCorner.X += ItemsIconWidth;
                     }
@@ -614,7 +616,7 @@ bool CGUISTKListBox::isAutoScrollEnabled() const
 
 void CGUISTKListBox::recalculateIconWidth()
 {
-    for(int x = 0; x < Items.getLast().m_contents.size(); ++x)
+    for(int x = 0; x < (int)Items.getLast().m_contents.size(); ++x)
     {
         s32 icon = Items.getLast().m_contents[x].m_icon;
 	if (IconBank && icon > -1 &&

From aba6b9f0e611bffda0c5306684c022404472b9b3 Mon Sep 17 00:00:00 2001
From: unitraxx <unitraxx@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Wed, 24 Jul 2013 13:08:45 +0000
Subject: [PATCH 44/44] add a synchronousRequest option to the HTTPManager

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13336 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/online/http_manager.cpp | 12 +++++++++++-
 src/online/http_manager.hpp |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/online/http_manager.cpp b/src/online/http_manager.cpp
index a4296bb50..a3d065134 100644
--- a/src/online/http_manager.cpp
+++ b/src/online/http_manager.cpp
@@ -152,7 +152,17 @@ namespace Online{
         // Wake up the network http thread
         pthread_cond_signal(&m_cond_request);
         m_request_queue.unlock();
-    }   // insertRequest
+    }   // addRequest
+
+    // ----------------------------------------------------------------------------
+    /** Immediately performs a request synchronously
+     *  \param request The pointer to the new request to insert.
+     */
+    void HTTPManager::synchronousRequest(Request *request)
+    {
+        assert(request->isAllowedToAdd());
+        request->execute();
+    }   // synchronousRequest
 
     // ---------------------------------------------------------------------------
     /** The actual main loop, which is started as a separate thread from the
diff --git a/src/online/http_manager.hpp b/src/online/http_manager.hpp
index 42bf0d6d0..0ea32815a 100644
--- a/src/online/http_manager.hpp
+++ b/src/online/http_manager.hpp
@@ -83,6 +83,7 @@ namespace Online{
             std::string getPage(Online::Request * request);
             XMLNode * getXMLFromPage(Online::Request * request);
 
+            void synchronousRequest(Online::Request *request);
             void addRequest(Online::Request *request);
             void cancelAllDownloads();
             void stopNetworkThread();