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

2010-01-22 22:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* contrib/hbnetio/utils/netiosrv.hbp
  * contrib/hbnetio/utils/netiosrv.prg
  + contrib/hbnetio/utils/netiocmd.prg
    + Applied patch sent by Vailton Renato.
    * Some formatting applied to it.
This commit is contained in:
Viktor Szakats
2010-01-22 21:20:07 +00:00
parent e37d3cfa86
commit 1aae754554
4 changed files with 174 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-01-22 22:19 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbnetio/utils/netiosrv.hbp
* contrib/hbnetio/utils/netiosrv.prg
+ contrib/hbnetio/utils/netiocmd.prg
+ Applied patch sent by Vailton Renato.
* Some formatting applied to it.
2010-01-22 18:01 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbwin/wapi_wingdi.c
- Dropped array support for DOCINFO parameter.

93
harbour/contrib/hbnetio/utils/netiocmd.prg Normal file
View File

@@ -0,0 +1,93 @@
/*
* $Id$
*/
/*
* The following parts are Copyright of the individual authors.
* www - http://www.harbour-project.org
*
* Copyright 2010 Viktor Szakats (harbour.01 syenar.hu)
* ...
*
* See COPYING for licensing terms.
*
*/
FUNCTION hbnetiosrv_LoadCmds( bQuit, bShowInfo )
LOCAL hCmds
/* We add here a little validation to ensure that we can not be hacked. [vailtom] */
IF Lower( ProcName( 1 ) + "-" + ProcFile( 1 ) ) != "main-netiosrv.prg"
RETURN NIL
ENDIF
hCmds := { ;
"?" => { "Synonym for 'help'." , {|| cmdHelp( hCmds ) } },;
"clear" => { "Clear screen." , {|| Scroll(), SetPos( 0, 0 ) } },;
"config" => { "Show server configuration." , bShowInfo },;
"sysinfo" => { "Show system/build information.", {|| cmdSysInfo() } },;
"quit" => { "Stop server and exit." , bQuit },;
"help" => { "Display this help." , {|| cmdHelp( hCmds ) } };
}
RETURN hCmds
/* TODO: - on the fly change of RPC filter modules
- listing active connections
- listing open files
- listing active locks
- activity meters (transferred bytes, bandwidth, etc)
- showing number of connections
- showing number of open files
- listing transferred bytes
- gracefully shutting down server by waiting for connections to close and not accept new ones
- pausing server */
STATIC PROCEDURE cmdSysInfo()
QQOut( "OS: " + OS(), hb_osNewLine() )
QQOut( "Harbour: " + Version(), hb_osNewLine() )
QQOut( "C Compiler: " + hb_Compiler(), hb_osNewLine() )
QQOut( "Memory: " + hb_ntos( Memory( 0 ) ) + "KB", hb_osNewLine() )
RETURN
STATIC PROCEDURE cmdHelp( hCommands )
LOCAL aTexts := {}
LOCAL n, k, v, c, m := 0
hb_HEval( hCommands, {| k | m := Max( m, Len( k ) ) } )
AAdd( aTexts, "Commands:" )
/* Processing commands */
FOR n := 1 TO Len( hCommands )
k := hb_hKeyAt( hCommands, n )
v := hb_HValueAt( hCommands, n )
AAdd( aTexts, " " + PadR( k, m ) + " - " + v[ 1 ] )
NEXT
ASort( aTexts, 2 )
AAdd( aTexts, "" )
AAdd( aTexts, "Keyboard shortcuts:" )
AAdd( aTexts, PadR( " <Up>", m ) + " - Move up on historic list." )
AAdd( aTexts, PadR( " <Down>", m ) + " - Move down on historic list." )
AAdd( aTexts, PadR( " <Tab>", m ) + " - Complete command." )
AAdd( aTexts, PadR( " <Alt+V>", m ) + " - Paste Clipboard contents (if apropriate)." )
c := 0
m := MaxRow()
FOR n := 1 TO Len( aTexts )
QQOut( aTexts[ n ], hb_osNewLine() )
IF ++c == m
c := 0
QQOut( "Press any key to continue..." )
Inkey( 0 )
Scroll( Row(), 0, Row(), MaxCol(), 0 )
SetPos( Row(), 0 )
ENDIF
NEXT
RETURN

