fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-02-02 17:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* doc/cmpopt.txt
    ! Fixed missing SVN keyword.
      [Przemek was faster]

  * source/rtl/perfuncs.prg
  * source/rtl/menuto.prg
  * source/rtl/getlist.prg
  * source/rtl/readvar.prg
  * source/rtl/thfuncx.prg
  * source/rtl/text.prg
    * Renamed THREAD STATIC vars to t_* (from s_*).
This commit is contained in:
Viktor Szakats
2009-02-02 16:32:36 +00:00
parent aa8d8e73af
commit d13af773dd
7 changed files with 76 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
harbour/ChangeLog
View File

@@ -8,6 +8,18 @@
2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-02 17:25 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* doc/cmpopt.txt
! Fixed missing SVN keyword.
* source/rtl/perfuncs.prg
* source/rtl/menuto.prg
* source/rtl/getlist.prg
* source/rtl/readvar.prg
* source/rtl/thfuncx.prg
* source/rtl/text.prg
* Renamed THREAD STATIC vars to t_* (from s_*).
2009-02-02 17:34 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/doc/cmpopt.txt
* svn ps svn:keywords "Author Date Id Revision"

20
harbour/source/rtl/getlist.prg
View File

@@ -52,18 +52,18 @@
/* NOTE: Harbour internal function to set and get the active GetList */
THREAD STATIC s_oGetListActive
THREAD STATIC t_oGetListActive
PROCEDURE __GetListSetActive( oGetList )
IF s_oGetListActive != NIL
s_oGetListActive:HasFocus := .F.
IF t_oGetListActive != NIL
t_oGetListActive:HasFocus := .F.
ENDIF
s_oGetListActive := oGetList
t_oGetListActive := oGetList
IF s_oGetListActive != NIL
s_oGetListActive:HasFocus := .T.
IF t_oGetListActive != NIL
t_oGetListActive:HasFocus := .T.
ENDIF
RETURN
@@ -71,13 +71,13 @@ PROCEDURE __GetListSetActive( oGetList )
/* NOTE: Using a separate function for maximum speed */
FUNCTION __GetListActive()
RETURN s_oGetListActive
RETURN t_oGetListActive
FUNCTION __GetListLast( oGetListLast )
THREAD STATIC s_oGetListLast
THREAD STATIC t_oGetListLast
IF oGetListLast != NIL
s_oGetListLast := oGetListLast
t_oGetListLast := oGetListLast
ENDIF
RETURN s_oGetListLast
RETURN t_oGetListLast

50
harbour/source/rtl/menuto.prg
View File

