Changeset 3762

Timestamp:

Jun 27, 2000, 8:20:46 PM (25 years ago)

Author:

mike

Message:

Fixed some key values in DInput

Location:

trunk

Files:

• changelog (modified) (7 diffs)
• src/dinput/dinput.cpp (modified) (3 diffs)

trunk/changelog

@@ -1 @@
- /* $Id: changelog,v 1.1008 2000-06-26 12:24:31 sandervl Exp $ */
+ /* $Id: changelog,v 1.1009 2000-06-27 18:20:44 mike Exp $ */
+
+ 2000-06-27: Michal Necasek <michalnec@volny.cz>
+    - DINPUT:      Fixed some key values, MS uses mostly raw scan
+                   codes but not always, why am I not surprised?
 
  2000-06-26: Sander van Leeuwen <sandervl@xs4all.nl>
@@ -6 +10 @@
                    in WinInvalidateRect/Region call -> fixes painting of
                    background bitmap in XWing vs Tie Fighter install app.
-                   WinInvalidateRegion with fIncludeChildren=0 invalidates both 
+                   WinInvalidateRegion with fIncludeChildren=0 invalidates both
                    the parent and child windows (for !WS_CLIPCHILDREN window)
                    fIncludeChildren=1 -> invalidates only child (in xwing case
@@ -14 +18 @@
                    applying fixups. (fixes crash in IBM VisualAge Java setup)
 
- 2000-06-24: Michal Necasek <mike@mendelu.cz>
     - KERNEL32:    When creating files and mode is readonly, change to
                    read/write (or else DosOpen fails)
@@ -76 +79 @@
     - USER32:      Region fixes (RedrawWindow)
                    Get/SetWindowRgn fixes
-    - INCLUDE\OS2WRAP.H: 
+    - INCLUDE\OS2WRAP.H:
                    Added missing wrappers for GpiCreatePolygonRegion,
                    GpiCreateEllipticRegion & GpiCreateRoundRectRegion
@@ -89 +92 @@
     - KERNEL32:     - fix in HandleManager::DuplicateHandler to call
                       OSLibDosDupHandle() instead of CreateFile
-                    - fix oslibdos.h FILE_ SetFilePointer constants 
+                    - fix oslibdos.h FILE_ SetFilePointer constants
                       were shifted by 1
                     - fix for signed negative 32-bit seek from llseek()
@@ -100 +103 @@
     - USER32:       Rewrote ExcludeUpdateRgn & GetUpdateRgn
                     Check if update rectangle is emtpy in PM WM_PAINT msg;
-                    ignore it when that's the case 
+                    ignore it when that's the case
                     -> fixes excessive redrawing in Lotus Notes
     - GDI32:        Put back region apis
@@ -145 +148 @@
                     if update region doesn't include (part of) the nonclient area.
                     -> fixes RealPlayer 7 titlebar, borders & menu
-                    GetTopWindow fix. (should work properly now)                  
+                    GetTopWindow fix. (should work properly now)
 
  2000-08-03: knut st. osmundsen <knut.stange.osmundsen@mynd.no>

trunk/src/dinput/dinput.cpp

@@ -1 @@
-/* $Id: dinput.cpp,v 1.7 2000-05-29 21:30:17 mike Exp $ */
+/* $Id: dinput.cpp,v 1.8 2000-06-27 18:20:46 mike Exp $ */
 /*              DirectInput
  *
@@ -621 +621 @@
 }
 
+BYTE scan2dinput(BYTE scan) {
+   BYTE dscan;
+
+   switch (scan) {
+      case 0x61:
+         dscan = DIK_UP;
+         break;
+      case 0x63:
+         dscan = DIK_LEFT;
+         break;
+      case 0x64:
+         dscan = DIK_RIGHT;
+         break;
+      case 0x66:
+         dscan = DIK_DOWN;
+         break;
+      case 0x5C:
+         dscan = DIK_NUMPADSLASH;
+         break;
+      case 0x5A:
+         dscan = DIK_NUMPADENTER;
+         break;
+      case 0x68:
+         dscan = DIK_INSERT;
+         break;
+      case 0x60:
+         dscan = DIK_HOME;
+         break;
+      case 0x62:
+         dscan = DIK_PGUP;
+         break;
+      case 0x69:
+         dscan = DIK_DELETE;
+         break;
+      case 0x65:
+         dscan = DIK_END;
+         break;
+      case 0x67:
+         dscan = DIK_PGDN;
+         break;
+      case 0x5B:
+         dscan = DIK_RCONTROL;
+         break;
+      case 0x5E:
+         dscan = DIK_RALT;
+         break;
+      default:
+         dscan = scan;
+   }
+   return dscan;
+}
+
 LRESULT CALLBACK event_keyHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
    TRACE("DINPUT-SKAI: keyHandler (msg=%x wParam=0x%X, lParam=0x%lX)\n", msg, wParam, lParam);
@@ -626 +678 @@
    SysKeyboardAImpl* This = (SysKeyboardAImpl*) current_keylock;
    BYTE  scan = (lParam >> 16) & 0xFF;
-
-   /* messages may arrive mustiple times; we need to check for duplicates */
+   /* fix the scancode, DInput only uses real scancodes in 90% cases */
+   scan = scan2dinput(scan);
+
+   /* messages may arrive multiple times; we need to check for duplicates */
    static HWND   oldhwnd = NULL;
    static UINT   oldmsg  = 0;