Make chat show full history when opened

src/client/Minecraft.cpp

@@ -36,6 +36,7 @@
 #include "gui/Font.h"
 #include "gui/screens/RenameMPLevelScreen.h"
 #include "gui/screens/ConsoleScreen.h"
+#include "gui/screens/ChatScreen.h"
 #include "sound/SoundEngine.h"
 #endif
 #include "../platform/CThread.h"
@@ -672,15 +673,20 @@ void Minecraft::tickInput() {
 		}
 
 		if (e.action == MouseAction::ACTION_WHEEL) {
-			Inventory* v = player->inventory;
+			// If chat/console is open, use the wheel to scroll through chat history.
+			if (screen && (dynamic_cast<ChatScreen*>(screen) || dynamic_cast<ConsoleScreen*>(screen))) {
+				gui.scrollChat(e.dy);
+			} else {
+				Inventory* v = player->inventory;
 
-			int numSlots = gui.getNumSlots();
+				int numSlots = gui.getNumSlots();
 #ifndef PLATFORM_DESKTOP
-			numSlots--;
+				numSlots--;
 #endif
 
-			int slot = (v->selected - e.dy + numSlots) % numSlots;
+				int slot = (v->selected - e.dy + numSlots) % numSlots;
-			v->selectSlot(slot);
+				v->selectSlot(slot);
+			}
 		}
 		/*
 		if (mouseDiggable && options.useMouseForDigging) {

src/client/gui/Gui.cpp

@@ -3,6 +3,8 @@
 #include "client/Options.h"
 #include "platform/input/Keyboard.h"
 #include "screens/IngameBlockSelectionScreen.h"
+#include "screens/ChatScreen.h"
+#include "screens/ConsoleScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
 #include "../renderer/Tesselator.h"
@@ -24,6 +26,7 @@
 #include "../../world/PosTranslator.h"
 #include "../../platform/time.h"
 #include <cmath>
+#include <algorithm>
 
 float Gui::InvGuiScale = 1.0f / 3.0f;
 float Gui::GuiScale = 1.0f / Gui::InvGuiScale;
@@ -37,6 +40,7 @@ Gui::Gui(Minecraft* minecraft)
 	progress(0),
 	overlayMessageTime(0),
 	animateOverlayMessageColor(false),
+	chatScrollOffset(0),
 	tbr(1),
 	_inventoryNeedsUpdate(true),
 	_flashSlotId(-1),
@@ -113,8 +117,18 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	renderToolBar(a, ySlot, screenWidth);
 
 	glEnable(GL_BLEND);
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
 	unsigned int max = 10;
-    bool isChatting = false;
+	if (isChatting) {
+		int lineHeight = 9;
+		max = (screenHeight - 48) / lineHeight;
+		if (max < 1) max = 1;
+		int maxScroll = (int)guiMessages.size() - (int)max;
+		if (maxScroll < 0) maxScroll = 0;
+		if (chatScrollOffset > maxScroll) chatScrollOffset = maxScroll;
+	} else {
+		chatScrollOffset = 0;
+	}
 	renderChatMessages(screenHeight, max, isChatting, font);
 #if !defined(RPI)
 	renderOnSelectItemNameText(screenWidth, font, ySlot);
@@ -205,6 +219,29 @@ void Gui::handleClick(int button, int x, int y) {
 
 void Gui::handleKeyPressed(int key)
 {
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	if (isChatting) {
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		if (key == 38) { // VK_UP
+			scrollChat(1);
+			return;
+		} else if (key == 40) { // VK_DOWN
+			scrollChat(-1);
+			return;
+		} else if (key == 33) { // VK_PRIOR (Page Up)
+			// Scroll by a page
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(maxVisible);
+			return;
+		} else if (key == 34) { // VK_NEXT (Page Down)
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(-maxVisible);
+			return;
+		}
+	}
+
 	if (key == Keyboard::KEY_F1) {
 		minecraft->options.F1 = !minecraft->options.F1;
 	}
@@ -233,6 +270,23 @@ void Gui::handleKeyPressed(int key)
 	}
 }
 
+void Gui::scrollChat(int delta) {
+	if (delta == 0)
+		return;
+
+	int screenHeight = (int)(minecraft->height * InvGuiScale);
+	int maxVisible = (screenHeight - 48) / 9;
+	if (maxVisible <= 0)
+		return;
+
+	int maxScroll = (int)guiMessages.size() - maxVisible;
+	if (maxScroll < 0) maxScroll = 0;
+	int desired = chatScrollOffset + delta;
+	if (desired < 0) desired = 0;
+	if (desired > maxScroll) desired = maxScroll;
+	chatScrollOffset = desired;
+}
+
 void Gui::tick() {
 	if (overlayMessageTime > 0) overlayMessageTime--;
 	tickCount++;
@@ -263,9 +317,17 @@ void Gui::addMessage(const std::string& _string) {
 	message.message = string;
 	message.ticks = 0;
 	guiMessages.insert(guiMessages.begin(), message);
-	while (guiMessages.size() > 30) {
+
+	// Keep a larger history so users can scroll through the full chat
+	const unsigned int MaxHistoryLines = 200;
+	while (guiMessages.size() > MaxHistoryLines) {
 		guiMessages.pop_back();
 	}
+
+	// If the user has scrolled up, keep their window fixed (new messages shift older ones down)
+	if (chatScrollOffset > 0) {
+		chatScrollOffset++;
+	}
 }
 
 void Gui::setNowPlaying(const std::string& string) {
@@ -845,9 +907,16 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
 	//        // glScalef2(1.0f / ssc.scale, 1.0f / ssc.scale, 1);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	int baseY = screenHeight - 48;
-	for (unsigned int i = 0; i < guiMessages.size() && i < max; i++) {
+	int start = chatScrollOffset;
-		if (guiMessages.at(i).ticks < 20 * 10 || isChatting) {
+	if (start < 0) start = 0;
-			float t = guiMessages.at(i).ticks / (20 * 10.0f);
+	for (unsigned int i = 0; i < max; i++) {
+		unsigned int msgIdx = (unsigned int)start + i;
+		if (msgIdx >= guiMessages.size())
+			break;
+
+		GuiMessage& message = guiMessages.at(msgIdx);
+		if (message.ticks < 20 * 10 || isChatting) {
+			float t = message.ticks / (20 * 10.0f);
 			t = 1 - t;
 			t = t * 10;
 			if (t < 0) t = 0;
@@ -859,18 +928,18 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
 			if (alpha > 0) {
 				const float x = 2;
 				const float y = (float)(baseY - i * 9);
-				std::string msg = guiMessages.at(i).message;
+				std::string msg = message.message;
 				this->fill(x, y - 1, x + MAX_MESSAGE_WIDTH, y + 8, (alpha / 2) << 24);
 				glEnable(GL_BLEND);
 
 				// special-case join/leave announcements
-		int baseColor = 0xffffff;
+			int baseColor = 0xffffff;
-		if (msg.find(" joined the game") != std::string::npos ||
+			if (msg.find(" joined the game") != std::string::npos ||
-			msg.find(" left the game") != std::string::npos) {
+				msg.find(" left the game") != std::string::npos) {
-			baseColor = 0xffff00; // yellow
+				baseColor = 0xffff00; // yellow
-		}
+			}
-		// replace previous logic; allow full colour tags now
+			// replace previous logic; allow full colour tags now
-		Gui::drawColoredString(font, msg, x, y, alpha);
+			Gui::drawColoredString(font, msg, x, y, alpha);
 			}
 		}
 	}

src/client/gui/Gui.h

@@ -39,6 +39,7 @@ public:
 
 	void handleClick(int button, int x, int y);
 	void handleKeyPressed( int key );
+	void scrollChat(int delta);
 
 	void tick();
 	void render(float a, bool mouseFree, int xMouse, int yMouse);
@@ -96,6 +97,7 @@ private:
 	int MAX_MESSAGE_WIDTH;
 	//ItemRenderer itemRenderer;
 	GuiMessageList guiMessages;
+	int chatScrollOffset;
 	Random random;
 
 	Minecraft* minecraft;

src/platform/HttpClient.cpp

@@ -319,7 +319,7 @@ bool download(const std::string& url, std::vector<unsigned char>& outBody) {
         if (status != 200) {
             std::string bodySnippet;
             if (!outBody.empty()) {
-                size_t len = std::min(outBody.size(), (size_t)1024);
+                size_t len = outBody.size() < 1024 ? outBody.size() : 1024;
                 bodySnippet.assign(outBody.begin(), outBody.begin() + len);
             }
             LOGW("[HttpClient] HTTP status %d for %s\n", status, currentUrl.c_str());