2008-01-26 06:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* tests/gfx.prg
   * tests/wcecon.prg
   * tests/gtchars.prg
   * tests/gtkeys.prg
   * include/hbgtinfo.ch
   * source/rtl/hbgtcore.c
   * source/rtl/gtkbstat.c
   * source/rtl/gtdos/gtdos.c
   * source/rtl/gtwin/gtwin.c
   * source/rtl/gtxwc/gtxwc.c
   * source/rtl/gtos2/gtos2.c
   * source/rtl/gtcrs/gtcrs.c
   * source/rtl/gtalleg/gtalleg.c
   * source/rtl/gtstd/gtstd.c
   * source/rtl/gtsln/gtsln.c
   * source/rtl/gttrm/gttrm.c
   * source/rtl/gtpca/gtpca.c
   * source/rtl/gtgui/gtgui.c
   * source/rtl/gtcgi/gtcgi.c
   * source/rtl/gtwvt/gtwvt.c
   * contrib/hbgtwvg/gtwvg.c
     ! Some minor formatting to the .ch file. Removed 
       reference to non-existing doc/gtinfo.txt.
     * Using HB_GTI_* instead of GTI_* in Harbour files.
This commit is contained in:
Viktor Szakats
2008-01-26 05:29:20 +00:00
parent b9c3cbccfc
commit a92f87015d
22 changed files with 279 additions and 261 deletions

View File

@@ -8,6 +8,32 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2008-01-26 06:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* tests/gfx.prg
* tests/wcecon.prg
* tests/gtchars.prg
* tests/gtkeys.prg
* include/hbgtinfo.ch
* source/rtl/hbgtcore.c
* source/rtl/gtkbstat.c
* source/rtl/gtdos/gtdos.c
* source/rtl/gtwin/gtwin.c
* source/rtl/gtxwc/gtxwc.c
* source/rtl/gtos2/gtos2.c
* source/rtl/gtcrs/gtcrs.c
* source/rtl/gtalleg/gtalleg.c
* source/rtl/gtstd/gtstd.c
* source/rtl/gtsln/gtsln.c
* source/rtl/gttrm/gttrm.c
* source/rtl/gtpca/gtpca.c
* source/rtl/gtgui/gtgui.c
* source/rtl/gtcgi/gtcgi.c
* source/rtl/gtwvt/gtwvt.c
* contrib/hbgtwvg/gtwvg.c
! Some minor formatting to the .ch file. Removed
reference to non-existing doc/gtinfo.txt.
* Using HB_GTI_* instead of GTI_* in Harbour files.
2008-01-25 21:27 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* harbour-ce-spec
* harbour-w32-spec

View File

