From bc1ec5f01a20ddb019349623f22c5f81eca459a2 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Wed, 15 Oct 2008 18:03:34 +0000
Subject: [PATCH] 2008-10-15 20:03 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/debug/tbrwtext.prg     ! fixed
 vertical navigation to be compatible with old debugger       and Clipper    
 ! fixed horizontal scrolling to the size of maximal line       not to the
 size of current line     % use single call to hb_aTokens() to convert source
 code into array

---
 harbour/ChangeLog                 |  8 ++++
 harbour/source/debug/tbrwtext.prg | 68 +++++++++++++------------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d0a245c281..737d3430f3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-10-15 20:03 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/debug/tbrwtext.prg
+    ! fixed vertical navigation to be compatible with old debugger
+      and Clipper
+    ! fixed horizontal scrolling to the size of maximal line
+      not to the size of current line
+    % use single call to hb_aTokens() to convert source code into array
+
 2008-10-15 19:08 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/debug/dbgbrwsr.prg
     ! added missing #include "common.ch"
diff --git a/harbour/source/debug/tbrwtext.prg b/harbour/source/debug/tbrwtext.prg
index feeb97e92c..bd2d816fb5 100644
--- a/harbour/source/debug/tbrwtext.prg
+++ b/harbour/source/debug/tbrwtext.prg
@@ -70,6 +70,7 @@ CREATE CLASS HBBrwText
 
    VAR cCurLine
    VAR nLineOffset
+   VAR nMaxLineLen
 
    VAR nTop
    VAR nLeft
@@ -81,10 +82,10 @@ CREATE CLASS HBBrwText
 
    METHOD New( nTop, nLeft, nBottom, nRight, cFileName, cColors, lLineNumbers )
 
-   METHOD RefreshAll() INLINE ::oBrw:ForceStable(), ::oBrw:RefreshAll()
-   METHOD ForceStable() INLINE ::oBrw:ForceStable()
-   METHOD RefreshCurrent() INLINE ::oBrw:RefreshCurrent()
-   METHOD GotoLine( n ) INLINE ::oBrw:GoTop(), ::oBrw:MoveCursor( n - 1 ), ::RefreshAll()
+   METHOD RefreshAll() INLINE ::oBrw:ForceStable():RefreshAll(), Self
+   METHOD ForceStable() INLINE ::oBrw:ForceStable(), Self
+   METHOD RefreshCurrent() INLINE ::oBrw:RefreshCurrent(), Self
+   METHOD GotoLine( n )
    METHOD SetActiveLine( n )
    METHOD GetLine( n )
    METHOD ToggleBreakPoint( nRow, lSet )
@@ -99,15 +100,15 @@ CREATE CLASS HBBrwText
    METHOD Resize( nTop, nLeft, nBottom, nRight )
    METHOD GetLineColor()
 
-   METHOD Up() INLINE ::oBrw:Up(), ::oBrw:ForceStable()
-   METHOD Down() INLINE ::oBrw:Down(), ::oBrw:ForceStable()
-   METHOD PageUp() INLINE ::oBrw:PageUp(), ::oBrw:ForceStable()
-   METHOD PageDown() INLINE ::oBrw:PageDown(), ::oBrw:ForceStable()
-   METHOD GoTop() INLINE ::oBrw:GoTop(), ::oBrw:ForceStable()
-   METHOD GoBottom() INLINE ::oBrw:GoBottom(), ::oBrw:ForceStable()
+   METHOD Up() INLINE ::oBrw:Up():ForceStable(), Self
+   METHOD Down() INLINE ::oBrw:Down():ForceStable(), Self
+   METHOD PageUp() INLINE ::oBrw:PageUp():ForceStable(), Self
+   METHOD PageDown() INLINE ::oBrw:PageDown():ForceStable(), Self
+   METHOD GoTop() INLINE ::oBrw:GoTop():ForceStable(), Self
+   METHOD GoBottom() INLINE ::oBrw:GoBottom():ForceStable(), Self
 
-   METHOD Right() INLINE iif( ::nLineOffset < Len( ::aRows[ ::nRow ] ), ( ::nLineOffset++, ::RefreshAll() ), NIL )
-   METHOD Left() INLINE iif( ::nLineOffset > 1, ( ::nLineOffset--, ::RefreshAll() ), NIL )
+   METHOD Right() INLINE IIF( ::nLineOffset < ::nMaxLineLen, ( ::nLineOffset++, ::RefreshAll() ), ), Self
+   METHOD Left() INLINE IIF( ::nLineOffset > 1, ( ::nLineOffset--, ::RefreshAll() ), ), Self
 
    METHOD RowPos() INLINE ::nRow
 
@@ -149,6 +150,13 @@ METHOD New( nTop, nLeft, nBottom, nRight, cFileName, cColors, lLineNumbers ) CLA
 
    RETURN Self
 
+METHOD GotoLine( n ) CLASS HBBrwText
+
+   ::oBrw:MoveCursor( n - ::nRow )
+   ::RefreshAll()
+
+   RETURN Self
+
 METHOD SetActiveLine( n ) CLASS HBBrwText
 
    ::nActiveLine := n
@@ -179,12 +187,17 @@ METHOD ToggleBreakPoint( nRow, lSet) CLASS HBBrwText
 
 METHOD LoadFile( cFileName ) CLASS HBBrwText
 
+   LOCAL nMaxLineLen := 0
+   LOCAL cLine
+
    ::cFileName := cFileName
-
    ::aRows := Text2Array( MemoRead( cFileName ) )
-
    ::nRows := Len( ::aRows )
 
+   FOR EACH cLine in ::aRows
+      nMaxLineLen := Max( nMaxLineLen, Len( cLine ) )
+   NEXT
+   ::nMaxLineLen := nMaxLineLen
    ::nLineOffset := 1
 
    RETURN NIL
@@ -253,7 +266,7 @@ METHOD Search( cString, lCaseSensitive, nMode ) CLASS HBBrwText
    ENDCASE
 
    DO WHILE Eval( bMove ) != 0
-      IF cString $ iif( lCaseSensitive, ::cCurLine, Upper( ::cCurLine ) )
+      IF cString $ IIF( lCaseSensitive, ::cCurLine, Upper( ::cCurLine ) )
          lFound := .T.
          ::RefreshAll()
          EXIT
@@ -329,27 +342,4 @@ STATIC FUNCTION WhichEOL( cString )
 
 STATIC FUNCTION Text2Array( cString )
 
-   LOCAL cLine
-
-   LOCAL nTokNum := 1
-   LOCAL aArray  := {}
-
-   LOCAL cEOL    := WhichEOL( cString )
-   LOCAL nEOLLen := Len( cEOL )
-
-   LOCAL nRetLen := 0
-   LOCAL ncSLen  := Len( cString )
-
-   LOCAL nTokPos := 0
-
-   DO WHILE nRetLen < ncSLen
-
-      cLine := hb_TokenPtr(@cString, @nTokPos, cEOL )
-
-      nRetLen += Len( cLine ) + nEOLLen
-
-      AAdd( aArray, cLine )
-
-   ENDDO
-
-   RETURN aArray
+   RETURN hb_aTokens( cString, WhichEOL( cString ) )