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

2001-04-30 13:00 UTC-0400 David G. Holm <dholm@jsd-llc.com>CVS: ----------------------------------------------------------------------

Browse Source
This commit is contained in:
David G. Holm
2001-04-30 17:02:43 +00:00
parent c1188f415a
commit 59b29a8263
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
harbour/ChangeLog
View File

@@ -1,3 +1,12 @@
2001-04-30 13:00 UTC-0400 David G. Holm <dholm@jsd-llc.com>
* include/hbinkey.ch
* source/rtl/inkey.c
* source/rtl/gtwin/gtwin.c
% Corrected handling of enhanced keys with no key modifiers.
As a result, the Key Pad Enter key is distinct from the normal
Enter key when using HB_INKEY_EXTENDED mode.
2001-04-28 02:10 UTC-0800 Ron Pinkas <ron@profit-master.com>
* include/hbapi.h
- Removed 2nd parameter from hb_arrayClone() declaration

8
harbour/include/hbinkey.ch
View File

@@ -248,10 +248,10 @@
#define HB_KP_CTRL_STAR 567
#define HB_KP_SHIFT_STAR 695
#define HB_KP_ENTER 284
#define HB_KP_ALT_ENTER 412
#define HB_KP_CTRL_ENTER 540
#define HB_KP_SHIFT_ENTER 668
#define HB_KP_ENTER 1052
#define HB_KP_ALT_ENTER 1180
#define HB_KP_CTRL_ENTER 1308
#define HB_KP_SHIFT_ENTER 1436
#define HB_KP_HOME 327
#define HB_KP_UP 328

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

@@ -279,6 +279,7 @@ static int StdFnKeys( WORD wKey, BOOL bEnhanced )
int ch;
/* Normal function key */
ch = wKey + HB_INKEY_NONE;
if( bEnhanced ) ch += HB_INKEY_ENHANCED;
return ch;
}
@@ -515,7 +516,6 @@ int hb_gt_ReadKey( HB_inkey_enum eventmask )
fprintf( stdout, "d" );
#endif
ch = StdFnKeys( wKey, bEnhanced );
if( bEnhanced ) ch += HB_INKEY_ENHANCED;
}
}
}

18
harbour/source/rtl/inkey.c
View File

@@ -824,12 +824,6 @@ int hb_inkeyTranslate( int key, HB_inkey_enum event_mask )
case HB_KP_SHIFT_STAR:
key = '*';
break;
case HB_KP_ENTER:
key = K_ENTER;
break;
case HB_KP_CTRL_ENTER:
key = K_CTRL_ENTER;
break;
case HB_K_HOME:
key = K_HOME;
break;
@@ -1076,6 +1070,18 @@ int hb_inkeyTranslate( int key, HB_inkey_enum event_mask )
case HB_KP_SHIFT_DEL:
key = K_DEL;
break;
case HB_KP_ENTER:
key = K_ENTER;
break;
case HB_KP_ALT_ENTER:
key = K_ALT_ENTER;
break;
case HB_KP_CTRL_ENTER:
key = K_CTRL_ENTER;
break;
case HB_KP_SHIFT_ENTER:
key = K_ENTER;
break;
}
}
if( key == -99 )