@@ -2164,28 +2164,28 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_INPUTFD:
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_INPUT_HANDLE ) );
break;
case GTI_OUTPUTFD:
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_OUTPUT_HANDLE ) );
break;
case GTI_ERRORFD:
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_ERROR_HANDLE ) );
break;
case GTI_FONTSIZE:
case HB_GTI_FONTSIZE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.PTEXTSIZE.y );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -2204,7 +2204,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTWIDTH:
case HB_GTI_FONTWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.fontWidth );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -2214,7 +2214,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTNAME:
case HB_GTI_FONTNAME:
pInfo->pResult = hb_itemPutC( pInfo->pResult, _s.fontFace );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) /* TODO */
{
@@ -2222,26 +2222,26 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTWEIGHT:
case HB_GTI_FONTWEIGHT:
switch( _s.fontWeight )
{
case FW_THIN:
case FW_EXTRALIGHT:
case FW_LIGHT:
iVal = GTI_FONTW_THIN;
iVal = HB_GTI_FONTW_THIN;
break;
case FW_DONTCARE:
case FW_NORMAL:
case FW_MEDIUM:
iVal = GTI_FONTW_NORMAL;
iVal = HB_GTI_FONTW_NORMAL;
break;
case FW_SEMIBOLD:
case FW_BOLD:
case FW_EXTRABOLD:
case FW_HEAVY:
iVal = GTI_FONTW_BOLD;
iVal = HB_GTI_FONTW_BOLD;
break;
default:
@@ -2254,32 +2254,32 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
/* store font status for next operation on fontsize */
switch( hb_itemGetNI( pInfo->pNewVal ) )
{
case GTI_FONTW_THIN:
case HB_GTI_FONTW_THIN:
_s.fontWeight = FW_LIGHT;
break;
case GTI_FONTW_NORMAL:
case HB_GTI_FONTW_NORMAL:
_s.fontWeight = FW_NORMAL;
break;
case GTI_FONTW_BOLD:
case HB_GTI_FONTW_BOLD:
_s.fontWeight = FW_BOLD;
break;
}
}
break;
case GTI_FONTQUALITY:
case HB_GTI_FONTQUALITY:
switch( _s.fontQuality )
{
case ANTIALIASED_QUALITY:
iVal = GTI_FONTQ_HIGH;
iVal = HB_GTI_FONTQ_HIGH;
break;
case DEFAULT_QUALITY:
case DRAFT_QUALITY:
iVal = GTI_FONTQ_NORMAL;
iVal = HB_GTI_FONTQ_NORMAL;
break;
case NONANTIALIASED_QUALITY:
case PROOF_QUALITY:
iVal = GTI_FONTQ_DRAFT;
iVal = HB_GTI_FONTQ_DRAFT;
break;
default:
iVal = 0;
@@ -2290,20 +2290,20 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
switch( hb_itemGetNI( pInfo->pNewVal ) )
{
case GTI_FONTQ_HIGH:
case HB_GTI_FONTQ_HIGH:
_s.fontQuality = ANTIALIASED_QUALITY;
break;
case GTI_FONTQ_NORMAL:
case HB_GTI_FONTQ_NORMAL:
_s.fontQuality = DEFAULT_QUALITY;
break;
case GTI_FONTQ_DRAFT:
case HB_GTI_FONTQ_DRAFT:
_s.fontQuality = DRAFT_QUALITY;
break;
}
}
break;
case GTI_SCREENHEIGHT:
case HB_GTI_SCREENHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.PTEXTSIZE.y * _s.ROWS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -2312,7 +2312,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_SCREENWIDTH:
case HB_GTI_SCREENWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.PTEXTSIZE.x * _s.COLS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -2321,7 +2321,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPWIDTH:
{
RECT rDesk;
HWND hDesk;
@@ -2331,7 +2331,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.right - rDesk.left );
break;
}
case GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPHEIGHT:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
@@ -2339,7 +2339,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.bottom - rDesk.top );
break;
}
case GTI_DESKTOPCOLS:
case HB_GTI_DESKTOPCOLS:
{
RECT rDesk;
HWND hDesk;
@@ -2349,7 +2349,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
( rDesk.right - rDesk.left ) / _s.PTEXTSIZE.x );
break;
}
case GTI_DESKTOPROWS:
case HB_GTI_DESKTOPROWS:
{
RECT rDesk;
HWND hDesk;
@@ -2359,7 +2359,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
( rDesk.bottom - rDesk.top ) / _s.PTEXTSIZE.y );
break;
}
case GTI_WINTITLE:
case HB_GTI_WINTITLE:
{
char * szTitle = NULL;
if( hb_gt_wvt_GetWindowTitle( &szTitle ) )
@@ -2370,7 +2370,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_gt_wvt_SetWindowTitle( hb_itemGetCPtr( pInfo->pNewVal ) );
break;
}
case GTI_CODEPAGE:
case HB_GTI_CODEPAGE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.CodePage );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 && iVal != _s.CodePage )
@@ -2380,7 +2380,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_ICONFILE:
case HB_GTI_ICONFILE:
{
HICON hIcon = 0;
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
@@ -2399,7 +2399,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
}
case GTI_ICONRES:
case HB_GTI_ICONRES:
{
HICON hIcon = 0;
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
@@ -2422,21 +2422,21 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( UINT_PTR ) hIcon );
break;
}
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.COLS );
break;
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, _s.ROWS );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( _s.CodePage == OEM_CHARSET ?
@@ -2463,7 +2463,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_CURSORBLINKRATE:
case HB_GTI_CURSORBLINKRATE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, GetCaretBlinkTime() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
SetCaretBlinkTime( hb_itemGetNI( pInfo->pNewVal ) );

View File

@@ -51,12 +51,6 @@
*
*/
/*
Minimal informations:
READ doc/gtinfo.txt
*/
#ifndef HB_GTINFO_CH_
#define HB_GTINFO_CH_
@@ -77,12 +71,10 @@
Enable if the caps-lock key affects the top
row keys. (Alternate language keys are not
handled properly by this temporary fix.
Default is disabled.
*/
Default is disabled. */
#define HB_GTI_KBDALT 12 /* This will get/set the status of the alt-numpad
key handling.
Default is Enabled.
*/
Default is Enabled. */
#define HB_GTI_FULLSCREEN 13 /* Is it full screen GT driver? */
#define HB_GTI_KBDSUPPORT 14 /* Is it keyboard input supported? */
#define HB_GTI_CLIPBOARDDATA 15 /* Get/Set clipboard */

View File

@@ -820,17 +820,17 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_INPUTFD:
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, -1 );
break;
case GTI_SCREENWIDTH:
case HB_GTI_SCREENWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_fInit ?
AL_SCREEN_W : s_byFontWidth * s_iScrWidth );
iWidth = hb_itemGetNI( pInfo->pNewVal );
@@ -841,7 +841,7 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_SCREENHEIGHT:
case HB_GTI_SCREENHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_fInit ?
AL_SCREEN_H : s_byFontSize * s_iScrHeight );
iHeight = hb_itemGetNI( pInfo->pNewVal );
@@ -852,7 +852,7 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_SCREENDEPTH:
case HB_GTI_SCREENDEPTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_fInit ?
al_bitmap_color_depth( al_screen ) : al_desktop_color_depth() );
iValue = hb_itemGetNI( pInfo->pNewVal );
@@ -864,7 +864,7 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTSIZE:
case HB_GTI_FONTSIZE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_byFontSize );
iValue = hb_itemGetNI( pInfo->pNewVal );
if( iValue > 0 && iValue < 256 )
@@ -875,25 +875,25 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTWIDTH:
case HB_GTI_FONTWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_byFontWidth );
break;
case GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPWIDTH:
al_get_desktop_resolution( &iWidth, &iHeight );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, iWidth );
break;
case GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPHEIGHT:
al_get_desktop_resolution( &iWidth, &iHeight );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, iHeight );
break;
case GTI_DESKTOPDEPTH:
case HB_GTI_DESKTOPDEPTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, al_desktop_color_depth() );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
if( al_keyboard_needs_poll() )
{
al_poll_keyboard();
@@ -905,18 +905,18 @@ static BOOL hb_gt_alleg_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_WINTITLE:
case HB_GTI_WINTITLE:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
al_set_window_title( hb_itemGetCPtr( pInfo->pNewVal ) );
}
break;
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_iScrWidth );
break;
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_iScrHeight );
break;

View File

@@ -126,7 +126,7 @@ static void hb_gt_cgi_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
hb_fsSetDevMode( pGTCGI->hStdout, FD_BINARY );
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
HB_GTSELF_SETFLAG( pGT, GTI_STDOUTCON, TRUE );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDOUTCON, TRUE );
}
static void hb_gt_cgi_Exit( PHB_GT pGT )

View File

@@ -2472,7 +2472,7 @@ static void hb_gt_crs_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
add_new_ioBase( ioBase );
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
HB_GTSELF_RESIZE( pGT, s_ioBase->maxrow, s_ioBase->maxcol );
HB_GTSELF_SETFLAG( pGT, GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETBLINK( pGT, TRUE );
}
}
@@ -2896,12 +2896,12 @@ static BOOL hb_gt_crs_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_ESCDELAY:
case HB_GTI_ESCDELAY:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_ioBase->esc_delay );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
s_ioBase->esc_delay = hb_itemGetNI( pInfo->pNewVal );

View File

