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

2009-07-13 16:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/rtl/gtwin/gtwin.c
  * source/rtl/gtwvt/gtwvt.h
  * source/rtl/gtwvt/gtwvt.c
    * Formatting.

  * source/rtl/gtwin/gtwin.c
    ! Fixed displaying cursor after recent changes. It was
      a small mistake when removing some dead code.
This commit is contained in:
Viktor Szakats
2009-07-13 14:24:30 +00:00
parent 3282d67ff3
commit bc41230dfc
4 changed files with 35 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -17,6 +17,16 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-13 16:18 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/gtwin/gtwin.c
* source/rtl/gtwvt/gtwvt.h
* source/rtl/gtwvt/gtwvt.c
* Formatting.
* source/rtl/gtwin/gtwin.c
! Fixed displaying cursor after recent changes. It was
a small mistake when removing some dead code.
2009-07-13 03:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/rddads/adsfunc.c
% Minor optimizations.

118
harbour/source/rtl/gtwin/gtwin.c
View File

@@ -88,8 +88,6 @@
# include "hbapicdp.h"
#endif
#if !defined( HB_NO_WIN_CONSOLE )
#if !defined( __LCC__ )
# include <wincon.h>
#endif
@@ -189,18 +187,19 @@ static int s_altisdown = 0;
static int s_altnum = 0;
static int s_mouseLast; /* Last mouse button to be pressed */
static int hb_mouse_iCol;
static int hb_mouse_iRow;
static int s_mouse_iCol;
static int s_mouse_iRow;
static OSVERSIONINFO s_osv;
typedef struct _ClipKeyCode {
typedef struct _CLIPKEYCODE
{
int key;
int alt_key;
int ctrl_key;
int shift_key;
int altgr_key;
} ClipKeyCode;
} CLIPKEYCODE;
#define CLIP_STDKEY_COUNT 96
#define CLIP_EXTKEY_COUNT 34
@@ -208,7 +207,7 @@ typedef struct _ClipKeyCode {
/* Keypad keys */
static const ClipKeyCode stdKeyTab[CLIP_STDKEY_COUNT] = {
static const CLIPKEYCODE stdKeyTab[CLIP_STDKEY_COUNT] = {
{ 32, 0, 0, 0, 0}, /* ' ' */
{ 33, 0, 0, 0, 0}, /* '!' */
{ 34, 0, 0, 0, 0}, /* '"' */
@@ -358,7 +357,7 @@ static const ClipKeyCode stdKeyTab[CLIP_STDKEY_COUNT] = {
#define K_SH_ENTER K_ENTER /* Shift-Enter == Enter */
#endif
static const ClipKeyCode extKeyTab[CLIP_EXTKEY_COUNT] = {
static const CLIPKEYCODE extKeyTab[CLIP_EXTKEY_COUNT] = {
{K_F1, K_ALT_F1, K_CTRL_F1, K_SH_F1, K_ALT_F1}, /* 00 */
{K_F2, K_ALT_F2, K_CTRL_F2, K_SH_F2, K_ALT_F2}, /* 01 */
{K_F3, K_ALT_F3, K_CTRL_F3, K_SH_F3, K_ALT_F3}, /* 02 */
@@ -513,8 +512,7 @@ static void hb_gt_win_xScreenUpdate( void )
&srWin ); /* screen buffer rect to write data to */
}
if( s_iOldCurStyle != s_iCursorStyle &&
s_iCursorStyle == SC_NONE )
if( s_iOldCurStyle != s_iCursorStyle )
hb_gt_win_xSetCursorStyle();
if( s_iCursorStyle != SC_NONE &&
@@ -671,13 +669,9 @@ static void hb_gt_win_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
s_osv.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
GetVersionEx( &s_osv );
if( s_osv.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS )
{
s_dwAltGrBits = RIGHT_ALT_PRESSED;
}
else
{
s_dwAltGrBits = LEFT_CTRL_PRESSED | RIGHT_ALT_PRESSED;
}
/* stdin && stdout && stderr */
s_hStdIn = hFilenoStdin;
@@ -733,9 +727,7 @@ static void hb_gt_win_Init( PHB_GT pGT, HB_FHANDLE hFilenoStdin, HB_FHANDLE hFil
}
#endif
if( s_HInput == INVALID_HANDLE_VALUE )
{
hb_errInternal( 10001, "Can't allocate console", NULL, NULL );
}
}
HB_GTSUPER_INIT( pGT, hFilenoStdin, hFilenoStdout, hFilenoStderr );
@@ -938,7 +930,7 @@ static int Handle_Alt_Key( int * paltisdown, int * paltnum, unsigned short wKey,
on Keydown, it better be the alt or a numpad key,
or bail out.
*/
switch(wKey)
switch( wKey )
{
case 0x38:
case 0x47:
@@ -954,7 +946,7 @@ static int Handle_Alt_Key( int * paltisdown, int * paltnum, unsigned short wKey,
break;
default:
*paltisdown=0;
*paltisdown = 0;
break;
}
}
@@ -964,7 +956,7 @@ static int Handle_Alt_Key( int * paltisdown, int * paltnum, unsigned short wKey,
unsigned short nm = 10;
switch(wKey)
switch( wKey )
{
case 0x38:
/* Alt key ... */
@@ -997,7 +989,7 @@ static int Handle_Alt_Key( int * paltisdown, int * paltnum, unsigned short wKey,
case 0x47: --nm;
case 0x48: --nm;
case 0x49: --nm;
*paltnum = ((*paltnum * 10) & 0xff) + nm;
*paltnum = ( ( *paltnum * 10 ) & 0xff ) + nm;
break;
default:
@@ -1153,7 +1145,7 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
{
int ch = 0,
extKey = -1;
const ClipKeyCode *clipKey = NULL;
const CLIPKEYCODE * clipKey = NULL;
HB_TRACE(HB_TR_DEBUG, ("hb_gt_win_ReadKey(%p,%d)", pGT, iEventMask));
@@ -1270,70 +1262,40 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
}
if( s_wRepeated == 0 )
{
s_wRepeated = s_irInBuf[ s_cNumIndex ].Event.KeyEvent.wRepeatCount;
}
if( s_wRepeated > 0 ) /* Might not be redundant */
{
s_wRepeated--;
}
#if 0
printf( "\n\nhb_gt_ReadKey(): dwState is %ld, wChar is %d, wKey is %d, ch is %d", dwState, wChar, wKey, ch );
#endif
if( wChar == 8 ) /* VK_BACK */
{
extKey = EXKEY_BS;
}
else if( wChar == 9 ) /* VK_TAB */
{
extKey = EXKEY_TAB;
}
else if( wChar == 13 ) /* VK_RETURN */
{
extKey = EXKEY_ENTER;
}
else if( wChar == 27 ) /* VK_ESCAPE */
{
extKey = EXKEY_ESC;
}
else if( wChar == 33 ) /* VK_PRIOR */
{
extKey = EXKEY_PGUP;
}
else if( wChar == 34 ) /* VK_NEXT */
{
extKey = EXKEY_PGDN;
}
else if( wChar == 35 ) /* VK_END */
{
extKey = EXKEY_END;
}
else if( wChar == 36 ) /* VK_HOME */
{
extKey = EXKEY_HOME;
}
else if( wChar == 37 ) /* VK_LEFT */
{
extKey = EXKEY_LEFT;
}
else if( wChar == 38 ) /* VK_UP */
{
extKey = EXKEY_UP;
}
else if( wChar == 39 ) /* VK_RIGHT */
{
extKey = EXKEY_RIGHT;
}
else if( wChar == 40 ) /* VK_DOWN */
{
extKey = EXKEY_DOWN;
}
else if( wChar == 45 ) /* VK_INSERT */
{
extKey = EXKEY_INS;
}
else if( wChar == 46 && (!(ch==46)) ) /* VK_DELETE */
{
/* International keyboard under Win98 - when VirtualKey and Ascii
@@ -1348,17 +1310,11 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
ch = 47;
}
else if( wChar == 106 ) /* VK_MULTIPLY */
{
extKey = EXKEY_KPASTERISK;
}
else if( wChar == 107 ) /* VK_ADD */
{
extKey = EXKEY_KPPLUS;
}
else if( wChar == 109 ) /* VK_SUBTRACT */
{
extKey = EXKEY_KPMINUS;
}
else if( wChar == 111 || /* VK_DIVIDE */
( wChar == 191 && ( dwState & ENHANCED_KEY )))
{
@@ -1366,68 +1322,42 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
extKey = EXKEY_KPDIVIDE;
}
else if( wChar >= 112 && wChar <= 123 ) /* F1-F12 VK_F1-VK_F12 */
{
extKey = wChar - 112;
}
else if( ch >= K_SPACE && ch <= K_CTRL_BS )
{
clipKey = &stdKeyTab[ ch - K_SPACE ];
}
else if( ch > 0 && ch < K_SPACE && ( dwState & ( LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) ) )
{
clipKey = &stdKeyTab[ ch + '@' ];
}
else if( ch < 0 ) /* international keys */
{
ch += 256;
}
if( extKey > -1 )
{
clipKey = &extKeyTab[ extKey ];
}
if( clipKey )
{
if( ( dwState & SHIFT_PRESSED ) && ( dwState & ( LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) ) )
{
if( clipKey->key == K_TAB )
{
ch = K_CTRL_SH_TAB;
}
}
else if( dwState & LEFT_ALT_PRESSED )
{
ch = clipKey->alt_key;
}
else if( dwState & RIGHT_ALT_PRESSED )
{
ch = clipKey->altgr_key;
}
else if( dwState & ( LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED ) )
{
ch = clipKey->ctrl_key;
}
else if( dwState & SHIFT_PRESSED )
{
ch = clipKey->shift_key;
}
else
{
ch = clipKey->key;
}
if( ch == 0 ) /* for keys that are only on shift or AltGr */
{
ch = clipKey->key;
}
}
/* national codepage translation */
if( ch > 0 && ch <= 255 )
{
ch = s_keyTrans[ ch ];
}
}
}
else if( b_MouseEnable &&
@@ -1435,8 +1365,8 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
iEventMask & ~( INKEY_KEYBOARD | INKEY_RAW ) )
{
hb_mouse_iCol = s_irInBuf[ s_cNumIndex ].Event.MouseEvent.dwMousePosition.X;
hb_mouse_iRow = s_irInBuf[ s_cNumIndex ].Event.MouseEvent.dwMousePosition.Y;
s_mouse_iCol = s_irInBuf[ s_cNumIndex ].Event.MouseEvent.dwMousePosition.X;
s_mouse_iRow = s_irInBuf[ s_cNumIndex ].Event.MouseEvent.dwMousePosition.Y;
if( iEventMask & INKEY_MOVE &&
s_irInBuf[ s_cNumIndex ].Event.MouseEvent.dwEventFlags == MOUSE_MOVED )
@@ -1483,15 +1413,11 @@ static int hb_gt_win_ReadKey( PHB_GT pGT, int iEventMask )
/* Set up to process the next input event (if any) */
if( s_wRepeated == 0 )
{
s_cNumIndex++;
}
}
#if 0
if( ch )
{
printf(" %ld:%ld",ch,extKey);
}
#endif
return ch;
@@ -1566,9 +1492,7 @@ static BOOL hb_gt_win_SetKeyCP( PHB_GT pGT, const char *pszTermCDP, const char *
#ifndef HB_CDP_SUPPORT_OFF
if( !pszHostCDP )
{
pszHostCDP = hb_cdpID();
}
if( pszTermCDP && pszHostCDP )
{
@@ -1692,9 +1616,7 @@ static BOOL hb_gt_win_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
ulLen );
}
else
{
pInfo->pResult = hb_itemPutC( pInfo->pResult, NULL );
}
}
break;
@@ -1718,8 +1640,8 @@ static void hb_gt_win_mouse_GetPos( PHB_GT pGT, int * piRow, int * piCol )
{
HB_SYMBOL_UNUSED( pGT );
*piRow = hb_mouse_iRow;
*piCol = hb_mouse_iCol;
*piRow = s_mouse_iRow;
*piCol = s_mouse_iCol;
}
static BOOL hb_gt_win_mouse_ButtonState( PHB_GT pGT, int iButton )
@@ -1797,13 +1719,9 @@ static void hb_gt_win_Refresh( PHB_GT pGT )
if( iRow < 0 || iCol < 0 ||
iRow >= ( int ) _GetScreenHeight() ||
iCol >= ( int ) _GetScreenWidth() )
{
s_iCursorStyle = SC_NONE;
}
else
{
s_iCursorStyle = iStyle;
}
hb_gt_win_xScreenUpdate();
}
@@ -1862,5 +1780,3 @@ HB_CALL_ON_STARTUP_END( _hb_startup_gt_Init_ )
static HB_$INITSYM hb_vm_auto__hb_startup_gt_Init_ = _hb_startup_gt_Init_;
#pragma data_seg()
#endif
#endif /* HB_NO_WIN_CONSOLE */

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

@@ -141,11 +141,8 @@ static void hb_gt_wvt_RegisterClass( HINSTANCE hInstance )
if( ! RegisterClass( &wndclass ) )
{
int iError = GetLastError();
if( iError != 1410 )
{
if( GetLastError() != 1410 )
hb_errInternal( 10001, "Failed to register WVT window class", NULL, NULL );
}
}
}
@@ -516,9 +513,8 @@ static BOOL hb_gt_wvt_GetCharFromInputQueue( PHB_GTWVT pWVT, int * iKey )
{
*iKey = pWVT->Keys[ pWVT->keyPointerOut ];
if( ++pWVT->keyPointerOut >= WVT_CHAR_QUEUE_SIZE )
{
pWVT->keyPointerOut = 0;
}
return TRUE;
}
@@ -531,16 +527,12 @@ static void hb_gt_wvt_TranslateKey( PHB_GTWVT pWVT, int key, int shiftkey, int a
int nVirtKey = GetKeyState( VK_MENU );
if( nVirtKey & 0x8000 ) /* alt + key */
{
hb_gt_wvt_AddCharToInputQueue( pWVT, altkey );
}
else
{
nVirtKey = GetKeyState( VK_CONTROL );
if( nVirtKey & 0x8000 ) /* control + key */
{
hb_gt_wvt_AddCharToInputQueue( pWVT, controlkey );
}
else
{
nVirtKey = GetKeyState( VK_SHIFT );
@@ -1288,9 +1280,7 @@ static BOOL hb_gt_wvt_KeyEvent( PHB_GTWVT pWVT, UINT message, WPARAM wParam, LPA
pWVT->IgnoreWM_SYSCHAR = TRUE;
}
else
{
DefWindowProc( pWVT->hWnd, message, wParam, lParam ); /* Let windows handle ScrollLock */
}
}
else if( bCtrl && iScanCode == 53 && bShift )
{
@@ -1727,7 +1717,7 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
case WM_SIZE:
if( pWVT->bResizing )
{
if( !pWVT->bAlreadySizing )
if( ! pWVT->bAlreadySizing )
{
pWVT->bAlreadySizing = TRUE;
@@ -1742,10 +1732,8 @@ static LRESULT CALLBACK hb_gt_wvt_WndProc( HWND hWnd, UINT message, WPARAM wPara
#if ! defined( HB_OS_WIN_CE )
case WM_NCLBUTTONDBLCLK:
if( !pWVT->bMaximized )
{
if( ! pWVT->bMaximized )
hb_gt_wvt_Maximize( pWVT );
}
return 0;
#endif
@@ -1981,9 +1969,8 @@ static BOOL hb_gt_wvt_SetMode( PHB_GT pGT, int iRow, int iCol )
* font settings will fit in the window
*/
if( hb_gt_wvt_ValidWindowSize( pWVT->hWnd, iRow, iCol, hFont, pWVT->fontWidth ) )
{
fResult = hb_gt_wvt_InitWindow( pWVT, iRow, iCol );
}
DeleteObject( hFont );
HB_GTSELF_REFRESH( pGT );
}
@@ -2159,18 +2146,13 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->fontWidth );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
{
/* store font status for next operation on fontsize */
pWVT->fontWidth = iVal;
}
pWVT->fontWidth = iVal; /* store font status for next operation on fontsize */
break;
case HB_GTI_FONTNAME:
pInfo->pResult = hb_itemPutC( pInfo->pResult, pWVT->fontFace );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_STRING ) /* TODO */
{
hb_strncpy( pWVT->fontFace, hb_itemGetCPtr( pInfo->pNewVal ), sizeof( pWVT->fontFace ) - 1 );
}
break;
case HB_GTI_FONTWEIGHT:
@@ -2258,18 +2240,14 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->PTEXTSIZE.y * pWVT->ROWS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
{
HB_GTSELF_SETMODE( pGT, ( iVal / pWVT->PTEXTSIZE.y ), pWVT->COLS );
}
break;
case HB_GTI_SCREENWIDTH:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->PTEXTSIZE.x * pWVT->COLS );
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal > 0 )
{
HB_GTSELF_SETMODE( pGT, pWVT->ROWS, ( iVal / pWVT->PTEXTSIZE.x ) );
}
break;
case HB_GTI_DESKTOPWIDTH:
@@ -2326,7 +2304,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
iVal = hb_itemGetNI( pInfo->pNewVal );
if( iVal != pWVT->CodePage )
{
if( !pWVT->hWnd )
if( ! pWVT->hWnd )
{
pWVT->CodePage = iVal;
}
@@ -2663,10 +2641,8 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
else
{
int i;
if( !pInfo->pResult )
{
if( ! pInfo->pResult )
pInfo->pResult = hb_itemNew( NULL );
}
hb_arrayNew( pInfo->pResult, 16 );
for( i = 0; i < 16; i++ )
hb_arraySetNL( pInfo->pResult, i + 1, pWVT->COLORS[ i ] );
@@ -2688,9 +2664,7 @@ static BOOL hb_gt_wvt_Info( PHB_GT pGT, int iType, PHB_GT_INFO pInfo )
case HB_GTI_RESIZEMODE:
pInfo->pResult = hb_itemPutNI( pInfo->pResult, pWVT->ResizeMode );
if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC )
{
pWVT->ResizeMode = hb_itemGetNI( pInfo->pNewVal );
}
break;
case HB_GTI_SETPOS_XY:

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

@@ -51,15 +51,11 @@
*/
#ifndef HB_WVT_H_
#define HB_WVT_H_
#define HB_GT_NAME WVT
#include <windows.h>
/*#include <winuser.h>*/
/*#include <commctrl.h>*/
#include "hbset.h"
#include "hbgtcore.h"