Improve chat history and disconnects

src/client/client.cpp

@@ -238,13 +238,10 @@ void Client::onPeerDisconnected(peer_t peer_id)
 
 	// send event for client destruction
 	{
-		GameEvent e(GameEvent::C2G_DIALOG);
-		e.text = new std::string("Server disconnected");
-		sendNewEvent(e);
-
 		GameEvent e2(GameEvent::C2G_DISCONNECT);
 		sendNewEvent(e2);
 	}
+	printf("Client: Disconnected from the server\n");
 }
 
 void Client::processPacket(peer_t peer_id, Packet &pkt)

src/core/connection.cpp

@@ -7,7 +7,7 @@
 #include <string.h> // strerror
 #include <sstream>
 
-#if 1
+#if 0
 	#define DEBUGLOG(...) printf(__VA_ARGS__)
 #else
 	#define DEBUGLOG(...) /* SILENCE */
@@ -72,8 +72,9 @@ Connection::Connection(Connection::ConnectionType type, const char *name)
 
 Connection::~Connection()
 {
-	DEBUGLOG("--- ENet %s: Cleaning up ...\n", m_name);
 	m_running = false;
+	if (!m_host)
+		return;
 
 	for (size_t i = 0; i < m_host->peerCount; ++i)
 		enet_peer_disconnect_later(&m_host->peers[i], 0);
@@ -84,6 +85,8 @@ Connection::~Connection()
 			ERRORLOG("--- ENet %s: Failed to join thread status=%d\n", m_name, errno);
 		}
 	}
+	while (m_thread)
+		sleep(1);
 
 	// Apply force if needed
 	for (size_t i = 0; i < m_host->peerCount; ++i)
@@ -161,7 +164,7 @@ void Connection::disconnect(peer_t peer_id)
 	if (!peer)
 		return;
 
-	enet_peer_disconnect(peer, 0);
+	enet_peer_disconnect_later(peer, 0);
 	// Actual handling done in async event handler
 }
 

src/core/macros.h

@@ -17,6 +17,8 @@ typedef std::unique_lock<std::mutex> SimpleLock;
 
 typedef uint32_t peer_t; // same as in ENetPeer
 
+void sleep_ms(long delay);
+
 // Auto-unlock wrapper for larger operations
 template<typename T>
 class PtrLock {

src/gui/gameplay.cpp

@@ -80,15 +80,15 @@ void SceneGameplay::draw()
 			core::dimension2di(wsize.Width - SIZEW, wsize.Height - 50 - 160)
 		);
 		if (m_chathistory_text.empty())
-			m_chathistory_text = L"Chat history:\n";
+			m_chathistory_text = L"--- Start of chat history ---\n";
 
 		auto e = m_gui->gui->addEditBox(m_chathistory_text.c_str(), rect_ch, true);
 		e->setAutoScroll(true);
 		e->setMultiLine(true);
 		e->setWordWrap(true);
 		e->setEnabled(false);
 		e->setDrawBackground(false);
-		e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT);
+		e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_LOWERRIGHT);
 		e->setOverrideColor(0xFFCCCCCC);
 		m_chathistory = e;
 	}
@@ -209,6 +209,16 @@ bool SceneGameplay::OnEvent(const SEvent &e)
 				}
 				break;
 			case EMIE_MOUSE_WHEEL:
+				{
+					core::vector2di pos(e.MouseInput.X, e.MouseInput.Y);
+					auto root = m_gui->gui->getRootGUIElement();
+					auto element = root->getElementFromPoint(pos);
+					if (element && element != root) {
+						// Forward inputs to the corresponding element
+						return false;
+					}
+				}
+
 				{
 					float dir = e.MouseInput.Wheel > 0 ? 1 : -1;
 
@@ -326,11 +336,8 @@ bool SceneGameplay::OnEvent(GameEvent &e)
 			}
 			return true;
 		case E::C2G_DIALOG:
-			printf(" * SYSTEM: %s\n", e.text->c_str());
+			// TODO: show an actual dialog?
 			break;
-		case E::C2G_DISCONNECT:
-			m_gui->disconnect();
-			return true;
 		default: break;
 	}
 	return false;