@@ -1389,13 +1389,13 @@ static int hb_gt_dos_getKbdState( void )
ucStat = HB_PEEK_BYTE( 0x0040, 0x0017 );
if( ucStat & HB_BIOS_SHIFT ) iKbdState |= GTI_KBD_SHIFT;
if( ucStat & HB_BIOS_CTRL ) iKbdState |= GTI_KBD_CTRL;
if( ucStat & HB_BIOS_ALT ) iKbdState |= GTI_KBD_ALT;
if( ucStat & HB_BIOS_SCROLL ) iKbdState |= GTI_KBD_SCROLOCK;
if( ucStat & HB_BIOS_NUMLOCK ) iKbdState |= GTI_KBD_NUMLOCK;
if( ucStat & HB_BIOS_CAPSLOCK ) iKbdState |= GTI_KBD_CAPSLOCK;
if( ucStat & HB_BIOS_INSERT ) iKbdState |= GTI_KBD_INSERT;
if( ucStat & HB_BIOS_SHIFT ) iKbdState |= HB_GTI_KBD_SHIFT;
if( ucStat & HB_BIOS_CTRL ) iKbdState |= HB_GTI_KBD_CTRL;
if( ucStat & HB_BIOS_ALT ) iKbdState |= HB_GTI_KBD_ALT;
if( ucStat & HB_BIOS_SCROLL ) iKbdState |= HB_GTI_KBD_SCROLOCK;
if( ucStat & HB_BIOS_NUMLOCK ) iKbdState |= HB_GTI_KBD_NUMLOCK;
if( ucStat & HB_BIOS_CAPSLOCK ) iKbdState |= HB_GTI_KBD_CAPSLOCK;
if( ucStat & HB_BIOS_INSERT ) iKbdState |= HB_GTI_KBD_INSERT;
return iKbdState;
}
@@ -1404,13 +1404,13 @@ static void hb_gt_dos_setKbdState( int iKbdState )
{
UCHAR ucStat = 0;
ucStat |= ( iKbdState & GTI_KBD_SHIFT ) ? HB_BIOS_SHIFT : 0;
ucStat |= ( iKbdState & GTI_KBD_CTRL ) ? HB_BIOS_CTRL : 0;
ucStat |= ( iKbdState & GTI_KBD_ALT ) ? HB_BIOS_ALT : 0;
ucStat |= ( iKbdState & GTI_KBD_SCROLOCK ) ? HB_BIOS_SCROLL : 0;
ucStat |= ( iKbdState & GTI_KBD_NUMLOCK ) ? HB_BIOS_NUMLOCK : 0;
ucStat |= ( iKbdState & GTI_KBD_CAPSLOCK ) ? HB_BIOS_CAPSLOCK : 0;
ucStat |= ( iKbdState & GTI_KBD_INSERT ) ? HB_BIOS_INSERT : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_SHIFT ) ? HB_BIOS_SHIFT : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_CTRL ) ? HB_BIOS_CTRL : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_ALT ) ? HB_BIOS_ALT : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_SCROLOCK ) ? HB_BIOS_SCROLL : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_NUMLOCK ) ? HB_BIOS_NUMLOCK : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_CAPSLOCK ) ? HB_BIOS_CAPSLOCK : 0;
ucStat |= ( iKbdState & HB_GTI_KBD_INSERT ) ? HB_BIOS_INSERT : 0;
HB_POKE_BYTE( 0x0040, 0x0017, ucStat );
}
@@ -1421,12 +1421,12 @@ static BOOL hb_gt_dos_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_dos_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_dos_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );

View File

@@ -105,7 +105,7 @@ static BOOL hb_gt_gui_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
#if defined( HB_OS_WIN_32 )
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( CF_TEXT, hb_itemGetCPtr( pInfo->pNewVal ),
@@ -128,7 +128,7 @@ static BOOL hb_gt_gui_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );

View File

