X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Fdrv%2Fvterm_termbuf.c;h=ee543858408c7d5634bfc3524877bef953096046;hb=878381a37febeb0033d9c1c4ee8262517b9e74aa;hp=2511048cfaf86ae23606cb5231f59e5fd2c9941a;hpb=48743e39650eb1ef988380e9d95f27fd40d3a9ce;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/drv/vterm_termbuf.c b/KernelLand/Kernel/drv/vterm_termbuf.c
index 2511048c..ee543858 100644
--- a/KernelLand/Kernel/drv/vterm_termbuf.c
+++ b/KernelLand/Kernel/drv/vterm_termbuf.c
@@ -15,17 +15,16 @@
  */
 void VT_int_PutString(tVTerm *Term, const Uint8 *Buffer, Uint Count)
 {
-	Uint32	val;
 	 int	i;
 	
 	// Iterate
 	for( i = 0; i < Count; i++ )
 	{
 		// Handle escape sequences
-		if( Buffer[i] == 0x1B )
+		int ret = VT_int_ParseEscape(Term, (const char*)&Buffer[i], Count-i);
+		if( ret > 0 )
 		{
-			i ++;
-			i += VT_int_ParseEscape(Term, (const char*)&Buffer[i]) - 1;
+			i += ret-1;
 			continue;
 		}
 		
@@ -33,6 +32,7 @@ void VT_int_PutString(tVTerm *Term, const Uint8 *Buffer, Uint Count)
 		if( Buffer[i] < 128 )	// Plain ASCII
 			VT_int_PutChar(Term, Buffer[i]);
 		else {	// UTF-8
+			Uint32	val;
 			i += ReadUTF8(&Buffer[i], &val) - 1;
 			VT_int_PutChar(Term, val);
 		}
@@ -70,14 +70,15 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		write_pos -= write_pos % Term->TextWidth;
 		break;
 	
-	case '\t': { int tmp = write_pos / Term->TextWidth;
+	case '\t': {
+		int line = write_pos / Term->TextWidth;
 		write_pos %= Term->TextWidth;
 		do {
 			buffer[ write_pos ].Ch = '\0';
 			buffer[ write_pos ].Colour = Term->CurColour;
 			write_pos ++;
 		} while(write_pos & 7);
-		write_pos += tmp * Term->TextWidth;
+		write_pos += line * Term->TextWidth;
 		break; }
 	
 	case '\b':
@@ -85,7 +86,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		if(write_pos == 0)	break;
 		
 		write_pos --;
-		// Singe Character
+		// Single Character
 		if(buffer[ write_pos ].Ch != '\0') {
 			buffer[ write_pos ].Ch = 0;
 			buffer[ write_pos ].Colour = Term->CurColour;
@@ -114,7 +115,6 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 	
 	if(Term->Flags & VT_FLAG_ALTBUF)
 	{
-		Term->AltBuf = buffer;
 		Term->AltWritePos = write_pos;
 		
 		if(Term->AltWritePos >= Term->TextWidth*Term->TextHeight)
@@ -126,7 +126,6 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 	}
 	else
 	{
-		Term->Text = buffer;
 		Term->WritePos = write_pos;
 		// Move Screen
 		// - Check if we need to scroll the entire scrollback buffer
@@ -134,10 +133,6 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		{
 			 int	base;
 			
-			// Update previous line
-			Term->WritePos -= Term->TextWidth;
-			VT_int_UpdateScreen( Term, 0 );
-			
 			// Update view position
 			base = Term->TextWidth*Term->TextHeight*(giVT_Scrollback);
 			if(Term->ViewPos < base)
@@ -146,16 +141,12 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 				Term->ViewPos = base;
 			
 			VT_int_ScrollText(Term, 1);
+			Term->WritePos -= Term->TextWidth;
 		}
 		// Ok, so we only need to scroll the screen
 		else if(Term->WritePos >= Term->ViewPos + Term->TextWidth*Term->TextHeight)
 		{
-			// Update the last line
-			Term->WritePos -= Term->TextWidth;
-			VT_int_UpdateScreen( Term, 0 );
-			Term->WritePos += Term->TextWidth;
-			
-			VT_int_ScrollText(Term, 1);
+			VT_int_ScrollFramebuffer( Term, 1 );
 			
 			Term->ViewPos += Term->TextWidth;
 		}
@@ -189,7 +180,7 @@ void VT_int_ScrollText(tVTerm *Term, int Count)
 		scroll_height = height;
 	}
 
-	// Scroll text downwards	
+	// Scroll text upwards (more space at bottom)
 	if( Count > 0 )
 	{
 		 int	base;
@@ -297,7 +288,7 @@ void VT_int_ClearLine(tVTerm *Term, int Num)
  * \param NewWidth	New framebuffer width
  * \param NewHeight	New framebuffer height
  */
-void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight)
+void VT_int_Resize(tVTerm *Term, int NewWidth, int NewHeight)
 {
 	 int	oldW = Term->Width;
 	 int	oldTW = Term->TextWidth;
@@ -311,8 +302,6 @@ void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight)
 	if(NewWidth > giVT_RealWidth)	NewWidth = giVT_RealWidth;
 	if(NewHeight > giVT_RealHeight)	NewHeight = giVT_RealHeight;
 	
-	Term->Mode = NewMode;
-
 	// Fast exit if no resolution change
 	if(NewWidth == Term->Width && NewHeight == Term->Height)
 		return ;
@@ -370,7 +359,8 @@ void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight)
 	}
 	
 	// Debug
-	switch(NewMode)
+	#if 0
+	switch(Term->Mode)
 	{
 	case TERM_MODE_TEXT:
 		Log_Log("VTerm", "Set VT %p to text mode (%ix%i)",
@@ -384,6 +374,7 @@ void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight)
 	//case TERM_MODE_3DACCEL:
 	//	return;
 	}
+	#endif
 }