From 25f48aa426a5e7dea5eef2943b70cfc3bb5be0be Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 13 Jan 2010 17:14:01 +0000 Subject: [PATCH] 2010-01-13 18:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/tget.prg ! Fixed cursor positioning bug, when @S picture length is higher than actual edit buffer length. Thanks to Stupar for report. [TOMERGE 2.0] * contrib/hbnetio/utils/netiosrv.prg * Minor. --- harbour/ChangeLog | 16 +++++++++++++--- harbour/contrib/hbnetio/utils/netiosrv.prg | 2 +- harbour/src/rtl/tget.prg | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7752f543ef..e09ea0e56c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,18 +17,28 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-01-13 18:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/tget.prg + ! Fixed cursor positioning bug, when @S picture length is + higher than actual edit buffer length. + Thanks to Stupar for report. + [TOMERGE 2.0] + + * contrib/hbnetio/utils/netiosrv.prg + * Minor. + 2010-01-13 08:53 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.prg * contrib/hbide/ideeditor.prg * contrib/hbide/idemisc.prg * contrib/hbide/ideobject.prg ! Code cleanup. - ! Started preparations for line nos dispaly commented out with + ! Started preparations for line nos dispaly commented out with #if 0/#endif construct. * contrib/hbqt/hbqt_hbslots.cpp - ! Fixed to initialize the C to PRG calling block with correct - parameters number. + ! Fixed to initialize the C to PRG calling block with correct + parameters number. 2010-01-13 17:12 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/Makefile diff --git a/harbour/contrib/hbnetio/utils/netiosrv.prg b/harbour/contrib/hbnetio/utils/netiosrv.prg index 3a55e389eb..eb6b67df97 100644 --- a/harbour/contrib/hbnetio/utils/netiosrv.prg +++ b/harbour/contrib/hbnetio/utils/netiosrv.prg @@ -144,7 +144,7 @@ PROCEDURE Main( ... ) CASE Lower( cCommand ) == "config" ShowConfig( netiosrv ) CASE Lower( cCommand ) == "help" - OutStd( "config - Show server config", hb_osNewLine() ) + OutStd( "config - Show server configuration", hb_osNewLine() ) OutStd( "quit - Stop server and exit", hb_osNewLine() ) CASE ! Empty( cCommand ) OutStd( "Error: Unknown command.", hb_osNewLine() ) diff --git a/harbour/src/rtl/tget.prg b/harbour/src/rtl/tget.prg index 6bff79ab25..3b012a5c2d 100644 --- a/harbour/src/rtl/tget.prg +++ b/harbour/src/rtl/tget.prg @@ -332,16 +332,16 @@ METHOD display() CLASS GET hb_ColorIndex( ::cColorSpec, iif( ::hasFocus, GET_CLR_ENHANCED, GET_CLR_UNSELECTED ) ) ) nRowPos := ::nRow - nColPos := ::nCol + ::nDispLen + nColPos := ::nCol + Min( ::nDispLen, Len( cBuffer ) ) IF Set( _SET_DELIMITERS ) .AND. !::hasFocus #ifdef HB_COMPAT_C53 hb_dispOutAt( ::nRow, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) - hb_dispOutAt( ::nRow, ::nCol + ::nDispLen, SubStr( Set( _SET_DELIMCHARS ), 2, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) + hb_dispOutAt( ::nRow, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ), hb_ColorIndex( ::cColorSpec, GET_CLR_UNSELECTED ) ) #else /* NOTE: C5.2 will use the default color. We're replicating this here. [vszakats] */ hb_dispOutAt( ::nRow, ::nCol - 1, SubStr( Set( _SET_DELIMCHARS ), 1, 1 ) ) - hb_dispOutAt( ::nRow, ::nCol + ::nDispLen, SubStr( Set( _SET_DELIMCHARS ), 2, 1 ) ) + hb_dispOutAt( ::nRow, nColPos , SubStr( Set( _SET_DELIMCHARS ), 2, 1 ) ) #endif ++nColPos ENDIF