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

2012-10-01 22:23 UTC+0200 Viktor Szakats (harbour syenar.net)

Browse Source 
* include/box.ch
  * include/button.ch
    + added Unicode compatible macros for drawing strings

  * contrib/hbmisc/hbedit.prg
  * contrib/hbmisc/stringp.prg
  * contrib/hbmisc/twirler.prg
  * contrib/hbmisc/hbmisc.hbx
    * formatted using hbformat and manually
    * DEFAULT() made STATIC. It was colliding with xhb
      after latest changes. INCOMPATIBLE. Use HB_DEFAULT()
      instead.
    ! DEFAULT() fixed using != on strings
This commit is contained in:
Viktor Szakats
2012-10-01 20:24:50 +00:00
parent 105cdb0721
commit 450a2e891e
7 changed files with 270 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -16,6 +16,21 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-10-01 22:23 UTC+0200 Viktor Szakats (harbour syenar.net)
* include/box.ch
* include/button.ch
+ added Unicode compatible macros for drawing strings
* contrib/hbmisc/hbedit.prg
* contrib/hbmisc/stringp.prg
* contrib/hbmisc/twirler.prg
* contrib/hbmisc/hbmisc.hbx
* formatted using hbformat and manually
* DEFAULT() made STATIC. It was colliding with xhb
after latest changes. INCOMPATIBLE. Use HB_DEFAULT()
instead.
! DEFAULT() fixed using != on strings
2012-10-01 19:39 UTC+0200 Viktor Szakats (harbour syenar.net)
* src/rtl/Makefile
- src/rtl/cdpbox.prg

220
harbour/contrib/hbmisc/hbedit.prg
View File

