X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fvterm.c;h=522a882703b991e7ba34f7d3aa137de39e318ece;hb=3db5d3e28339f04ea268cfabdea6997a7b9dd166;hp=b0684ffc7c2f31b7f789fbdb230389eabd898563;hpb=598e7ce1643cdab22b55edc686a1a48c422b5fca;p=tpg%2Facess2.git diff --git a/Kernel/drv/vterm.c b/Kernel/drv/vterm.c index b0684ffc..522a8827 100644 --- a/Kernel/drv/vterm.c +++ b/Kernel/drv/vterm.c @@ -5,35 +5,41 @@ #include #include #include +#include // === CONSTANTS === #define NUM_VTS 4 -#define MAX_INPUT_BYTES 64 -#define VT_SCROLLBACK 4 // 4 Screens of text +#define MAX_INPUT_CHARS 64 +#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 enum eVT_Modes { - VT_MODE_TEXT, - VT_MODE_8BPP, - VT_MODE_16BPP, - VT_MODE_24BPP, - VT_MODE_32BPP, + VT_MODE_TEXT8, // UTF-8 Text Mode (VT100 Emulation) + VT_MODE_TEXT32, // UTF-32 Text Mode (Acess Native) + VT_MODE_8BPP, // 256 Colour Mode + VT_MODE_16BPP, // 16 bit Colour Mode + VT_MODE_24BPP, // 24 bit Colour Mode + VT_MODE_32BPP, // 32 bit Colour Mode NUM_VT_MODES }; // === TYPES === typedef struct { int Mode; + int Flags; int Width, Height; int ViewPos, WritePos; Uint32 CurColour; char Name[2]; - int NumInputBytes; - Uint8 InputBuffer[MAX_INPUT_BYTES]; + int InputRead; + int InputWrite; + Uint32 InputBuffer[MAX_INPUT_CHARS]; union { tVT_Char *Text; Uint32 *Buffer; @@ -48,6 +54,7 @@ tVFS_Node *VT_FindDir(tVFS_Node *Node, char *Name); Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer); int VT_IOCtl(tVFS_Node *Node, int Id, void *Data); +void VT_KBCallBack(Uint32 Codepoint); void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count); int VT_int_ParseEscape(tVTerm *Term, char *Buffer); void VT_int_PutChar(tVTerm *Term, Uint32 Ch); @@ -55,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 === @@ -81,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) { @@ -129,15 +137,16 @@ int VT_Install(char **Arguments) // Create Nodes for( i = 0; i < NUM_VTS; i++ ) { - gVT_Terminals[i].Mode = VT_MODE_TEXT; + gVT_Terminals[i].Mode = VT_MODE_TEXT8; + gVT_Terminals[i].Flags = 0; gVT_Terminals[i].Width = DEFAULT_WIDTH; gVT_Terminals[i].Height = DEFAULT_HEIGHT; gVT_Terminals[i].CurColour = DEFAULT_COLOUR; 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'; @@ -173,6 +182,8 @@ void VT_InitInput() { giVT_InputDevHandle = VFS_Open(gsVT_InputDevice, VFS_OPENFLAG_READ); LOG("giVT_InputDevHandle = %x\n", giVT_InputDevHandle); + if(giVT_InputDevHandle == -1) return ; + VFS_IOCtl(giVT_InputDevHandle, KB_IOCTL_SETCALLBACK, VT_KBCallBack); } /** @@ -222,8 +233,39 @@ tVFS_Node *VT_FindDir(tVFS_Node *Node, char *Name) */ Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) { - //ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer); - //LEAVE('i', 0); + int pos = 0; + tVTerm *term = &gVT_Terminals[ Node->Inode ]; + + // Check current mode + switch(term->Mode) + { + case VT_MODE_TEXT8: + while(pos < Length) + { + while(term->InputRead == term->InputWrite) Threads_Yield(); + while(term->InputRead != term->InputWrite) + { + pos += WriteUTF8(Buffer+pos, term->InputBuffer[term->InputRead]); + term->InputRead ++; + term->InputRead %= MAX_INPUT_CHARS; + } + } + break; + + case VT_MODE_TEXT32: + while(pos < Length) + { + 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; + } return 0; } @@ -240,10 +282,14 @@ Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) // Write switch( term->Mode ) { - case VT_MODE_TEXT: + case VT_MODE_TEXT8: VT_int_PutString(term, Buffer, Length); break; + case VT_MODE_TEXT32: + //VT_int_PutString32(term, Buffer, Length); + break; } + //LEAVE('i', 0); return 0; } @@ -257,6 +303,23 @@ int VT_IOCtl(tVFS_Node *Node, int Id, void *Data) return 0; } +/** + * \fn void VT_KBCallBack(Uint32 Codepoint) + * \brief Called on keyboard interrupt + */ +void VT_KBCallBack(Uint32 Codepoint) +{ + tVTerm *term = &gVT_Terminals[giVT_CurrentTerminal]; + + term->InputBuffer[ term->InputWrite ] = Codepoint; + term->InputWrite ++; + term->InputWrite %= MAX_INPUT_CHARS; + if(term->InputRead == term->InputWrite) { + term->InputRead ++; + term->InputRead %= MAX_INPUT_CHARS; + } +} + /** * \fn void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count) * \brief Print a string to the Virtual Terminal @@ -269,6 +332,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; } @@ -280,6 +344,31 @@ void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count) VT_int_PutChar(Term, val); } } + + // Update cursor + if( !(Term->Flags & VT_FLAG_HIDECSR) ) + { + tVideo_IOCtl_Pos pos; + pos.x = Term->WritePos % Term->Width; + pos.y = Term->WritePos / Term->Width; + VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos); + } +} + +/** + * \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('-'); } /** @@ -320,10 +409,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 @@ -375,6 +471,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': @@ -415,7 +512,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; @@ -430,7 +529,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 ++ ) @@ -441,6 +544,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 ); @@ -461,11 +569,12 @@ void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll ) &Term->Text[Term->ViewPos] ); } else { + int pos = Term->WritePos - Term->WritePos % Term->Width; VFS_WriteAt( giVT_OutputDevHandle, - Term->ViewPos*sizeof(tVT_Char), + (pos - Term->ViewPos)*sizeof(tVT_Char), Term->Width*sizeof(tVT_Char), - &Term->Text[Term->ViewPos] + &Term->Text[pos] ); } }