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

2009-02-26 12:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/source/rtl/gtwvt/gtwvt.h
  * harbour/source/rtl/gtwvt/gtwvt.c
    + added support to set codepage for box drawing characters using
      HB_GTI_BOXCP as numeric value just like in HB_GTI_CODEPAGE for
      non UNICODE builds. In Windows CP encoding has even higher priority
      then font name so such functionality is necessary for users who
      have to keep normal and box font synced
    % do not allocate separate font handle for BOX drawing characters
      when they have the same encoding as normal characters
    ! keep box and normal font handles synced and free then on exit
    ! respect HB_GTI_RESIZABLE settings when new window is created
This commit is contained in:
Przemyslaw Czerpak
2009-02-26 10:57:23 +00:00
parent 7bdb1a9ea4
commit 4ced222eb0
3 changed files with 126 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -8,6 +8,19 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-02-26 12:02 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/source/rtl/gtwvt/gtwvt.h
* harbour/source/rtl/gtwvt/gtwvt.c
+ added support to set codepage for box drawing characters using
HB_GTI_BOXCP as numeric value just like in HB_GTI_CODEPAGE for
non UNICODE builds. In Windows CP encoding has even higher priority
then font name so such functionality is necessary for users who
have to keep normal and box font synced
% do not allocate separate font handle for BOX drawing characters
when they have the same encoding as normal characters
! keep box and normal font handles synced and free then on exit
! respect HB_GTI_RESIZABLE settings when new window is created
2009-02-26 10:24 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* bin/hb-mkdyn.bat
+ Moving .lib and .exp (if they are generated) files

137
harbour/source/rtl/gtwvt/gtwvt.c
View File

