Put ChatEvent handler into own function

[dragonfireclient.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 48b1af60313d306477169b42976fc9d8fabe2917..151ea7148bf4da8f47095d552625d21b2117f5e0 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,11 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #ifdef _MSC_VER
-#ifndef SERVER // Dedicated server isn't linked with Irrlicht
-       #pragma comment(lib, "Irrlicht.lib")
-       // This would get rid of the console window
-       //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
-#endif
+       #ifndef SERVER // Dedicated server isn't linked with Irrlicht
+               #pragma comment(lib, "Irrlicht.lib")
+               // This would get rid of the console window
+               //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup")
+       #endif
        #pragma comment(lib, "zlibwapi.lib")
        #pragma comment(lib, "Shell32.lib")
 #endif
@@ -45,16 +45,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "httpfetch.h"
 #include "guiEngine.h"
 #include "map.h"
+#include "player.h"
 #include "mapsector.h"
 #include "fontengine.h"
 #include "gameparams.h"
 #include "database.h"
+#include "config.h"
+#if USE_CURSES
+       #include "terminal_chat_console.h"
+#endif
 #ifndef SERVER
 #include "client/clientlauncher.h"
 #endif
 
 #ifdef HAVE_TOUCHSCREENGUI
-#include "touchscreengui.h"
+       #include "touchscreengui.h"
+#endif
+
+#if !defined(SERVER) && \
+       (IRRLICHT_VERSION_MAJOR == 1) && \
+       (IRRLICHT_VERSION_MINOR == 8) && \
+       (IRRLICHT_VERSION_REVISION == 2)
+       #error "Irrlicht 1.8.2 is known to be broken - please update Irrlicht to version >= 1.8.3"
 #endif
 
 #define DEBUGFILE "debug.txt"
@@ -277,6 +289,8 @@ static void set_allowed_options(OptionList *allowed_options)
                        _("Set gameid (\"--gameid list\" prints available ones)"))));
        allowed_options->insert(std::make_pair("migrate", ValueSpec(VALUETYPE_STRING,
                        _("Migrate from current map backend to another (Only works when using minetestserver or with --server)"))));
+       allowed_options->insert(std::make_pair("terminal", ValueSpec(VALUETYPE_FLAG,
+                       _("Feature an interactive terminal (Only works when using minetestserver or with --server)"))));
 #ifndef SERVER
        allowed_options->insert(std::make_pair("videomodes", ValueSpec(VALUETYPE_FLAG,
                        _("Show available video modes"))));
@@ -816,21 +830,83 @@ static bool run_dedicated_server(const GameParams &game_params, const Settings &
        if (cmd_args.exists("migrate"))
                return migrate_database(game_params, cmd_args);
 
-       try {
-               // Create server
-               Server server(game_params.world_path, game_params.game_spec, false,
-                       bind_addr.isIPv6());
-               server.start(bind_addr);
-
-               // Run server
+       if (cmd_args.exists("terminal")) {
+#if USE_CURSES
+               bool name_ok = true;
+               std::string admin_nick = g_settings->get("name");
+
+               name_ok = name_ok && !admin_nick.empty();
+               name_ok = name_ok && string_allowed(admin_nick, PLAYERNAME_ALLOWED_CHARS);
+
+               if (!name_ok) {
+                       if (admin_nick.empty()) {
+                               errorstream << "No name given for admin. "
+                                       << "Please check your minetest.conf that it "
+                                       << "contains a 'name = ' to your main admin account."
+                                       << std::endl;
+                       } else {
+                               errorstream << "Name for admin '"
+                                       << admin_nick << "' is not valid. "
+                                       << "Please check that it only contains allowed characters. "
+                                       << "Valid characters are: " << PLAYERNAME_ALLOWED_CHARS_USER_EXPL
+                                       << std::endl;
+                       }
+                       return false;
+               }
+               ChatInterface iface;
                bool &kill = *porting::signal_handler_killstatus();
-               dedicated_server_loop(server, kill);
-       } catch (const ModError &e) {
-               errorstream << "ModError: " << e.what() << std::endl;
-               return false;
-       } catch (const ServerError &e) {
-               errorstream << "ServerError: " << e.what() << std::endl;
-               return false;
+
+               try {
+                       // Create server
+                       Server server(game_params.world_path,
+                               game_params.game_spec, false, bind_addr.isIPv6(), &iface);
+
+                       g_term_console.setup(&iface, &kill, admin_nick);
+
+                       g_term_console.start();
+
+                       server.start(bind_addr);
+                       // Run server
+                       dedicated_server_loop(server, kill);
+               } catch (const ModError &e) {
+                       g_term_console.stopAndWaitforThread();
+                       errorstream << "ModError: " << e.what() << std::endl;
+                       return false;
+               } catch (const ServerError &e) {
+                       g_term_console.stopAndWaitforThread();
+                       errorstream << "ServerError: " << e.what() << std::endl;
+                       return false;
+               }
+
+               // Tell the console to stop, and wait for it to finish,
+               // only then leave context and free iface
+               g_term_console.stop();
+               g_term_console.wait();
+
+               g_term_console.clearKillStatus();
+       } else {
+#else
+               errorstream << "Cmd arg --terminal passed, but "
+                       << "compiled without ncurses. Ignoring." << std::endl;
+       } {
+#endif
+               try {
+                       // Create server
+                       Server server(game_params.world_path, game_params.game_spec, false,
+                               bind_addr.isIPv6());
+                       server.start(bind_addr);
+
+                       // Run server
+                       bool &kill = *porting::signal_handler_killstatus();
+                       dedicated_server_loop(server, kill);
+
+               } catch (const ModError &e) {
+                       errorstream << "ModError: " << e.what() << std::endl;
+                       return false;
+               } catch (const ServerError &e) {
+                       errorstream << "ServerError: " << e.what() << std::endl;
+                       return false;
+               }
        }
 
        return true;