From 0ae9a207f6f3fb6a82246936d87a0305944d045d Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Thu, 19 Oct 2000 20:29:16 +0000 Subject: [PATCH] 2000-10-19 16:25 UTC-0400 David G. Holm --- harbour/ChangeLog | 4 ++++ harbour/source/rtl/gtwin/gtwin.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 28d13f48d2..aeb5cbf4bf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,7 @@ +2000-10-19 16:25 UTC-0400 David G. Holm + * source/rtl/gtwin.gtwin.c + ! Fixed bug in if test for discarding accent key strokes. + 2000-10-19 11:00 UTC+0800 Ron Pinkas * contrib/dot/pp.prg ! Corrected bug with #else diff --git a/harbour/source/rtl/gtwin/gtwin.c b/harbour/source/rtl/gtwin/gtwin.c index 37f5612ab4..36ea5d03aa 100644 --- a/harbour/source/rtl/gtwin/gtwin.c +++ b/harbour/source/rtl/gtwin/gtwin.c @@ -317,6 +317,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask ) WORD wChar = s_irInBuf[ s_cNumIndex ].Event.KeyEvent.wVirtualKeyCode; WORD wKey = s_irInBuf[ s_cNumIndex ].Event.KeyEvent.wVirtualScanCode; ch = s_irInBuf[ s_cNumIndex ].Event.KeyEvent.uChar.AsciiChar; + /* fprintf( stdout, "\n\nhb_gt_ReadKey(): dwState is %ld, wChar is %d, wKey is %d, ch is %d", dwState, wChar, wKey, ch ); */ if( ch == 224 ) { /* Strip extended key lead-in codes */ @@ -330,7 +331,7 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask ) ch += 256; } /* && ch == -32 added for international keyboard support ( Alexander Kresin ) */ - else if( ch == 0 || ch == -32 || ( dwState & ( ENHANCED_KEY | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_ALT_PRESSED | RIGHT_CTRL_PRESSED | SHIFT_PRESSED ) ) ) + else if( ( ch == 0 || ch == -32 ) && ( dwState & ( ENHANCED_KEY | LEFT_ALT_PRESSED | LEFT_CTRL_PRESSED | RIGHT_ALT_PRESSED | RIGHT_CTRL_PRESSED | SHIFT_PRESSED ) ) ) { /* Process non-ASCII key codes */ if( eventmask & INKEY_RAW ) wKey = wChar;