2
harbour/contrib/hbnetio/utils/netiosrv.hbp
View File

@@ -6,6 +6,8 @@
hbmk.hbm
netiosrv.prg
netiocmd.prg
-o{!dos&x86}hbnetio_${hb_plat}
-o{!dos&!x86}hbnetio_${hb_plat}_${hb_cpu}
-o{dos}hbnetio

120
harbour/contrib/hbnetio/utils/netiosrv.prg
View File

@@ -61,8 +61,14 @@ PROCEDURE Main( ... )
LOCAL bKeyUp
LOCAL bKeyIns
LOCAL bKeyPaste
LOCAL bKeyTab
LOCAL GetList := {}
LOCAL GetList := {}
LOCAL lQuit := .F.
LOCAL hCommands
LOCAL nSavedRow
LOCAL nPos
LOCAL aCmd
LOCAL aHistory, nHistIndex
@@ -124,45 +130,61 @@ PROCEDURE Main( ... )
ShowConfig( netiosrv )
OutStd( hb_osNewLine() )
OutStd( "hbnetiosrv command prompt:", hb_osNewLine() )
OutStd( "Type a command or '?' for help.", hb_osNewLine() )
aHistory := { "quit" }
lQuit := .F.
aHistory := { "quit" }
nHistIndex := Len( aHistory ) + 1
hCommands := hbnetiosrv_LoadCmds( {|| lQuit := .T. },; /* codeblock to quit */
{|| ShowConfig( netiosrv ) } ) /* codeblock to display config both uses local vars */
/* Command prompt */
DO WHILE .T.
DO WHILE !lQuit
cCommand := Space( 128 )
QQOut( "hbnetiosrv$ " )
@ Row(), Col() GET cCommand PICTURE "@S" + hb_ntos( MaxCol() - Col() + 1 ) COLOR hb_ColorIndex( SetColor(), CLR_STANDARD ) + "," + hb_ColorIndex( SetColor(), CLR_STANDARD )
nSavedRow := Row()
@ nSavedRow, Col() GET cCommand PICTURE "@S" + hb_ntos( MaxCol() - Col() + 1 ) COLOR hb_ColorIndex( SetColor(), CLR_STANDARD ) + "," + hb_ColorIndex( SetColor(), CLR_STANDARD )
SetCursor( iif( ReadInsert(), SC_INSERT, SC_NORMAL ) )
bKeyIns := SetKey( K_INS, ;
{|| SetCursor( iif( ReadInsert( ! ReadInsert() ), ;
bKeyIns := SetKey( K_INS,;
{|| SetCursor( iif( ReadInsert( ! ReadInsert() ),;
SC_NORMAL, SC_INSERT ) ) } )
bKeyUp := SetKey( K_UP, ;
{|| iif( nHistIndex > 1, ;
cCommand := PadR( aHistory[ --nHistIndex ], Len( cCommand ) ), ) } )
bKeyDown := SetKey( K_DOWN, ;
{|| cCommand := PadR( iif( nHistIndex < Len( aHistory ), ;
aHistory[ ++nHistIndex ], ;
( nHistIndex := Len( aHistory ) + 1, "" ) ), Len( cCommand ) ) } )
bKeyPaste := SetKey( K_ALT_V, {|| hb_gtInfo( HB_GTI_CLIPBOARDPASTE ) } )
bKeyUp := SetKey( K_UP,;
{|| iif( nHistIndex > 1,;
cCommand := PadR( aHistory[ --nHistIndex ], Len( cCommand ) ), ),;
ManageCursor( cCommand ) } )
bKeyDown := SetKey( K_DOWN,;
{|| cCommand := PadR( iif( nHistIndex < Len( aHistory ),;
aHistory[ ++nHistIndex ],;
( nHistIndex := Len( aHistory ) + 1, "" ) ), Len( cCommand ) ),;
ManageCursor( cCommand ) } )
bKeyPaste := SetKey( K_ALT_V, {|| hb_gtInfo( HB_GTI_CLIPBOARDPASTE )})
bKeyTab := SetKey( K_TAB, {|| CompleteCmd( @cCommand, hCommands ) } )
READ
SetKey( K_DOWN, bKeyPaste )
SetKey( K_DOWN, bKeyDown )
SetKey( K_UP, bKeyUp )
SetKey( K_INS, bKeyIns )
/* Positions the cursor on the line previously saved */
SetPos( nSavedRow, MaxCol() - 1 )
SetKey( K_ALT_V, bKeyPaste )
SetKey( K_DOWN, bKeyDown )
SetKey( K_UP, bKeyUp )
SetKey( K_INS, bKeyIns )
SetKey( K_TAB, bKeyTab )
QQOut( hb_osNewLine() )
QQOut( hb_osNewLine() )
cCommand := AllTrim( cCommand )
IF Empty( cCommand )
LOOP
ENDIF
IF Empty( aHistory ) .OR. ! ATail( aHistory ) == cCommand
IF Len( aHistory ) < 64
AAdd( aHistory, cCommand )
@@ -173,34 +195,13 @@ PROCEDURE Main( ... )
ENDIF
nHistIndex := Len( aHistory ) + 1
/* TODO: - on the fly change of RPC filter modules
- listing active connections
- listing open files
- listing active locks
- activity meters (transferred bytes, bandwidth, etc)
- showing number of connections
- showing number of open files
- listing transferred bytes
- gracefully shutting down server by waiting for connections to close and not accept new ones
- pausing server */
DO CASE
CASE Lower( cCommand ) == "quit"
EXIT
CASE Lower( cCommand ) == "config"
ShowConfig( netiosrv )
CASE Lower( cCommand ) == "sysinfo"
QQOut( "OS: " + OS(), hb_osNewLine() )
QQOut( "Harbour: " + Version(), hb_osNewLine() )
QQOut( "C Compiler: " + hb_Compiler(), hb_osNewLine() )
QQOut( "Memory: " + hb_ntos( Memory( 0 ) ) + "KB", hb_osNewLine() )
CASE Lower( cCommand ) == "help"
QQOut( "config - Show server configuration", hb_osNewLine() )
QQOut( "sysinfo - Show system/build information", hb_osNewLine() )
QQOut( "quit - Stop server and exit", hb_osNewLine() )
CASE ! Empty( cCommand )
QQOut( "Error: Unknown command.", hb_osNewLine() )
ENDCASE
nPos := iif( Empty(cCommand), 0, hb_HPos( hCommands, Lower( cCommand ) ) )
IF nPos > 0
aCmd := hb_HValueAt( hCommands, nPos )
Eval( aCmd[ 2 ], cCommand, netiosrv )
ELSE
QQOut( "Error: Unknown command '" + cCommand + "'.", hb_osNewLine() )
ENDIF
ENDDO
netio_serverstop( netiosrv[ _NETIOSRV_pListenSocket ] )
@@ -212,6 +213,29 @@ PROCEDURE Main( ... )
RETURN
/* Complete the command line, based on the first characters that the user typed. [vailtom] */
STATIC PROCEDURE CompleteCmd( cCommand, hCommands )
LOCAL s := Lower( AllTrim( cCommand ) )
LOCAL n, c
/* We need at least one character to search */
IF Len( s ) > 1
FOR n := 1 TO Len( hCommands )
c := hb_hKeyAt( hCommands, n )
IF s == Lower( Left( c, Len( s ) ) )
cCommand := PadR( c, Len( cCommand ) )
ManageCursor( cCommand )
RETURN
ENDIF
NEXT
ENDIF
RETURN
/* Adjusted the positioning of cursor on navigate through history. [vailtom] */
STATIC PROCEDURE ManageCursor( cCommand )
KEYBOARD Chr( K_HOME ) + iif( ! Empty( cCommand ), Chr( K_END ), "" )
RETURN
STATIC PROCEDURE ShowConfig( netiosrv )
QQOut( "Listening on: " + netiosrv[ _NETIOSRV_cIFAddr ] + ":" + hb_ntos( netiosrv[ _NETIOSRV_nPort ] ), hb_osNewLine() )