X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Fdrv%2Fvterm.c;h=db56f0e7765ddfd443c9647ff01c073c456d56b4;hb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;hp=52c3a944b31e584bfe79319477df0f191fbb7733;hpb=635bc78017d8a4a16314a973e39c849b2afac795;p=tpg%2Facess2.git

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 52c3a944..db56f0e7 100644
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -30,7 +30,7 @@
 #define	VT_FLAG_HASFB	0x10	//!< Set if the VTerm has requested the Framebuffer
 
 enum eVT_InModes {
-	VT_INMODE_TEXT8,	// UTF-8 Text Mode (VT100 Emulation)
+	VT_INMODE_TEXT8,	// UTF-8 Text Mode (VT100/xterm Emulation)
 	VT_INMODE_TEXT32,	// UTF-32 Text Mode (Acess Native)
 	NUM_VT_INMODES
 };
@@ -65,7 +65,7 @@ typedef struct {
 } tVTerm;
 
 // === IMPORTS ===
-extern void	Debug_SetKTerminal(char *File);
+extern void	Debug_SetKTerminal(const char *File);
 
 // === PROTOTYPES ===
  int	VT_Install(char **Arguments);
@@ -82,6 +82,7 @@ void	VT_SetMode(int Mode);
 void	VT_SetTerminal(int ID);
 void	VT_KBCallBack(Uint32 Codepoint);
 void	VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count);
+void	VT_int_ClearLine(tVTerm *Term, int Num);
  int	VT_int_ParseEscape(tVTerm *Term, char *Buffer);
 void	VT_int_PutChar(tVTerm *Term, Uint32 Ch);
 void	VT_int_ScrollFramebuffer( tVTerm *Term );
@@ -157,10 +158,10 @@ int VT_Install(char **Arguments)
 			Log_Debug("VTerm", "Argument '%s'", arg);
 			
 			if( strcmp(opt, "Video") == 0 ) {
-				gsVT_OutputDevice = val;
+				gsVT_OutputDevice = strdup(val);
 			}
 			else if( strcmp(opt, "Input") == 0 ) {
-				gsVT_InputDevice = val;
+				gsVT_InputDevice = strdup(val);
 			}
 			else if( strcmp(opt, "Width") == 0 ) {
 				giVT_RealWidth = atoi( val );
@@ -178,8 +179,8 @@ int VT_Install(char **Arguments)
 	if(gsVT_InputDevice)	Modules_InitialiseBuiltin( gsVT_InputDevice );
 	
 	// Apply Defaults
-	if(!gsVT_OutputDevice)	gsVT_OutputDevice = DEFAULT_OUTPUT;
-	if(!gsVT_InputDevice)	gsVT_InputDevice = DEFAULT_INPUT;
+	if(!gsVT_OutputDevice)	gsVT_OutputDevice = strdup(DEFAULT_OUTPUT);
+	if(!gsVT_InputDevice)	gsVT_InputDevice = strdup(DEFAULT_INPUT);
 	
 	// Create paths
 	{
@@ -392,6 +393,8 @@ int VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data)
 		
 		len = strlen(Data);
 		
+		// TODO: Check if the string used is a heap string
+		
 		free(gsVT_OutputDevice);
 		
 		gsVT_OutputDevice = malloc(len+1);
@@ -1031,7 +1034,7 @@ void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
 void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 {
 	 int	i;
-		
+	
 	switch(Ch)
 	{
 	case '\0':	return;	// Ignore NULL byte
@@ -1083,7 +1086,7 @@ void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
 	// - Check if we need to scroll the entire scrollback buffer
 	if(Term->WritePos >= Term->TextWidth*Term->TextHeight*(giVT_Scrollback+1))
 	{
-		 int	base, i;
+		 int	base;
 		
 		// Move back by one
 		Term->WritePos -= Term->TextWidth;