Kernel/VTerm - Replace offset WritePos with Row,Col pair

[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 95a2bce..532d268 100644 (file)
--- a/KernelLand/Kernel/drv/vterm_output.c
+++ b/KernelLand/Kernel/drv/vterm_output.c
@@ -7,6 +7,7 @@
  */
 #include "vterm.h"
 #include <api_drv_video.h>
+#define DEBUG  0
 
 // === CODE ===
 /**
@@ -23,6 +24,7 @@ void VT_InitOutput()
        VT_SetResolution( giVT_RealWidth, giVT_RealHeight );
        VT_SetTerminal( 0 );
        VT_SetMode( VIDEO_BUFFMT_TEXT );
+       LOG("VTerm output initialised");
 }
 
 /**
@@ -94,8 +96,6 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
        }
        else if( Term->Mode == TERM_MODE_TEXT )
        {
-                int    offset;
-               
 //             if( !(Term->Flags & VT_FLAG_SHOWCSR)
 //              && ( (Term->Flags & VT_FLAG_HIDECSR) || !Term->Node.ReadThreads)
 //               )
@@ -106,13 +106,9 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
                }
                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;
                }
@@ -131,17 +127,15 @@ void VT_int_UpdateCursor( tVTerm *Term, int bShow )
  */
 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;
        
        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;
                // Re copy the entire screen?
                if(UpdateAll) {
                        VFS_WriteAt(
@@ -153,7 +147,7 @@ void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
                }
                // 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),
@@ -161,7 +155,7 @@ void VT_int_UpdateScreen( tVTerm *Term, int UpdateAll )
                                &buffer[ofs]
                                );
                }
-               break;
+               break; }
        case TERM_MODE_FB:
                break;
        }