X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fvterm.c;h=1d4b367246507933e0219e86670eb5f14e373565;hb=193a19846230cd653ca61b65d54538974116c1ea;hp=85ab0e1630ae7abc7855c1c32b7b6a59e0713ecb;hpb=e6795eb552a6be88b7870dae14a958ab391bfae8;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 85ab0e16..1d4b3672 100644
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -24,6 +24,7 @@
 #define	DEFAULT_WIDTH	640
 #define	DEFAULT_HEIGHT	480
 #define DEFAULT_SCROLLBACK	2	// 2 Screens of text + current screen
+//#define DEFAULT_SCROLLBACK	0
 #define	DEFAULT_COLOUR	(VT_COL_BLACK|(0xAAA<<16))
 
 #define	VT_FLAG_HIDECSR	0x01
@@ -802,10 +803,10 @@ void VT_KBCallBack(Uint32 Codepoint)
 		case KEY_PGDOWN:
 			if( gpVT_CurTerm->Flags & VT_FLAG_ALTBUF )
 				return ;
-			if( gpVT_CurTerm->ViewPos < gpVT_CurTerm->Width*gpVT_CurTerm->Height*(giVT_Scrollback-1) )
+			if( gpVT_CurTerm->ViewPos < gpVT_CurTerm->Width*gpVT_CurTerm->Height*(giVT_Scrollback) )
 				gpVT_CurTerm->ViewPos += gpVT_CurTerm->Width;
 			else
-				gpVT_CurTerm->ViewPos = gpVT_CurTerm->Width*gpVT_CurTerm->Height*(giVT_Scrollback-1);
+				gpVT_CurTerm->ViewPos = gpVT_CurTerm->Width*gpVT_CurTerm->Height*(giVT_Scrollback);
 			return;
 		}
 	}
@@ -904,11 +905,6 @@ void VT_KBCallBack(Uint32 Codepoint)
 	}
 	
 	VFS_MarkAvaliable(&term->Node, 1);
-	
-	// Wake up the thread waiting on us
-	//if( term->ReadingThread >= 0 ) {
-	//	Threads_WakeTID(term->ReadingThread);
-	//}
 }
 
 /**
@@ -968,7 +964,7 @@ int VT_int_ParseEscape(tVTerm *Term, char *Buffer)
 		}
 		
 		// Get Command
-		if(	('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
+		if( ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
 		{
 			if( bQuestionMark )
 			{
@@ -1356,7 +1352,8 @@ void VT_int_ScrollText(tVTerm *Term, int Count)
 	 int	height, init_write_pos;
 	 int	len, i;
 	 int	scroll_top, scroll_height;
-	
+
+	// Get buffer pointer and attributes	
 	if( Term->Flags & VT_FLAG_ALTBUF )
 	{
 		buf = Term->AltBuf;
@@ -1368,22 +1365,24 @@ void VT_int_ScrollText(tVTerm *Term, int Count)
 	else
 	{
 		buf = Term->Text;
-		height = Term->TextHeight*giVT_Scrollback;
+		height = Term->TextHeight*(giVT_Scrollback+1);
 		init_write_pos = Term->WritePos;
 		scroll_top = 0;
 		scroll_height = height;
 	}
-	
+
+	// Scroll text downwards	
 	if( Count > 0 )
 	{
 		 int	base;
+	
+		// Set up
 		if(Count > scroll_height)	Count = scroll_height;
-//		Debug("Scroll: Count = %i", Count);
 		base = Term->TextWidth*(scroll_top + scroll_height - Count);
 		len = Term->TextWidth*(scroll_height - Count);
 		
 		// Scroll terminal cache
-		memcpy(
+		memmove(
 			&buf[Term->TextWidth*scroll_top],
 			&buf[Term->TextWidth*(scroll_top+Count)],
 			len*sizeof(tVT_Char)
@@ -1418,7 +1417,7 @@ void VT_int_ScrollText(tVTerm *Term, int Count)
 		len = Term->TextWidth*(scroll_height - Count);
 		
 		// Scroll terminal cache
-		memcpy(
+		memmove(
 			&buf[Term->TextWidth*(scroll_top+Count)],
 			&buf[Term->TextWidth*scroll_top],
 			len*sizeof(tVT_Char)