Implement text searcher in server selection

data/gui/online/server_selection.stkgui

@@ -9,7 +9,8 @@
         </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%"/>
+            <list id="server_list" x="0" y="0" width="100%" height="93%"/>
+            <textbox id="searcher" width="100%" height="7%"/>
         </box>
         <div width="99%" align="center" layout="vertical-row" height="fit">
             <div width="100%" height="fit" layout="horizontal-row" >

src/states_screens/server_selection.cpp

@@ -97,6 +97,8 @@ void ServerSelection::loadedFromFile()
     m_private_server->setState(false);
     m_game_started = getWidget<GUIEngine::CheckBoxWidget>("game_started");
     assert(m_game_started != NULL);
+    m_searcher = getWidget<GUIEngine::TextBoxWidget>("searcher");
+    assert(m_searcher != NULL);
     m_game_started->setState(false);
     m_icon_bank = new irr::gui::STKModifiedSpriteBank(GUIEngine::getGUIEnv());
     video::ITexture* icon1 = irr_driver->getTexture(
@@ -133,6 +135,9 @@ void ServerSelection::beforeAddingWidget()
 void ServerSelection::init()
 {
     Screen::init();
+    m_current_column = 5/*distance*/;
+    m_searcher->clearListeners();
+    m_searcher->addListener(this);
     m_icon_bank->setScale((float)getHeight() / 15.0f / 128.0f);
     m_server_list_widget->setIcons(m_icon_bank, (float)getHeight() / 12.0f);
     m_sort_desc = false;
@@ -143,18 +148,17 @@ void ServerSelection::init()
 // ----------------------------------------------------------------------------
 /** Loads the list of all servers. The gui element will be
  *  updated.
- *  \param sort_case what sorting method will be used.
  */
-void ServerSelection::loadList(unsigned sort_case)
+void ServerSelection::loadList()
 {
     m_server_list_widget->clear();
-    std::sort(m_servers.begin(), m_servers.end(), [sort_case, this]
+    std::sort(m_servers.begin(), m_servers.end(), [this]
         (const std::shared_ptr<Server> a,
          const std::shared_ptr<Server> b)->bool
         {
             std::shared_ptr<Server> c = m_sort_desc ? a : b;
             std::shared_ptr<Server> d = m_sort_desc ? b : a;
-            switch (sort_case)
+            switch (m_current_column)
             {
             case 0:
                 return c->getLowerCaseName() > d->getLowerCaseName();
@@ -225,12 +229,14 @@ void ServerSelection::onColumnClicked(int column_id, bool sort_desc, bool sort_d
     if (sort_default)
     {
         m_sort_desc = false;
-        loadList(/* distance */ 5);
+        m_current_column = 5/*distance*/;
+        loadList();
     }
     else
     {
         m_sort_desc = sort_desc;
-        loadList(column_id);
+        m_current_column = column_id;
+        loadList();
     }
 }   // onColumnClicked
 
@@ -343,7 +349,20 @@ void ServerSelection::copyFromServersManager()
                 return true;
             return false;
         }), m_servers.end());
-    loadList(/* distance */ 5);
+    const core::stringw& search = m_searcher->getText();
+    const std::string search_word_lc = StringUtils::toLowerCase(
+        StringUtils::wideToUtf8(search));
+    if (!search_word_lc.empty())
+    {
+        m_servers.erase(std::remove_if(m_servers.begin(), m_servers.end(),
+            [search_word_lc](const std::shared_ptr<Server>& a)->bool
+            {
+                if (!a->searchByName(search_word_lc))
+                    return true;
+                return false;
+            }), m_servers.end());
+    }
+    loadList();
 }   // copyFromServersManager
 
 // ----------------------------------------------------------------------------

src/states_screens/server_selection.hpp

@@ -20,6 +20,7 @@
 
 #include "guiengine/screen.hpp"
 #include "guiengine/widgets/list_widget.hpp"
+#include "guiengine/widgets/text_box_widget.hpp"
 
 #include <memory>
 
@@ -30,7 +31,6 @@ namespace GUIEngine
     class CheckBoxWidget;
     class IconButtonWidget;
     class LabelWidget;
-    class ListWidget;
 }
 
 namespace irr
@@ -49,7 +49,8 @@ class Server;
   */
 class ServerSelection :  public GUIEngine::Screen,
                          public GUIEngine::ScreenSingleton<ServerSelection>,
-                         public GUIEngine::IListWidgetHeaderListener
+                         public GUIEngine::IListWidgetHeaderListener,
+                         public GUIEngine::ITextBoxWidgetListener
 {
     friend class GUIEngine::ScreenSingleton<ServerSelection>;
 
@@ -64,17 +65,20 @@ private:
     GUIEngine::IconButtonWidget* m_reload_widget;
     GUIEngine::LabelWidget* m_update_status;
     GUIEngine::ListWidget* m_server_list_widget;
+    GUIEngine::TextBoxWidget* m_searcher;
     irr::gui::STKModifiedSpriteBank* m_icon_bank;
 
     /** \brief To check (and set) if sort order is descending **/
     bool m_sort_desc;
 
+    int m_current_column;
+
     bool m_refreshing_server;
     
     float m_refresh_timer;
 
     /** Load the servers into the main list.*/
-    void loadList(unsigned sort_case);
+    void loadList();
 
     void copyFromServersManager();
 
@@ -85,13 +89,15 @@ public:
     virtual void loadedFromFile() OVERRIDE;
 
     /** \brief implement callback from parent class GUIEngine::Screen */
-    virtual void eventCallback(GUIEngine::Widget* widget, const std::string& name,
+    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 column_id, bool sort_desc, bool sort_default) OVERRIDE;
+    virtual void onColumnClicked(int column_id, bool sort_desc,
+                                 bool sort_default) OVERRIDE;
 
     virtual void init() OVERRIDE;
 
@@ -102,6 +108,11 @@ public:
     /** \brief implement callback from parent class GUIEngine::Screen */
     virtual void onUpdate(float dt) OVERRIDE;
 
+    virtual void onTextUpdated() OVERRIDE         { copyFromServersManager(); }
+
+    virtual bool onEnterPressed(const irr::core::stringw& text) OVERRIDE
+                                                              { return false; }
+
 };   // ServerSelection
 
 #endif