Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / KernelLand / Kernel / drv / vterm_output.c

diff --git a/KernelLand/Kernel/drv/vterm_output.c b/KernelLand/Kernel/drv/vterm_output.c
index 532d268..95c552f 100644 (file)
--- a/KernelLand/Kernel/drv/vterm_output.c
+++ b/KernelLand/Kernel/drv/vterm_output.c
@@ -5,9 +5,9 @@
  * drv/vterm_input.c
  * - Virtual Terminal - Input code
  */
+#define DEBUG  0
 #include "vterm.h"
 #include <api_drv_video.h>
-#define DEBUG  0
 
 // === CODE ===
 /**
@@ -52,8 +52,12 @@ void VT_int_ScrollFramebuffer( tVTerm *Term, int Count )
        // 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;
@@ -81,6 +85,7 @@ void VT_int_ScrollFramebuffer( tVTerm *Term, int Count )
        // 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 )
@@ -88,6 +93,8 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
        tVideo_IOCtl_Pos        csr_pos;
 
        if( Term != gpVT_CurTerm )      return ;
+       
+       ENTER("pTerm bShow", Term, bShow);
 
        if( !bShow )
        {
@@ -119,6 +126,7 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
                csr_pos.y = Term->VideoCursorY;
        }
        VFS_IOCtl(giVT_OutputDevHandle, VIDEO_IOCTL_SETCURSOR, &csr_pos);
+       LEAVE('-');
 }      
 
 /**
@@ -127,15 +135,21 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
  */
 void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
 {
+       ENTER("pTerm iUpdateAll", Term, UpdateAll);
        // Only update if this is the current terminal
-       if( Term != gpVT_CurTerm )      return;
-       
+       if( Term != gpVT_CurTerm ) {
+               LOG("Term != gpVT_CurTerm (%p)", gpVT_CurTerm);
+               LEAVE('-');
+               return;
+       }
+               
        switch( Term->Mode )
        {
        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 (R%i,C%i), buffer=%p", view_pos, wrpos, wrpos->Row, wrpos->Col, buffer);
                // Re copy the entire screen?
                if(UpdateAll) {
                        VFS_WriteAt(
@@ -148,6 +162,7 @@ void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
                // Only copy the current line
                else {
                        size_t  ofs = wrpos->Row * Term->TextWidth;
+                       LOG("ofs = %i", ofs);
                        VFS_WriteAt(
                                giVT_OutputDevHandle,
                                (ofs - view_pos)*sizeof(tVT_Char),
@@ -161,5 +176,6 @@ void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
        }
        
        VT_int_UpdateCursor(Term, 1);
+       LEAVE('-');
 }