@@ -218,6 +218,13 @@ static void hb_gt_wvt_Free( PHB_GTWVT pWVT )
if( pWVT->pszSelectCopy )
hb_xfree( pWVT->pszSelectCopy );
#if !defined( UNICODE )
if( pWVT->hFontBox && pWVT->hFontBox != pWVT->hFont )
DeleteObject( pWVT->hFontBox );
#endif
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
if( pWVT->hWnd )
DestroyWindow( pWVT->hWnd );
@@ -291,6 +298,9 @@ static PHB_GTWVT hb_gt_wvt_New( PHB_GT pGT, HINSTANCE hInstance, int iCmdShow )
pWVT->CentreWindow = TRUE; /* Default is to always display window in centre of screen */
pWVT->CodePage = OEM_CHARSET; /* GetACP(); - set code page to default system */
#if !defined( UNICODE )
pWVT->boxCodePage = OEM_CHARSET; /* GetACP(); - set code page to default system */
#endif
pWVT->Win9X = ( osvi.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS );
pWVT->AltF4Close = FALSE;
@@ -656,14 +666,21 @@ static void hb_gt_wvt_FitSize( PHB_GTWVT pWVT )
tm.tmAveCharWidth >= 3 &&
tm.tmHeight >= 4 )
{
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
#if ! defined( UNICODE )
if( pWVT->hFontBox )
if( pWVT->hFontBox && pWVT->hFontBox != pWVT->hFont )
DeleteObject( pWVT->hFontBox );
pWVT->hFontBox = hb_gt_wvt_GetFont( pWVT->fontFace, fontHeight, fontWidth, pWVT->fontWeight, pWVT->fontQuality, OEM_CHARSET );
if( pWVT->CodePage == pWVT->boxCodePage )
pWVT->hFontBox = hFont;
else
{
pWVT->hFontBox = hb_gt_wvt_GetFont( pWVT->fontFace, fontHeight, fontWidth, pWVT->fontWeight, pWVT->fontQuality, pWVT->boxCodePage );
if( !pWVT->hFontBox )
pWVT->hFontBox = hFont;
}
#endif
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
pWVT->hFont = hFont;
pWVT->fontHeight = tm.tmHeight;
@@ -732,8 +749,17 @@ static void hb_gt_wvt_ResetWindowSize( PHB_GTWVT pWVT )
hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, pWVT->CodePage );
#if ! defined( UNICODE )
pWVT->hFontBox = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, OEM_CHARSET );
if( pWVT->hFontBox )
DeleteObject( pWVT->hFontBox );
if( pWVT->CodePage == pWVT->boxCodePage )
pWVT->hFontBox = hFont;
else
{
pWVT->hFontBox = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, pWVT->boxCodePage );
if( !pWVT->hFontBox )
pWVT->hFontBox = hFont;
}
#endif
pWVT->hFont = hFont;
}
@@ -1754,7 +1780,7 @@ static BOOL hb_gt_wvt_ValidWindowSize( HWND hWnd, int rows, int cols, HFONT hFon
return ( width <= maxWidth ) && ( height <= maxHeight );
}
static HWND hb_gt_wvt_CreateWindow( HINSTANCE hInstance )
static HWND hb_gt_wvt_CreateWindow( HINSTANCE hInstance, BOOL bResizable )
{
HWND hWnd;
LPTSTR szAppName;
@@ -1766,8 +1792,11 @@ static HWND hb_gt_wvt_CreateWindow( HINSTANCE hInstance )
hWnd = CreateWindow(
s_szClassName, /* classname */
szAppName, /* window name */
WS_THICKFRAME|WS_OVERLAPPED|WS_CAPTION|
WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX, /* style */
bResizable ? /* style */
( WS_THICKFRAME|WS_OVERLAPPED|WS_CAPTION|
WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX ) :
( WS_BORDER|WS_OVERLAPPED|WS_CAPTION|
WS_SYSMENU|WS_MINIMIZEBOX|WS_MAXIMIZEBOX ),
0, /* x */
0, /* y */
CW_USEDEFAULT, /* width */
@@ -1786,7 +1815,7 @@ static BOOL hb_gt_wvt_CreateConsoleWindow( PHB_GTWVT pWVT )
{
if( !pWVT->hWnd )
{
pWVT->hWnd = hb_gt_wvt_CreateWindow( pWVT->hInstance );
pWVT->hWnd = hb_gt_wvt_CreateWindow( pWVT->hInstance, pWVT->bResizable );
if( !pWVT->hWnd )
hb_errInternal( 10001, "Failed to create WVT window", NULL, NULL );
@@ -2264,38 +2293,90 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_CODEPAGE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->CodePage );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( ( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC ) && iVal != pWVT->CodePage )
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
{
pWVT->CodePage = iVal;
if( pWVT->hFont )
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal != pWVT->CodePage )
{
DeleteObject( pWVT->hFont );
pWVT->hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, pWVT->CodePage );
if( !pWVT->hWnd )
{
pWVT->CodePage = iVal;
}
#if !defined( UNICODE )
else if( iVal == pWVT->boxCodePage )
{
if( pWVT->hFont != pWVT->hFontBox )
{
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
pWVT->hFont = pWVT->hFontBox;
}
pWVT->CodePage = iVal;
}
#endif
else
{
HFONT hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, iVal );
if( hFont )
{
if( pWVT->hFont )
DeleteObject( pWVT->hFont );
pWVT->hFont = hFont;
pWVT->CodePage = iVal;
}
}
}
if( pWVT->hWnd )
hb_gt_wvt_ResetWindowSize( pWVT );
}
break;
#if defined( UNICODE )
case HB_GTI_BOXCP:
{
const char * szVal;
#if defined( UNICODE )
pInfo->pResult = hb_itemPutC( pInfo->pResult,
pWVT->boxCDP ? pWVT->boxCDP->id : NULL );
szVal = hb_itemGetCPtr( pInfo->pNewVal );
if( szVal && *szVal )
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING )
{
PHB_CODEPAGE cdpBox = hb_cdpFind( szVal );
PHB_CODEPAGE cdpBox = hb_cdpFind( hb_itemGetCPtr( pInfo->pNewVal ) );
if( cdpBox )
pWVT->boxCDP = cdpBox;
}
break;
}
#else
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->boxCodePage );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
{
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal != pWVT->boxCodePage )
{
if( !pWVT->hWnd )
{
pWVT->boxCodePage = iVal;
}
else if( iVal == pWVT->CodePage )
{
if( pWVT->hFontBox != pWVT->hFont )
{
if( pWVT->hFontBox )
DeleteObject( pWVT->hFontBox );
pWVT->hFontBox = pWVT->hFont;
}
pWVT->boxCodePage = iVal;
}
else
{
HFONT hFont = hb_gt_wvt_GetFont( pWVT->fontFace, pWVT->fontHeight, pWVT->fontWidth,
pWVT->fontWeight, pWVT->fontQuality, iVal );
if( hFont )
{
if( pWVT->hFontBox )
DeleteObject( pWVT->hFontBox );
pWVT->hFontBox = hFont;
pWVT->boxCodePage = iVal;
}
}
}
}
#endif
break;
case HB_GTI_ICONFILE:
{

5
harbour/source/rtl/gtwvt/gtwvt.h
View File

@@ -159,7 +159,7 @@ typedef struct
PHB_CODEPAGE boxCDP; /* CodePage for legacy drawing chars: IBM437 */
#endif
#if !defined(UNICODE)
#if !defined( UNICODE )
BYTE keyTransTbl[ 256 ];
BYTE chrTransTbl[ 256 ];
#endif
@@ -168,6 +168,9 @@ typedef struct
BOOL bIconToFree; /* Do we need to free this icon when it's not NULL? */
int CodePage; /* Code page to use for display characters */
#if ! defined( UNICODE )
int boxCodePage; /* Code page to use for display draw line characters */
#endif
BOOL Win9X; /* Flag to say if running on Win9X not NT/2000/XP */
BOOL AltF4Close; /* Can use Alt+F4 to close application */
BOOL CentreWindow; /* True if window is to be Reset into centre of window */