From 4e6bcf02d2192992fcea57be7d8dcf6a439d31f3 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 1 Mar 2020 18:30:00 +0100
Subject: [PATCH 1/5] [Server] Pass stdin to a Lua event, fix Ctrl+C on Windows

---
 apps/openmw-mp/Networking.cpp             | 27 ++++++++++++++++++-----
 apps/openmw-mp/Script/ScriptFunctions.hpp |  3 ++-
 apps/openmw-mp/handleInput.cpp            | 24 ++++++++++++++++++++
 apps/openmw-mp/handleInput.hpp            |  3 +++
 4 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 apps/openmw-mp/handleInput.cpp
 create mode 100644 apps/openmw-mp/handleInput.hpp

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index c3067f58c..e034b6394 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -25,6 +25,8 @@
 #include "processors/ObjectProcessor.hpp"
 #include "processors/WorldstateProcessor.hpp"
 
+#include "handleInput.hpp"
+
 using namespace mwmp;
 using namespace std;
 
@@ -496,6 +498,20 @@ void signalHandler(int signum)
     }
 }
 
+#ifdef _WIN32
+BOOL WINAPI sigIntHandler(_In_ DWORD dwCtrlType) {
+    switch (dwCtrlType)
+    {
+    case CTRL_C_EVENT:
+        signalHandler(15);
+        return TRUE;
+    default:
+        // Pass signal on to the next handler
+        return FALSE;
+    }
+}
+#endif
+
 int Networking::mainLoop()
 {
     RakNet::Packet *packet;
@@ -506,16 +522,15 @@ int Networking::mainLoop()
     sigIntHandler.sa_handler = signalHandler;
     sigemptyset(&sigIntHandler.sa_mask);
     sigIntHandler.sa_flags = 0;
+    sigaction(SIGTERM, &sigIntHandler, NULL);
+    sigaction(SIGINT, &sigIntHandler, NULL);
+#else
+    SetConsoleCtrlHandler(sigIntHandler, TRUE);
 #endif
     
     while (running and !killLoop)
     {
-#ifndef _WIN32
-        sigaction(SIGTERM, &sigIntHandler, NULL);
-        sigaction(SIGINT, &sigIntHandler, NULL);
-#endif
-        if (kbhit() && getch() == '\n')
-            break;
+        mwmp_input::handler();
         for (packet=peer->Receive(); packet; peer->DeallocatePacket(packet), packet=peer->Receive())
         {
             if (getMasterClient()->Process(packet))
diff --git a/apps/openmw-mp/Script/ScriptFunctions.hpp b/apps/openmw-mp/Script/ScriptFunctions.hpp
index fe04c739f..a1d539410 100644
--- a/apps/openmw-mp/Script/ScriptFunctions.hpp
+++ b/apps/openmw-mp/Script/ScriptFunctions.hpp
@@ -214,7 +214,8 @@ public:
             {"OnWorldWeather",           Callback<unsigned short>()},
             {"OnClientScriptGlobal",     Callback<unsigned short>()},
             {"OnMpNumIncrement",         Callback<int>()},
-            {"OnRequestDataFileList",    Callback<>()}
+            {"OnRequestDataFileList",    Callback<>()},
+            {"OnServerWindowInput",      Callback<const char *>()}
     };
 };
 
diff --git a/apps/openmw-mp/handleInput.cpp b/apps/openmw-mp/handleInput.cpp
new file mode 100644
index 000000000..cbc00f5df
--- /dev/null
+++ b/apps/openmw-mp/handleInput.cpp
@@ -0,0 +1,24 @@
+#include <Script/Script.hpp>
+#include <Kbhit.h>
+using namespace std;
+namespace mwmp_input {
+    string windowInputBuffer;
+    void handler() {
+        char c;
+#ifndef WIN32 // on WIndows conio.h getch() and kbhit() are deprecated, use _getch() and _kbhit() instead
+        while (kbhit()) {
+            c = getch();
+#else
+        while (_kbhit()) {
+            c = _getch();
+#endif
+            cout << c << flush;
+            if (c == '\n' || c == '\r') { // handle carriage return as new line on Windows
+                cout << endl;
+                Script::Call<Script::CallbackIdentity("OnServerWindowInput")>(windowInputBuffer.c_str());
+                windowInputBuffer.assign("");
+            }
+            else windowInputBuffer += c;
+        }
+    }
+}
diff --git a/apps/openmw-mp/handleInput.hpp b/apps/openmw-mp/handleInput.hpp
new file mode 100644
index 000000000..af0fb1341
--- /dev/null
+++ b/apps/openmw-mp/handleInput.hpp
@@ -0,0 +1,3 @@
+namespace mwmp_input {
+    void handler();
+}

From 59693abc74c4ba1f95418cfa48a8aefb5f45284e Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 2 Mar 2020 14:19:00 +0100
Subject: [PATCH 2/5] [Server] Handle backspace in the server window

---
 apps/openmw-mp/handleInput.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/openmw-mp/handleInput.cpp b/apps/openmw-mp/handleInput.cpp
index cbc00f5df..0265587cf 100644
--- a/apps/openmw-mp/handleInput.cpp
+++ b/apps/openmw-mp/handleInput.cpp
@@ -5,10 +5,10 @@ namespace mwmp_input {
     string windowInputBuffer;
     void handler() {
         char c;
-#ifndef WIN32 // on WIndows conio.h getch() and kbhit() are deprecated, use _getch() and _kbhit() instead
+#ifndef WIN32
         while (kbhit()) {
             c = getch();
-#else
+#else // on Windows conio.h getch() and kbhit() are deprecated, use _getch() and _kbhit() instead
         while (_kbhit()) {
             c = _getch();
 #endif
@@ -18,6 +18,9 @@ namespace mwmp_input {
                 Script::Call<Script::CallbackIdentity("OnServerWindowInput")>(windowInputBuffer.c_str());
                 windowInputBuffer.assign("");
             }
+            else if (c == '\b') {
+                windowInputBuffer.erase(windowInputBuffer.size() - 1);
+            }
             else windowInputBuffer += c;
         }
     }

From 2b71cbb8fcd98391bc37430afa606c7f7d246d24 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Mon, 2 Mar 2020 14:40:00 +0100
Subject: [PATCH 3/5] [Server] Handle backspace input if the current line is
 empty

---
 apps/openmw-mp/handleInput.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/openmw-mp/handleInput.cpp b/apps/openmw-mp/handleInput.cpp
index 0265587cf..071a826ea 100644
--- a/apps/openmw-mp/handleInput.cpp
+++ b/apps/openmw-mp/handleInput.cpp
@@ -19,7 +19,9 @@ namespace mwmp_input {
                 windowInputBuffer.assign("");
             }
             else if (c == '\b') {
-                windowInputBuffer.erase(windowInputBuffer.size() - 1);
+                auto size = windowInputBuffer.size();
+                if (size > 0)
+                    windowInputBuffer.erase(size - 1);
             }
             else windowInputBuffer += c;
         }

From 758ec17a6e82f4aa69bba7bfb09059f2e73ad0e2 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 15 Mar 2020 17:18:00 +0100
Subject: [PATCH 4/5] [Server] Include handleInput.cpp correctly

---
 apps/openmw-mp/Networking.cpp  | 2 +-
 apps/openmw-mp/handleInput.hpp | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 apps/openmw-mp/handleInput.hpp

diff --git a/apps/openmw-mp/Networking.cpp b/apps/openmw-mp/Networking.cpp
index e034b6394..bfda43863 100644
--- a/apps/openmw-mp/Networking.cpp
+++ b/apps/openmw-mp/Networking.cpp
@@ -25,7 +25,7 @@
 #include "processors/ObjectProcessor.hpp"
 #include "processors/WorldstateProcessor.hpp"
 
-#include "handleInput.hpp"
+#include "handleInput.cpp"
 
 using namespace mwmp;
 using namespace std;
diff --git a/apps/openmw-mp/handleInput.hpp b/apps/openmw-mp/handleInput.hpp
deleted file mode 100644
index af0fb1341..000000000
--- a/apps/openmw-mp/handleInput.hpp
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace mwmp_input {
-    void handler();
-}

From e0aaa7ee40fc7d33f9c7867b6f5a0d0104b74831 Mon Sep 17 00:00:00 2001
From: uramer <antonuramer@gmail.com>
Date: Sun, 15 Mar 2020 17:30:00 +0100
Subject: [PATCH 5/5] [Server] Remove duplicate includes

---
 apps/openmw-mp/handleInput.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw-mp/handleInput.cpp b/apps/openmw-mp/handleInput.cpp
index 071a826ea..702d007bc 100644
--- a/apps/openmw-mp/handleInput.cpp
+++ b/apps/openmw-mp/handleInput.cpp
@@ -1,5 +1,3 @@
-#include <Script/Script.hpp>
-#include <Kbhit.h>
 using namespace std;
 namespace mwmp_input {
     string windowInputBuffer;