@@ -21,22 +21,22 @@
#xtranslate COLORARRAY( <x> ) => &( '{"' + StrTran( <x>, ',', '","' ) + '"}' )
THREAD STATIC s_aLevel := {}
THREAD STATIC s_nPointer := 1
THREAD STATIC t_aLevel := {}
THREAD STATIC t_nPointer := 1
FUNCTION __AtPrompt( nRow, nCol, cPrompt, cMsg, cColor )
IF s_nPointer < 1
s_nPointer := 1
IF t_nPointer < 1
t_nPointer := 1
ENDIF
// add the current level empty array.
DO WHILE Len( s_aLevel ) < s_nPointer
AAdd( s_aLevel, {} )
DO WHILE Len( t_aLevel ) < t_nPointer
AAdd( t_aLevel, {} )
ENDDO
// add to the static array
AAdd( s_aLevel[ s_nPointer ], { nRow, nCol, cPrompt, cMsg, cColor } )
AAdd( t_aLevel[ t_nPointer ], { nRow, nCol, cPrompt, cMsg, cColor } )
// put this prompt on the screen right now
DispOutAt( nRow, nCol, cPrompt, cColor )
@@ -79,16 +79,16 @@ FUNCTION __MenuTo( bBlock, cVariable )
// if no prompts were defined, exit with 0
IF s_nPointer < 1 .OR. s_nPointer > Len( s_aLevel )
IF t_nPointer < 1 .OR. t_nPointer > Len( t_aLevel )
n := 0
ELSE
s_nPointer ++
nPointer := s_nPointer
t_nPointer ++
nPointer := t_nPointer
nArrLen := Len( s_aLevel[ nPointer - 1 ] )
nArrLen := Len( t_aLevel[ nPointer - 1 ] )
// put choice in a valid range
@@ -120,7 +120,7 @@ FUNCTION __MenuTo( bBlock, cVariable )
DispOutAt( nMsgRow, nMsgCol, Space( Len( xMsg ) ) )
ENDIF
xMsg := s_aLevel[ nPointer - 1, n, 4 ]
xMsg := t_aLevel[ nPointer - 1, n, 4 ]
// Code Block messages ( yes, they are documented! )
IF ISBLOCK( xMsg )
@@ -142,8 +142,8 @@ FUNCTION __MenuTo( bBlock, cVariable )
// save the current row
q := n
IF s_aLevel[ s_nPointer - 1, n, 5 ] != NIL
aColor := COLORARRAY( s_aLevel[ s_nPointer - 1, n, 5 ] )
IF t_aLevel[ t_nPointer - 1, n, 5 ] != NIL
aColor := COLORARRAY( t_aLevel[ t_nPointer - 1, n, 5 ] )
cFrontColor := iif( Empty( aColor[ 1 ] ), NIL, aColor[ 1 ] )
cBackColor := iif( Len( aColor ) > 1, aColor[ 2 ], NIL )
ENDIF
@@ -155,9 +155,9 @@ FUNCTION __MenuTo( bBlock, cVariable )
ENDIF
// highlight the prompt
DispOutAt( s_aLevel[ nPointer - 1, n, 1 ],;
s_aLevel[ nPointer - 1, n, 2 ],;
s_aLevel[ nPointer - 1, n, 3 ],;
DispOutAt( t_aLevel[ nPointer - 1, n, 1 ],;
t_aLevel[ nPointer - 1, n, 2 ],;
t_aLevel[ nPointer - 1, n, 3 ],;
cBackColor )
IF Set( _SET_INTENSITY )
@@ -200,7 +200,7 @@ FUNCTION __MenuTo( bBlock, cVariable )
EXIT
CASE K_LBUTTONDOWN
CASE K_LDBLCLK
IF ( nMouseClik := HitTest( s_aLevel[ nPointer - 1 ], ;
IF ( nMouseClik := HitTest( t_aLevel[ nPointer - 1 ], ;
MRow(), MCol() ) ) > 0
n := nMouseClik
ENDIF
@@ -238,7 +238,7 @@ FUNCTION __MenuTo( bBlock, cVariable )
OTHERWISE
// did user hit a hot key?
FOR y := 1 TO nArrLen
IF Upper( Left( LTrim( s_aLevel[ nPointer - 1, y, 3 ] ), 1 ) ) == Upper( Chr( nKey ) )
IF Upper( Left( LTrim( t_aLevel[ nPointer - 1, y, 3 ] ), 1 ) ) == Upper( Chr( nKey ) )
n := y
lExit := .T.
EXIT
@@ -247,9 +247,9 @@ FUNCTION __MenuTo( bBlock, cVariable )
ENDSWITCH
IF n != 0
DispOutAt( s_aLevel[ nPointer - 1, q, 1 ],;
s_aLevel[ nPointer - 1, q, 2 ],;
s_aLevel[ nPointer - 1, q, 3 ],;
DispOutAt( t_aLevel[ nPointer - 1, q, 1 ],;
t_aLevel[ nPointer - 1, q, 2 ],;
t_aLevel[ nPointer - 1, q, 3 ],;
cFrontColor )
ENDIF
@@ -258,9 +258,9 @@ FUNCTION __MenuTo( bBlock, cVariable )
ReadVar( cSaveReadVar )
SetCursor( nSaveCursor )
s_nPointer := nPointer
s_nPointer --
ASize( s_aLevel, s_nPointer - 1 )
t_nPointer := nPointer
t_nPointer --
ASize( t_aLevel, t_nPointer - 1 )
ENDIF

20
harbour/source/rtl/perfuncs.prg
View File

@@ -50,15 +50,15 @@
*
*/
THREAD STATIC s_aObjects
THREAD STATIC t_aObjects
FUNCTION hb_SetObject( oSelf, bConstructor )
IF s_aObjects == NIL
s_aObjects := {}
AAdd( s_aObjects, oSelf )
IF t_aObjects == NIL
t_aObjects := {}
AAdd( t_aObjects, oSelf )
ELSE
AAdd( s_aObjects, oSelf := Eval( bConstructor ) )
AAdd( t_aObjects, oSelf := Eval( bConstructor ) )
ENDIF
RETURN oSelf
@@ -67,12 +67,12 @@ FUNCTION hb_EndObject()
LOCAL oSelf
IF Len( s_aObjects ) > 1
ASize( s_aObjects, Len( s_aObjects ) - 1 )
oSelf := ATail( s_aObjects )
IF Len( t_aObjects ) > 1
ASize( t_aObjects, Len( t_aObjects ) - 1 )
oSelf := ATail( t_aObjects )
ELSE
oSelf := s_aObjects[ 1 ]
s_aObjects := NIL
oSelf := t_aObjects[ 1 ]
t_aObjects := NIL
ENDIF
RETURN oSelf

6
harbour/source/rtl/readvar.prg
View File

@@ -53,7 +53,7 @@
#include "common.ch"
FUNCTION ReadVar( cVarName )
THREAD STATIC s_cVarName := ""
THREAD STATIC t_cVarName := ""
LOCAL cOldVarName
LOCAL oGetList
@@ -62,10 +62,10 @@ FUNCTION ReadVar( cVarName )
RETURN oGetList:ReadVar( cVarName )
ENDIF
cOldVarName := s_cVarName
cOldVarName := t_cVarName
IF ISCHARACTER( cVarName )
s_cVarName := cVarName
t_cVarName := cVarName
ENDIF
RETURN cOldVarName

26
harbour/source/rtl/text.prg
View File

@@ -50,31 +50,31 @@
*
*/
THREAD STATIC s_cFile
THREAD STATIC s_lOldPrinter
THREAD STATIC s_lOldExtra
THREAD STATIC s_cOldExtraFile
THREAD STATIC t_cFile
THREAD STATIC t_lOldPrinter
THREAD STATIC t_lOldExtra
THREAD STATIC t_cOldExtraFile
PROCEDURE __TextSave( cFile )
s_cFile := cFile
t_cFile := cFile
IF s_cFile == "PRINTER"
s_lOldPrinter := Set( _SET_PRINTER, .T. )
IF t_cFile == "PRINTER"
t_lOldPrinter := Set( _SET_PRINTER, .T. )
ELSE
s_lOldExtra := Set( _SET_EXTRA, .T. )
s_cOldExtraFile := Set( _SET_EXTRAFILE, cFile )
t_lOldExtra := Set( _SET_EXTRA, .T. )
t_cOldExtraFile := Set( _SET_EXTRAFILE, cFile )
ENDIF
RETURN
PROCEDURE __TextRestore()
IF s_cFile == "PRINTER"
Set( _SET_PRINTER, s_lOldPrinter )
IF t_cFile == "PRINTER"
Set( _SET_PRINTER, t_lOldPrinter )
ELSE
Set( _SET_EXTRAFILE, s_cOldExtraFile )
Set( _SET_EXTRA, s_lOldExtra )
Set( _SET_EXTRAFILE, t_cOldExtraFile )
Set( _SET_EXTRA, t_lOldExtra )
ENDIF
RETURN

6
harbour/source/rtl/thfuncx.prg
View File

@@ -59,11 +59,11 @@ FUNCTION ThreadID()
FUNCTION ThreadObject( oThread )
THREAD STATIC s_oThread
THREAD STATIC t_oThread
IF PCount() > 0
s_oThread := oThread
t_oThread := oThread
ENDIF
RETURN s_oThread
RETURN t_oThread
FUNCTION ThreadWait( aThreads, nTimeOut )