Changeset 5375

Timestamp:

Mar 25, 2001, 10:06:13 PM (25 years ago)

Author:

mike

Message:

Fixed keyboard input a little

Location:

trunk

Files:

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

trunk/changelog

@@ -1 @@
-/* $Id: changelog,v 1.1319 2001-03-25 08:51:22 sandervl Exp $ */
+/* $Id: changelog,v 1.1320 2001-03-25 20:06:12 mike Exp $ */
+
+ 2001-03-25: Michal Necasek <michalnec@volny.cz>
+    - DINPUT:   o Fixed keyboard handling. Now arrow keys should work right
+                  on both numpad and the separate arrow block among other things.
 
  2001-03-25: Sander van Leeuwen <sandervl@xs4all.nl>
     - USER32:   o If a static window has children, then we can't return HTTRANSPARENT
-                  for WM_NCHITTEST. For some reason PM then sends all mouse messages 
-                  to the parent of the static window; even if they are intended 
+                  for WM_NCHITTEST. For some reason PM then sends all mouse messages
+                  to the parent of the static window; even if they are intended
                   for the children of the static window.
                   TODO: This could break some win32 apps (parent not receiving mouse
@@ -38 +42 @@
                   (fixes crash in PowerDVD with release build of kernel32)
 
- 2001-03-22: Michal Necasek <michalnec@volny.cz>
-    - USER32:   o Show the mouse pointer in the exitlist handler of user32.
                   (should restore the mouse pointer after a game crashes)
 
@@ -79 +81 @@
                   now work as executed thru pec.exe.
     - Kernel32: o Init VIO Console for Pe2Lx CUI images.
-
-                  [DirectDraw]
-                  Fullscreen=[True|False|0|1]
-
-                  Don't blame me if your machine goes up in smoke after you've
-                  turned fullscreen on ;-)
-                  Note: It seems that fullscreen currently doesn't work right
-                  with newer SDD releases for 8bpp apps, though 16/24/32bpp
-                  should be OK (palette setting problems)
 
  2001-03-15: knut st. osmundsen <knut.stange.osmundsen@mynd.no>

trunk/src/dinput/dinput.cpp

@@ -1 @@
-/* $Id: dinput.cpp,v 1.9 2000-06-27 21:32:41 mike Exp $ */
+/* $Id: dinput.cpp,v 1.10 2001-03-25 20:06:13 mike Exp $ */
 /*              DirectInput
  *
@@ -621 +621 @@
 }
 
-BYTE scan2dinput(BYTE scan) {
+BYTE scan2dinput(WORD scan) {
    BYTE dscan;
 
    switch (scan) {
-      case 0x61:
+      case 0x148:
          dscan = DIK_UP;
          break;
-      case 0x63:
+      case 0x14b:
          dscan = DIK_LEFT;
          break;
-      case 0x64:
+      case 0x14d:
          dscan = DIK_RIGHT;
          break;
-      case 0x66:
+      case 0x150:
          dscan = DIK_DOWN;
          break;
-      case 0x5C:
+      case 0x135:
          dscan = DIK_NUMPADSLASH;
          break;
-      case 0x5A:
+      case 0x11c:
          dscan = DIK_NUMPADENTER;
          break;
-      case 0x68:
+      case 0x152:
          dscan = DIK_INSERT;
          break;
-      case 0x60:
+      case 0x147:
          dscan = DIK_HOME;
          break;
-      case 0x62:
+      case 0x149:
          dscan = DIK_PGUP;
          break;
-      case 0x69:
+      case 0x153:
          dscan = DIK_DELETE;
          break;
-      case 0x65:
+      case 0x14F:
          dscan = DIK_END;
          break;
-      case 0x67:
+      case 0x151:
          dscan = DIK_PGDN;
          break;
-      case 0x5B:
+      case 0x11D:
          dscan = DIK_RCONTROL;
          break;
@@ -668 +668 @@
          break;
       default:
-         dscan = scan;
+         dscan = scan & 0xFF;
    }
    return dscan;
@@ -677 +677 @@
 
    SysKeyboardAImpl* This = (SysKeyboardAImpl*) current_keylock;
-   BYTE  scan = (lParam >> 16) & 0xFF;
+   WORD  scan = (lParam >> 16) & 0x1FF;
    /* fix the scancode, DInput only uses real scancodes in 90% cases */
    scan = scan2dinput(scan);