@@ -65,16 +65,16 @@ int hb_gt_w32_getKbdState( void )
GetKeyboardState( kbState );
if( kbState[VK_SHIFT ] & 0x80 ) iKbdState |= GTI_KBD_SHIFT;
if( kbState[VK_CONTROL ] & 0x80 ) iKbdState |= GTI_KBD_CTRL;
if( kbState[VK_MENU ] & 0x80 ) iKbdState |= GTI_KBD_ALT;
if( kbState[VK_LWIN ] & 0x80 ) iKbdState |= GTI_KBD_LWIN;
if( kbState[VK_RWIN ] & 0x80 ) iKbdState |= GTI_KBD_RWIN;
if( kbState[VK_APPS ] & 0x80 ) iKbdState |= GTI_KBD_MENU;
if( kbState[VK_SCROLL ] & 0x01 ) iKbdState |= GTI_KBD_SCROLOCK;
if( kbState[VK_NUMLOCK ] & 0x01 ) iKbdState |= GTI_KBD_NUMLOCK;
if( kbState[VK_CAPITAL ] & 0x01 ) iKbdState |= GTI_KBD_CAPSLOCK;
if( kbState[VK_INSERT ] & 0x01 ) iKbdState |= GTI_KBD_INSERT;
if( kbState[VK_SHIFT ] & 0x80 ) iKbdState |= HB_GTI_KBD_SHIFT;
if( kbState[VK_CONTROL ] & 0x80 ) iKbdState |= HB_GTI_KBD_CTRL;
if( kbState[VK_MENU ] & 0x80 ) iKbdState |= HB_GTI_KBD_ALT;
if( kbState[VK_LWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_LWIN;
if( kbState[VK_RWIN ] & 0x80 ) iKbdState |= HB_GTI_KBD_RWIN;
if( kbState[VK_APPS ] & 0x80 ) iKbdState |= HB_GTI_KBD_MENU;
if( kbState[VK_SCROLL ] & 0x01 ) iKbdState |= HB_GTI_KBD_SCROLOCK;
if( kbState[VK_NUMLOCK ] & 0x01 ) iKbdState |= HB_GTI_KBD_NUMLOCK;
if( kbState[VK_CAPITAL ] & 0x01 ) iKbdState |= HB_GTI_KBD_CAPSLOCK;
if( kbState[VK_INSERT ] & 0x01 ) iKbdState |= HB_GTI_KBD_INSERT;
return iKbdState;
}
@@ -85,16 +85,16 @@ void hb_gt_w32_setKbdState( int iKbdState )
GetKeyboardState( kbState );
kbState[VK_SHIFT ] = ( iKbdState & GTI_KBD_SHIFT ) ? 0x80 : 0;
kbState[VK_CONTROL] = ( iKbdState & GTI_KBD_CTRL ) ? 0x80 : 0;
kbState[VK_MENU ] = ( iKbdState & GTI_KBD_ALT ) ? 0x80 : 0;
kbState[VK_LWIN ] = ( iKbdState & GTI_KBD_LWIN ) ? 0x80 : 0;
kbState[VK_RWIN ] = ( iKbdState & GTI_KBD_RWIN ) ? 0x80 : 0;
kbState[VK_APPS ] = ( iKbdState & GTI_KBD_MENU ) ? 0x80 : 0;
kbState[VK_SCROLL ] = ( iKbdState & GTI_KBD_SCROLOCK ) ? 0x01 : 0;
kbState[VK_NUMLOCK] = ( iKbdState & GTI_KBD_NUMLOCK ) ? 0x01 : 0;
kbState[VK_CAPITAL] = ( iKbdState & GTI_KBD_CAPSLOCK ) ? 0x01 : 0;
kbState[VK_INSERT ] = ( iKbdState & GTI_KBD_INSERT ) ? 0x01 : 0;
kbState[VK_SHIFT ] = ( iKbdState & HB_GTI_KBD_SHIFT ) ? 0x80 : 0;
kbState[VK_CONTROL] = ( iKbdState & HB_GTI_KBD_CTRL ) ? 0x80 : 0;
kbState[VK_MENU ] = ( iKbdState & HB_GTI_KBD_ALT ) ? 0x80 : 0;
kbState[VK_LWIN ] = ( iKbdState & HB_GTI_KBD_LWIN ) ? 0x80 : 0;
kbState[VK_RWIN ] = ( iKbdState & HB_GTI_KBD_RWIN ) ? 0x80 : 0;
kbState[VK_APPS ] = ( iKbdState & HB_GTI_KBD_MENU ) ? 0x80 : 0;
kbState[VK_SCROLL ] = ( iKbdState & HB_GTI_KBD_SCROLOCK ) ? 0x01 : 0;
kbState[VK_NUMLOCK] = ( iKbdState & HB_GTI_KBD_NUMLOCK ) ? 0x01 : 0;
kbState[VK_CAPITAL] = ( iKbdState & HB_GTI_KBD_CAPSLOCK ) ? 0x01 : 0;
kbState[VK_INSERT ] = ( iKbdState & HB_GTI_KBD_INSERT ) ? 0x01 : 0;
SetKeyboardState( kbState );
}

View File

@@ -820,8 +820,8 @@ static BOOL hb_gt_os2_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;

View File

@@ -523,8 +523,8 @@ static void hb_gt_pca_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
}
HB_GTSELF_RESIZE( pGT, iRows, iCols );
HB_GTSELF_SETFLAG( pGT, GTI_STDOUTCON, s_bStdoutConsole );
HB_GTSELF_SETFLAG( pGT, GTI_STDERRCON, s_bStderrConsole );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDOUTCON, s_bStdoutConsole );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDERRCON, s_bStderrConsole );
hb_gt_pca_AnsiInit();
hb_gt_pca_AnsiGetCurPos( &s_iRow, &s_iCol );
@@ -858,8 +858,8 @@ static BOOL hb_gt_pca_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;

View File

@@ -696,9 +696,9 @@ static void hb_gt_sln_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
hb_gt_sln_mouse_Init();
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
HB_GTSELF_RESIZE( pGT, SLtt_Screen_Rows, SLtt_Screen_Cols );
HB_GTSELF_SETFLAG( pGT, GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETFLAG( pGT, GTI_STDOUTCON, s_fStdOutTTY );
HB_GTSELF_SETFLAG( pGT, GTI_STDERRCON, s_fStdErrTTY );
HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDOUTCON, s_fStdOutTTY );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDERRCON, s_fStdErrTTY );
HB_GTSELF_SETBLINK( pGT, TRUE );
HB_GTSELF_SETPOS( pGT, SLsmg_get_row(), SLsmg_get_column() );
@@ -901,12 +901,12 @@ static BOOL hb_gt_sln_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_ESCDELAY:
case HB_GTI_ESCDELAY:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_sln_escDelay );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_sln_escDelay = hb_itemGetNI( pInfo->pNewVal );

View File

@@ -263,8 +263,8 @@ static void hb_gt_std_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
SetConsoleMode( ( HANDLE ) hb_fsGetOsHandle( pGTSTD->hStdin ), 0x0000 );
}
#endif
HB_GTSELF_SETFLAG( pGT, GTI_STDOUTCON, pGTSTD->fStdoutConsole );
HB_GTSELF_SETFLAG( pGT, GTI_STDERRCON, pGTSTD->fStderrConsole );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDOUTCON, pGTSTD->fStdoutConsole );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDERRCON, pGTSTD->fStderrConsole );
}
static void hb_gt_std_Exit( PHB_GT pGT )
@@ -721,8 +721,8 @@ static BOOL hb_gt_std_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch ( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;

View File

@@ -2889,9 +2889,9 @@ static void hb_gt_trm_Init( PHB_GT pGT, FHANDLE hFilenoStdin, FHANDLE hFilenoStd
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
HB_GTSELF_RESIZE( pGT, iRows, iCols );
HB_GTSELF_SETFLAG( pGT, GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETFLAG( pGT, GTI_STDOUTCON, pTerm->fStdoutTTY );
HB_GTSELF_SETFLAG( pGT, GTI_STDERRCON, pTerm->fStderrTTY );
HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, FALSE );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDOUTCON, pTerm->fStdoutTTY );
HB_GTSELF_SETFLAG( pGT, HB_GTI_STDERRCON, pTerm->fStderrTTY );
HB_GTSELF_SETBLINK( pGT, TRUE );
pTerm->Init( pTerm );
@@ -3375,24 +3375,24 @@ static BOOL hb_gt_trm_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pTerm = HB_GTTRM_GET( pGT );
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_ESCDELAY:
case HB_GTI_ESCDELAY:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pTerm->esc_delay );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
pTerm->esc_delay = hb_itemGetNI( pInfo->pNewVal );
break;
case GTI_DELKEYMAP:
case HB_GTI_DELKEYMAP:
szVal = hb_itemGetCPtr( pInfo->pNewVal );
if( szVal && *szVal )
removeKeyMap( pTerm, hb_itemGetCPtr( pInfo->pNewVal ) );
break;
case GTI_ADDKEYMAP:
case HB_GTI_ADDKEYMAP:
iVal = hb_arrayGetNI( pInfo->pNewVal, 1 );
szVal = hb_arrayGetCPtr( pInfo->pNewVal, 2 );
if( iVal && szVal && *szVal )

