// === CONSTANTS ===
#define VERSION ((0<<8)|(50))
-#define NUM_VTS 4
+#define NUM_VTS 7
#define MAX_INPUT_CHARS32 64
#define MAX_INPUT_CHARS8 (MAX_INPUT_CHARS32*4)
#define VT_SCROLLBACK 1 // 2 Screens of text
#define DEFAULT_OUTPUT "VGA"
-//#define DEFAULT_OUTPUT "/Devices/BochsGA"
+//#define DEFAULT_OUTPUT "BochsGA"
#define DEFAULT_INPUT "PS2Keyboard"
#define DEFAULT_WIDTH 80
#define DEFAULT_HEIGHT 25
#define DEFAULT_COLOUR (VT_COL_BLACK|(0xAAA<<16))
#define VT_FLAG_HIDECSR 0x01
+#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)
tVFS_Node Node;
} tVTerm;
+// === IMPORTS ===
+extern void Debug_SetKTerminal(char *File);
+
// === PROTOTYPES ===
int VT_Install(char **Arguments);
char *VT_ReadDir(tVFS_Node *Node, int Pos);
int VT_int_ParseEscape(tVTerm *Term, char *Buffer);
void VT_int_PutChar(tVTerm *Term, Uint32 Ch);
void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll );
+void VT_int_ChangeMode(tVTerm *Term, int NewMode);
// === CONSTANTS ===
const Uint16 caVT100Colours[] = {
gVT_Terminals[i].WritePos = 0;
gVT_Terminals[i].ViewPos = 0;
- 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].Buffer = calloc( DEFAULT_WIDTH*DEFAULT_HEIGHT*VT_SCROLLBACK, sizeof(tVT_Char) );
gVT_Terminals[i].Name[0] = '0'+i;
gVT_Terminals[i].Name[1] = '\0';
// Add to DevFS
DevFS_AddDevice( &gVT_DrvInfo );
+ // Set kernel output to VT0
+ Debug_SetKTerminal("/Devices/VTerm/0");
+
return 0;
}
void VT_InitOutput()
{
giVT_OutputDevHandle = VFS_Open(gsVT_OutputDevice, VFS_OPENFLAG_WRITE);
- LOG("giVT_OutputDevHandle = %x\n", giVT_OutputDevHandle);
VT_SetTerminal( 0 );
}
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);
}
while(pos < Length)
{
while(term->InputRead == term->InputWrite) Threads_Yield();
- while(term->InputRead != term->InputWrite)
- {
- ((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
- pos ++;
- term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS32;
- }
+ ((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
+ pos ++;
+ term->InputRead ++;
+ term->InputRead %= MAX_INPUT_CHARS32;
}
break;
}
// Get/Set the mode (and apply any changes)
case TERM_IOCTL_MODETYPE:
if(Data == NULL) return term->Mode;
- term->Mode = *iData;
+
+ if(term->Mode != *iData) {
+ VT_int_ChangeMode(term, *iData);
+ }
+
// Update the screen dimensions
if(giVT_CurrentTerminal == Node->Inode)
VT_SetTerminal( giVT_CurrentTerminal );
gVT_Terminals[ ID ].RealWidth = mode.width;
gVT_Terminals[ ID ].RealHeight = mode.height;
VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_SETMODE, &modeNum );
+
+ // Update current terminal ID
+ Log("Changed terminal from %i to %i", giVT_CurrentTerminal, ID);
+ giVT_CurrentTerminal = ID;
+
+ // Update the screen
+ VT_int_UpdateScreen( &gVT_Terminals[ ID ], 1 );
}
/**
break;
switch(Codepoint)
{
- case KEY_F1:
- giVT_CurrentTerminal = 0;
- break;
- case KEY_F2:
- giVT_CurrentTerminal = 0;
- break;
- case KEY_F3:
- giVT_CurrentTerminal = 0;
- break;
- case KEY_F4:
- giVT_CurrentTerminal = 0;
- break;
+ case KEY_F1: VT_SetTerminal(0); return;
+ case KEY_F2: VT_SetTerminal(1); return;
+ case KEY_F3: VT_SetTerminal(2); return;
+ case KEY_F4: VT_SetTerminal(3); return;
+ case KEY_F5: VT_SetTerminal(4); return;
+ case KEY_F6: VT_SetTerminal(5); return;
+ case KEY_F7: VT_SetTerminal(6); return;
+ case KEY_F8: VT_SetTerminal(7); return;
+ case KEY_F9: VT_SetTerminal(8); return;
+ case KEY_F10: VT_SetTerminal(9); return;
+ case KEY_F11: VT_SetTerminal(10); return;
+ case KEY_F12: VT_SetTerminal(11); return;
+ case KEY_PGUP:
+ return;
+ case KEY_PGDOWN:
+ return;
}
- return;
}
// Encode key
if(term->Mode == TERM_MODE_TEXT)
{
Uint8 buf[6] = {0};
- int len;
+ int len = 0;
// Ignore Modifer Keys
if(Codepoint > KEY_MODIFIERS) return;
switch(Codepoint)
{
case KEY_LEFT:
- buf[0] = '\x1B'; buf[1] = '[';
- buf[2] = 'D'; len = 3;
+ buf[0] = '\x1B'; buf[1] = '['; buf[2] = 'D';
+ len = 3;
break;
case KEY_RIGHT:
- buf[0] = '\x1B'; buf[1] = '[';
- buf[2] = 'C'; len = 3;
+ buf[0] = '\x1B'; buf[1] = '['; buf[2] = 'C';
+ len = 3;
+ break;
+ case KEY_UP:
+ buf[0] = '\x1B'; buf[1] = '['; buf[2] = 'A';
+ len = 3;
break;
+ case KEY_DOWN:
+ buf[0] = '\x1B'; buf[1] = '['; buf[2] = 'B';
+ len = 3;
+ break;
+
+ case KEY_PGUP:
+ buf[0] = '\x1B'; buf[1] = '['; buf[2] = '5'; // Some overline also
+ //len = 4; // Commented out until I'm sure
+ break;
+ case KEY_PGDOWN:
+ len = 0;
+ break;
+
+ // Attempt to encode in UTF-8
default:
len = WriteUTF8( buf, Codepoint );
- //Log("Codepoint = 0x%x", Codepoint);
+ if(len == 0) {
+ Warning("Codepoint (%x) is unrepresentable in UTF-8", Codepoint);
+ }
break;
}
- //Log("len = %i, buf = %s", len, buf);
+ if(len == 0) {
+ // Unprintable / Don't Pass
+ return;
+ }
// Write
if( MAX_INPUT_CHARS8 - term->InputWrite >= len )
Term->WritePos -= Term->WritePos % Term->Width;
else
Term->WritePos -= tmp;
- Log("Left by %i", tmp);
break;
// Right
*/
void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
{
- if(UpdateAll) {
+ // Only update if this is the current terminal
+ if( Term != &gVT_Terminals[giVT_CurrentTerminal] ) return;
+
+ if( Term->Mode == TERM_MODE_TEXT )
+ {
+ if(UpdateAll) {
+ VFS_WriteAt(
+ giVT_OutputDevHandle,
+ 0,
+ Term->Width*Term->Height*sizeof(tVT_Char),
+ &Term->Text[Term->ViewPos]
+ );
+ } else {
+ int pos = Term->WritePos - Term->WritePos % Term->Width;
+ VFS_WriteAt(
+ giVT_OutputDevHandle,
+ (pos - Term->ViewPos)*sizeof(tVT_Char),
+ Term->Width*sizeof(tVT_Char),
+ &Term->Text[pos]
+ );
+ }
+ }
+ else
+ {
VFS_WriteAt(
giVT_OutputDevHandle,
0,
- Term->Width*Term->Height*sizeof(tVT_Char),
- &Term->Text[Term->ViewPos]
- );
- } else {
- int pos = Term->WritePos - Term->WritePos % Term->Width;
- VFS_WriteAt(
- giVT_OutputDevHandle,
- (pos - Term->ViewPos)*sizeof(tVT_Char),
- Term->Width*sizeof(tVT_Char),
- &Term->Text[pos]
+ Term->Width*Term->Height*sizeof(Uint32),
+ &Term->Buffer
);
}
}
+/**
+ * \fn void VT_int_ChangeMode(tVTerm *Term, int NewMode)
+ * \brief Change the mode of a VTerm
+ */
+void VT_int_ChangeMode(tVTerm *Term, int NewMode)
+{
+ switch(NewMode)
+ {
+ case TERM_MODE_TEXT:
+ free(Term->Buffer);
+ Term->Text = calloc( Term->Width*Term->Height*VT_SCROLLBACK, sizeof(tVT_Char) );
+ break;
+ case TERM_MODE_FB:
+ free(Term->Text);
+ Term->Buffer = calloc( Term->Width*Term->Height, sizeof(Uint32) );
+ break;
+ case TERM_MODE_OPENGL:
+ return;
+ }
+
+ Term->Mode = NewMode;
+}
+
// ---
// Font Render
// ---
Uint8 *VT_Font_GetChar(Uint32 Codepoint);
// === GLOBALS ===
-int giVT_CharWidth = FONT_WIDTH;
+int giVT_CharWidth = FONT_WIDTH+1;
int giVT_CharHeight = FONT_HEIGHT;
// === CODE ===
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)))
+ if(*font & (1 << (FONT_WIDTH-x-1)))
buf[x] = FGC;
else
buf[x] = BGC;
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au