X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fvterm.c;h=b1d5181ae573640f4a44a2d2def2c81f52743921;hb=74249214db770c83e22a9a49795ea3dc4235274e;hp=8aa7321b805a747bb969ec9ad52ede95f8c0d293;hpb=8a867fdf503d26e151bcc084a7147ba0f62271b0;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 8aa7321b..b1d5181a 100644
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -10,12 +10,12 @@
 // === CONSTANTS ===
 #define	NUM_VTS	4
 #define MAX_INPUT_CHARS	64
-#define VT_SCROLLBACK	4	// 4 Screens of text
+#define VT_SCROLLBACK	1	// 4 Screens of text
 #define DEFAULT_OUTPUT	"/Devices/VGA"
 #define DEFAULT_INPUT	"/Devices/PS2Keyboard"
 #define	DEFAULT_WIDTH	80
 #define	DEFAULT_HEIGHT	25
-#define	DEFAULT_COLOUR	(VT_COL_BLACK|(VT_COL_WHITE<<16))
+#define	DEFAULT_COLOUR	(VT_COL_BLACK|(0xAAA<<16))
 
 #define	VT_FLAG_HIDECSR	0x01
 
@@ -62,8 +62,8 @@ void	VT_int_UpdateScreen( tVTerm *Term, int UpdateAll );
 
 // === CONSTANTS ===
 const Uint16	caVT100Colours[] = {
-		VT_COL_BLACK, 0, 0, 0, 0, 0, 0, VT_COL_LTGREY,
-		VT_COL_GREY, 0, 0, 0, 0, 0, 0, VT_COL_WHITE
+		VT_COL_BLACK, 0x700, 0x070, 0x770, 0x007, 0x707, 0x077, 0xAAA,
+		VT_COL_GREY, 0xF00, 0x0F0, 0xFF0, 0x00F, 0xF0F, 0x0FF, VT_COL_WHITE
 	};
 
 // === GLOBALS ===
