From 054e74dcb7573d594f4d6f1aa7f6dc340ea0329d Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Thu, 26 Jul 2001 18:35:44 +0000
Subject: [PATCH] See ChangeLog entry 2001-07-26 14:35 UTC-0400 David G. Holm
 <dholm@jsd-llc.com>

---
 harbour/ChangeLog                |  5 +++++
 harbour/source/rtl/gtsln/gtsln.c | 34 ++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a628e861bc..9bf9b0af2f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-26 14:35 UTC-0400 David G. Holm <dholm@jsd-llc.com>
+
+  * source/rtl/gtsln/gtsln.c
+    * Fixes by Marek Paliwoda <paliwoda@inetia.pl> 
+
 2001-07-26 14:30 GMT Dave Pearson <davep@davep.org>
    * source/rtl/profiler.prg
       * Resorted Antonio's profile reporter due to copyright concerns.
diff --git a/harbour/source/rtl/gtsln/gtsln.c b/harbour/source/rtl/gtsln/gtsln.c
index 6671fc2a9c..30b865ba7d 100644
--- a/harbour/source/rtl/gtsln/gtsln.c
+++ b/harbour/source/rtl/gtsln/gtsln.c
@@ -60,12 +60,13 @@
    #include <slang.h>
 #endif
 
+/* missing defines in previous versions of Slang - this can not work ! */
+#if SLANG_VERSION < 10400
    typedef unsigned short SLsmg_Char_Type;
    #define SLSMG_EXTRACT_CHAR( x ) ( ( x ) & 0xFF )
    #define SLSMG_EXTRACT_COLOR( x ) ( ( ( x ) >> 8 ) & 0xFF )
    #define SLSMG_BUILD_CHAR( ch, color ) ( ( ( SLsmg_Char_Type ) ( unsigned char )( ch ) ) | ( ( color ) << 8 ) )
 
-/* missing defines in previous versions of Slang - this can not work ! */
 #if SLANG_VERSION < 10308
    #define SLSMG_DIAMOND_CHAR	0x04
    #define SLSMG_DEGREE_CHAR	0xF8
@@ -82,6 +83,7 @@
    #define SLSMG_BLOCK_CHAR     '0'
    */
 #endif
+#endif
 
 #include <unistd.h>
 #include <signal.h>
@@ -100,7 +102,7 @@
 extern unsigned char s_convKDeadKeys[];
 extern int hb_gt_Init_Terminal( int phase );
 
-/* to convert characters desplayed */
+/* to convert characters displayed */
 static void hb_gt_build_conv_tabs();
 
 /* extern int _SLsnprintf (char *, unsigned int, char *, ...); */
@@ -329,7 +331,7 @@ void hb_gt_SetPos( SHORT iRow, SHORT iCol, SHORT iMethod )
    HB_SYMBOL_UNUSED( iMethod );
 
    SLsmg_gotorc( iRow, iCol );
-   /* SLtt_goto_rc( iRow, iCol ); */ /* ??? */
+   /* SLtt_goto_rc( iRow, iCol ); */
 
    if( s_uiDispCount == 0 )
       SLsmg_refresh();
@@ -458,11 +460,12 @@ void hb_gt_SetCursorStyle( USHORT uiStyle )
          }
 
          SLtt_write_string( cursDefseq );
-
-         if( s_uiDispCount == 0 )
-            SLsmg_refresh();
       }
 #endif
+
+      if( s_uiDispCount == 0 )
+         /* SLsmg_refresh(); */
+         SLtt_flush_output();
    }
 }
 
@@ -538,7 +541,8 @@ void hb_gt_Puts( USHORT uiRow, USHORT uiCol, BYTE byAttr, BYTE * pbyStr, ULONG u
    if( ulLen > 0 )
       SLsmg_write_raw( pScr, ulLen );
 
-   hb_gt_SetPos( uiRow, uiCol + ulLen, HB_GT_SET_POS_AFTER );
+   /* NOTE : enable this if problems with cursor positioning occur */
+   /* hb_gt_SetPos( uiRow, uiCol + ulLen, HB_GT_SET_POS_AFTER ); */
 
    hb_xfree( ( BYTE * )pScr );
 }
@@ -650,6 +654,9 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight,
          iColSize += iCols;
       }
 
+      /* this is probably not compatible with Clipper */
+      hb_gt_DispBegin();
+      
       hb_gtGetPos( &usSaveRow, &usSaveCol );
 
       for( iCount = ( iRows >= 0 ? usTop : usBottom );
@@ -673,11 +680,11 @@ void hb_gt_Scroll( USHORT usTop, USHORT usLeft, USHORT usBottom, USHORT usRight,
       hb_xfree( fpBlank );
       hb_xfree( fpBuff );
 
-      hb_gtSetPos( usSaveRow, usSaveCol );
-/*
-      if( s_uiDispCount == 0 )
-         SLsmg_refresh();
-*/
+      /* hb_gtSetPos( usSaveRow, usSaveCol ); */
+      SLsmg_gotorc( usSaveRow, usSaveCol );
+
+      /* this is probably not compatible with Clipper */
+      hb_gt_DispEnd();
    }
 }
 
@@ -918,7 +925,8 @@ USHORT hb_gt_Box( USHORT uiTop, USHORT uiLeft, USHORT uiBottom, USHORT uiRight,
       hb_gt_xPutch( uiBottom, uiRight, byAttr, szBox[ 4 ] ); /* Bottom right corner */
    }
 
-   SLsmg_gotorc( uiTop + 1, uiLeft + 1 );
+   /* NOTE : enable this if problems with cursor positioning occur */
+   /* SLsmg_gotorc( uiTop + 1, uiLeft + 1 ); */
 
    hb_gt_DispEnd();