* contrib/hbxbp/hbxbp.hbc
+ Added gtgui as default GT on win/wce systems.
* include/extend.api
* include/hbsetup.ch
* include/hbapi.h
+ Added new HB_LEGACY_LEVEL3 macro to wrap legacy
constructs to be deprecated in the next major release.
Currently legacy IS*() parameter type checking macros
are marked as such, ones present in CA-Cl*pper retained
in extend.api even when this macro off.
; NOTE: It's recommended for 3rd party developers to
start using new HB_IS*() macros. They work
the same as Clipper compatible IS*() macros,
but got a HB_ prefix: ISNUM( 1 ) -> HB_ISNUM( 1 )
(not to be confused with HB_IS_*() macros which
accept a PHB_ITEM)
Here's a little batch which helps this process:
---
gsar -o -s:x20ISNUM( -r:x20HB_ISNUM( *.c *.cpp
gsar -o -s:x20ISCHAR( -r:x20HB_ISCHAR( *.c *.cpp
gsar -o -s:x20ISLOG( -r:x20HB_ISLOG( *.c *.cpp
gsar -o -s:x20ISARRAY( -r:x20HB_ISARRAY( *.c *.cpp
gsar -o -s:x20ISBYREF( -r:x20HB_ISBYREF( *.c *.cpp
gsar -o -s:x20ISDATE( -r:x20HB_ISDATE( *.c *.cpp
gsar -o -s:x20ISDATETIME( -r:x20HB_ISDATETIME( *.c *.cpp
gsar -o -s:x20ISNIL( -r:x20HB_ISNIL( *.c *.cpp
gsar -o -s:x20ISTIMESTAMP( -r:x20HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s:x20ISBLOCK( -r:x20HB_ISBLOCK( *.c *.cpp
gsar -o -s:x20ISPOINTER( -r:x20HB_ISPOINTER( *.c *.cpp
gsar -o -s:x20ISSYMBOL( -r:x20HB_ISSYMBOL( *.c *.cpp
gsar -o -s:x20ISOBJECT( -r:x20HB_ISOBJECT( *.c *.cpp
gsar -o -s:x20ISHASH( -r:x20HB_ISHASH( *.c *.cpp
gsar -o -s!ISNUM( -r!HB_ISNUM( *.c *.cpp
gsar -o -s!ISCHAR( -r!HB_ISCHAR( *.c *.cpp
gsar -o -s!ISLOG( -r!HB_ISLOG( *.c *.cpp
gsar -o -s!ISARRAY( -r!HB_ISARRAY( *.c *.cpp
gsar -o -s!ISBYREF( -r!HB_ISBYREF( *.c *.cpp
gsar -o -s!ISDATE( -r!HB_ISDATE( *.c *.cpp
gsar -o -s!ISDATETIME( -r!HB_ISDATETIME( *.c *.cpp
gsar -o -s!ISNIL( -r!HB_ISNIL( *.c *.cpp
gsar -o -s!ISTIMESTAMP( -r!HB_ISTIMESTAMP( *.c *.cpp
gsar -o -s!ISBLOCK( -r!HB_ISBLOCK( *.c *.cpp
gsar -o -s!ISPOINTER( -r!HB_ISPOINTER( *.c *.cpp
gsar -o -s!ISSYMBOL( -r!HB_ISSYMBOL( *.c *.cpp
gsar -o -s!ISOBJECT( -r!HB_ISOBJECT( *.c *.cpp
gsar -o -s!ISHASH( -r!HB_ISHASH( *.c *.cpp
---
* source/rtl/hbinet.c
* Formatting.
% Minor optimizations.
* source/debug/dbgentry.c
* source/rdd/dbcmd.c
* source/rdd/dbcmd53.c
* source/rdd/dbcmdx.c
* source/rdd/dbdetach.c
* source/rdd/dbsql.c
* source/rdd/hbsix/sxfname.c
* source/rdd/hbsix/sxord.c
* source/rdd/hbsix/sxtable.c
* source/rdd/usrrdd/usrrdd.c
* source/rtl/at.c
* source/rtl/box.c
* source/rtl/cdpapi.c
* source/rtl/chrasc.c
* source/rtl/colorind.c
* source/rtl/console.c
* source/rtl/copyfile.c
* source/rtl/dateshb.c
* source/rtl/dirdrive.c
* source/rtl/diskspac.c
* source/rtl/disksphb.c
* source/rtl/errapi.c
* source/rtl/filesys.c
* source/rtl/fscopy.c
* source/rtl/fssize.c
* source/rtl/fstemp.c
* source/rtl/gete.c
* source/rtl/gtfunc.c
* source/rtl/gx.c
* source/rtl/hbbit.c
* source/rtl/hbgtcore.c
* source/rtl/hbhex.c
* source/rtl/hbi18n1.c
* source/rtl/hbinet.c
* source/rtl/hbprocfn.c
* source/rtl/hbrandom.c
* source/rtl/hbregex.c
* source/rtl/hbstrsh.c
* source/rtl/hbtoken.c
* source/rtl/hbzlib.c
* source/rtl/hbzlibgz.c
* source/rtl/inkey.c
* source/rtl/itemseri.c
* source/rtl/left.c
* source/rtl/math.c
* source/rtl/maxrow.c
* source/rtl/mlcfunc.c
* source/rtl/mouse53.c
* source/rtl/mousex.c
* source/rtl/mtran.c
* source/rtl/natmsg.c
* source/rtl/padc.c
* source/rtl/padl.c
* source/rtl/padr.c
* source/rtl/philes.c
* source/rtl/philes53.c
* source/rtl/rat.c
* source/rtl/replic.c
* source/rtl/right.c
* source/rtl/round.c
* source/rtl/run.c
* source/rtl/saverest.c
* source/rtl/scroll.c
* source/rtl/setcolor.c
* source/rtl/setcurs.c
* source/rtl/setpos.c
* source/rtl/shadow.c
* source/rtl/strc.c
* source/rtl/strmatch.c
* source/rtl/strpeek.c
* source/rtl/strtoexp.c
* source/rtl/strtran.c
* source/rtl/stuff.c
* source/rtl/substr.c
* source/rtl/tone.c
* source/rtl/trace.c
* source/rtl/transfrm.c
* source/rtl/valtype.c
* source/rtl/word.c
* source/vm/arrayshb.c
* source/vm/asort.c
* source/vm/classes.c
* source/vm/cmdarg.c
* source/vm/eval.c
* source/vm/hashfunc.c
* source/vm/hvm.c
* source/vm/memvars.c
* source/vm/proc.c
* source/vm/thread.c
* IS*() -> HB_IS*() macro rename.
(pass 1 - sf.net SVN works badly today, so I've split
the commit to raise the chances of a successfully
finished one)
260 lines
6.9 KiB
C
260 lines
6.9 KiB
C
/*
|
|
* $Id$
|
|
*/
|
|
|
|
/*
|
|
* Harbour Project source code:
|
|
* The Keyboard API
|
|
*
|
|
* Copyright 1999 David G. Holm <dholm@jsd-llc.com>
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2, or (at your option)
|
|
* any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this software; see the file COPYING. If not, write to
|
|
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
|
* Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
|
|
*
|
|
* As a special exception, the Harbour Project gives permission for
|
|
* additional uses of the text contained in its release of Harbour.
|
|
*
|
|
* The exception is that, if you link the Harbour libraries with other
|
|
* files to produce an executable, this does not by itself cause the
|
|
* resulting executable to be covered by the GNU General Public License.
|
|
* Your use of that executable is in no way restricted on account of
|
|
* linking the Harbour library code into it.
|
|
*
|
|
* This exception does not however invalidate any other reasons why
|
|
* the executable file might be covered by the GNU General Public License.
|
|
*
|
|
* This exception applies only to the code released by the Harbour
|
|
* Project under the name Harbour. If you copy code from other
|
|
* Harbour Project or Free Software Foundation releases into a copy of
|
|
* Harbour, as the General Public License permits, the exception does
|
|
* not apply to the code that you add in this way. To avoid misleading
|
|
* anyone as to the status of such modified files, you must delete
|
|
* this exception notice from them.
|
|
*
|
|
* If you write modifications of your own for Harbour, it is your choice
|
|
* whether to permit this exception to apply to your modifications.
|
|
* If you do not wish that, delete this exception notice.
|
|
*
|
|
*/
|
|
|
|
/*
|
|
* The following parts are Copyright of the individual authors.
|
|
* www - http://www.harbour-project.org
|
|
*
|
|
* Copyright 1999-2001 Viktor Szakats (harbour.01 syenar.hu)
|
|
* HB_KEYPUT()
|
|
*
|
|
* Copyright 2002 Walter Negro <anegro@overnet.com.ar>
|
|
* hb_inkeySetLast()
|
|
*
|
|
* Copyright 2003 Przemyslaw Czerpak <druzus@acn.waw.pl>
|
|
* HB_SETLASTKEY()
|
|
*
|
|
* Copyright 2004 Peter Rees <peter@rees.co.nz>
|
|
* HB_SETINKEYBEFOREBLOCK()
|
|
* HB_SETINKEYAFTERBLOCK()
|
|
*
|
|
* See COPYING for licensing terms.
|
|
*
|
|
*/
|
|
|
|
#include "hbapigt.h"
|
|
#include "hbapiitm.h"
|
|
#include "hbset.h"
|
|
#include "hbstack.h"
|
|
#include "hbvm.h"
|
|
|
|
typedef struct
|
|
{
|
|
PHB_ITEM before;
|
|
PHB_ITEM after;
|
|
} HB_INKEYBLOCK, * PHB_INKEYBLOCK;
|
|
|
|
static void hb_inkeyBlockRelease( void * cargo )
|
|
{
|
|
PHB_INKEYBLOCK pInkeyBlock = ( PHB_INKEYBLOCK ) cargo;
|
|
|
|
if( pInkeyBlock->before )
|
|
hb_itemRelease( pInkeyBlock->before );
|
|
if( pInkeyBlock->after )
|
|
hb_itemRelease( pInkeyBlock->after );
|
|
}
|
|
|
|
static HB_TSD_NEW( s_inkeyBlock, sizeof( HB_INKEYBLOCK ), NULL, hb_inkeyBlockRelease );
|
|
|
|
HB_FUNC( INKEY )
|
|
{
|
|
PHB_INKEYBLOCK pInkeyBlock = ( PHB_INKEYBLOCK ) hb_stackTestTSD( &s_inkeyBlock );
|
|
USHORT uiPCount = ( USHORT ) hb_pcount();
|
|
PHB_ITEM pKey = NULL;
|
|
int iKey;
|
|
|
|
if( pInkeyBlock && pInkeyBlock->before )
|
|
hb_vmEvalBlock( pInkeyBlock->before );
|
|
|
|
do
|
|
{
|
|
iKey = hb_inkey( uiPCount == 1 || ( uiPCount > 1 && HB_ISNUM( 1 ) ),
|
|
hb_parnd( 1 ),
|
|
HB_ISNUM( 2 ) ? hb_parni( 2 ) : hb_setGetEventMask() );
|
|
|
|
if( iKey == 0 || !pInkeyBlock || !pInkeyBlock->after )
|
|
break;
|
|
|
|
pKey = hb_itemPutNI( pKey, iKey );
|
|
iKey = hb_itemGetNI( hb_vmEvalBlockV( pInkeyBlock->after, 1, pKey ) );
|
|
hb_inkeySetLast( iKey );
|
|
}
|
|
while( iKey == 0 );
|
|
|
|
if( pKey )
|
|
hb_itemRelease( pKey );
|
|
|
|
hb_retni( iKey );
|
|
}
|
|
|
|
/* temporary disabled */
|
|
#if 0
|
|
HB_FUNC( HB_SETINKEYBEFOREBLOCK )
|
|
{
|
|
PHB_INKEYBLOCK pInkeyBlock = ( PHB_INKEYBLOCK ) hb_stackGetTSD( &s_inkeyBlock );
|
|
|
|
if( pInkeyBlock->before )
|
|
hb_itemReturn( pInkeyBlock->before );
|
|
|
|
if( hb_pcount() > 0 )
|
|
{
|
|
PHB_ITEM pBlock = hb_param( 1, HB_IT_BLOCK );
|
|
|
|
if( pInkeyBlock->before )
|
|
hb_itemRelease( pInkeyBlock->before );
|
|
pInkeyBlock->before = pBlock ? hb_itemNew( pBlock ) : pBlock;
|
|
}
|
|
}
|
|
|
|
HB_FUNC( HB_SETINKEYAFTERBLOCK )
|
|
{
|
|
PHB_INKEYBLOCK pInkeyBlock = ( PHB_INKEYBLOCK ) hb_stackGetTSD( &s_inkeyBlock );
|
|
|
|
if( pInkeyBlock->after )
|
|
hb_itemReturn( pInkeyBlock->after );
|
|
|
|
if( hb_pcount() > 0 )
|
|
{
|
|
PHB_ITEM pBlock = hb_param( 1, HB_IT_BLOCK );
|
|
|
|
if( pInkeyBlock->after )
|
|
hb_itemRelease( pInkeyBlock->after );
|
|
pInkeyBlock->after = pBlock ? hb_itemNew( pBlock ) : pBlock;
|
|
}
|
|
}
|
|
|
|
#endif
|
|
|
|
HB_FUNC( __KEYBOARD )
|
|
{
|
|
/* Clear the typeahead buffer without reallocating the keyboard buffer */
|
|
hb_inkeyReset();
|
|
|
|
if( HB_ISCHAR( 1 ) )
|
|
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
|
|
}
|
|
|
|
HB_FUNC( HB_KEYCLEAR )
|
|
{
|
|
hb_inkeyReset();
|
|
}
|
|
|
|
HB_FUNC( HB_KEYPUT )
|
|
{
|
|
if( HB_ISNUM( 1 ) )
|
|
{
|
|
hb_inkeyPut( hb_parni( 1 ) );
|
|
}
|
|
else if( HB_ISCHAR( 1 ) )
|
|
{
|
|
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
|
|
}
|
|
else if( HB_ISARRAY( 1 ) )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
ULONG ulIndex;
|
|
ULONG ulElements = hb_arrayLen( pArray );
|
|
|
|
for( ulIndex = 1; ulIndex <= ulElements; ulIndex++ )
|
|
{
|
|
HB_TYPE type = hb_arrayGetType( pArray, ulIndex );
|
|
|
|
if( type & HB_IT_NUMERIC )
|
|
{
|
|
hb_inkeyPut( hb_arrayGetNI( pArray, ulIndex ) );
|
|
}
|
|
else if( type & HB_IT_STRING )
|
|
{
|
|
hb_inkeySetText( ( const char * ) hb_arrayGetCPtr( pArray, ulIndex ), hb_arrayGetCLen( pArray, ulIndex ) );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
HB_FUNC( HB_KEYINS )
|
|
{
|
|
if( HB_ISNUM( 1 ) )
|
|
{
|
|
hb_inkeyIns( hb_parni( 1 ) );
|
|
}
|
|
else if( HB_ISCHAR( 1 ) )
|
|
{
|
|
hb_inkeySetText( hb_parc( 1 ), hb_parclen( 1 ) );
|
|
}
|
|
else if( HB_ISARRAY( 1 ) )
|
|
{
|
|
PHB_ITEM pArray = hb_param( 1, HB_IT_ARRAY );
|
|
ULONG ulIndex;
|
|
ULONG ulElements = hb_arrayLen( pArray );
|
|
|
|
for( ulIndex = 1; ulIndex <= ulElements; ulIndex++ )
|
|
{
|
|
HB_TYPE type = hb_arrayGetType( pArray, ulIndex );
|
|
|
|
if( type & HB_IT_NUMERIC )
|
|
{
|
|
hb_inkeyIns( hb_arrayGetNI( pArray, ulIndex ) );
|
|
}
|
|
else if( type & HB_IT_STRING )
|
|
{
|
|
hb_inkeySetText( ( const char * ) hb_arrayGetCPtr( pArray, ulIndex ), hb_arrayGetCLen( pArray, ulIndex ) );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
HB_FUNC( NEXTKEY )
|
|
{
|
|
hb_retni( hb_inkeyNext( HB_ISNUM( 1 ) ? hb_parni( 1 ) : hb_setGetEventMask() ) );
|
|
}
|
|
|
|
HB_FUNC( LASTKEY )
|
|
{
|
|
hb_retni( hb_inkeyLast( HB_ISNUM( 1 ) ? hb_parni( 1 ) : INKEY_ALL ) );
|
|
}
|
|
|
|
HB_FUNC( HB_SETLASTKEY )
|
|
{
|
|
if( HB_ISNUM( 1 ) )
|
|
hb_retni( hb_inkeySetLast( hb_parni( 1 ) ) );
|
|
}
|