@@ -389,7 +396,6 @@ video::ITexture *SceneGameplay::generateTexture(const wchar_t *text, u32 color)
 	return texture;
 }
 
-
 void SceneGameplay::updateWorld()
 {
 	auto world = m_gui->getClient()->getWorld();

src/gui/gui.cpp

@@ -9,7 +9,7 @@
 #include "lobby.h"
 #include "gameplay.h"
 
-void sleep_ms(long delay);
+extern const char *VERSION_STRING;
 
 Gui::Gui()
 {
@@ -20,7 +20,12 @@ Gui::Gui()
 
 	ASSERT_FORCED(device, "Failed to initialize driver");
 
-	device->setWindowCaption(L"OpenEdits v1.0.2-dev");
+	{
+		// Title bar
+		core::stringw version;
+		core::multibyteToWString(version, VERSION_STRING);
+		device->setWindowCaption(version.c_str());
+	}
 
 	scenemgr = device->getSceneManager();
 	gui = device->getGUIEnvironment();
@@ -95,6 +100,18 @@ void Gui::run()
 			t_last = t_now;
 		}
 
+		if (m_pending_disconnect) {
+			if (m_client) {
+				delete m_client;
+				m_client = nullptr;
+			}
+			if (m_server) {
+				delete m_server;
+				m_server = nullptr;
+			}
+			m_pending_disconnect = false;
+		}
+
 		if (m_client) {
 			m_client->step(dtime);
 		}
@@ -171,6 +188,10 @@ bool Gui::OnEvent(GameEvent &e)
 	if (!m_initialized)
 		return false;
 
+	if (e.type_c2g == GameEvent::C2G_DISCONNECT) {
+		disconnect();
+		return true;
+	}
 	return getHandler(m_scenetype)->OnEvent(e);
 }
 
@@ -222,28 +243,16 @@ void Gui::connect(SceneConnect *sc)
 		m_client->setEventHandler(this);
 		setNextScene(SceneHandlerType::Lobby);
 	} else {
-		puts("Wait timed out.");
-		delete m_client;
-		m_client = nullptr;
-
-		delete m_server;
-		m_server = nullptr;
+		puts("Connection timed out: Server is not reachable.");
+		m_pending_disconnect = true;
 	}
 }
 
 void Gui::disconnect()
 {
 	setNextScene(SceneHandlerType::Connect);
 
-	if (m_client) {
-		delete m_client;
-		m_client = nullptr;
-	}
-
-	if (m_server) {
-		delete m_server;
-		m_server = nullptr;
-	}
+	m_pending_disconnect = true;
 }
 
 void Gui::joinWorld(SceneLobby *sc)

src/gui/gui.h

@@ -79,6 +79,7 @@ class Gui : public IEventReceiver, public GameEventHandler {
 	inline void setNextScene(SceneHandlerType type) { m_scenetype_next = type; }
 
 	bool m_initialized = false;
+	bool m_pending_disconnect = false;
 
 	SceneHandlerType m_scenetype_next;
 	SceneHandlerType m_scenetype;

src/main.cpp

@@ -10,6 +10,8 @@ void sleep_ms(long delay)
 	std::this_thread::sleep_for(std::chrono::milliseconds(delay));
 }
 
+const char *VERSION_STRING = "OpenEdits v1.0.3-dev";
+
 void unittest();
 
 static void exit_cleanup()
@@ -86,9 +88,18 @@ int main(int argc, char *argv[])
 	g_blockmanager = new BlockManager();
 	register_packs();
 
-	if (argc >= 2 && strcmp(argv[1], "--unittest") == 0) {
-		unittest();
-		return EXIT_SUCCESS;
+	if (argc >= 2) {
+		if (strcmp(argv[1], "--version") == 0) {
+			puts(VERSION_STRING);
+			return EXIT_SUCCESS;
+		}
+		if (strcmp(argv[1], "--unittest") == 0) {
+			// Depends on BlockManager and ENet
+			unittest();
+			return EXIT_SUCCESS;
+		}
+		puts("-!- Unknown command line option.");
+		return EXIT_FAILURE;
 	}
 
 	Gui gui;