/*
* Acess2 Virtual Terminal Driver
*/
-#define DEBUG 1
-#include <acess.h>
+#define DEBUG 0
+#include "vterm.h"
#include <fs_devfs.h>
#include <modules.h>
-#include <tpl_drv_video.h>
-#include <tpl_drv_keyboard.h>
-#include <tpl_drv_terminal.h>
+#include <api_drv_keyboard.h>
+#include <api_drv_video.h>
#include <errno.h>
-
-#define USE_CTRL_ALT 0
+#include <semaphore.h>
// === CONSTANTS ===
#define VERSION ((0<<8)|(50))
#define NUM_VTS 8
-#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 "BochsGA"
+#define DEFAULT_OUTPUT "Vesa"
+#define FALLBACK_OUTPUT "x86_VGAText"
#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)
- VT_INMODE_TEXT32, // UTF-32 Text Mode (Acess Native)
- NUM_VT_INMODES
-};
+#define DEFAULT_WIDTH 640
+#define DEFAULT_HEIGHT 480
+#define DEFAULT_SCROLLBACK 2 // 2 Screens of text + current screen
+//#define DEFAULT_SCROLLBACK 0
// === TYPES ===
-typedef struct {
- int Mode; //!< Current Mode (see ::eTplTerminal_Modes)
- int Flags; //!< Flags (see VT_FLAG_*)
- short Width; //!< Virtual Width
- short Height; //!< Virtual Height
- short RealWidth; //!< Real Width
- short RealHeight; //!< Real Height
-
- int ViewPos; //!< View Buffer Offset (Text Only)
- int WritePos; //!< Write Buffer Offset (Text Only)
- Uint32 CurColour; //!< Current Text Colour
- char Name[2]; //!< Name of the terminal
-
- int InputRead; //!< Input buffer read position
- int InputWrite; //!< Input buffer write position
- char InputBuffer[MAX_INPUT_CHARS8];
- union {
- tVT_Char *Text;
- Uint32 *Buffer;
- };
- tVFS_Node Node;
-} tVTerm;
// === IMPORTS ===
-extern void Debug_SetKTerminal(char *File);
+extern void Debug_SetKTerminal(const char *File);
// === PROTOTYPES ===
int VT_Install(char **Arguments);
char *VT_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *VT_FindDir(tVFS_Node *Node, char *Name);
+tVFS_Node *VT_FindDir(tVFS_Node *Node, const char *Name);
int VT_Root_IOCtl(tVFS_Node *Node, int Id, void *Data);
Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
-Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
+Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer);
int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data);
-void VT_SetTerminal(int ID);
-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);
-void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll );
-void VT_int_ChangeMode(tVTerm *Term, int NewMode);
// === CONSTANTS ===
-const Uint16 caVT100Colours[] = {
- VT_COL_BLACK, 0x700, 0x070, 0x770, 0x007, 0x707, 0x077, 0xAAA,
- VT_COL_GREY, 0xF00, 0x0F0, 0xFF0, 0x00F, 0xF0F, 0x0FF, VT_COL_WHITE
- };
// === GLOBALS ===
-MODULE_DEFINE(0, VERSION, VTerm, VT_Install, NULL, DEFAULT_OUTPUT, DEFAULT_INPUT, NULL);
+MODULE_DEFINE(0, VERSION, VTerm, VT_Install, NULL, DEFAULT_INPUT, NULL);
+tVFS_NodeType gVT_RootNodeType = {
+ .TypeName = "VTerm Root",
+ .ReadDir = VT_ReadDir,
+ .FindDir = VT_FindDir,
+ .IOCtl = VT_Root_IOCtl
+ };
+tVFS_NodeType gVT_TermNodeType = {
+ .TypeName = "VTerm",
+ .Read = VT_Read,
+ .Write = VT_Write,
+ .IOCtl = VT_Terminal_IOCtl
+ };
tDevFS_Driver gVT_DrvInfo = {
NULL, "VTerm",
{
.Size = NUM_VTS,
.Inode = -1,
.NumACLs = 0,
- .ReadDir = VT_ReadDir,
- .FindDir = VT_FindDir,
- .IOCtl = VT_Root_IOCtl
+ .Type = &gVT_RootNodeType
}
};
// --- Terminals ---
tVTerm gVT_Terminals[NUM_VTS];
int giVT_CurrentTerminal = 0;
+tVTerm *gpVT_CurTerm = &gVT_Terminals[0];
+// --- Video State ---
+short giVT_RealWidth = DEFAULT_WIDTH; //!< Screen Width
+short giVT_RealHeight = DEFAULT_HEIGHT; //!< Screen Height
+ int giVT_Scrollback = DEFAULT_SCROLLBACK;
// --- Driver Handles ---
char *gsVT_OutputDevice = NULL;
char *gsVT_InputDevice = NULL;
int giVT_OutputDevHandle = -2;
int giVT_InputDevHandle = -2;
-// --- Key States --- (Used for VT Switching/Magic Combos)
- int gbVT_CtrlDown = 0;
- int gbVT_AltDown = 0;
- int gbVT_SysrqDown = 0;
// === CODE ===
/**
*/
int VT_Install(char **Arguments)
{
- char **args = Arguments;
- char *arg;
int i;
// Scan Arguments
if(Arguments)
{
- for( ; (arg = *args); args++ )
+ char **args;
+ const char *arg;
+ for(args = Arguments; (arg = *args); args++ )
{
- if(arg[0] != '-') continue;
-
- switch(arg[1])
- {
- // Set output device
- case 'o':
- if(args[1] == NULL) break;
- if(gsVT_OutputDevice) free(gsVT_OutputDevice);
- gsVT_OutputDevice = malloc(strlen(args[1])+1);
- strcpy(gsVT_OutputDevice, args[1]);
- args ++;
- break;
+ char data[strlen(arg)+1];
+ char *opt = data;
+ char *val;
- // Set input device
- case 'i':
- if(args[1] == NULL) break;
- if(gsVT_InputDevice) free(gsVT_InputDevice);
- gsVT_InputDevice = malloc(strlen(args[1])+1);
- strcpy(gsVT_InputDevice, args[1]);
- args ++;
- break;
+ val = strchr(arg, '=');
+ strcpy(data, arg);
+ if( val ) {
+ data[ val - arg ] = '\0';
+ val ++;
+ }
+ Log_Debug("VTerm", "Argument '%s'", arg);
+ if( strcmp(opt, "Video") == 0 ) {
+ if( !gsVT_OutputDevice )
+ gsVT_OutputDevice = strdup(val);
+ }
+ else if( strcmp(opt, "Input") == 0 ) {
+ if( !gsVT_InputDevice )
+ gsVT_InputDevice = strdup(val);
+ }
+ else if( strcmp(opt, "Width") == 0 ) {
+ giVT_RealWidth = atoi( val );
+ }
+ else if( strcmp(opt, "Height") == 0 ) {
+ giVT_RealHeight = atoi( val );
+ }
+ else if( strcmp(opt, "Scrollback") == 0 ) {
+ giVT_Scrollback = atoi( val );
}
}
}
// Apply Defaults
- if(!gsVT_OutputDevice) gsVT_OutputDevice = "/Devices/"DEFAULT_OUTPUT;
- if(!gsVT_InputDevice) gsVT_InputDevice = "/Devices/"DEFAULT_INPUT;
+ if(!gsVT_OutputDevice) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
+ else if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)DEFAULT_OUTPUT;
+ if( Module_EnsureLoaded( gsVT_OutputDevice ) ) gsVT_OutputDevice = (char*)FALLBACK_OUTPUT;
+ if( Module_EnsureLoaded( gsVT_OutputDevice ) ) {
+ Log_Error("VTerm", "Fallback video '%s' is not avaliable, giving up", FALLBACK_OUTPUT);
+ return MODULE_ERR_MISC;
+ }
+
+ if(!gsVT_InputDevice) gsVT_InputDevice = (char*)DEFAULT_INPUT;
+ else if( Module_EnsureLoaded( gsVT_InputDevice ) ) gsVT_InputDevice = (char*)DEFAULT_INPUT;
+
+ // Create device paths
+ {
+ char *tmp;
+ tmp = malloc( 9 + strlen(gsVT_OutputDevice) + 1 );
+ strcpy(tmp, "/Devices/");
+ strcpy(&tmp[9], gsVT_OutputDevice);
+ gsVT_OutputDevice = tmp;
+
+ tmp = malloc( 9 + strlen(gsVT_InputDevice) + 1 );
+ strcpy(tmp, "/Devices/");
+ strcpy(&tmp[9], gsVT_InputDevice);
+ gsVT_InputDevice = tmp;
+ }
+
+ Log_Log("VTerm", "Using '%s' as output", gsVT_OutputDevice);
+ Log_Log("VTerm", "Using '%s' as input", gsVT_InputDevice);
- LOG("Using '%s' as output", gsVT_OutputDevice);
- LOG("Using '%s' as input", gsVT_InputDevice);
+ VT_InitOutput();
+ VT_InitInput();
// Create Nodes
for( i = 0; i < NUM_VTS; i++ )
{
gVT_Terminals[i].Mode = TERM_MODE_TEXT;
gVT_Terminals[i].Flags = 0;
- gVT_Terminals[i].Width = DEFAULT_WIDTH;
- gVT_Terminals[i].Height = DEFAULT_HEIGHT;
+// gVT_Terminals[i].Flags = VT_FLAG_HIDECSR; //HACK - Stop all those memcpy calls
gVT_Terminals[i].CurColour = DEFAULT_COLOUR;
gVT_Terminals[i].WritePos = 0;
+ gVT_Terminals[i].AltWritePos = 0;
gVT_Terminals[i].ViewPos = 0;
+ gVT_Terminals[i].ReadingThread = -1;
+ gVT_Terminals[i].ScrollHeight = 0;
- gVT_Terminals[i].Buffer = calloc( DEFAULT_WIDTH*DEFAULT_HEIGHT*VT_SCROLLBACK, sizeof(tVT_Char) );
+ // Initialise
+ VT_int_ChangeMode( &gVT_Terminals[i],
+ TERM_MODE_TEXT, giVT_RealWidth, giVT_RealHeight );
gVT_Terminals[i].Name[0] = '0'+i;
gVT_Terminals[i].Name[1] = '\0';
gVT_Terminals[i].Node.Inode = i;
gVT_Terminals[i].Node.ImplPtr = &gVT_Terminals[i];
gVT_Terminals[i].Node.NumACLs = 0; // Only root can open virtual terminals
-
- gVT_Terminals[i].Node.Read = VT_Read;
- gVT_Terminals[i].Node.Write = VT_Write;
- gVT_Terminals[i].Node.IOCtl = VT_Terminal_IOCtl;
+
+ gVT_Terminals[i].Node.Type = &gVT_TermNodeType;
+// Semaphore_Init(&gVT_Terminals[i].InputSemaphore, 0, MAX_INPUT_CHARS8, "VTerm", gVT_Terminals[i].Name);
}
// Add to DevFS
}
/**
- * \fn void VT_InitOutput()
- * \brief Initialise Video Output
+ * \brief Set the video resolution
+ * \param Width New screen width
+ * \param Height New screen height
*/
-void VT_InitOutput()
+void VT_SetResolution(int Width, int Height)
{
- giVT_OutputDevHandle = VFS_Open(gsVT_OutputDevice, VFS_OPENFLAG_WRITE);
- VT_SetTerminal( 0 );
-}
-
-/**
- * \fn void VT_InitInput()
- * \brief Initialises the input
- */
-void VT_InitInput()
-{
- giVT_InputDevHandle = VFS_Open(gsVT_InputDevice, VFS_OPENFLAG_READ);
- if(giVT_InputDevHandle == -1) return ;
- VFS_IOCtl(giVT_InputDevHandle, KB_IOCTL_SETCALLBACK, VT_KBCallBack);
+ tVideo_IOCtl_Mode mode = {0};
+ int tmp;
+ int i;
+
+ // Create the video mode
+ mode.width = Width;
+ mode.height = Height;
+ mode.bpp = 32;
+ mode.flags = 0;
+
+ // Set video mode
+ VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_FINDMODE, &mode );
+ tmp = mode.id;
+ if( Width != mode.width || Height != mode.height )
+ {
+ Log_Warning("VTerm",
+ "Selected resolution (%ix%i is not supported) by the device, using (%ix%i)",
+ giVT_RealWidth, giVT_RealHeight,
+ mode.width, mode.height
+ );
+ giVT_RealWidth = mode.width;
+ giVT_RealHeight = mode.height;
+ }
+ VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_GETSETMODE, &tmp );
+
+ // Resize text terminals if needed
+ if( gVT_Terminals[0].Text && (giVT_RealWidth != mode.width || giVT_RealHeight != mode.height) )
+ {
+ int newBufSize = (giVT_RealWidth/giVT_CharWidth)
+ *(giVT_RealHeight/giVT_CharHeight)
+ *(giVT_Scrollback+1);
+ //tVT_Char *tmp;
+ // Resize the text terminals
+ Log_Debug("VTerm", "Resizing terminals to %ix%i",
+ giVT_RealWidth/giVT_CharWidth, giVT_RealHeight/giVT_CharHeight);
+ for( i = 0; i < NUM_VTS; i ++ )
+ {
+ if( gVT_Terminals[i].Mode != TERM_MODE_TEXT ) continue;
+
+ gVT_Terminals[i].TextWidth = giVT_RealWidth/giVT_CharWidth;
+ gVT_Terminals[i].TextHeight = giVT_RealHeight/giVT_CharHeight;
+ gVT_Terminals[i].ScrollHeight = gVT_Terminals[i].TextHeight;
+
+ gVT_Terminals[i].Text = realloc(
+ gVT_Terminals[i].Text,
+ newBufSize*sizeof(tVT_Char)
+ );
+ }
+ }
}
/**
}
/**
- * \fn tVFS_Node *VT_FindDir(tVFS_Node *Node, char *Name)
+ * \fn tVFS_Node *VT_FindDir(tVFS_Node *Node, const char *Name)
* \brief Find an item in the VTerm directory
+ * \param Node Root node
+ * \param Name Name (number) of the terminal
*/
-tVFS_Node *VT_FindDir(tVFS_Node *Node, char *Name)
+tVFS_Node *VT_FindDir(tVFS_Node *Node, const char *Name)
{
int num;
- //ENTER("pNode sName", Node, Name);
+ ENTER("pNode sName", Node, Name);
// Open the input and output files if needed
if(giVT_OutputDevHandle == -2) VT_InitOutput();
return NULL;
}
// Return node
- //LEAVE('p', &gVT_Terminals[num].Node);
+ LEAVE('p', &gVT_Terminals[num].Node);
return &gVT_Terminals[num].Node;
}
len = strlen(Data);
+ // TODO: Check if the string used is a heap string
+
free(gsVT_OutputDevice);
gsVT_OutputDevice = malloc(len+1);
}
/**
- * \fn Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
* \brief Read from a virtual terminal
*/
Uint64 VT_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
{
int pos = 0;
+ int avail;
tVTerm *term = &gVT_Terminals[ Node->Inode ];
+ Uint32 *codepoint_buf = Buffer;
+ Uint32 *codepoint_in;
+
+ Mutex_Acquire( &term->ReadingLock );
// Check current mode
switch(term->Mode)
{
+ // Text Mode (UTF-8)
case TERM_MODE_TEXT:
- while(pos < Length)
+ VT_int_UpdateCursor(term, 1);
+
+ VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "VT_Read (UTF-8)");
+
+ avail = term->InputWrite - term->InputRead;
+ if(avail < 0)
+ avail += MAX_INPUT_CHARS8;
+ if(avail > Length - pos)
+ avail = Length - pos;
+
+ while( avail -- )
{
- while(term->InputRead == term->InputWrite) Threads_Yield();
-
((char*)Buffer)[pos] = term->InputBuffer[term->InputRead];
pos ++;
term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS8;
+ while(term->InputRead >= MAX_INPUT_CHARS8)
+ term->InputRead -= MAX_INPUT_CHARS8;
}
break;
- case TERM_MODE_FB:
- //case TERM_MODE_:
- while(pos < Length)
+ //case TERM_MODE_FB:
+ // Other - UCS-4
+ default:
+ VFS_SelectNode(Node, VFS_SELECT_READ, NULL, "VT_Read (UCS-4)");
+
+ avail = term->InputWrite - term->InputRead;
+ if(avail < 0)
+ avail += MAX_INPUT_CHARS32;
+ Length /= 4;
+ if(avail > Length - pos)
+ avail = Length - pos;
+
+ codepoint_in = (void*)term->InputBuffer;
+ codepoint_buf = Buffer;
+
+ while( avail -- )
{
- while(term->InputRead == term->InputWrite) Threads_Yield();
- ((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
+ codepoint_buf[pos] = codepoint_in[term->InputRead];
pos ++;
term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS32;
+ while(term->InputRead >= MAX_INPUT_CHARS32)
+ term->InputRead -= MAX_INPUT_CHARS32;
}
+ pos *= 4;
break;
}
- return 0;
+
+ // Mark none avaliable if buffer empty
+ if( term->InputRead == term->InputWrite )
+ VFS_MarkAvaliable(&term->Node, 0);
+
+ term->ReadingThread = -1;
+
+// VT_int_UpdateCursor(term, term->Mode == TERM_MODE_TEXT);
+
+ Mutex_Release( &term->ReadingLock );
+
+ return pos;
}
/**
- * \fn Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+ * \fn Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
* \brief Write to a virtual terminal
*/
-Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
+Uint64 VT_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, const void *Buffer)
{
tVTerm *term = &gVT_Terminals[ Node->Inode ];
-
- //ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+ int size;
// Write
switch( term->Mode )
{
+ // Print Text
case TERM_MODE_TEXT:
VT_int_PutString(term, Buffer, Length);
break;
+
+ // Framebuffer :)
case TERM_MODE_FB:
- if( term->RealWidth > term->Width || term->RealHeight > term->Height )
+ // - Sanity Checking
+ size = term->Width*term->Height*4;
+ if( Offset > size ) {
+ Log_Notice("VTerm", "VT_Write: Offset (0x%llx) > FBSize (0x%x)",
+ Offset, size);
+ return 0;
+ }
+ if( Offset + Length > size ) {
+ Log_Notice("VTerm", "VT_Write: Offset+Length (0x%llx) > FBSize (0x%x)",
+ Offset+Length, size);
+ Length = size - Offset;
+ }
+
+ // Update screen if needed
+ if( Node->Inode == giVT_CurrentTerminal )
{
- #if 0
- int x, y, h;
- x = Offset/4; y = x / term->Width; x %= term->Width;
- w = Length/4+x; h = w / term->Width; w %= term->Width;
- while(h--)
+ if( giVT_RealHeight > term->Height )
+ Offset += (giVT_RealHeight - term->Height) / 2 * term->Width * 4;
+ // Handle undersized virtual terminals
+ if( giVT_RealWidth > term->Width )
+ {
+ // No? :( Well, just center it
+ int x, y, w, h;
+ Uint dst_ofs;
+ // TODO: Fix to handle the final line correctly?
+ x = Offset/4; y = x / term->Width; x %= term->Width;
+ w = Length/4+x; h = w / term->Width; w %= term->Width;
+
+ // Center
+ x += (giVT_RealWidth - term->Width) / 2;
+ dst_ofs = (x + y * giVT_RealWidth) * 4;
+ while(h--)
+ {
+ VFS_WriteAt( giVT_OutputDevHandle,
+ dst_ofs,
+ term->Width * 4,
+ Buffer
+ );
+ Buffer = (void*)( (Uint)Buffer + term->Width*4 );
+ dst_ofs += giVT_RealWidth * 4;
+ }
+ return 0;
+ }
+ else
{
- VFS_WriteAt( giVT_OutputDevHandle,
- (x+y*term->RealWidth)*4,
- term->Width * 4,
- Buffer
- );
- Buffer = (void*)( (Uint)Buffer + term->Width*term->Height*4 );
+ return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
}
- #endif
- return 0;
}
- else {
- return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
+ else
+ {
+ if( !term->Buffer )
+ term->Buffer = malloc( term->Width * term->Height * 4 );
+ // Copy to the local cache
+ memcpy( (char*)term->Buffer + (Uint)Offset, Buffer, Length );
}
+ break;
+ // Just pass on (for now)
+ // TODO: Handle locally too to ensure no information is lost on
+ // VT Switch (and to isolate terminals from each other)
+ case TERM_MODE_2DACCEL:
+ //case TERM_MODE_3DACCEL:
+ if( Node->Inode == giVT_CurrentTerminal )
+ {
+ VFS_Write( giVT_OutputDevHandle, Length, Buffer );
+ }
+ break;
}
- //LEAVE('i', 0);
return 0;
}
int VT_Terminal_IOCtl(tVFS_Node *Node, int Id, void *Data)
{
int *iData = Data;
+ int ret;
tVTerm *term = Node->ImplPtr;
ENTER("pNode iId pData", Node, Id, Data);
if(Id >= DRV_IOCTL_LOOKUP) {
+ // Only root can fiddle with graphics modes
+ // TODO: Remove this and replace with user ownership
if( Threads_GetUID() != 0 ) return -1;
}
switch(Id)
{
+ // --- Core Defined
case DRV_IOCTL_TYPE:
LEAVE('i', DRV_TYPE_TERMINAL);
return DRV_TYPE_TERMINAL;
case TERM_IOCTL_MODETYPE:
if(Data != NULL)
{
- if(term->Mode != *iData)
- VT_int_ChangeMode(term, *iData);
+ if( CheckMem(Data, sizeof(int)) == 0 ) {
+ LEAVE('i', -1);
+ return -1;
+ }
+ Log_Log("VTerm", "VTerm %i mode set to %i", (int)Node->Inode, *iData);
+
+ // Update mode if needed
+ if( term->Mode != *iData || term->NewWidth || term->NewHeight)
+ {
+ // Adjust for text mode
+ if( *iData == TERM_MODE_TEXT ) {
+ term->NewHeight *= giVT_CharHeight;
+ term->NewWidth *= giVT_CharWidth;
+ }
+ // Fill unchanged dimensions
+ if(term->NewHeight == 0) term->NewHeight = term->Height;
+ if(term->NewWidth == 0) term->NewWidth = term->Width;
+ // Set new mode
+ VT_int_ChangeMode(term, *iData, term->NewWidth, term->NewHeight);
+ // Clear unapplied dimensions
+ term->NewWidth = 0;
+ term->NewHeight = 0;
+ }
// Update the screen dimensions
- if(giVT_CurrentTerminal == Node->Inode)
+ if(Node->Inode == giVT_CurrentTerminal)
VT_SetTerminal( giVT_CurrentTerminal );
}
LEAVE('i', term->Mode);
// Get/set the terminal width
case TERM_IOCTL_WIDTH:
- if(Data != NULL) term->Width = *iData;
- Log("VT_Terminal_IOCtl - RETURN term->Width = %i", term->Width);
- LEAVE('i', term->Width);
- return term->Width;
+ if(Data != NULL) {
+ if( CheckMem(Data, sizeof(int)) == 0 ) {
+ LEAVE('i', -1);
+ return -1;
+ }
+ term->NewWidth = *iData;
+ }
+ if( term->NewWidth )
+ ret = term->NewWidth;
+ else if( term->Mode == TERM_MODE_TEXT )
+ ret = term->TextWidth;
+ else
+ ret = term->Width;
+ LEAVE('i', ret);
+ return ret;
// Get/set the terminal height
case TERM_IOCTL_HEIGHT:
- if(Data != NULL) term->Height = *iData;
- Log("VT_Terminal_IOCtl - RETURN term->Height = %i", term->Height);
- LEAVE('i', term->Height);
- return term->Height;
+ if(Data != NULL) {
+ if( CheckMem(Data, sizeof(int)) == 0 ) {
+ LEAVE('i', -1);
+ return -1;
+ }
+ term->NewHeight = *iData;
+ }
+ if( term->NewHeight )
+ ret = term->NewHeight;
+ else if( term->Mode == TERM_MODE_TEXT )
+ ret = term->TextHeight;
+ else
+ ret = term->Height;
+ LEAVE('i', ret);
+ return ret;
case TERM_IOCTL_FORCESHOW:
+ Log_Log("VTerm", "Thread %i forced VTerm %i to be shown",
+ Threads_GetTID(), (int)Node->Inode);
VT_SetTerminal( Node->Inode );
LEAVE('i', 1);
return 1;
- }
- LEAVE('i', -1);
- return -1;
-}
-
-/**
- * \fn void VT_SetTerminal(int ID)
- * \brief Set the current terminal
- */
-void VT_SetTerminal(int ID)
-{
- tVideo_IOCtl_Mode mode = {0};
- int modeNum;
-
- // Create the video mode
- mode.width = gVT_Terminals[ ID ].Width;
- mode.height = gVT_Terminals[ ID ].Height;
- // - Text Mode
- if(gVT_Terminals[ ID ].Mode == TERM_MODE_TEXT) {
- mode.bpp = 12;
- mode.flags = VIDEO_FLAG_TEXT;
- }
- // - Framebuffer or 3D
- else {
- mode.bpp = 32;
- mode.flags = 0;
- }
-
- // Set video mode
- VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_FINDMODE, &mode );
- modeNum = mode.id;
- gVT_Terminals[ ID ].RealWidth = mode.width;
- gVT_Terminals[ ID ].RealHeight = mode.height;
- VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_GETSETMODE, &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 );
-}
-
-/**
- * \fn void VT_KBCallBack(Uint32 Codepoint)
- * \brief Called on keyboard interrupt
- * \param Codepoint Pseudo-UTF32 character
- *
- * Handles a key press and sends the key code to the user's buffer.
- * If the code creates a kernel-magic sequence, it is not passed to the
- * user and is handled in-kernel.
- */
-void VT_KBCallBack(Uint32 Codepoint)
-{
- tVTerm *term = &gVT_Terminals[giVT_CurrentTerminal];
-
- // How the hell did we get a Codepoint of zero?
- if(Codepoint == 0) return;
-
- // Key Up
- if( Codepoint & 0x80000000 )
- {
- Codepoint &= 0x7FFFFFFF;
- switch(Codepoint)
- {
- #if !USE_CTRL_ALT
- case KEY_RSHIFT: gbVT_CtrlDown = 0; break;
- case KEY_LSHIFT: gbVT_AltDown = 0; break;
- #else
- case KEY_LALT:
- case KEY_RALT:
- gbVT_AltDown = 0;
- break;
- case KEY_LCTRL:
- case KEY_RCTRL:
- gbVT_CtrlDown = 0;
- break;
- #endif
- }
- return;
- }
-
- switch(Codepoint)
- {
- #if !USE_CTRL_ALT
- case KEY_RSHIFT: gbVT_CtrlDown = 1; break;
- case KEY_LSHIFT: gbVT_AltDown = 1; break;
- #else
- case KEY_LALT:
- case KEY_RALT:
- gbVT_AltDown = 1;
- break;
- case KEY_LCTRL:
- case KEY_RCTRL:
- gbVT_CtrlDown = 1;
- break;
- #endif
-
- default:
- #if USE_CTRL_ALT
- if(!gbVT_AltDown || !gbVT_CtrlDown)
- break;
- #endif
- switch(Codepoint)
- {
- 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;
- }
- }
- // Encode key
- if(term->Mode == TERM_MODE_TEXT)
- {
- Uint8 buf[6] = {0};
- int len = 0;
-
- // Ignore Modifer Keys
- if(Codepoint > KEY_MODIFIERS) return;
-
- // Get UTF-8/ANSI Encoding
- switch(Codepoint)
+ case TERM_IOCTL_GETSETCURSOR:
+ if(Data != NULL)
{
- case KEY_LEFT:
- buf[0] = '\x1B'; buf[1] = '['; buf[2] = 'D';
- len = 3;
- break;
- case KEY_RIGHT:
- 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 );
- if(len == 0) {
- Warning("Codepoint (%x) is unrepresentable in UTF-8", Codepoint);
+ tVideo_IOCtl_Pos *pos = Data;
+ if( !CheckMem(Data, sizeof(*pos)) ) {
+ errno = -EINVAL;
+ LEAVE('i', -1);
+ return -1;
}
- break;
- }
- if(len == 0) {
- // Unprintable / Don't Pass
- return;
+ if( term->Mode == TERM_MODE_TEXT )
+ {
+ if(term->Flags & VT_FLAG_ALTBUF)
+ term->AltWritePos = pos->x + pos->y * term->TextWidth;
+ else
+ term->WritePos = pos->x + pos->y * term->TextWidth + term->ViewPos;
+ VT_int_UpdateCursor(term, 0);
+ }
+ else
+ {
+ term->VideoCursorX = pos->x;
+ term->VideoCursorY = pos->y;
+ VT_int_UpdateCursor(term, 1);
+ }
}
-
- // Write
- if( MAX_INPUT_CHARS8 - term->InputWrite >= len )
- memcpy( &term->InputBuffer[term->InputWrite], buf, len );
- else {
- memcpy( &term->InputBuffer[term->InputWrite], buf, MAX_INPUT_CHARS8 - term->InputWrite );
- memcpy( &term->InputBuffer[0], buf, len - (MAX_INPUT_CHARS8 - term->InputWrite) );
+ ret = (term->Flags & VT_FLAG_ALTBUF) ? term->AltWritePos : term->WritePos-term->ViewPos;
+ LEAVE('i', ret);
+ return ret;
+
+ case TERM_IOCTL_SETCURSORBITMAP: {
+ tVideo_IOCtl_Bitmap *bmp = Data;
+ if( Data == NULL )
+ {
+ free( term->VideoCursor );
+ term->VideoCursor = NULL;
+ LEAVE('i', 0);
+ return 0;
}
- // Roll the buffer over
- term->InputWrite += len;
- term->InputWrite %= MAX_INPUT_CHARS8;
- if( (term->InputWrite - term->InputRead + MAX_INPUT_CHARS8)%MAX_INPUT_CHARS8 < len ) {
- term->InputRead = term->InputWrite + 1;
- term->InputRead %= MAX_INPUT_CHARS8;
+
+ // Sanity check bitmap
+ if( !CheckMem(bmp, sizeof(tVideo_IOCtl_Bitmap)) ) {
+ Log_Notice("VTerm", "%p in TERM_IOCTL_SETCURSORBITMAP invalid", bmp);
+ errno = -EINVAL;
+ LEAVE_RET('i', -1);
}
-
- }
- else
- {
- // Encode the raw UTF-32 Key
- ((Uint32*)term->InputBuffer)[ term->InputWrite ] = Codepoint;
- term->InputWrite ++;
- term->InputWrite %= MAX_INPUT_CHARS32;
- if(term->InputRead == term->InputWrite) {
- term->InputRead ++;
- term->InputRead %= MAX_INPUT_CHARS32;
+ if( !CheckMem(bmp->Data, bmp->W*bmp->H*sizeof(Uint32)) ) {
+ Log_Notice("VTerm", "%p in TERM_IOCTL_SETCURSORBITMAP invalid", bmp);
+ errno = -EINVAL;
+ LEAVE_RET('i', -1);
}
- }
-}
-/**
- * \fn void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
- * \brief Print a string to the Virtual Terminal
- */
-void VT_int_PutString(tVTerm *Term, Uint8 *Buffer, Uint Count)
-{
- Uint32 val;
- int i;
- for( i = 0; i < Count; i++ )
- {
- if( Buffer[i] == 0x1B ) // Escape Sequence
+ // Reallocate if needed
+ if(term->VideoCursor)
{
- i ++;
- i += VT_int_ParseEscape(Term, (char*)&Buffer[i]);
- continue;
+ if(bmp->W * bmp->H != term->VideoCursor->W * term->VideoCursor->H) {
+ free(term->VideoCursor);
+ term->VideoCursor = NULL;
+ }
}
-
- if( Buffer[i] < 128 ) // Plain ASCII
- VT_int_PutChar(Term, Buffer[i]);
- else { // UTF-8
- i += ReadUTF8(&Buffer[i], &val);
- VT_int_PutChar(Term, val);
+ if(!term->VideoCursor) {
+ term->VideoCursor = malloc(sizeof(tVideo_IOCtl_Pos) + bmp->W*bmp->H*sizeof(Uint32));
+ if(!term->VideoCursor) {
+ Log_Error("VTerm", "Unable to allocate memory for cursor");
+ errno = -ENOMEM;
+ LEAVE_RET('i', -1);
+ }
}
- }
+
+ memcpy(term->VideoCursor, bmp, sizeof(tVideo_IOCtl_Pos) + bmp->W*bmp->H*sizeof(Uint32));
- // 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);
- }
-}
+ Log_Debug("VTerm", "Set VT%i's cursor to %p %ix%i",
+ (int)term->Node.Inode, bmp, bmp->W, bmp->H);
-/**
- * \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;
+ if(gpVT_CurTerm == term)
+ VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSORBITMAP, term->VideoCursor);
+
+ LEAVE('i', 0);
+ return 0; }
}
- //LEAVE('-');
+ LEAVE('i', -1);
+ return -1;
}
/**
- * \fn int VT_int_ParseEscape(tVTerm *Term, char *Buffer)
- * \brief Parses a VT100 Escape code
+ * \fn void VT_SetTerminal(int ID)
+ * \brief Set the current terminal
*/
-int VT_int_ParseEscape(tVTerm *Term, char *Buffer)
+void VT_SetTerminal(int ID)
{
- char c;
- int argc = 0, j = 1;
- int tmp;
- int args[4] = {0,0,0,0};
-
- switch(Buffer[0]) {
- //Large Code
- case '[':
- // Get Arguments
- c = Buffer[1];
- do {
- while('0' <= c && c <= '9') {
- args[argc] *= 10;
- args[argc] += c-'0';
- c = Buffer[++j];
- }
- if( j != 1 ) argc ++;
- } while(c == ';');
-
- // Get string (what does this do?)
- if(c == '"') {
- c = Buffer[++j];
- while(c != '"')
- c = Buffer[++j];
- }
-
- // Get Command
- if( ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
+ // Copy the screen state
+ if( ID != giVT_CurrentTerminal && gpVT_CurTerm->Mode != TERM_MODE_TEXT )
+ {
+ if( !gpVT_CurTerm->Buffer )
+ gpVT_CurTerm->Buffer = malloc( gpVT_CurTerm->Width*gpVT_CurTerm->Height*4 );
+ if( gpVT_CurTerm->Width < giVT_RealWidth )
{
- switch(c)
+ int line;
+ Uint ofs = 0;
+ Uint32 *dest = gpVT_CurTerm->Buffer;
+ // Slower scanline copy
+ for( line = 0; line < gpVT_CurTerm->Height; line ++ )
{
- // Left
- case 'D':
- if(argc == 1) tmp = args[0];
- else tmp = 1;
-
- if( Term->WritePos-(tmp-1) % Term->Width == 0 )
- Term->WritePos -= Term->WritePos % Term->Width;
- else
- Term->WritePos -= tmp;
- break;
-
- // Right
- case 'C':
- if(argc == 1) tmp = args[0];
- else tmp = 1;
- if( (Term->WritePos + tmp) % Term->Width == 0 ) {
- Term->WritePos -= Term->WritePos % Term->Width;
- Term->WritePos += Term->Width - 1;
- } else
- Term->WritePos += tmp;
- break;
-
- // Clear By Line
- case 'J':
- // Clear Screen
- 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
- case 'm':
- for( ; argc--; )
- {
- // Flags
- if( 0 <= args[argc] && args[argc] <= 8)
- {
- switch(args[argc])
- {
- case 0: Term->CurColour = DEFAULT_COLOUR; break; // Reset
- case 1: Term->CurColour |= 0x80000000; break; // Bright
- case 2: Term->CurColour &= ~0x80000000; break; // Dim
- }
- }
- // Foreground Colour
- else if(30 <= args[argc] && args[argc] <= 37) {
- Term->CurColour &= 0xF000FFFF;
- Term->CurColour |= (Uint32)caVT100Colours[ args[argc]-30+(Term->CurColour>>28) ] << 16;
- }
- // Background Colour
- else if(40 <= args[argc] && args[argc] <= 47) {
- Term->CurColour &= 0xFFFF8000;
- Term->CurColour |= caVT100Colours[ args[argc]-40+((Term->CurColour>>12)&15) ];
- }
- }
- break;
+ VFS_ReadAt(giVT_OutputDevHandle, ofs, gpVT_CurTerm->Width*4, dest);
+ ofs += giVT_RealWidth * 4;
+ dest += gpVT_CurTerm->Width;
}
}
- break;
-
- default:
- break;
- }
-
- return j + 1;
-}
-
-/**
- * \fn void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
- * \brief Write a single character to a VTerm
- */
-void VT_int_PutChar(tVTerm *Term, Uint32 Ch)
-{
- int i;
- //ENTER("pTerm xCh", Term, Ch);
- //LOG("Term = {WritePos:%i, ViewPos:%i}", Term->WritePos, Term->ViewPos);
-
- switch(Ch)
- {
- case '\0': return; // Ignore NULL byte
- case '\n':
- Term->WritePos += Term->Width;
- case '\r':
- Term->WritePos -= Term->WritePos % Term->Width;
- break;
-
- case '\t':
- do {
- Term->Text[ Term->WritePos ].Ch = '\0';
- Term->Text[ Term->WritePos ].Colour = Term->CurColour;
- Term->WritePos ++;
- } while(Term->WritePos & 7);
- break;
-
- case '\b':
- // Backspace is invalid at Offset 0
- if(Term->WritePos == 0) break;
-
- Term->WritePos --;
- // Singe Character
- if(Term->Text[ Term->WritePos ].Ch != '\0') {
- Term->Text[ Term->WritePos ].Ch = 0;
- Term->Text[ Term->WritePos ].Colour = Term->CurColour;
- break;
- }
- // Tab
- i = 7; // Limit it to 8
- do {
- Term->Text[ Term->WritePos ].Ch = 0;
- Term->Text[ Term->WritePos ].Colour = Term->CurColour;
- Term->WritePos --;
- } while(Term->WritePos && i-- && Term->Text[ Term->WritePos ].Ch == '\0');
- if(Term->Text[ Term->WritePos ].Ch != '\0')
- Term->WritePos ++;
- break;
-
- default:
- Term->Text[ Term->WritePos ].Ch = Ch;
- Term->Text[ Term->WritePos ].Colour = Term->CurColour;
- Term->WritePos ++;
- break;
- }
-
-
- // Move Screen
- if(Term->WritePos >= Term->Width*Term->Height*VT_SCROLLBACK)
- {
- int base, i;
- Term->WritePos -= Term->Width;
-
- // Update view position
- base = Term->Width*Term->Height*(VT_SCROLLBACK-1);
- if(Term->ViewPos < base) Term->ViewPos += Term->Width;
- if(Term->ViewPos > base) Term->ViewPos = base;
-
- // Scroll terminal cache
- base = Term->Width*(Term->Height*VT_SCROLLBACK-1);
-
- // Scroll Back
- 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 ++ )
+ else
{
- Term->Text[ base + i ].Ch = 0;
- Term->Text[ base + i ].Colour = Term->CurColour;
+ VFS_ReadAt(giVT_OutputDevHandle,
+ 0, gpVT_CurTerm->Height*giVT_RealWidth*4,
+ gpVT_CurTerm->Buffer
+ );
}
-
- 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 );
-
- //LEAVE('-');
-}
-/**
- * \fn void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
- * \brief Updates the video framebuffer
- */
-void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
-{
- // Only update if this is the current terminal
- if( Term != &gVT_Terminals[giVT_CurrentTerminal] ) return;
+ // Update current terminal ID
+ Log_Log("VTerm", "Changed terminal from %i to %i", giVT_CurrentTerminal, ID);
+ giVT_CurrentTerminal = ID;
+ gpVT_CurTerm = &gVT_Terminals[ID];
- if( Term->Mode == TERM_MODE_TEXT )
+ if( gpVT_CurTerm->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]
- );
- }
+ VT_SetMode( VIDEO_BUFFMT_TEXT );
}
else
{
+ // Update the cursor image
+ if(gpVT_CurTerm->VideoCursor)
+ VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSORBITMAP, gpVT_CurTerm->VideoCursor);
+ VT_SetMode( VIDEO_BUFFMT_FRAMEBUFFER );
+ }
+
+ if(gpVT_CurTerm->Buffer)
+ {
+ // TODO: Handle non equal sized
VFS_WriteAt(
giVT_OutputDevHandle,
0,
- Term->Width*Term->Height*sizeof(Uint32),
- &Term->Buffer
+ gpVT_CurTerm->Width*gpVT_CurTerm->Height*sizeof(Uint32),
+ gpVT_CurTerm->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
-// ---
-#define MONOSPACE_FONT 10816
-
-#if MONOSPACE_FONT == 10808 // 8x8
-# include "vterm_font_8x8.h"
-#elif MONOSPACE_FONT == 10816 // 8x16
-# include "vterm_font_8x16.h"
-#endif
-
-// === PROTOTYPES ===
-Uint8 *VT_Font_GetChar(Uint32 Codepoint);
-
-// === GLOBALS ===
-int giVT_CharWidth = FONT_WIDTH+1;
-int giVT_CharHeight = FONT_HEIGHT;
-
-// === 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)
-{
- 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-1)))
- buf[x] = FGC;
- else
- buf[x] = BGC;
- }
- buf += Pitch;
- font ++;
- }
-}
-
-/**
- * \fn Uint32 VT_Colour12to24(Uint16 Col12)
- * \brief Converts a
- */
-Uint32 VT_Colour12to24(Uint16 Col12)
-{
- 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;
-}
-
-/**
- * \fn Uint8 *VT_Font_GetChar(Uint32 Codepoint)
- * \brief Gets an index into the font array given a Unicode Codepoint
- * \note See http://en.wikipedia.org/wiki/CP437
- */
-Uint8 *VT_Font_GetChar(Uint32 Codepoint)
-{
- int index = 0;
- if(Codepoint < 128)
- return &VTermFont[Codepoint*FONT_HEIGHT];
- switch(Codepoint)
- {
- case 0xC7: index = 128; break; // Ç
- case 0xFC: index = 129; break; // ü
- case 0xE9: index = 130; break; // é
- case 0xE2: index = 131; break; // â
- case 0xE4: index = 132; break; // ä
- case 0xE0: index = 133; break; // à
- case 0xE5: index = 134; break; // å
- case 0xE7: index = 135; break; // ç
- case 0xEA: index = 136; break; // ê
- case 0xEB: index = 137; break; // ë
- case 0xE8: index = 138; break; // è
- case 0xEF: index = 139; break; // ï
- case 0xEE: index = 140; break; // î
- case 0xEC: index = 141; break; // ì
- case 0xC4: index = 142; break; // Ä
- case 0xC5: index = 143; break; // Å
- }
- return &VTermFont[index*FONT_HEIGHT];
+ VT_int_UpdateCursor(gpVT_CurTerm, 1);
+ // Update the screen
+ VT_int_UpdateScreen(gpVT_CurTerm, 1);
}
-
-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