// === 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
// === 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 ===
// === CODE ===
/**
* \fn int VT_Install(char **Arguments)
+ * \brief Installs the Virtual Terminal Driver
*/
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';
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;
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];
{
if( Buffer[i] == 0x1B ) // Escape Sequence
{
+ i ++;
i += VT_int_ParseEscape(Term, (char*)&Buffer[i]);
continue;
}
}
}
+/**
+ * \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
//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
switch(Ch)
{
+ case 0: return; // Ignore NULL byte
case '\n':
Term->WritePos += Term->Width;
case '\r':
Term->WritePos ++;
break;
}
+
+ // Move Screen
if(Term->WritePos >= Term->Width*Term->Height*VT_SCROLLBACK)
{
int base, i;
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 ++ )
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 );