View File

@@ -1581,12 +1581,12 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_WINTITLE:
case HB_GTI_WINTITLE:
{
TCHAR buff[ 256 ];
char * szTitle;
@@ -1604,47 +1604,47 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
}
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
{
COORD coBuf = GetLargestConsoleWindowSize( s_HOutput );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, coBuf.Y - 1 );
break;
}
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
{
COORD coBuf = GetLargestConsoleWindowSize( s_HOutput );
pInfo->pResult = hb_itemPutNI( pInfo->pResult, coBuf.X - 1 );
break;
}
case GTI_VIEWPORTHEIGHT:
case HB_GTI_VIEWPORTHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_csbi.srWindow.Bottom -
s_csbi.srWindow.Top );
break;
case GTI_VIEWPORTWIDTH:
case HB_GTI_VIEWPORTWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, s_csbi.srWindow.Right -
s_csbi.srWindow.Left );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case GTI_KBDSPECIAL:
case HB_GTI_KBDSPECIAL:
pInfo->pResult = hb_itemPutL( pInfo->pResult, s_bSpecialKeyHandling );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_LOGICAL )
s_bSpecialKeyHandling = hb_itemGetL( pInfo->pNewVal );
break;
case GTI_KBDALT:
case HB_GTI_KBDALT:
pInfo->pResult = hb_itemPutL( pInfo->pResult, s_bAltKeyHandling );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_LOGICAL )
s_bAltKeyHandling = hb_itemGetL( pInfo->pNewVal );
break;
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( CF_OEMTEXT, hb_itemGetCPtr( pInfo->pNewVal ),

View File

@@ -1480,28 +1480,28 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_INPUTFD:
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_INPUT_HANDLE ) );
break;
case GTI_OUTPUTFD:
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_OUTPUT_HANDLE ) );
break;
case GTI_ERRORFD:
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult,
( UINT_PTR ) GetStdHandle( STD_ERROR_HANDLE ) );
break;
case GTI_FONTSIZE:
case HB_GTI_FONTSIZE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->PTEXTSIZE.y );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -1521,7 +1521,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTWIDTH:
case HB_GTI_FONTWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->fontWidth );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -1531,7 +1531,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTNAME:
case HB_GTI_FONTNAME:
pInfo->pResult = hb_itemPutC( pInfo->pResult, pWVT->fontFace );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) /* TODO */
{
@@ -1539,26 +1539,26 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_FONTWEIGHT:
case HB_GTI_FONTWEIGHT:
switch( pWVT->fontWeight )
{
case FW_THIN:
case FW_EXTRALIGHT:
case FW_LIGHT:
iVal = GTI_FONTW_THIN;
iVal = HB_GTI_FONTW_THIN;
break;
case FW_DONTCARE:
case FW_NORMAL:
case FW_MEDIUM:
iVal = GTI_FONTW_NORMAL;
iVal = HB_GTI_FONTW_NORMAL;
break;
case FW_SEMIBOLD:
case FW_BOLD:
case FW_EXTRABOLD:
case FW_HEAVY:
iVal = GTI_FONTW_BOLD;
iVal = HB_GTI_FONTW_BOLD;
break;
default:
@@ -1571,32 +1571,32 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
/* store font status for next operation on fontsize */
switch( hb_itemGetNI( pInfo->pNewVal ) )
{
case GTI_FONTW_THIN:
case HB_GTI_FONTW_THIN:
pWVT->fontWeight = FW_LIGHT;
break;
case GTI_FONTW_NORMAL:
case HB_GTI_FONTW_NORMAL:
pWVT->fontWeight = FW_NORMAL;
break;
case GTI_FONTW_BOLD:
case HB_GTI_FONTW_BOLD:
pWVT->fontWeight = FW_BOLD;
break;
}
}
break;
case GTI_FONTQUALITY:
case HB_GTI_FONTQUALITY:
switch( pWVT->fontQuality )
{
case ANTIALIASED_QUALITY:
iVal = GTI_FONTQ_HIGH;
iVal = HB_GTI_FONTQ_HIGH;
break;
case DEFAULT_QUALITY:
case DRAFT_QUALITY:
iVal = GTI_FONTQ_NORMAL;
iVal = HB_GTI_FONTQ_NORMAL;
break;
case NONANTIALIASED_QUALITY:
case PROOF_QUALITY:
iVal = GTI_FONTQ_DRAFT;
iVal = HB_GTI_FONTQ_DRAFT;
break;
default:
iVal = 0;
@@ -1607,20 +1607,20 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
switch( hb_itemGetNI( pInfo->pNewVal ) )
{
case GTI_FONTQ_HIGH:
case HB_GTI_FONTQ_HIGH:
pWVT->fontQuality = ANTIALIASED_QUALITY;
break;
case GTI_FONTQ_NORMAL:
case HB_GTI_FONTQ_NORMAL:
pWVT->fontQuality = DEFAULT_QUALITY;
break;
case GTI_FONTQ_DRAFT:
case HB_GTI_FONTQ_DRAFT:
pWVT->fontQuality = DRAFT_QUALITY;
break;
}
}
break;
case GTI_SCREENHEIGHT:
case HB_GTI_SCREENHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->PTEXTSIZE.y * pWVT->ROWS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -1629,7 +1629,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_SCREENWIDTH:
case HB_GTI_SCREENWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->PTEXTSIZE.x * pWVT->COLS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
@@ -1638,7 +1638,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPWIDTH:
{
RECT rDesk;
HWND hDesk;
@@ -1648,7 +1648,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.right - rDesk.left );
break;
}
case GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPHEIGHT:
{
RECT rDesk;
HWND hDesk = GetDesktopWindow();
@@ -1656,7 +1656,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, rDesk.bottom - rDesk.top );
break;
}
case GTI_DESKTOPCOLS:
case HB_GTI_DESKTOPCOLS:
{
RECT rDesk;
HWND hDesk;
@@ -1666,7 +1666,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
( rDesk.right - rDesk.left ) / pWVT->PTEXTSIZE.x );
break;
}
case GTI_DESKTOPROWS:
case HB_GTI_DESKTOPROWS:
{
RECT rDesk;
HWND hDesk;
@@ -1676,7 +1676,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
( rDesk.bottom - rDesk.top ) / pWVT->PTEXTSIZE.y );
break;
}
case GTI_WINTITLE:
case HB_GTI_WINTITLE:
{
char * szTitle = NULL;
if( hb_gt_wvt_GetWindowTitle( pWVT->hWnd, &szTitle ) )
@@ -1687,7 +1687,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
hb_gt_wvt_SetWindowTitle( pWVT->hWnd, hb_itemGetCPtr( pInfo->pNewVal ) );
break;
}
case GTI_CODEPAGE:
case HB_GTI_CODEPAGE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->CodePage );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 && iVal != pWVT->CodePage )
@@ -1697,7 +1697,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_ICONFILE:
case HB_GTI_ICONFILE:
{
HICON hIcon = 0;
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
@@ -1716,7 +1716,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
}
case GTI_ICONRES:
case HB_GTI_ICONRES:
{
HICON hIcon = 0;
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
@@ -1739,21 +1739,21 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, ( UINT_PTR ) hIcon );
break;
}
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->COLS );
break;
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->ROWS );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, hb_gt_w32_getKbdState() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
hb_gt_w32_setKbdState( hb_itemGetNI( pInfo->pNewVal ) );
break;
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_w32_setClipboard( pWVT->CodePage == OEM_CHARSET ?
@@ -1780,7 +1780,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_CURSORBLINKRATE:
case HB_GTI_CURSORBLINKRATE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, GetCaretBlinkTime() );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
SetCaretBlinkTime( hb_itemGetNI( pInfo->pNewVal ) );

