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

2007-04-16 01:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/debug/debugger.prg
    * removed some not longer necessary GTWVW extensions

  * harbour/source/rtl/hbgtcore.c
  * harbour/contrib/libct/ctwin.c
    + added support for GTI_{NEW,GET,SET}WIN in CTWIN
      Now debugger can be used with CTWIN without any problems
This commit is contained in:
Przemyslaw Czerpak
2007-04-15 23:50:24 +00:00
parent 942d57e0f1
commit eeb38e90e7
4 changed files with 46 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -8,6 +8,15 @@
2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
2007-04-16 01:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/debug/debugger.prg
* removed some not longer necessary GTWVW extensions
* harbour/source/rtl/hbgtcore.c
* harbour/contrib/libct/ctwin.c
+ added support for GTI_{NEW,GET,SET}WIN in CTWIN
Now debugger can be used with CTWIN without any problems
2007-04-16 00:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/common.mak
* harbour/bin/pack_src.sh

33
harbour/contrib/libct/ctwin.c
View File

@@ -1366,6 +1366,39 @@ static BOOL hb_ctw_gt_Info( int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutL( pInfo->pResult, TRUE );
break;
case GTI_NEWWIN:
{
BOOL fResult;
hb_ctw_SelectWindow( 0 );
fResult = HB_GTSUPER_INFO( iType, pInfo );
if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
hb_itemPutNI( hb_arrayGetItemPtr( pInfo->pResult, 8 ),
s_iCurrWindow );
return fResult;
}
case GTI_GETWIN:
{
BOOL fResult;
int iWindow = s_iCurrWindow;
hb_ctw_SelectWindow( 0 );
fResult = HB_GTSUPER_INFO( iType, pInfo );
if( fResult && hb_arrayLen( pInfo->pResult ) >= 8 )
hb_itemPutNI( hb_arrayGetItemPtr( pInfo->pResult, 8 ), iWindow );
return fResult;
}
case GTI_SETWIN:
{
BOOL fResult;
hb_ctw_SelectWindow( 0 );
fResult = HB_GTSUPER_INFO( iType, pInfo );
if( hb_arrayLen( pInfo->pNewVal ) == 8 )
hb_ctw_SelectWindow( hb_arrayGetNI( pInfo->pNewVal, 8 ) );
return fResult;
}
default:
return HB_GTSUPER_INFO( iType, pInfo );
}

22
harbour/source/debug/debugger.prg
View File

@@ -129,14 +129,11 @@
* The dimension of the debugger window
//#IFDEF __GTWVW__
#define DEBUGGER_MINROW 0
#define DEBUGGER_MINCOL 0
#define DEBUGGER_MAXROW 22
#define DEBUGGER_MAXCOL 77
//#ENDIF
static s_oDebugger
@@ -215,9 +212,6 @@ CLASS TDebugger
DATA lRunAtStartup
DATA lLineNumbers INIT .T.
//x for gtwvw:
DATA cGTVersion INIT ' '
METHOD New()
METHOD Activate()
@@ -397,20 +391,8 @@ METHOD New() CLASS TDebugger
::lGo := ::lRunAtStartup
/* Store the initial screen dimensions for now */
#ifdef __XHARBOUR__
if hb_gt_Version() == 'WVW' .and. ;
!( type( 'WVW_NOPENWINDOW()' ) == 'U' .OR. Type( 'WVW_NSETCURWINDOW()' ) == 'U' )
::cGTVersion := 'WVW'
::nMaxRow := DEBUGGER_MAXROW
::nMaxCol := DEBUGGER_MAXCOL
else
::nMaxRow := MaxRow()
::nMaxCol := MaxCol()
endif
#else
::nMaxRow := MaxRow()
::nMaxCol := MaxCol()
#endif
::nMaxRow := MaxRow()
::nMaxCol := MaxCol()
::oPullDown := __dbgBuildMenu( Self )

4
harbour/source/rtl/hbgtcore.c
View File

@@ -1499,7 +1499,7 @@ static BOOL hb_gt_def_Info( int iType, PHB_GT_INFO pInfo )
if( !pInfo->pResult )
pInfo->pResult = hb_itemNew( NULL );
hb_arrayNew( pInfo->pResult, 7 );
hb_arrayNew( pInfo->pResult, 8 );
hb_gt_GetPos( &iRow, &iCol );
hb_itemPutNI( hb_arrayGetItemPtr( pInfo->pResult, 1 ), iRow );
hb_itemPutNI( hb_arrayGetItemPtr( pInfo->pResult, 2 ), iCol );
@@ -1522,7 +1522,7 @@ static BOOL hb_gt_def_Info( int iType, PHB_GT_INFO pInfo )
break;
}
case GTI_SETWIN: /* restore screen buffer, cursor shape and possition */
if( hb_arrayLen( pInfo->pNewVal ) == 7 )
if( hb_arrayLen( pInfo->pNewVal ) == 8 )
{
hb_gt_DispBegin();
if( hb_arrayGetCLen( pInfo->pNewVal, 7 ) > 0 )