diff --git a/ChangeLog.txt b/ChangeLog.txt index 3361908280..f68799deda 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,14 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2014-08-17 23:06 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * include/hbrddcdx.h + * minor clarification in commnet + + * src/rtl/hbgtcore.c + * do not save and restore SetColor() when debugger is activated and + closed + 2014-08-13 16:27 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/debug/dbgentry.c * src/debug/debugger.prg diff --git a/include/hbrddcdx.h b/include/hbrddcdx.h index d5afc77bea..cb5e6a843a 100644 --- a/include/hbrddcdx.h +++ b/include/hbrddcdx.h @@ -181,8 +181,8 @@ HB_EXTERN_BEGIN /* indexSig: 0x01 - CLIP like, ignoreCase significant - 0x20 - ASCII ADI - 0x00 - UNICODE ADI + 0x20 - in index header: ADI file, in ADI tag header: ASCII + 0x00 - in ADI tag header: UNICODE */ /* CDX index node strucutres */ /* Compact Index Header Record */ diff --git a/src/rtl/hbgtcore.c b/src/rtl/hbgtcore.c index 7467ffad52..afe7e22a5a 100644 --- a/src/rtl/hbgtcore.c +++ b/src/rtl/hbgtcore.c @@ -1874,17 +1874,16 @@ static HB_BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) if( ! pInfo->pResult ) pInfo->pResult = hb_itemNew( NULL ); - hb_arrayNew( pInfo->pResult, 8 ); + hb_arrayNew( pInfo->pResult, 6 ); HB_GTSELF_GETPOS( pGT, &iRow, &iCol ); hb_arraySetNI( pInfo->pResult, 1, iRow ); hb_arraySetNI( pInfo->pResult, 2, iCol ); hb_arraySetNI( pInfo->pResult, 3, HB_GTSELF_GETCURSORSTYLE( pGT ) ); - hb_arraySetC ( pInfo->pResult, 4, hb_conSetColor( NULL ) ); iRow = HB_GTSELF_MAXROW( pGT ); iCol = HB_GTSELF_MAXCOL( pGT ); - hb_arraySetNI( pInfo->pResult, 5, iRow ); - hb_arraySetNI( pInfo->pResult, 6, iCol ); + hb_arraySetNI( pInfo->pResult, 4, iRow ); + hb_arraySetNI( pInfo->pResult, 5, iCol ); iFlag = HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, 0 ); nSize = HB_GTSELF_RECTSIZE( pGT, 0, 0, iRow, iCol ); @@ -1892,7 +1891,7 @@ static HB_BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) { void * pBuffer = hb_xgrab( nSize + 1 ); HB_GTSELF_SAVE( pGT, 0, 0, iRow, iCol, pBuffer ); - hb_arraySetCLPtr( pInfo->pResult, 7, ( char * ) pBuffer, nSize ); + hb_arraySetCLPtr( pInfo->pResult, 6, ( char * ) pBuffer, nSize ); } if( iFlag != 0 ) HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, iFlag ); @@ -1900,21 +1899,20 @@ static HB_BOOL hb_gt_def_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo ) } case HB_GTI_SETWIN: /* restore screen buffer, cursor shape and possition */ if( ( hb_itemType( pInfo->pNewVal ) & HB_IT_ARRAY ) && - hb_arrayLen( pInfo->pNewVal ) == 8 ) + hb_arrayLen( pInfo->pNewVal ) == 6 ) { HB_GTSELF_DISPBEGIN( pGT ); - if( hb_arrayGetCLen( pInfo->pNewVal, 7 ) > 0 ) + if( hb_arrayGetCLen( pInfo->pNewVal, 6 ) > 0 ) { int iFlag = HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, 0 ); - HB_GTSELF_REST( pGT, 0, 0, hb_arrayGetNI( pInfo->pNewVal, 5 ), - hb_arrayGetNI( pInfo->pNewVal, 6 ), - hb_arrayGetCPtr( pInfo->pNewVal, 7 ) ); + HB_GTSELF_REST( pGT, 0, 0, hb_arrayGetNI( pInfo->pNewVal, 4 ), + hb_arrayGetNI( pInfo->pNewVal, 5 ), + hb_arrayGetCPtr( pInfo->pNewVal, 6 ) ); HB_GTSELF_SETFLAG( pGT, HB_GTI_COMPATBUFFER, iFlag ); } HB_GTSELF_SETPOS( pGT, hb_arrayGetNI( pInfo->pNewVal, 1 ), hb_arrayGetNI( pInfo->pNewVal, 2 ) ); HB_GTSELF_SETCURSORSTYLE( pGT, hb_arrayGetNI( pInfo->pNewVal, 3 ) ); - hb_conSetColor( hb_arrayGetCPtr( pInfo->pNewVal, 4 ) ); HB_GTSELF_DISPEND( pGT ); HB_GTSELF_FLUSH( pGT ); }