View File

@@ -3632,9 +3632,9 @@ static int hb_gt_xwc_getKbdState( PXWND_DEF wnd )
{
int iKbdState = 0;
if( wnd->keyModifiers.bShift ) iKbdState |= GTI_KBD_SHIFT;
if( wnd->keyModifiers.bCtrl ) iKbdState |= GTI_KBD_CTRL;
if( wnd->keyModifiers.bAlt ) iKbdState |= GTI_KBD_ALT;
if( wnd->keyModifiers.bShift ) iKbdState |= HB_GTI_KBD_SHIFT;
if( wnd->keyModifiers.bCtrl ) iKbdState |= HB_GTI_KBD_CTRL;
if( wnd->keyModifiers.bAlt ) iKbdState |= HB_GTI_KBD_ALT;
return iKbdState;
}
@@ -3651,20 +3651,20 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
hb_gt_xwc_ConnectX( wnd, FALSE );
break;
case GTI_INPUTFD:
case GTI_SCREENDEPTH:
case GTI_DESKTOPDEPTH:
case GTI_DESKTOPWIDTH:
case GTI_DESKTOPHEIGHT:
case GTI_DESKTOPCOLS:
case GTI_DESKTOPROWS:
case GTI_CLIPBOARDDATA:
case HB_GTI_INPUTFD:
case HB_GTI_SCREENDEPTH:
case HB_GTI_DESKTOPDEPTH:
case HB_GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPCOLS:
case HB_GTI_DESKTOPROWS:
case HB_GTI_CLIPBOARDDATA:
hb_gt_xwc_ConnectX( wnd, TRUE );
break;
}
@@ -3672,45 +3672,45 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
switch( iType )
{
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISGRAPHIC:
pInfo->pResult = hb_itemPutL( pInfo->pResult, wnd->dpy != NULL );
break;
case GTI_INPUTFD:
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, ConnectionNumber( wnd->dpy ) );
break;
case GTI_SCREENWIDTH:
case HB_GTI_SCREENWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->width );
break;
case GTI_SCREENHEIGHT:
case HB_GTI_SCREENHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->height );
break;
case GTI_SCREENDEPTH:
case GTI_DESKTOPDEPTH:
case HB_GTI_SCREENDEPTH:
case HB_GTI_DESKTOPDEPTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult,
DefaultDepth( wnd->dpy, DefaultScreen( wnd->dpy ) ) );
break;
case GTI_FONTSIZE:
case HB_GTI_FONTSIZE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->fontHeight );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 ) /* TODO */
wnd->fontHeight = iVal;
break;
case GTI_FONTWIDTH:
case HB_GTI_FONTWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->fontWidth );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 ) /* TODO */
wnd->fontWidth = iVal;
break;
case GTI_FONTNAME:
case HB_GTI_FONTNAME:
pInfo->pResult = hb_itemPutC( pInfo->pResult, wnd->szFontName );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) /* TODO */
{
@@ -3720,25 +3720,25 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_DESKTOPWIDTH:
case GTI_DESKTOPHEIGHT:
case GTI_DESKTOPCOLS:
case GTI_DESKTOPROWS:
case HB_GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPCOLS:
case HB_GTI_DESKTOPROWS:
{
XWindowAttributes wndAttr;
XGetWindowAttributes( wnd->dpy, DefaultRootWindow( wnd->dpy ), &wndAttr );
switch( iType )
{
case GTI_DESKTOPWIDTH:
case HB_GTI_DESKTOPWIDTH:
iVal = wndAttr.width;
break;
case GTI_DESKTOPHEIGHT:
case HB_GTI_DESKTOPHEIGHT:
iVal = wndAttr.height;
break;
case GTI_DESKTOPCOLS:
case HB_GTI_DESKTOPCOLS:
iVal = wndAttr.width / wnd->fontWidth;
break;
case GTI_DESKTOPROWS:
case HB_GTI_DESKTOPROWS:
iVal = wndAttr.height / wnd->fontHeight;
break;
default:
@@ -3748,7 +3748,7 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
break;
}
case GTI_WINTITLE:
case HB_GTI_WINTITLE:
pInfo->pResult = hb_itemPutC( pInfo->pResult, wnd->szTitle );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
@@ -3764,15 +3764,15 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->cols );
break;
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->rows );
break;
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
hb_gt_xwc_RealRefresh( wnd );
@@ -3790,13 +3790,13 @@ static BOOL hb_gt_xwc_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_CURSORBLINKRATE:
case HB_GTI_CURSORBLINKRATE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, wnd->cursorBlinkRate );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
wnd->cursorBlinkRate = hb_itemGetNI( pInfo->pNewVal );
break;
case GTI_KBDSHIFTS:
case HB_GTI_KBDSHIFTS:
pInfo->pResult = hb_itemPutNI( pInfo->pResult,
hb_gt_xwc_getKbdState( wnd ) );
break;