@@ -72,6 +72,7 @@ tDevFS_Driver	gVT_DrvInfo = {
 	NULL, "VTerm",
 	{
 	.Flags = VFS_FFLAG_DIRECTORY,
+	.Size = NUM_VTS,
 	.Inode = -1,
 	.NumACLs = 0,
 	.ReadDir = VT_ReadDir,
@@ -88,6 +89,7 @@ char	*gsVT_InputDevice = NULL;
 // === CODE ===
 /**
  * \fn int VT_Install(char **Arguments)
+ * \brief Installs the Virtual Terminal Driver
  */
 int VT_Install(char **Arguments)
 {
@@ -144,8 +146,8 @@ int VT_Install(char **Arguments)
 		gVT_Terminals[i].WritePos = 0;
 		gVT_Terminals[i].ViewPos = 0;
 		
-		gVT_Terminals[i].Buffer = malloc( DEFAULT_WIDTH*DEFAULT_HEIGHT*sizeof(tVT_Char) );
-		memset( gVT_Terminals[i].Buffer, 0, DEFAULT_WIDTH*DEFAULT_HEIGHT*sizeof(tVT_Char) );
+		gVT_Terminals[i].Buffer = malloc( DEFAULT_WIDTH*DEFAULT_HEIGHT*VT_SCROLLBACK*sizeof(tVT_Char) );
+		memset( gVT_Terminals[i].Buffer, 0, DEFAULT_WIDTH*DEFAULT_HEIGHT*VT_SCROLLBACK*sizeof(tVT_Char) );
 		
 		gVT_Terminals[i].Name[0] = '0'+i;
 		gVT_Terminals[i].Name[1] = '\0';
@@ -193,7 +195,7 @@ char *VT_ReadDir(tVFS_Node *Node, int Pos)
 {
 	if(Pos < 0)	return NULL;
 	if(Pos >= NUM_VTS)	return NULL;
-	return gVT_Terminals[Pos].Name;
+	return strdup( gVT_Terminals[Pos].Name );
 }
 
 /**
@@ -241,12 +243,12 @@ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	case VT_MODE_TEXT8:
 		while(pos < Length)
 		{
-			while(term->InputRead == term->InputWrite)	Proc_Yield();
+			while(term->InputRead == term->InputWrite)	Threads_Yield();
 			while(term->InputRead != term->InputWrite)
 			{
-				LOG("WriteUTF8(%p, 0x%x)", Buffer+pos, term->InputBuffer[term->InputRead]);
 				pos += WriteUTF8(Buffer+pos, term->InputBuffer[term->InputRead]);
 				term->InputRead ++;
+				term->InputRead %= MAX_INPUT_CHARS;
 			}
 		}
 		break;
@@ -254,12 +256,13 @@ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 	case VT_MODE_TEXT32:
 		while(pos < Length)
 		{
-			while(term->InputRead == term->InputWrite)	Proc_Yield();
+			while(term->InputRead == term->InputWrite)	Threads_Yield();
 			while(term->InputRead != term->InputWrite)
 			{
 				((Uint32*)Buffer)[pos] = term->InputBuffer[term->InputRead];
 				pos ++;
 				term->InputRead ++;
+				term->InputRead %= MAX_INPUT_CHARS;
 			}
 		}
 		break;
@@ -330,6 +333,7 @@ void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
 	{
 		if( Buffer[i] == 0x1B )	// Escape Sequence
 		{
+			i ++;
 			i += VT_int_ParseEscape(Term, (char*)&Buffer[i]);
 			continue;
 		}
@@ -343,7 +347,7 @@ void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
 	}
 	
 	// Update cursor
-	if(Term->Flags & VT_FLAG_HIDECSR)
+	if( !(Term->Flags & VT_FLAG_HIDECSR) )
 	{
 		tVideo_IOCtl_Pos	pos;
 		pos.x = Term->WritePos % Term->Width;
@@ -352,6 +356,22 @@ void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
 	}
 }
 
+/**
+ * \fn void VT_int_ClearLine(tVTerm *Term, int Num)
+ * \brief Clears a line in a virtual terminal
+ */
+void VT_int_ClearLine(tVTerm *Term, int Num)
+{
+	 int	i;
+	//ENTER("pTerm iNum", Term, Num);
+	for( i = Term->Width; i--; )
+	{
+		Term->Text[ Num*Term->Width + i ].Ch = 0;
+		Term->Text[ Num*Term->Width + i ].Colour = Term->CurColour;
+	}
+	//LEAVE('-');
+}
+
 /**
  * \fn int VT_int_ParseEscape(tVTerm *Term, char *Buffer)
  * \brief Parses a VT100 Escape code
@@ -390,10 +410,17 @@ int VT_int_ParseEscape(tVTerm *Term, char *Buffer)
 			//Clear By Line
 			case 'J':
 				// Clear Screen
-				if(args[0] == 2) {
-					memset(Term->Text, 0, Term->Width*Term->Height*VT_SCROLLBACK*sizeof(tVT_Char));
+				switch(args[0])
+				{
+				case 2:
+					{
+					 int	i = Term->Height * VT_SCROLLBACK;
+					while( i-- )	VT_int_ClearLine(Term, i);
 					Term->WritePos = 0;
 					Term->ViewPos = 0;
+					VT_int_UpdateScreen(Term, 1);
+					}
+					break;
 				}
 				break;
 			// Set Font flags
@@ -445,6 +472,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 	
 	switch(Ch)
 	{
+	case '\0':	return;	// Ignore NULL byte
 	case '\n':
 		Term->WritePos += Term->Width;
 	case '\r':
@@ -453,7 +481,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 	
 	case '\t':
 		do {
-			Term->Text[ Term->WritePos ].Ch = '\t';
+			Term->Text[ Term->WritePos ].Ch = '\0';
 			Term->Text[ Term->WritePos ].Colour = Term->CurColour;
 			Term->WritePos ++;
 		} while(Term->WritePos & 7);
@@ -465,7 +493,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		
 		Term->WritePos --;
 		// Singe Character
-		if(Term->Text[ Term->WritePos ].Ch != '\t') {
+		if(Term->Text[ Term->WritePos ].Ch != '\0') {
 			Term->Text[ Term->WritePos ].Ch = 0;
 			Term->Text[ Term->WritePos ].Colour = Term->CurColour;
 			break;
@@ -476,7 +504,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 			Term->Text[ Term->WritePos ].Ch = 0;
 			Term->Text[ Term->WritePos ].Colour = Term->CurColour;
 			Term->WritePos --;
-		} while(Term->WritePos && i-- && Term->Text[ Term->WritePos ].Ch == '\t');
+		} while(Term->WritePos && i-- && Term->Text[ Term->WritePos ].Ch == '\0');
 		break;
 	
 	default:
@@ -485,7 +513,9 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		Term->WritePos ++;
 		break;
 	}
+		
 	
+	// Move Screen
 	if(Term->WritePos >= Term->Width*Term->Height*VT_SCROLLBACK)
 	{
 		 int	base, i;
@@ -500,7 +530,11 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		base = Term->Width*(Term->Height*VT_SCROLLBACK-1);
 		
 		// Scroll Back
-		memcpy( Term->Text, &Term->Text[Term->Width], base*sizeof(tVT_Char) );
+		memcpy(
+			Term->Text,
+			&Term->Text[Term->Width],
+			Term->Width*(Term->Height-1)*VT_SCROLLBACK*sizeof(tVT_Char)
+			);
 		
 		// Clear last row
 		for( i = 0; i < Term->Width; i ++ )
@@ -511,6 +545,11 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 		
 		VT_int_UpdateScreen( Term, 1 );
 	}
+	else if(Term->WritePos > Term->Width*Term->Height+Term->ViewPos)
+	{
+		Term->ViewPos += Term->Width;
+		VT_int_UpdateScreen( Term, 1 );
+	}
 	else
 		VT_int_UpdateScreen( Term, 0 );
 	
@@ -562,10 +601,15 @@ int VT_Font_GetHeight(Uint32 Codepoint)
 	return FONT_HEIGHT;
 }
 
+/**
+ * \fn void VT_Font_Render(Uint32 Codepoint, void *Buffer, Uint32 BGC, Uint32 FGC)
+ * \brief Render a font character
+ */
 void VT_Font_Render(Uint32 Codepoint, void *Buffer, Uint32 BGC, Uint32 FGC)
 {
-//	Uint8	*font;
-	
+	//Uint8	*font;
+	//Uint32	*buf = Buffer;
+	//font = VT_Font_GetChar(Codepoint);
 }
 
 /**