Debugging VT_int_ClearLine

[tpg/acess2.git] / Kernel / drv / vterm.c

diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c
index 8e97033..bf518c5 100644 (file)
--- a/Kernel/drv/vterm.c
+++ b/Kernel/drv/vterm.c
@@ -10,7 +10,7 @@
 // === 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
@@ -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, VT_COL_LTGREY,
+               VT_COL_GREY, 0xF00, 0x0F0, 0xFF0, 0x00F, 0xF0F, 0x0FF, VT_COL_WHITE
        };
 
 // === GLOBALS ===
@@ -88,6 +88,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 +145,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';
@@ -332,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;
                }
@@ -354,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
@@ -392,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
@@ -447,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':
@@ -487,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;
@@ -502,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 ++ )
@@ -513,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 );