View File

@@ -1419,41 +1419,41 @@ static BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
{
switch ( iType )
{
case GTI_ISGRAPHIC:
case GTI_FULLSCREEN:
case GTI_KBDSUPPORT:
case GTI_ISCTWIN:
case GTI_ISMULTIWIN:
case HB_GTI_ISGRAPHIC:
case HB_GTI_FULLSCREEN:
case HB_GTI_KBDSUPPORT:
case HB_GTI_ISCTWIN:
case HB_GTI_ISMULTIWIN:
pInfo->pResult = hb_itemPutL( pInfo->pResult, FALSE );
break;
case GTI_INPUTFD:
case HB_GTI_INPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, pGT->hStdIn );
break;
case GTI_OUTPUTFD:
case HB_GTI_OUTPUTFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, pGT->hStdOut );
break;
case GTI_ERRORFD:
case HB_GTI_ERRORFD:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, pGT->hStdErr );
break;
case GTI_COMPATBUFFER:
case HB_GTI_COMPATBUFFER:
pInfo->pResult = hb_itemPutL( pInfo->pResult, pGT->fVgaCell );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_LOGICAL )
pGT->fVgaCell = hb_itemGetL( pInfo->pNewVal );
break;
case GTI_VIEWMAXWIDTH:
case HB_GTI_VIEWMAXWIDTH:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, HB_GTSELF_MAXCOL( pGT ) );
break;
case GTI_VIEWMAXHEIGHT:
case HB_GTI_VIEWMAXHEIGHT:
pInfo->pResult = hb_itemPutNInt( pInfo->pResult, HB_GTSELF_MAXROW( pGT ) );
break;
case GTI_NEWWIN: /* clear screen area, set default cursor shape and position */
case HB_GTI_NEWWIN: /* clear screen area, set default cursor shape and position */
{
/* Clear screen */
HB_GTSELF_DISPBEGIN( pGT );
@@ -1465,7 +1465,7 @@ static BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
HB_GTSELF_FLUSH( pGT );
/* no break; */
}
case GTI_GETWIN: /* save screen buffer, cursor shape and possition */
case HB_GTI_GETWIN: /* save screen buffer, cursor shape and possition */
{
int iRow, iCol;
ULONG ulSize;
@@ -1493,7 +1493,7 @@ static BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
}
case GTI_SETWIN: /* restore screen buffer, cursor shape and possition */
case HB_GTI_SETWIN: /* restore screen buffer, cursor shape and possition */
if( hb_arrayLen( pInfo->pNewVal ) == 8 )
{
HB_GTSELF_DISPBEGIN( pGT );
@@ -1512,7 +1512,7 @@ static BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
}
break;
case GTI_CLIPBOARDDATA:
case HB_GTI_CLIPBOARDDATA:
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
/* set new Clipboard value */
@@ -1557,12 +1557,12 @@ static int hb_gt_def_Alert( PHB_GT pGT, PHB_ITEM pMessage, PHB_ITEM pOptions,
gtInfo.pNewVal = gtInfo.pResult = NULL;
HB_GTSELF_INFO( pGT, GTI_FULLSCREEN, &gtInfo );
HB_GTSELF_INFO( pGT, HB_GTI_FULLSCREEN, &gtInfo );
if( gtInfo.pResult )
{
fScreen = hb_itemGetL( gtInfo.pResult );
}
HB_GTSELF_INFO( pGT, GTI_KBDSUPPORT, &gtInfo );
HB_GTSELF_INFO( pGT, HB_GTI_KBDSUPPORT, &gtInfo );
if( gtInfo.pResult )
{
fKeyBoard = hb_itemGetL( gtInfo.pResult );
@@ -1878,17 +1878,17 @@ static int hb_gt_def_SetFlag( PHB_GT pGT, int iType, int iNewValue )
switch ( iType )
{
case GTI_COMPATBUFFER:
case HB_GTI_COMPATBUFFER:
iPrevValue = pGT->fVgaCell;
pGT->fVgaCell = iNewValue != 0;
break;
case GTI_STDOUTCON:
case HB_GTI_STDOUTCON:
iPrevValue = pGT->fStdOutCon;
pGT->fStdOutCon = iNewValue != 0;
break;
case GTI_STDERRCON:
case HB_GTI_STDERRCON:
iPrevValue = pGT->fStdErrCon;
pGT->fStdErrCon = iNewValue != 0;
break;

View File

@@ -12,7 +12,7 @@ Function Main
Local nScreenWidth, nFontHeight, nFontWidth
Local nTop, nLeft, nHeight, nWidth, nColor, nSec := Seconds()
If !hb_gtInfo(GTI_ISGRAPHIC)
If !hb_gtInfo(HB_GTI_ISGRAPHIC)
?
? "You are using a non graphics capable gt:"
? hb_gtVersion()
@@ -20,23 +20,23 @@ Local nTop, nLeft, nHeight, nWidth, nColor, nSec := Seconds()
Quit
End
If hb_gtInfo(GTI_DESKTOPWIDTH) > 1000
hb_gtInfo(GTI_FONTWIDTH, 12)
hb_gtInfo(GTI_FONTSIZE, 24)
If hb_gtInfo(HB_GTI_DESKTOPWIDTH) > 1000
hb_gtInfo(HB_GTI_FONTWIDTH, 12)
hb_gtInfo(HB_GTI_FONTSIZE, 24)
End
? hb_gtVersion(1)
nScreenWidth := hb_gtInfo(GTI_SCREENWIDTH)
nFontHeight := hb_gtInfo(GTI_FONTSIZE)
nFontWidth := hb_gtInfo(GTI_FONTWIDTH)
nScreenWidth := hb_gtInfo(HB_GTI_SCREENWIDTH)
nFontHeight := hb_gtInfo(HB_GTI_FONTSIZE)
nFontWidth := hb_gtInfo(HB_GTI_FONTWIDTH)
SetColor("n/w")
@ 0, 0 Say Space(MaxCol() + 1)
@ 1, 0 Say PadC(WELCOME, MaxCol() + 1)
@ 2, 0 Say Space(MaxCol() + 1)
hb_gtInfo(GTI_WINTITLE, "Cross-GT, multiplatform graphics demo")
hb_gtInfo(HB_GTI_WINTITLE, "Cross-GT, multiplatform graphics demo")
PutFrame(nFontHeight / 2,;
MaxCol() / 2 * nFontWidth - Len(WELCOME) / 2 * nFontWidth - nFontWidth,;
@@ -45,8 +45,8 @@ Local nTop, nLeft, nHeight, nWidth, nColor, nSec := Seconds()
hb_gfxMakeColor(0, 0, 0), hb_gfxMakeColor(255, 255, 255))
While Inkey() == 0
nTop := Int(hb_Random(3.1 * nFontHeight, hb_gtInfo(GTI_SCREENHEIGHT)))
nLeft := Int(hb_Random(hb_gtInfo(GTI_SCREENWIDTH)))
nTop := Int(hb_Random(3.1 * nFontHeight, hb_gtInfo(HB_GTI_SCREENHEIGHT)))
nLeft := Int(hb_Random(hb_gtInfo(HB_GTI_SCREENWIDTH)))
nHeight := Int(hb_Random(251))
nWidth := Int(hb_Random(251))
nColor := hb_gfxMakeColor(Int(hb_Random(32, 256)), Int(hb_Random(32, 256)), Int(hb_Random(32, 256)))

View File

@@ -39,9 +39,9 @@ else
endif
lBoxChar := !empty( lBoxChar )
HB_GTINFO( GTI_FONTNAME, "fixed" )
HB_GTINFO( GTI_FONTWIDTH, 9 )
HB_GTINFO( GTI_FONTSIZE, 20 )
HB_GTINFO( HB_GTI_FONTNAME, "fixed" )
HB_GTINFO( HB_GTI_FONTWIDTH, 9 )
HB_GTINFO( HB_GTI_FONTSIZE, 20 )
HB_SETTERMCP( cTermCP, cHostCP, lBoxChar )
@@ -50,7 +50,7 @@ HB_SETTERMCP( cTermCP, cHostCP, lBoxChar )
? "Host codpage: " + cHostCP + ", terminal codepage: " + cTermCP
?
//HB_GTINFO(GTI_COMPATBUFFER,.f.)
//HB_GTINFO(HB_GTI_COMPATBUFFER,.f.)
?
for i := 0 to 15
for j := 0 to 15
@@ -71,7 +71,7 @@ inkey(0)
? " CP-1250: say[ " + POL_WIN + " ]"; dspboxch( ", box[ " + POL_WIN + " ]" )
? " CP-852: say[ " + POL_852 + " ]"; dspboxch( ", box[ " + POL_852 + " ]" )
? chr(4)+chr(16)+chr(17)+chr(24)+chr(25)+chr(26)+chr(27)+chr(30)+chr(31)
HB_GTINFO(GTI_ESCDELAY,5)
HB_GTINFO(HB_GTI_ESCDELAY,5)
inkey(0)
alert("ALERT BOX")
return nil

View File

@@ -217,7 +217,7 @@ setcancel(.f.)
#ifdef __HARBOUR__
set(_SET_EVENTMASK,INKEY_ALL)
hb_gtInfo(GTI_ESCDELAY,50)
hb_gtInfo(HB_GTI_ESCDELAY,50)
hb_setCodePage( "PLMAZ" )
hb_setTermCP( "PLISO" )
? hb_gtVersion(1), hb_gtVersion()

View File

@@ -21,22 +21,22 @@ proc main()
local i, j, k
/* set OEM font encoding for non unicode modes */
hb_gtInfo( GTI_CODEPAGE, 255 )
hb_gtInfo( HB_GTI_CODEPAGE, 255 )
/* Set EN CP-437 encoding */
hb_setCodePage( "EN" )
hb_setTermCP( "EN" )
/* Set font size */
hb_gtInfo( GTI_FONTWIDTH, 6 )
hb_gtInfo( GTI_FONTSIZE, 12 )
hb_gtInfo( HB_GTI_FONTWIDTH, 6 )
hb_gtInfo( HB_GTI_FONTSIZE, 12 )
/* resize console window using new font size */
SetMode( MaxRow() + 1, MaxCol() + 1 )
/* get screen dimensions */
nMaxScrRow = hb_gtInfo( GTI_DESKTOPROWS )
nMaxScrCol = hb_gtInfo( GTI_DESKTOPCOLS )
nMaxScrRow = hb_gtInfo( HB_GTI_DESKTOPROWS )
nMaxScrCol = hb_gtInfo( HB_GTI_DESKTOPCOLS )
/* resize console window to the screen size */
SetMode( nMaxScrRow, nMaxScrCol )