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)
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_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[] = {
{
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';
return VFS_WriteAt( giVT_OutputDevHandle, Offset, Length, Buffer );
}
}
-
+ // Just pass on (for now)
case TERM_MODE_2DACCEL:
//case TERM_MODE_3DACCEL:
if( Node->Inode == giVT_CurrentTerminal )
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->Width != term->NewWidth
+ || term->Height != term->NewHeight)
+ {
+ VT_int_ChangeMode(term, *iData, term->NewWidth, term->NewHeight);
+ }
// 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 = *iData;
+ else
+ ret = term->Height;
+ LEAVE('i', ret);
+ return ret;
case TERM_IOCTL_FORCESHOW:
Log_Log("VTerm", "Thread %i forced VTerm %i to be shown",
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;
+ pos.x = gpVT_CurTerm->WritePos % gpVT_CurTerm->TextWidth;
+ pos.y = gpVT_CurTerm->WritePos / gpVT_CurTerm->TextWidth;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos);
}
*/
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;
void VT_int_ClearLine(tVTerm *Term, int Num)
{
int i;
+ tVT_Char *cell = &Term->Text[ Num*Term->TextWidth ];
+ if( Num < 0 || Num >= Term->TextHeight ) 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';
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--; )
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->TextWidth;
+ pos.y = Term->WritePos / Term->TextWidth;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &pos);
}
}
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
// - Check if we need to scroll the entire scrollback buffer
- if(Term->WritePos >= Term->Width*Term->Height*(giVT_Scrollback+1))
+ if(Term->WritePos >= Term->TextWidth*Term->TextHeight*(giVT_Scrollback+1))
{
int base, i;
//Debug("Scrolling entire buffer");
// Move back by one
- Term->WritePos -= Term->Width;
+ Term->WritePos -= Term->TextWidth;
// Update the scren
VT_int_UpdateScreen( Term, 0 );
// Update view position
- base = Term->Width*Term->Height*(giVT_Scrollback);
+ 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);
+ 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;
VT_int_UpdateScreen( Term, 0 );
}
// Ok, so we only need to scroll the screen
- else if(Term->WritePos >= Term->ViewPos + Term->Width*Term->Height)
+ else if(Term->WritePos >= Term->ViewPos + Term->TextWidth*Term->TextHeight)
{
//Debug("Term->WritePos (%i) >= %i",
// Term->WritePos,
//Debug("Scrolling screen only");
// Update the last line
- Term->WritePos -= Term->Width;
+ Term->WritePos -= Term->TextWidth;
VT_int_UpdateScreen( Term, 0 );
- Term->WritePos += Term->Width;
+ Term->WritePos += Term->TextWidth;
// Scroll
- Term->ViewPos += Term->Width;
+ Term->ViewPos += Term->TextWidth;
//Debug("Term->ViewPos = %i", Term->ViewPos);
VT_int_ScrollFramebuffer( Term );
VT_int_UpdateScreen( Term, 0 );
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);
// Restore old mode (this function is only called during text mode)
VFS_WriteAt(
giVT_OutputDevHandle,
0,
- Term->Width*Term->Height*sizeof(tVT_Char),
+ Term->TextWidth*Term->TextHeight*sizeof(tVT_Char),
&Term->Text[Term->ViewPos]
);
}
// Only copy the current line
else {
- int pos = Term->WritePos - Term->WritePos % Term->Width;
+ 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