// Only update if this is the current terminal
if( Term != gpVT_CurTerm ) return;
+ ENTER("pTerm iCount",
+ Term, Count);
+
if( Count > Term->ScrollHeight ) Count = Term->ScrollHeight;
if( Count < -Term->ScrollHeight ) Count = -Term->ScrollHeight;
+ LOG("Count = %i", Count);
// Switch to 2D Command Stream
tmp = VIDEO_BUFFMT_2DSTREAM;
// Restore old mode (this function is only called during text mode)
tmp = VIDEO_BUFFMT_TEXT;
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETBUFFORMAT, &tmp);
+ LEAVE('-');
}
void VT_int_UpdateCursor( tVTerm *Term, int bShow )
tVideo_IOCtl_Pos csr_pos;
if( Term != gpVT_CurTerm ) return ;
+
+ ENTER("pTerm bShow", Term, Show);
if( !bShow )
{
}
else if( Term->Mode == TERM_MODE_TEXT )
{
- int offset;
-
// if( !(Term->Flags & VT_FLAG_SHOWCSR)
// && ( (Term->Flags & VT_FLAG_HIDECSR) || !Term->Node.ReadThreads)
// )
}
else
{
- if(Term->Flags & VT_FLAG_ALTBUF)
- offset = Term->AltWritePos;
- else
- offset = Term->WritePos - Term->ViewPos;
-
- csr_pos.x = offset % Term->TextWidth;
- csr_pos.y = offset / Term->TextWidth;
+ const tVT_Pos *wrpos = VT_int_GetWritePosPtr(Term);
+ csr_pos.x = wrpos->Col;
+ csr_pos.y = wrpos->Row - (Term->Flags & VT_FLAG_ALTBUF ? 0 : Term->ViewTopRow);
if( 0 > csr_pos.y || csr_pos.y >= Term->TextHeight )
csr_pos.y = -1, csr_pos.x = -1;
}
csr_pos.y = Term->VideoCursorY;
}
VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &csr_pos);
+ LEAVE('-');
}
/**
*/
void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
{
- tVT_Char *buffer;
- int view_pos, write_pos;
// Only update if this is the current terminal
if( Term != gpVT_CurTerm ) return;
-
+
+ ENTER("pTerm iUpdateAll", Term, UpdateAll);
+
switch( Term->Mode )
{
- case TERM_MODE_TEXT:
- view_pos = (Term->Flags & VT_FLAG_ALTBUF) ? 0 : Term->ViewPos;
- write_pos = (Term->Flags & VT_FLAG_ALTBUF) ? Term->AltWritePos : Term->WritePos;
- buffer = (Term->Flags & VT_FLAG_ALTBUF) ? Term->AltBuf : Term->Text;
+ case TERM_MODE_TEXT: {
+ size_t view_pos = (Term->Flags & VT_FLAG_ALTBUF) ? 0 : Term->ViewTopRow*Term->TextWidth;
+ const tVT_Pos *wrpos = VT_int_GetWritePosPtr(Term);
+ const tVT_Char *buffer = (Term->Flags & VT_FLAG_ALTBUF) ? Term->AltBuf : Term->Text;
+ LOG("view_pos = %i, wrpos = %p, buffer=%p", view_pos, wrpos, buffer);
// Re copy the entire screen?
if(UpdateAll) {
VFS_WriteAt(
}
// Only copy the current line
else {
- int ofs = write_pos - write_pos % Term->TextWidth;
+ size_t ofs = wrpos->Row * Term->TextWidth;
VFS_WriteAt(
giVT_OutputDevHandle,
(ofs - view_pos)*sizeof(tVT_Char),
&buffer[ofs]
);
}
- break;
+ break; }
case TERM_MODE_FB:
break;
}
VT_int_UpdateCursor(Term, 1);
+ LEAVE('-');
}