@@ -8,7 +8,7 @@
#include "box.ch"
#define IIFNIL( isnil, notnil ) iif(notnil==NIL, isnil, notnil)
#define IIFNIL( isnil, notnil ) iif( notnil == NIL, isnil, notnil )
#define EDIT_LOWER 0 // convert to lowercase
#define EDIT_UPPER 1 // convert to uppercase
@@ -38,10 +38,6 @@
STATIC s_nESize := 4096 // default buffer size
//
**
//
//---------------------------------------------------------
//03-06-93 07:52pm
//
@@ -58,27 +54,29 @@ STATIC s_nESize := 4096 // default buffer size
// will be displayed with 'text in bold' highlighted using the second
// color specified by 'cColor' parameter
//
FUNCTION EditorNew( nTop, nLeft, nBottom, nRight, nLength, ;
cFrame, cTitle, cColor, nSize, nEscape )
cFrame, cTitle, cColor, nSize, nEscape )
LOCAL pEdit, oEdit
IF ! HB_ISNUMERIC( nLength )
nLength := 80
ENDIF
pEdit := ED_New( nLength, 4, IIFNIL(s_nESize, nSize), nEscape )
pEdit := ED_New( nLength, 4, IIFNIL( s_nESize, nSize ), nEscape )
IF ! Empty( pEdit )
oEdit := ARRAY( E_STRUCT_LEN )
oEdit[E_EDIT] := pEdit
oEdit[E_TOP] := nTop
oEdit[E_LEFT] := nLeft
oEdit[E_BOTTOM] := nBottom
oEdit[E_RIGHT] := nRight
oEdit[E_LINELEN] := nLength
oEdit[E_FRAME] := IIFNIL( B_DOUBLE, cFrame )
oEdit[E_TITLE] := cTitle
oEdit[E_COLOR] := IIFNIL( "W/N,W+/N,W+/R,GR+/N,G+/N", cColor )
oEdit[E_MODE] := EDIT_VIEW
oEdit := Array( E_STRUCT_LEN )
oEdit[ E_EDIT ] := pEdit
oEdit[ E_TOP ] := nTop
oEdit[ E_LEFT ] := nLeft
oEdit[ E_BOTTOM ] := nBottom
oEdit[ E_RIGHT ] := nRight
oEdit[ E_LINELEN ] := nLength
oEdit[ E_FRAME ] := IIFNIL( B_DOUBLE, cFrame )
oEdit[ E_TITLE ] := cTitle
oEdit[ E_COLOR ] := IIFNIL( "W/N,W+/N,W+/R,GR+/N,G+/N", cColor )
oEdit[ E_MODE ] := EDIT_VIEW
ED_Config( pEdit, nTop, nLeft, nBottom, nRight, 0, 0 )
ENDIF
@@ -88,20 +86,23 @@ FUNCTION EditorNew( nTop, nLeft, nBottom, nRight, nLength, ;
//---------------------------------------------------------
//03-06-93 09:16pm
//
PROCEDURE EditorKill( oEdit )
oEdit[E_EDIT] := NIL
oEdit[ E_EDIT ] := NIL
RETURN
//---------------------------------------------------------
//03-06-93 10:20pm
//
FUNCTION EditorCargo( oEdit, xCargo )
LOCAL _xCargo:=oEdit[E_CARGO]
LOCAL _xCargo := oEdit[ E_CARGO ]
IF PCount() >= 2
oEdit[E_CARGO] := xCargo
oEdit[ E_CARGO ] := xCargo
ENDIF
RETURN _xCargo
@@ -109,7 +110,9 @@ FUNCTION EditorCargo( oEdit, xCargo )
//---------------------------------------------------------
//19-07-93 01:08am
//
FUNCTION EditorTitle( oEdit, cTitle )
LOCAL _cTitle := oEdit[ E_TITLE ]
IF HB_ISSTRING( cTitle )
@@ -125,7 +128,9 @@ FUNCTION EditorTitle( oEdit, cTitle )
// EDIT_EDIT - full edit mode
// EDIT_VIEW - view only mode (no changes in text are allowed)
//
FUNCTION EditorMode( oEdit, lMode )
LOCAL _lMode := oEdit[ E_MODE ]
IF HB_ISLOGICAL( lMode )
@@ -137,7 +142,9 @@ FUNCTION EditorMode( oEdit, lMode )
//---------------------------------------------------------
//28-05-92 09:31am
//
FUNCTION EditorSize( nSize )
LOCAL _nSize := s_nESize
IF nSize != NIL
@@ -151,6 +158,7 @@ FUNCTION EditorSize( nSize )
//
// Appends passed text to the text already stored in editor
//
PROCEDURE EditorAddText( oEdit, cText )
ED_AddText( oEdit[ E_EDIT ], cText )
@@ -162,6 +170,7 @@ PROCEDURE EditorAddText( oEdit, cText )
//
// Sets new text in editor
//
PROCEDURE EditorSetText( oEdit, cText )
ED_SetText( oEdit[ E_EDIT ], cText )
@@ -173,8 +182,10 @@ PROCEDURE EditorSetText( oEdit, cText )
//
// Inserts passed text into editor starting from passed line number
//
PROCEDURE EditorInsText( oEdit, cText, nLine )
LOCAL nNum := IIFNIL( ED_LCount(oEdit[E_EDIT]), nLine )
LOCAL nNum := IIFNIL( ED_LCount( oEdit[ E_EDIT ] ), nLine )
ED_InsText( oEdit[ E_EDIT ], cText, nNum )
@@ -187,31 +198,34 @@ PROCEDURE EditorInsText( oEdit, cText, nLine )
// nCarret - specifies if soft carriage return (141/10) should be replaced by
// hard carriage returns (13/10)
//
FUNCTION EditorGetText( oEdit, nCarret )
IF ! HB_ISNUMERIC( nCarret )
nCarret := EDIT_HARD
ENDIF
RETURN ED_GetText( oEdit[E_EDIT], nCarret )
RETURN ED_GetText( oEdit[ E_EDIT ], nCarret )
//---------------------------------------------------------
//04-03-92 02:35pm
//
// Returns the line count stored in editor
//
FUNCTION EditorLCount( oEdit )
RETURN ED_LCount( oEdit[E_EDIT] )
RETURN ED_LCount( oEdit[ E_EDIT ] )
//---------------------------------------------------------
//06-03-92 07:09pm
//
// Returns the specified line of text from the editor
//
FUNCTION EditorGetLine( oEdit, nLine )
RETURN ED_GetLine( oEdit[E_EDIT], nLine )
RETURN ED_GetLine( oEdit[ E_EDIT ], nLine )
//---------------------------------------------------------
//06-03-92 07:10pm
@@ -219,15 +233,16 @@ FUNCTION EditorGetLine( oEdit, nLine )
// Returns the next line of text
//
// It can be used:
// nLCount :=EditorLCount( oEdit )
// cLine :=EditorGetLine( oEdit, 1 )
// FOR i:=2 TO nLCount
// cLine :=EditorNextLine( oEdit )
// nLCount := EditorLCount( oEdit )
// cLine := EditorGetLine( oEdit, 1 )
// FOR i := 2 TO nLCount
// cLine := EditorNextLine( oEdit )
// NEXT
//
FUNCTION EditorNextLine( oEdit )
RETURN ED_GetNext(oEdit[E_EDIT])
RETURN ED_GetNext( oEdit[ E_EDIT ] )
//---------------------------------------------------------
//03-06-93 10:11pm
@@ -243,8 +258,10 @@ FUNCTION EditorNextLine( oEdit )
// nEscape - the code of color escape character
// lSave - specifies if edited file can be saved under a different name
//
FUNCTION EditorFile( xInput, cOutput, nLineLen, ;
lConv, nEscape, lSave )
lConv, nEscape, lSave )
LOCAL nHandle, nLen, oEdit, lSaved, lClose := .F.
LOCAL nSize
@@ -252,28 +269,28 @@ FUNCTION EditorFile( xInput, cOutput, nLineLen, ;
lSave := .T.
ENDIF
IF HB_ISSTRING(xInput)
nHandle := FOPEN( xInput )
IF HB_ISSTRING( xInput )
nHandle := FOpen( xInput )
lClose := .T.
ELSE
nHandle := xInput
ENDIF
IF nHandle > 0
nLen := MAX( FileLength( nHandle ), s_nESize )
nLen := Max( FileLength( nHandle ), s_nESize )
ELSE
nLen := s_nESize
ENDIF
nSize := iif( nLen < 8192, nLen*2, INT(nLen*1.5) )
oEdit := EditorNew( 01,00,23,79, nLineLen, "--- ", cOutput, , ;
nSize, nEscape )
nSize := iif( nLen < 8192, nLen * 2, Int( nLen * 1.5 ) )
oEdit := EditorNew( 01, 00, 23, 79, nLineLen, "--- ", cOutput, , ;
nSize, nEscape )
IF nHandle > 0
ED_ReadText( oEdit[E_EDIT], nHandle, 0, nLen, ;
iif( lConv==NIL, .F., lConv ) )
ED_ReadText( oEdit[ E_EDIT ], nHandle, 0, nLen, ;
iif( lConv == NIL, .F., lConv ) )
IF lClose
FCLOSE( nHandle )
FClose( nHandle )
ENDIF
ELSE
EditorSetText( oEdit, " " )
@@ -298,10 +315,11 @@ FUNCTION EditorFile( xInput, cOutput, nLineLen, ;
// lConv - specifies if some unprintable characters should be converted
// (NOTE: it was used to allow display charcters with ASCII code 27 and 26)
//
FUNCTION EditorRead( oEditor, nHandle, nOffset, nLen, lConv )
RETURN ED_ReadText( oEditor[E_EDIT], nHandle, nOffset, nLen, ;
iif( lConv==NIL, .T., lConv ) )
RETURN ED_ReadText( oEditor[ E_EDIT ], nHandle, nOffset, nLen, ;
iif( lConv == NIL, .T., lConv ) )
//---------------------------------------------------------
//03-06-93 08:31pm
@@ -313,25 +331,27 @@ FUNCTION EditorRead( oEditor, nHandle, nOffset, nLen, lConv )
// lFrame - specifies if the frame around the editor should be displayed
// nHelp - the help index into help subsystem
//
FUNCTION EditorEdit( oEdit, lEdit, lFrame )
LOCAL nRow, nCol := 0, nKey, bKey, oBox, nCursor, nState
LOCAL nTop, nLeft, nBottom, nRight
LOCAL lSaveAllowed, lSaved := .F.
oBox := SAVEBOX( oEdit[E_TOP], oEdit[E_LEFT], ;
oEdit[E_BOTTOM], oEdit[E_RIGHT], ;
oEdit[E_COLOR], oEdit[E_FRAME] )
oBox := SAVEBOX( oEdit[ E_TOP ], oEdit[ E_LEFT ], ;
oEdit[ E_BOTTOM ], oEdit[ E_RIGHT ], ;
oEdit[ E_COLOR ], oEdit[ E_FRAME ] )
oEdit[E_INSERT] := SET( _SET_INSERT )
// SayInsert()
nCursor := SetCursor( iif(oEdit[E_INSERT], SC_NORMAL, SC_SPECIAL1) )
oEdit[ E_INSERT ] := Set( _SET_INSERT )
// SayInsert()
nCursor := SetCursor( iif( oEdit[ E_INSERT ], SC_NORMAL, SC_SPECIAL1 ) )
IF HB_ISLOGICAL( lEdit )
oEdit[E_MODE] := lEdit
oEdit[ E_MODE ] := lEdit
ENDIF
lSaveAllowed :=( SETKEY(K_F2) == NIL )
// IF lSaveAllowed
// DisplayHelp( 73 ) //F2-save
// ENDIF
lSaveAllowed := ( SetKey( K_F2 ) == NIL )
// IF lSaveAllowed
// DisplayHelp( 73 ) // F2-save
// ENDIF
nTop := oEdit[ E_TOP ] + 1
nLeft := oEdit[ E_LEFT ] + 1
@@ -348,7 +368,7 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame )
then it sets current position of editor.
It also sets the current editor as the working one. This means that
all next ED_* functions will used the editor handle specified
by oEditor[E_EDIT] - it is tricky solution to speed access (we
by oEditor[ E_EDIT ] - it is tricky solution to speed access (we
don't need to pass the editor handle with every ED_*() call
(Well... this editor was created when AT-286 computers worked in
its full glory :)
@@ -361,21 +381,21 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame )
IF nRow != ED_Row( oEdit[ E_EDIT ] )
nRow := ED_Row( oEdit[ E_EDIT ] )
@ oEdit[ E_TOP ], nState SAY STRZERO( nRow, 4 )
@ oEdit[ E_TOP ], nState SAY StrZero( nRow, 4 )
ENDIF
IF nCol != ED_Col( oEdit[ E_EDIT ] )
nCol := ED_Col( oEdit[ E_EDIT ] )
@ oEdit[ E_TOP ], nState + 5 SAY STRZERO( nCol, 3 )
@ oEdit[ E_TOP ], nState + 5 SAY StrZero( nCol, 3 )
ENDIF
SETPOS( nTop + ED_WinRow( oEdit[ E_EDIT ] ), nLeft + ED_WinCol( oEdit[ E_EDIT ] ) )
SetPos( nTop + ED_WinRow( oEdit[ E_EDIT ] ), nLeft + ED_WinCol( oEdit[ E_EDIT ] ) )
// nKey := WaitForKey()
nKey := INKEY( 0 )
// nKey := WaitForKey()
nKey := Inkey( 0 )
DO CASE
CASE nKey >= 32 .AND. nKey < 256
IF oEdit[ E_MODE ]
ED_PutChar( oEdit[ E_EDIT ], nKey, oEdit[E_INSERT] )
ED_PutChar( oEdit[ E_EDIT ], nKey, oEdit[ E_INSERT ] )
ENDIF
CASE nKey == K_F2 .AND. lSaveAllowed
@@ -385,23 +405,23 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame )
CASE nKey == K_DOWN
IF ! ED_Down( oEdit[ E_EDIT ] )
SCROLL( nTop, nLeft, nBottom, nRight, 1 )
Scroll( nTop, nLeft, nBottom, nRight, 1 )
ENDIF
CASE nKey == K_UP
IF ! ED_Up( oEdit[ E_EDIT ] )
SCROLL( nTop, nLeft, nBottom, nRight, -1 )
Scroll( nTop, nLeft, nBottom, nRight, - 1 )
ENDIF
CASE nKey == K_ESC
EXIT
OTHERWISE
bKey := SETKEY( nKey )
bKey := SetKey( nKey )
IF HB_ISBLOCK( bKey )
EVAL( bKey, oEdit )
Eval( bKey, oEdit )
ELSE
IF oEdit[E_MODE]
IF oEdit[ E_MODE ]
EditorKeys( oEdit, nKey )
ENDIF
ENDIF
@@ -410,19 +430,20 @@ FUNCTION EditorEdit( oEdit, lEdit, lFrame )
SetCursor( nCursor )
RESTBOX( oBox )
// HELPREST.
// HELPREST.
RETURN lSaved
//
**
//*
//
//---------------------------------------------------------
//03-06-93 08:35pm
//
STATIC PROCEDURE EditorKeys( oEdit, nKey )
LOCAL i
DO CASE
@@ -436,21 +457,21 @@ STATIC PROCEDURE EditorKeys( oEdit, nKey )
ED_DelChar( oEdit[ E_EDIT ] )
CASE nKey == K_BS
ED_BSpace( oEdit[ E_EDIT ], oEdit[E_INSERT] )
ED_BSpace( oEdit[ E_EDIT ], oEdit[ E_INSERT ] )
CASE nKey == K_RETURN
ED_Return( oEdit[ E_EDIT ], oEdit[E_INSERT] )
ED_Return( oEdit[ E_EDIT ], oEdit[ E_INSERT ] )
CASE nKey == K_TAB
// ED_Tab( oEdit[ E_EDIT ], oEdit[E_INSERT] )
// ED_Tab( oEdit[ E_EDIT ], oEdit[ E_INSERT ] )
FOR i := 1 TO 4
ED_PutChar( oEdit[ E_EDIT ], 32, oEdit[E_INSERT] )
ED_PutChar( oEdit[ E_EDIT ], 32, oEdit[ E_INSERT ] )
NEXT
CASE nKey == K_INS
oEdit[E_INSERT] := !oEdit[E_INSERT]
SET( _SET_INSERT, oEdit[E_INSERT] )
SetCursor( iif(oEdit[E_INSERT], SC_NORMAL, SC_SPECIAL1) )
oEdit[ E_INSERT ] := !oEdit[ E_INSERT ]
Set( _SET_INSERT, oEdit[ E_INSERT ] )
SetCursor( iif( oEdit[ E_INSERT ], SC_NORMAL, SC_SPECIAL1 ) )
// SayInsert()
ENDCASE
@@ -460,7 +481,9 @@ STATIC PROCEDURE EditorKeys( oEdit, nKey )
//---------------------------------------------------------
//04-06-93 02:06am
//
STATIC FUNCTION EditorMove( pEdit, nKey )
LOCAL lMoved := .T.
DO CASE
@@ -484,61 +507,66 @@ STATIC FUNCTION EditorMove( pEdit, nKey )
//---------------------------------------------------------
//03-06-93 10:23pm
//
STATIC FUNCTION EditorSave( oEdit )
LOCAL nHandle, cFile
cFile := EditorCargo( oEdit )
IF EMPTY( cFile )
cFile := "testfile.txt" //GetFileName( 10, 10 )
IF Empty( cFile )
cFile := "testfile.txt" // GetFileName( 10, 10 )
ENDIF
IF EMPTY( cFile )
IF Empty( cFile )
RETURN .F.
ENDIF
nHandle := FCREATE( cFile, FC_NORMAL )
nHandle := FCreate( cFile, FC_NORMAL )
IF nHandle > 0
FWRITE( nHandle, EditorGetText( oEdit ) )
FWrite( nHandle, EditorGetText( oEdit ) )
FCLOSE( nHandle )
FClose( nHandle )
ENDIF
RETURN nHandle > 0
//---------------------------------------------------------
*09/29/91 08:40pm
*
//09/29/91 08:40pm
//
FUNCTION SaveBox( top, left, bott, right, kolor, patt )
LOCAL cBox, cClr, nBottom, nRight
IF PCOUNT() > 4
cClr := SETCOLOR( kolor )
cBox := SAVESCREEN( top, left, bott, right)
IF PCount() > 4
cClr := SetColor( kolor )
cBox := SaveScreen( top, left, bott, right )
@ top, left, bott, right BOX patt
ELSE
cClr := SETCOLOR()
cBox := SAVESCREEN( top, left, bott, right )
cClr := SetColor()
cBox := SaveScreen( top, left, bott, right )
nBottom := bott
nRight := right
ENDIF
RETURN { top, left, nBottom, nRight, cBox, cClr }
//---------------------------------------------------------
*09/29/91 08:42pm
*
//09/29/91 08:42pm
//
PROCEDURE RestBox( oBox )
RESTSCREEN( oBox[ 1 ], oBox[ 2 ], oBox[ 3 ], oBox[ 4 ], oBox[ 5 ] )
SETCOLOR( oBox[ 6 ] )
RestScreen( oBox[ 1 ], oBox[ 2 ], oBox[ 3 ], oBox[ 4 ], oBox[ 5 ] )
SetColor( oBox[ 6 ] )
RETURN
STATIC FUNCTION FileLength( nH )
LOCAL nPos := FSEEK( nH, 0, FS_RELATIVE )
LOCAL nLen := FSEEK( nH, 0, FS_END )
FSEEK( nH, nPos, FS_SET )
LOCAL nPos := FSeek( nH, 0, FS_RELATIVE )
LOCAL nLen := FSeek( nH, 0, FS_END )
FSeek( nH, nPos, FS_SET )
RETURN nLen

1
harbour/contrib/hbmisc/hbmisc.hbx
View File

@@ -35,7 +35,6 @@ DYNAMIC DECTOBIN
DYNAMIC DECTOHEXA
DYNAMIC DECTOOCTAL
DYNAMIC DECTOROMAN
DYNAMIC DEFAULT
DYNAMIC EDITORADDTEXT
DYNAMIC EDITORCARGO
DYNAMIC EDITOREDIT

135
harbour/contrib/hbmisc/stringp.prg
View File

@@ -56,8 +56,9 @@
* $FuncName$ <xRet> Default( <xArg>, <xDefault> )
* $Description$ If argument is not set, return default
* $End$ */
function Default( xArg, xDef )
return iif( ValType(xArg) != ValType(xDef), xDef, xArg )
STATIC FUNCTION DEFAULT( xArg, xDef )
RETURN iif( !( ValType( xArg ) == ValType( xDef ) ), xDef, xArg )
/* $Doc$
@@ -82,82 +83,83 @@ return iif( ValType(xArg) != ValType(xDef), xDef, xArg )
*
*
* $End$ */
function ToChar( xTxt, cSeparator, lDebug )
local cValTxt
local cOut
local n
local nLen
local aData
FUNCTION ToChar( xTxt, cSeparator, lDebug )
LOCAL cValTxt
LOCAL cOut
LOCAL n
LOCAL nLen
LOCAL aData
cSeparator := Default( cSeparator, " " )
lDebug := Default( lDebug, .F. )
cValTxt := ValType( xTxt )
do case
case cValTxt=="C" .or. cValTxt=="M" // Character
cOut := iif( lDebug, '"'+xTxt+'"', xTxt )
DO CASE
CASE cValTxt == "C" .OR. cValTxt == "M" // Character
cOut := iif( lDebug, '"' + xTxt + '"', xTxt )
case cValTxt=="N" // Numeric
cOut := hb_NToS(xTxt)
CASE cValTxt == "N" // Numeric
cOut := hb_ntos( xTxt )
case cValTxt=="U" // Nothing to write
cOut := iif( lDebug, "NIL", "" )
CASE cValTxt == "U" // Nothing to write
cOut := iif( lDebug, "NIL", "" )
case cValTxt=="D" // Date
cOut := TransForm(xTxt, "")
CASE cValTxt == "D" // Date
cOut := Transform( xTxt, "" )
case cValTxt=="L" // Logical
if lDebug
cOut := iif( xTxt, ".T.", ".F." )
else
cOut := iif( xTxt, "True", "False" )
endif
CASE cValTxt == "L" // Logical
IF lDebug
cOut := iif( xTxt, ".T.", ".F." )
ELSE
cOut := iif( xTxt, "True", "False" )
ENDIF
case cValTxt=="A" // Array
if lDebug
cOut := "{"
else
cOut := ""
endif
nLen := Len( xTxt )
for n := 1 to nLen // For each item : Recurse !
cOut += ToChar( xTxt[n], cSeparator, lDebug )
if n != nLen
CASE cValTxt == "A" // Array
IF lDebug
cOut := "{"
ELSE
cOut := ""
ENDIF
nLen := Len( xTxt )
FOR n := 1 TO nLen // For each item : Recurse !
cOut += ToChar( xTxt[ n ], cSeparator, lDebug )
IF n != nLen
cOut += cSeparator
ENDIF
NEXT n
IF lDebug
cOut += "}"
ENDIF
CASE cValTxt == "B" // Codeblock
IF lDebug
cOut := "Block"
ELSE
cOut := Eval( xTxt )
ENDIF
CASE cValTxt == "O" // Object
IF lDebug
cOut := xTxt:ClassName() + "(#" + ToChar( xTxt:ClassH() ) + "):{"
aData := __objGetValueLIST( xTxt )
nLen := Len( aData )
FOR n := 1 TO nLen // For each item : Recurse !
cOut += aData[ n ][ HB_OO_DATA_SYMBOL ] + ":" + ;
ToChar( aData[ n ] [HB_OO_DATA_VALUE ], cSeparator, lDebug )
IF n != nLen
cOut += cSeparator
endif
next n
if lDebug
cOut += "}"
endif
ENDIF
NEXT n
cOut += "}"
ELSE
cOut := ToChar( xTxt:Run(), cSeparator, lDebug )
ENDIF
case cValTxt=="B" // Codeblock
if lDebug
cOut := "Block"
else
cOut := Eval( xTxt )
endif
ENDCASE
case cValTxt=="O" // Object
if lDebug
cOut := xTxt:ClassName() + "(#" + ToChar( xTxt:ClassH() ) + "):{"
aData := __objGetValueList( xTxt )
nLen := Len( aData )
for n := 1 to nLen // For each item : Recurse !
cOut += aData[n][HB_OO_DATA_SYMBOL] + ":" + ;
ToChar( aData[n][HB_OO_DATA_VALUE], cSeparator, lDebug )
if n != nLen
cOut += cSeparator
endif
next n
cOut += "}"
else
cOut := ToChar( xTxt:Run(), cSeparator, lDebug )
endif
endcase
return cOut
RETURN cOut
//
// <xItem> Debug ( <xItem> )
@@ -165,8 +167,9 @@ return cOut
// Non-volatile debugging function showing contents of xItem and returing
// passed argument.
//
function Debug( xItem )
FUNCTION Debug( xItem )
QOut( ToChar( xItem, ", ", .T. ) )
return xItem
RETURN xItem

93
harbour/contrib/hbmisc/twirler.prg
View File

@@ -1,6 +1,6 @@
//
// $Id$
//
/*
* $Id$
*/
// New libmisc twirler class
/* Harbour Project source code
@@ -10,54 +10,65 @@
#include "hbclass.ch"
class Twirler
var n_Row
var n_Col
var n_Index
var n_Seconds
var n_Smooth
var c_Chars
var c_Title
method new( nRow, nCol, cTitle, cChars, nSmooth )
method twirl()
method show()
method hide()
end class
CREATE CLASS Twirler
VAR n_Row
VAR n_Col
VAR n_Index
VAR n_Seconds
VAR n_Smooth
VAR c_Chars
VAR c_Title
METHOD new( nRow, nCol, cTitle, cChars, nSmooth )
METHOD twirl()
METHOD show()
METHOD hide()
END CLASS
METHOD new( nRow, nCol, cTitle, cChars, nSmooth ) CLASS Twirler
method new( nRow, nCol, cTitle, cChars, nSmooth ) class Twirler
::n_Row := nRow
::n_Col := nCol
::n_Smooth := nSmooth
::c_Chars := iif( EMPTY( cChars ), "|/-\", cChars )
::c_Chars := iif( Empty( cChars ), "|/-\", cChars )
::c_Title := cTitle
IF EMPTY( ::c_Title )
IF Empty( ::c_Title )
::c_Title := ""
END IF
::n_Col += LEN( ::c_Title )
return Self
ENDIF
::n_Col += Len( ::c_Title )
method twirl() class Twirler
local nSeconds := SECONDS()
IF EMPTY( ::n_Seconds ) .OR. nSeconds - ::n_Seconds >= ::n_Smooth .OR. nSeconds < ::n_Seconds
@ ::n_Row, ::n_Col SAY SUBSTR( ::c_Chars, ::n_Index, 1 )
RETURN Self
METHOD twirl() CLASS Twirler
LOCAL nSeconds := Seconds()
IF Empty( ::n_Seconds ) .OR. nSeconds - ::n_Seconds >= ::n_Smooth .OR. nSeconds < ::n_Seconds
@ ::n_Row, ::n_Col SAY SubStr( ::c_Chars, ::n_Index, 1 )
::n_Index++
if ::n_Index > LEN( ::c_Chars )
if ::n_Index > Len( ::c_Chars )
::n_Index := 1
end if
IF !EMPTY( ::n_Seconds )
ENDIF
IF !Empty( ::n_Seconds )
::n_Seconds := nSeconds
END IF
END IF
return Self
ENDIF
ENDIF
RETURN Self
METHOD show() CLASS Twirler
method show() class Twirler
::n_Index := 1
IF ! EMPTY( ::n_Smooth )
::n_Seconds := -::n_Smooth
END IF
@ ::n_Row, ::n_Col - LEN( ::c_Title ) SAY ::c_Title
return Self
IF ! Empty( ::n_Smooth )
::n_Seconds := - ::n_Smooth
ENDIF
@ ::n_Row, ::n_Col - Len( ::c_Title ) SAY ::c_Title
method hide() class Twirler
@ ::n_Row, ::n_Col - LEN( ::c_Title ) SAY SPACE( LEN( ::c_Title ) + 1 )
return Self
RETURN Self
METHOD hide() CLASS Twirler
@ ::n_Row, ::n_Col - Len( ::c_Title ) SAY Space( Len( ::c_Title ) + 1 )
RETURN Self

5
harbour/include/box.ch
View File

@@ -71,4 +71,9 @@
#define B_DOUBLE_SINGLE ( Chr( 213 ) + Chr( 205 ) + Chr( 184 ) + Chr( 179 ) + ; /* "╒═╕│╛═╘│" */
Chr( 190 ) + Chr( 205 ) + Chr( 212 ) + Chr( 179 ) )
#define HB_B_SINGLE_UNI hb_UTF8ToStrBox( "┌─┐│┘─└│" )
#define HB_B_DOUBLE_UNI hb_UTF8ToStrBox( "╔═╗║╝═╚║" )
#define HB_B_SINGLE_DOUBLE_UNI hb_UTF8ToStrBox( "╓─╖║╜─╙║" )
#define HB_B_DOUBLE_SINGLE_UNI hb_UTF8ToStrBox( "╒═╕│╛═╘│" )
#endif /* _BOX_CH */

5
harbour/include/button.ch
View File

@@ -64,6 +64,11 @@
#define SEPARATOR_SINGLE ( Chr( 195 ) + MENU_SEPARATOR + Chr( 180 ) ) /* "├" "┤" single separator for popup menu */
#define SEPARATOR_DOUBLE_SINGLE ( Chr( 199 ) + MENU_SEPARATOR + Chr( 182 ) ) /* "╟" "╢" double line left and right and single separator for popup menu */
#define HB_MENU_SEPARATOR_UNI hb_UTF8ToStrBox( "─" )
#define HB_SEPARATOR_DOUBLE_UNI hb_UTF8ToStrBox( "╠═╣" )
#define HB_SEPARATOR_SINGLE_UNI hb_UTF8ToStrBox( "├─┤" )
#define HB_SEPARATOR_DOUBLE_SINGLE_UNI hb_UTF8ToStrBox( "╟─╢" )
/* return values for HitTest methods */
#define HTNOWHERE 0