#define DEFAULT_WIDTH 640
#define DEFAULT_HEIGHT 480
#define DEFAULT_SCROLLBACK 2 // 2 Screens of text + current screen
-#define TEXTTERM_WIDTH (BOOT_WIDTH/8)
-#define TEXTTERM_HEIGHT (BOOT_WIDTH/16)
#define DEFAULT_COLOUR (VT_COL_BLACK|(0xAAA<<16))
#define VT_FLAG_HIDECSR 0x01
typedef struct {
int Mode; //!< Current Mode (see ::eTplTerminal_Modes)
int Flags; //!< Flags (see VT_FLAG_*)
+
+ short NewWidth; //!< Un-applied dimensions (Width)
+ short NewHeight; //!< Un-applied dimensions (Height)
short Width; //!< Virtual Width
short Height; //!< Virtual Height
+ short TextWidth; //!< Text Virtual Width
+ short TextHeight; //!< Text Virtual Height
int ViewPos; //!< View Buffer Offset (Text Only)
int WritePos; //!< Write Buffer Offset (Text Only)
Uint32 CurColour; //!< Current Text Colour
+ tMutex ReadingLock; //!< Lock the VTerm when a process is reading from it
+ tTID ReadingThread; //!< Owner of the lock
int InputRead; //!< Input buffer read position
int InputWrite; //!< Input buffer write position
char InputBuffer[MAX_INPUT_CHARS8];
- union {
- tVT_Char *Text;
- Uint32 *Buffer;
- };
+
+ tVT_Char *Text;
+ Uint32 *Buffer;
+
char Name[2]; //!< Name of the terminal
tVFS_Node Node;
} tVTerm;
void VT_InitOutput(void);
void VT_InitInput(void);
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);
void VT_int_PutChar(tVTerm *Term, Uint32 Ch);
void VT_int_ScrollFramebuffer( tVTerm *Term );
void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll );
-void VT_int_ChangeMode(tVTerm *Term, int NewMode);
+void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight);
// === CONSTANTS ===
const Uint16 caVT100Colours[] = {
val = arg + strpos(arg, '='); *val++ = '\0';
if( strcmp(opt, "Video") == 0 ) {
- if(gsVT_OutputDevice) free(gsVT_OutputDevice);
- gsVT_OutputDevice = strdup(val);
+ gsVT_OutputDevice = val;
}
else if( strcmp(opt, "Input") == 0 ) {
- if(gsVT_InputDevice) free(gsVT_InputDevice);
- gsVT_InputDevice = strdup(val);
+ gsVT_InputDevice = val;
}
else if( strcmp(opt, "Width") == 0 ) {
giVT_RealWidth = atoi( val );
}
}
+ if(gsVT_OutputDevice) Modules_InitialiseBuiltin( gsVT_OutputDevice );
+ if(gsVT_InputDevice) Modules_InitialiseBuiltin( gsVT_InputDevice );
+
// Apply Defaults
- if(!gsVT_OutputDevice) gsVT_OutputDevice = "/Devices/"DEFAULT_OUTPUT;
- if(!gsVT_InputDevice) gsVT_InputDevice = "/Devices/"DEFAULT_INPUT;
+ if(!gsVT_OutputDevice) gsVT_OutputDevice = DEFAULT_OUTPUT;
+ if(!gsVT_InputDevice) gsVT_InputDevice = DEFAULT_INPUT;
+
+ // Create 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);
{
gVT_Terminals[i].Mode = TERM_MODE_TEXT;
gVT_Terminals[i].Flags = 0;
- gVT_Terminals[i].Width = giVT_RealWidth/giVT_CharWidth;
- gVT_Terminals[i].Height = giVT_RealHeight/giVT_CharHeight;
gVT_Terminals[i].CurColour = DEFAULT_COLOUR;
gVT_Terminals[i].WritePos = 0;
gVT_Terminals[i].ViewPos = 0;
- gVT_Terminals[i].Buffer = calloc(
- gVT_Terminals[i].Width*gVT_Terminals[i].Height*(giVT_Scrollback+1),
- 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';
Log_Warning("VTerm", "Oh F**k, I can't open the video device '%s'", gsVT_OutputDevice);
return ;
}
- VT_SetResolution(giVT_RealWidth, giVT_RealHeight);
+ VT_SetResolution( giVT_RealWidth, giVT_RealHeight );
VT_SetTerminal( 0 );
VT_SetMode( VIDEO_BUFFMT_TEXT );
}
VFS_IOCtl(giVT_InputDevHandle, KB_IOCTL_SETCALLBACK, VT_KBCallBack);
}
+/**
+ * \brief Set the video resolution
+ * \param Width New screen width
+ * \param Height New screen height
+ */
+void VT_SetResolution(int Width, int Height)
+{
+ 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
+ );
+ }
+ VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_GETSETMODE, &tmp );
+
+ // Resize text terminals if needed
+ if( 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
+ giVT_RealWidth = mode.width;
+ giVT_RealHeight = mode.height;
+ for( i = 0; i < NUM_VTS; i ++ )
+ {
+ if( gVT_Terminals[i].Mode != TERM_MODE_TEXT ) continue;
+
+ gVT_Terminals[i].Text = realloc(
+ gVT_Terminals[i].Text,
+ newBufSize*sizeof(tVT_Char)
+ );
+ }
+ }
+}
+
+/**
+ * \brief Set video output buffer mode
+ */
+void VT_SetMode(int Mode)
+{
+ VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_SETBUFFORMAT, &Mode );
+}
+
/**
* \fn char *VT_ReadDir(tVFS_Node *Node, int Pos)
* \brief Read from the VTerm Directory
}
/**
- * \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;
int pos = 0;
tVTerm *term = &gVT_Terminals[ Node->Inode ];
+ Mutex_Acquire( &term->ReadingLock );
+ term->ReadingThread = Threads_GetTID();
+
// Check current mode
switch(term->Mode)
{
+ // Text Mode (UTF-8)
case TERM_MODE_TEXT:
while(pos < Length)
{
- while(term->InputRead == term->InputWrite) Threads_Yield();
+ //TODO: Sleep instead
+ while(term->InputRead == term->InputWrite) Threads_Sleep();
((char*)Buffer)[pos] = term->InputBuffer[term->InputRead];
pos ++;
break;
//case TERM_MODE_FB:
+ // Other - UCS-4
default:
while(pos < Length)
{
- while(term->InputRead == term->InputWrite) Threads_Yield();
+ while(term->InputRead == term->InputWrite) Threads_Sleep();
((Uint32*)Buffer)[pos] = ((Uint32*)term->InputBuffer)[term->InputRead];
pos ++;
term->InputRead ++;
}
break;
}
+
+ term->ReadingThread = -1;
+ Mutex_Release( &term->ReadingLock );
+
return 0;
}
// Write
switch( term->Mode )
{
+ // Print Text
case TERM_MODE_TEXT:
VT_int_PutString(term, Buffer, Length);
break;
+ // Framebuffer :)
case TERM_MODE_FB:
+
+ // - 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;
}
+ // Copy to the local cache
memcpy( (void*)((Uint)term->Buffer + (Uint)Offset), Buffer, Length );
+ // Update screen if needed
if( Node->Inode == giVT_CurrentTerminal )
{
+ // Fill entire screen?
if( giVT_RealWidth > term->Width || giVT_RealHeight > term->Height )
{
- #if 0
- int x, y, h;
+ // No? :( Well, just center it
+ int x, y, w, h;
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;
+ y += (giVT_RealHeight - term->Height) / 2;
while(h--)
{
VFS_WriteAt( giVT_OutputDevHandle,
- (x+y*term->RealWidth)*4,
+ (x + y * giVT_RealWidth)*4,
term->Width * 4,
Buffer
);
- Buffer = (void*)( (Uint)Buffer + term->Width*term->Height*4 );
+ Buffer = (void*)( (Uint)Buffer + term->Width*4 );
+ y ++;
}
- #endif
return 0;
}
else {
return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
}
}
+ // 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;
}
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);
Log_Log("VTerm", "VTerm %i mode set to %i", (int)Node->Inode, *iData);
// Update mode if needed
- if(term->Mode != *iData)
- VT_int_ChangeMode(term, *iData);
+ 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(Node->Inode == giVT_CurrentTerminal)
LEAVE('i', -1);
return -1;
}
- term->Width = *iData;
+ term->NewWidth = *iData;
}
- Log("VT_Terminal_IOCtl - RETURN term->Width = %i", term->Width);
- LEAVE('i', term->Width);
- return term->Width;
+ 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:
LEAVE('i', -1);
return -1;
}
- term->Height = *iData;
+ term->NewHeight = *iData;
}
- Log("VT_Terminal_IOCtl - RETURN term->Height = %i", term->Height);
- LEAVE('i', term->Height);
- return term->Height;
+ 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",
return -1;
}
-void VT_SetResolution(int Width, int Height)
-{
- 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
- );
- }
- VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_GETSETMODE, &tmp );
-
- // Resize text terminals if needed
- if( 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
- giVT_RealWidth = mode.width;
- giVT_RealHeight = mode.height;
- for( i = 0; i < NUM_VTS; i ++ )
- {
- if( gVT_Terminals[i].Mode != TERM_MODE_TEXT ) continue;
-
- gVT_Terminals[i].Text = realloc(
- gVT_Terminals[i].Text,
- newBufSize*sizeof(tVT_Char)
- );
- }
- }
-}
-
-void VT_SetMode(int Mode)
-{
- VFS_IOCtl( giVT_OutputDevHandle, VIDEO_IOCTL_SETBUFFORMAT, &Mode );
-}
-
/**
* \fn void VT_SetTerminal(int ID)
* \brief Set the current terminal
if( gpVT_CurTerm->Mode == TERM_MODE_TEXT && !(gpVT_CurTerm->Flags & VT_FLAG_HIDECSR) )
{
tVideo_IOCtl_Pos pos;
- pos.x = gpVT_CurTerm->WritePos % gpVT_CurTerm->Width;
- pos.y = gpVT_CurTerm->WritePos / gpVT_CurTerm->Width;
- VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos);
+ pos.x = (gpVT_CurTerm->WritePos - gpVT_CurTerm->ViewPos) % gpVT_CurTerm->TextWidth;
+ pos.y = (gpVT_CurTerm->WritePos - gpVT_CurTerm->ViewPos) / gpVT_CurTerm->TextWidth;
+ if( pos.x < gpVT_CurTerm->TextHeight )
+ VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos);
}
if( gpVT_CurTerm->Mode == TERM_MODE_TEXT )
*/
void VT_KBCallBack(Uint32 Codepoint)
{
- tVTerm *term = &gVT_Terminals[giVT_CurrentTerminal];
+ tVTerm *term = gpVT_CurTerm;
- // How the hell did we get a Codepoint of zero?
+ // How the hell did we get a codepoint of zero?
if(Codepoint == 0) return;
// Key Up
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;
+ case KEY_LALT: gbVT_AltDown &= ~1; break;
+ case KEY_RALT: gbVT_AltDown &= ~2; break;
+ case KEY_LCTRL: gbVT_CtrlDown &= ~1 break;
+ case KEY_RCTRL: gbVT_CtrlDown &= ~2; break;
#endif
}
return;
switch(Codepoint)
{
- #if !USE_CTRL_ALT
+ #if !USE_CTRL_ALT // HACK: Use both shifts instead of 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;
+ case KEY_LALT: gbVT_AltDown |= 1; break;
+ case KEY_RALT: gbVT_AltDown |= 2; break;
+ case KEY_LCTRL: gbVT_CtrlDown |= 1; break;
+ case KEY_RCTRL: gbVT_CtrlDown |= 2; 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_F10: VT_SetTerminal(9); return;
case KEY_F11: VT_SetTerminal(10); return;
case KEY_F12: VT_SetTerminal(11); return;
+ // Scrolling
case KEY_PGUP:
if( gpVT_CurTerm->ViewPos > gpVT_CurTerm->Width )
gpVT_CurTerm->ViewPos -= gpVT_CurTerm->Width;
term->InputRead %= MAX_INPUT_CHARS32;
}
}
+
+ // Wake up the thread waiting on us
+ if( term->ReadingThread >= 0 ) {
+ Threads_WakeTID(term->ReadingThread);
+ }
}
/**
void VT_int_ClearLine(tVTerm *Term, int Num)
{
int i;
+ tVT_Char *cell = &Term->Text[ Num*Term->TextWidth ];
+ if( Num < 0 || Num >= Term->TextHeight * (giVT_Scrollback + 1) ) return ;
//ENTER("pTerm iNum", Term, Num);
- for( i = Term->Width; i--; )
+ for( i = Term->TextWidth; i--; )
{
- Term->Text[ Num*Term->Width + i ].Ch = 0;
- Term->Text[ Num*Term->Width + i ].Colour = Term->CurColour;
+ cell[ i ].Ch = 0;
+ cell[ i ].Colour = Term->CurColour;
}
//LEAVE('-');
}
if( '0' <= c && c <= '9' )
{
do {
+ if(c == ';') c = Buffer[j++];
while('0' <= c && c <= '9') {
args[argc] *= 10;
args[argc] += c-'0';
} while(c == ';');
}
- /*
- // Get string (what does this do?)
- if(c == '"') {
- c = Buffer[j++];
- while(c != '"')
- c = Buffer[j++];
- }
- */
-
- //Log_Debug("VTerm", "argc = %i", argc);
-
// Get Command
if( ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z'))
{
if(argc == 1) tmp = args[0];
else tmp = 1;
- if( Term->WritePos-(tmp-1) % Term->Width == 0 )
- Term->WritePos -= Term->WritePos % Term->Width;
+ if( Term->WritePos-(tmp-1) % Term->TextWidth == 0 )
+ Term->WritePos -= Term->WritePos % Term->TextWidth;
else
Term->WritePos -= tmp;
break;
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;
+ if( (Term->WritePos + tmp) % Term->TextWidth == 0 ) {
+ Term->WritePos -= Term->WritePos % Term->TextWidth;
+ Term->WritePos += Term->TextWidth - 1;
} else
Term->WritePos += tmp;
break;
{
case 2:
{
- int i = Term->Height * (giVT_Scrollback + 1);
+ int i = Term->TextHeight * (giVT_Scrollback + 1);
while( i-- ) VT_int_ClearLine(Term, i);
Term->WritePos = 0;
Term->ViewPos = 0;
break;
}
break;
+ // Set cursor position
+ case 'h':
+ Term->WritePos = args[0] + args[1]*Term->TextWidth;
+ Log_Debug("VTerm", "args = {%i, %i}", args[0], args[1]);
+ break;
// Set Font flags
case 'm':
for( ; argc--; )
{
Uint32 val;
int i;
+
+ // Iterate
for( i = 0; i < Count; i++ )
{
- if( Buffer[i] == 0x1B ) // Escape Sequence
+ // Handle escape sequences
+ if( Buffer[i] == 0x1B )
{
i ++;
i += VT_int_ParseEscape(Term, (char*)&Buffer[i]) - 1;
continue;
}
+ // Fast check for non UTF-8
if( Buffer[i] < 128 ) // Plain ASCII
VT_int_PutChar(Term, Buffer[i]);
else { // UTF-8
- i += ReadUTF8(&Buffer[i], &val);
+ i += ReadUTF8(&Buffer[i], &val) - 1;
VT_int_PutChar(Term, val);
}
}
if( Term == gpVT_CurTerm && !(Term->Flags & VT_FLAG_HIDECSR) )
{
tVideo_IOCtl_Pos pos;
- pos.x = Term->WritePos % Term->Width;
- pos.y = Term->WritePos / Term->Width;
+ pos.x = (Term->WritePos - Term->ViewPos) % Term->TextWidth;
+ pos.y = (Term->WritePos - Term->ViewPos) / Term->TextWidth;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos);
}
}
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':
VT_int_UpdateScreen( Term, 0 ); // Update the line before newlining
- Term->WritePos += Term->Width;
+ Term->WritePos += Term->TextWidth;
case '\r':
- Term->WritePos -= Term->WritePos % Term->Width;
+ Term->WritePos -= Term->WritePos % Term->TextWidth;
break;
case '\t':
}
// Move Screen
- if(Term->WritePos >= Term->Width*Term->Height*(giVT_Scrollback+1))
+ // - Check if we need to scroll the entire scrollback buffer
+ if(Term->WritePos >= Term->TextWidth*Term->TextHeight*(giVT_Scrollback+1))
{
int base, i;
- Term->WritePos -= Term->Width;
+
+ // Move back by one
+ Term->WritePos -= Term->TextWidth;
+ // Update the scren
VT_int_UpdateScreen( Term, 0 );
// Update view position
- base = Term->Width*Term->Height*(giVT_Scrollback-1);
- if(Term->ViewPos < base) Term->ViewPos += Term->Width;
- if(Term->ViewPos > base) Term->ViewPos = base;
+ base = Term->TextWidth*Term->TextHeight*(giVT_Scrollback);
+ if(Term->ViewPos < base)
+ Term->ViewPos += Term->Width;
+ if(Term->ViewPos > base)
+ Term->ViewPos = base;
// Scroll terminal cache
- base = Term->Width*(Term->Height*(giVT_Scrollback+1)-1);
-
- // Scroll Back
+ base = Term->TextWidth*(Term->TextHeight*(giVT_Scrollback+1)-1);
memcpy(
Term->Text,
- &Term->Text[Term->Width],
- (Term->Width*Term->Height*(giVT_Scrollback+1)-Term->Width)*sizeof(tVT_Char)
+ &Term->Text[Term->TextWidth],
+ base*sizeof(tVT_Char)
);
// Clear last row
- for( i = 0; i < Term->Width; i ++ )
+ for( i = 0; i < Term->TextWidth; i ++ )
{
Term->Text[ base + i ].Ch = 0;
Term->Text[ base + i ].Colour = Term->CurColour;
}
- //LOG("Scrolled buffer");
VT_int_ScrollFramebuffer( Term );
VT_int_UpdateScreen( Term, 0 );
}
- else if(Term->WritePos >= Term->ViewPos + Term->Width*Term->Height)
+ // Ok, so we only need to scroll the screen
+ else if(Term->WritePos >= Term->ViewPos + Term->TextWidth*Term->TextHeight)
{
- //LOG("Scrolled screen");
- Term->WritePos -= Term->Width;
+ //Debug("Term->WritePos (%i) >= %i",
+ // Term->WritePos,
+ // Term->ViewPos + Term->Width*Term->Height
+ // );
+ //Debug("Scrolling screen only");
+
+ // Update the last line
+ Term->WritePos -= Term->TextWidth;
VT_int_UpdateScreen( Term, 0 );
- Term->WritePos += Term->Width;
+ Term->WritePos += Term->TextWidth;
+ VT_int_ClearLine(Term, Term->WritePos / Term->TextWidth);
- Term->ViewPos += Term->Width;
+ // Scroll
+ Term->ViewPos += Term->TextWidth;
+ //Debug("Term->ViewPos = %i", Term->ViewPos);
VT_int_ScrollFramebuffer( Term );
VT_int_UpdateScreen( Term, 0 );
}
Uint16 SrcX, SrcY;
Uint16 W, H;
} PACKED buf;
+
// Only update if this is the current terminal
if( Term != gpVT_CurTerm ) return;
- // This should only be called in text mode
-
+ // Switch to 2D Command Stream
tmp = VIDEO_BUFFMT_2DSTREAM;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETBUFFORMAT, &tmp);
+ // BLIT from 0,0 to 0,giVT_CharHeight
buf.Op = VIDEO_2DOP_BLIT;
buf.DstX = 0; buf.DstY = 0;
buf.SrcX = 0; buf.SrcY = giVT_CharHeight;
- buf.W = Term->Width * giVT_CharWidth;
- buf.H = (Term->Height-1) * giVT_CharHeight;
+ buf.W = Term->TextWidth * giVT_CharWidth;
+ buf.H = (Term->TextHeight-1) * giVT_CharHeight;
+ VFS_WriteAt(giVT_OutputDevHandle, 0, sizeof(buf), &buf);
- VFS_WriteAt(giVT_OutputDevHandle, 0, 1+12, &buf);
-
- // Restore old mode
+ // Restore old mode (this function is only called during text mode)
tmp = VIDEO_BUFFMT_TEXT;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETBUFFORMAT, &tmp);
}
switch( Term->Mode )
{
case TERM_MODE_TEXT:
+ // Re copy the entire screen?
if(UpdateAll) {
- //LOG("UpdateAll = 1");
- //LOG("VFS_WriteAt(0x%x, 0, %i*sizeof(tVT_Char), &Term->Text[%i])",
- // giVT_OutputDevHandle, Term->Width*Term->Height, Term->ViewPos);
VFS_WriteAt(
giVT_OutputDevHandle,
0,
- Term->Width*Term->Height*sizeof(tVT_Char),
+ Term->TextWidth*Term->TextHeight*sizeof(tVT_Char),
&Term->Text[Term->ViewPos]
);
- } else {
- int pos = Term->WritePos - Term->WritePos % Term->Width;
- //LOG("UpdateAll = 0");
- //LOG("VFS_WriteAt(0x%x, %i*sizeof(tVT_Char), %i*sizeof(tVT_Char), &Term->Text[%i])",
- // giVT_OutputDevHandle, (pos - Term->ViewPos), Term->Width, pos);
+ }
+ // Only copy the current line
+ else {
+ int pos = Term->WritePos - Term->WritePos % Term->TextWidth;
VFS_WriteAt(
giVT_OutputDevHandle,
(pos - Term->ViewPos)*sizeof(tVT_Char),
- Term->Width*sizeof(tVT_Char),
+ Term->TextWidth*sizeof(tVT_Char),
&Term->Text[pos]
);
}
}
/**
- * \fn void VT_int_ChangeMode(tVTerm *Term, int NewMode)
- * \brief Change the mode of a VTerm
+ * \brief Update the screen mode
+ * \param Term Terminal to update
+ * \param NewMode New mode to set
+ * \param NewWidth New framebuffer width
+ * \param NewHeight New framebuffer height
*/
-void VT_int_ChangeMode(tVTerm *Term, int NewMode)
-{
+void VT_int_ChangeMode(tVTerm *Term, int NewMode, int NewWidth, int NewHeight)
+{
+ int oldW = Term->Width;
+ int oldTW = oldW / giVT_CharWidth;
+ int oldH = Term->Height;
+ int oldTH = oldH / giVT_CharWidth;
+ tVT_Char *oldTBuf = Term->Text;
+ Uint32 *oldFB = Term->Buffer;
+ int w, h, i;
+
+ // TODO: Increase RealWidth/RealHeight when this happens
+ if(NewWidth > giVT_RealWidth) NewWidth = giVT_RealWidth;
+ if(NewHeight > giVT_RealHeight) NewHeight = giVT_RealHeight;
+
+ // Calculate new dimensions
+ Term->TextWidth = NewWidth / giVT_CharWidth;
+ Term->TextHeight = NewHeight / giVT_CharHeight;
+ Term->Width = NewWidth;
+ Term->Height = NewHeight;
+ Term->Mode = NewMode;
+
+ // Allocate new buffers
+ // - Text
+ Term->Text = calloc(
+ Term->TextWidth * Term->TextHeight * (giVT_Scrollback+1),
+ sizeof(tVT_Char)
+ );
+ if(oldTBuf) {
+ // Copy old buffer
+ w = oldTW;
+ if( w > Term->TextWidth ) w = Term->TextWidth;
+ h = oldTH;
+ if( h > Term->TextHeight ) h = Term->TextHeight;
+ h *= giVT_Scrollback + 1;
+ for( i = 0; i < h; i ++ )
+ {
+ memcpy(
+ &Term->Text[i*Term->TextWidth],
+ &oldTBuf[i*oldTW],
+ w*sizeof(tVT_Char)
+ );
+
+ }
+ }
+
+ // - Framebuffer
+ Term->Buffer = calloc( Term->Width * Term->Height, sizeof(Uint32) );
+ if(oldFB) {
+ // Copy old buffer
+ w = oldW;
+ if( w > Term->Width ) w = Term->Width;
+ h = oldH;
+ if( h > Term->Height ) h = Term->Height;
+ for( i = 0; i < h; i ++ )
+ {
+ memcpy(
+ &Term->Buffer[i*Term->Width],
+ &oldFB[i*oldW],
+ w*sizeof(Uint32)
+ );
+ }
+ }
+
+
+ // Debug
switch(NewMode)
{
case TERM_MODE_TEXT:
- Log_Log("VTerm", "Set VT %p to text mode", Term);
- free(Term->Buffer);
- Term->Text = calloc( Term->Width*Term->Height*(giVT_Scrollback+1), sizeof(tVT_Char) );
+ Log_Log("VTerm", "Set VT %p to text mode (%ix%i)",
+ Term, Term->TextWidth, Term->TextHeight);
break;
case TERM_MODE_FB:
- Log_Log("VTerm", "Set VT %p to framebuffer mode (%ix%i)", Term,
- Term->Width, Term->Height);
- free(Term->Text);
- Term->Buffer = calloc( Term->Width*Term->Height, sizeof(Uint32) );
- Log_Debug("VTerm", "Term->Buffer = %p", Term->Buffer);
+ Log_Log("VTerm", "Set VT %p to framebuffer mode (%ix%i)",
+ Term, Term->Width, Term->Height);
break;
//case TERM_MODE_2DACCEL:
//case TERM_MODE_3DACCEL:
// return;
}
-
- Term->Mode = NewMode;
}
// ---
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au