#include <fs_devfs.h>
#include <modules.h>
#include <tpl_drv_video.h>
+#include <tpl_drv_keyboard.h>
// === 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;
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);
// === 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 ===
NULL, "VTerm",
{
.Flags = VFS_FFLAG_DIRECTORY,
+ .Size = NUM_VTS,
.Inode = -1,
.NumACLs = 0,
.ReadDir = VT_ReadDir,
// === CODE ===
/**
* \fn int VT_Install(char **Arguments)
+ * \brief Installs the Virtual Terminal Driver
*/
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';
{
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);
}
/**
{
if(Pos < 0) return NULL;
if(Pos >= NUM_VTS) return NULL;
- return gVT_Terminals[Pos].Name;
+ return strdup( gVT_Terminals[Pos].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;
}
// 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;
}
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
{
if( Buffer[i] == 0x1B ) // Escape Sequence
{
+ i ++;
i += VT_int_ParseEscape(Term, (char*)&Buffer[i]);
continue;
}
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('-');
}
/**
//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':
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);
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;
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');
+ if(Term->Text[ Term->WritePos ].Ch != '\0')
+ Term->WritePos ++;
break;
default:
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 );
&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]
);
}
}
# include "vterm_font_8x16.h"
#endif
+// === PROTOTYPES ===
+Uint8 *VT_Font_GetChar(Uint32 Codepoint);
+
+// === GLOBALS ===
+int giVT_CharWidth = FONT_WIDTH;
+int giVT_CharHeight = FONT_HEIGHT;
-int VT_Font_GetWidth(Uint32 Codepoint)
-{
- return FONT_WIDTH;
-}
-int VT_Font_GetHeight(Uint32 Codepoint)
+// === CODE ===
+/**
+ * \fn void VT_Font_Render(Uint32 Codepoint, void *Buffer, int Pitch, Uint32 BGC, Uint32 FGC)
+ * \brief Render a font character
+ */
+void VT_Font_Render(Uint32 Codepoint, void *Buffer, int Pitch, Uint32 BGC, Uint32 FGC)
{
- return FONT_HEIGHT;
+ Uint8 *font;
+ Uint32 *buf = Buffer;
+ int x, y;
+ font = VT_Font_GetChar(Codepoint);
+
+ for(y = 0; y < FONT_HEIGHT; y ++)
+ {
+ for(x = 0; x < FONT_WIDTH; x ++)
+ {
+ if(*font & (1 << (FONT_WIDTH-x)))
+ buf[x] = FGC;
+ else
+ buf[x] = BGC;
+ }
+ buf += Pitch;
+ font ++;
+ }
}
-void VT_Font_Render(Uint32 Codepoint, void *Buffer, Uint32 BGC, Uint32 FGC)
+/**
+ * \fn Uint32 VT_Colour12to24(Uint16 Col12)
+ * \brief Converts a
+ */
+Uint32 VT_Colour12to24(Uint16 Col12)
{
-// Uint8 *font;
-
+ Uint32 ret;
+ int tmp;
+ tmp = Col12 & 0xF;
+ ret = (tmp << 0) | (tmp << 4);
+ tmp = (Col12 & 0xF0) >> 4;
+ ret |= (tmp << 8) | (tmp << 12);
+ tmp = (Col12 & 0xF00) >> 8;
+ ret |= (tmp << 16) | (tmp << 20);
+ return ret;
}
/**
return &VTermFont[index*FONT_HEIGHT];
}
+
+EXPORTAS(&giVT_CharWidth, giVT_CharWidth);
+EXPORTAS(&giVT_CharHeight, giVT_CharHeight);
+EXPORT(VT_Font_Render);
+EXPORT(VT_Colour12to24);
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au