Changeset 6254 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

Jul 8, 2001, 5:51:43 PM (24 years ago)

Author:

sandervl

Message:

edit control bugfix (selected text); key translation additions; clipboard memory handle translation added

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (5 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.56 2001-07-03 20:36:54 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.57 2001-07-08 15:51:42 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -140 +140 @@
     0x12, 0x5E,     // 0x5E RAlt
     0x13, 0x45,     // 0x5F Pause
-    0, 0,           // 0x60
-    0, 0,           // 0x61
-    0, 0,           // 0x62
-    0, 0,           // 0x63
-    0, 0,           // 0x64
-    0, 0,           // 0x65
-    0, 0,           // 0x66
-    0, 0,           // 0x67
-    0, 0,           // 0x68
-    0, 0,           // 0x69
-    0, 0,           // 0x6A
-    0, 0,           // 0x6B
+    VK_HOME_W,   0x60,           // 0x60
+    VK_UP_W,     0x61,           // 0x61
+    VK_PRIOR_W,  0x62,           // 0x62
+    VK_LEFT_W,   0x63,           // 0x63
+    VK_RIGHT_W,  0x64,           // 0x64
+    VK_END_W,    0x65,           // 0x65
+    VK_DOWN_W,   0x66,           // 0x66
+    VK_NEXT_W,   0x67,           // 0x67
+    VK_INSERT_W, 0x68,           // 0x68
+    VK_DELETE_W, 0x69,           // 0x69
+    VK_F23_W,    0x6A,           // 0x6A
+    VK_F24_W,    0x6B,           // 0x6B
     0x5D, 0x15D,    // 0x6C RWin (PM scan 0x7C)
     0, 0,           // 0x6D
@@ -604 +604 @@
             // get "virtual" scancode from character code because
             // for "regular" keys they are equal
-            scanCode = ( SHORT1FROMMP(os2Msg->mp2) >> 8) & 0x0FF;
+            if(!(flags & (KC_SHIFT|KC_ALT|KC_CTRL))) {
+                scanCode = ( SHORT1FROMMP(os2Msg->mp2) >> 8) & 0x0FF;
+            }
             isExtended = TRUE;
         }
@@ -651 +653 @@
             winMsg->lParam = winMsg->lParam | (1<<24);
 
-        if (!(SHORT1FROMMP(os2Msg->mp1) & KC_ALT))
+        if (!(flags & KC_ALT))
         {
             //
@@ -687 +689 @@
                     winMsg->lParam |= 1 << 30;                          // bit 30, previous state, 1 means key was pressed
             }
+//NT sends WM_SYSKEYDOWN for single Alt key
+#if 0
             if(winMsg->wParam == VK_MENU_W) {
                 winMsg->message = 0; //WM_SYS* already implies Alt
             }
+#endif
         }
         if (ISKDB_CAPTURED())