From 623d76c194d653fe26132c4cea04316fb04caab5 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Thu, 22 May 2014 09:02:00 +0800
Subject: [PATCH] Usermode/irc - Fix scrolling on new messages.

- Also fixed scroll direction in GUI terminal
---
 .../Applications/gui_terminal_src/vt100.c     |  8 +++----
 Usermode/Applications/irc_src/window.c        | 21 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/Usermode/Applications/gui_terminal_src/vt100.c b/Usermode/Applications/gui_terminal_src/vt100.c
index 4c35bfdd..6a2321ea 100644
--- a/Usermode/Applications/gui_terminal_src/vt100.c
+++ b/Usermode/Applications/gui_terminal_src/vt100.c
@@ -493,12 +493,12 @@ int Term_HandleVT100_Long(tTerminal *Term, int Len, const char *Buffer)
 				break;
 			}
 			break;
-		case 'S':	// Scroll text up n=1
-			Display_ScrollDown(Term, (argc >= 1 ? args[0] : 1));
-			break;
-		case 'T':	// Scroll text down n=1
+		case 'S':	// Scroll text up n=1 (expose bottom)
 			Display_ScrollDown(Term, -(argc >= 1 ? args[0] : 1));
 			break;
+		case 'T':	// Scroll text down n=1 (expose top)
+			Display_ScrollDown(Term, (argc >= 1 ? args[0] : 1));
+			break;
 		case 'c':	// Send Device Attributes
 			switch(args[0])
 			{
diff --git a/Usermode/Applications/irc_src/window.c b/Usermode/Applications/irc_src/window.c
index 48daeb5c..ba12880c 100644
--- a/Usermode/Applications/irc_src/window.c
+++ b/Usermode/Applications/irc_src/window.c
@@ -141,26 +141,33 @@ size_t Windows_int_PaintMessagePrefix(const tMessage *Message, bool EnablePrint)
 
 size_t Windows_int_PaintMessageLine(const tMessage *Message, size_t Offset, bool EnablePrint)
 {
-	_SysDebug("Windows_int_PaintMessageLine: Message=%p,Offset=%zi, EnablePrint=%b",
-		Message, Offset, EnablePrint);
+	_SysDebug("Windows_int_PaintMessageLine: Message=%p,Offset=%i,EnablePrint=%b",
+		Message, (int)Offset, EnablePrint);
 	if( Offset > strlen(Message->Data) ) {
+		_SysDebug("Windows_int_PaintMessageLine: No message left");
 		return 0;
 	}
+	_SysDebug("Windows_int_PaintMessageLine: Message->Data=\"%.*s\"+\"%s\"",
+		(int)Offset, Message->Data, Message->Data+Offset);
 	
 	size_t	avail = giTerminal_Width - Message->PrefixLen;
 	const char *msg_data = Message->Data + Offset;
-	int used = WordBreak(msg_data+Offset, avail);
+	int used = WordBreak(msg_data, avail);
 	
 	if( EnablePrint )
 	{
 		if( Offset == 0 )
 			Windows_int_PaintMessagePrefix(Message, true);
-		else
-			printf("\x1b[%iC", Message->PrefixLen);
+		else {
+			for(int i = 0; i < Message->PrefixLen; i ++)
+				printf(" ");
+			//printf("\x1b[%iC", Message->PrefixLen);
+		}
 		printf("%.*s", used, msg_data);
 	}
 	
-	if( msg_data[used] == '\0' )
+	_SysDebug("used(%i) >= strlen(msg_data)(%i)", used, strlen(msg_data));
+	if( used >= strlen(msg_data) )
 		return 0;
 	
 	return Offset + used;
@@ -308,7 +315,7 @@ void Window_AppendMessage(tWindow *Window, enum eMessageClass Class, const char
 		printf("\33[s");	// Save cursor
 		size_t	offset = 0, len;
 		do {
-			printf("\33[T");	// Scroll down 1 (free space below)
+			printf("\33[S");	// Scroll down 1 (free space below)
 			SetCursorPos(giTerminal_Height-2, 1);
 			len = Windows_int_PaintMessageLine(msg, offset, true);
 			offset += len;
-- 
2.20.1