Changeset 7191

Timestamp:

Oct 24, 2001, 3:19:10 PM (24 years ago)

Author:

phaller

Message:

.

Location:

trunk

Files:

• include/winscan.h (modified) (7 diffs)
• src/user32/oslibmsgtranslate.cpp (modified) (3 diffs)
• src/user32/winkeyboard.cpp (modified) (3 diffs)

trunk/include/winscan.h

@@ -30 +30 @@
 #define WINSCAN_BRACKETRIGHT    0x1b  
 #define WINSCAN_ENTER           0x1c  
+#define WINSCAN_PADENTER        0x1c
 #define WINSCAN_CTRLLEFT        0x1d
 #define WINSCAN_CTRLRIGHT       0x1d
@@ -45 +46 @@
 #define WINSCAN_GRAVE           0x29  
 #define WINSCAN_SHIFTLEFT       0x2a  
-
-// @@@PH
-// not verified from here!
 #define WINSCAN_BACKSLASH       0x2b  
 #define WINSCAN_Z               0x2c  
@@ -58 +56 @@
 #define WINSCAN_COMMA           0x33  
 #define WINSCAN_PERIOD          0x34  
-#define WINSCAN_SLASH           0x35  
+#define WINSCAN_SLASH           0x35
+#define WINSCAN_PADSLASH        0x35
 #define WINSCAN_SHIFTRIGHT      0x36  
 #define WINSCAN_PADASTERISK     0x37  
@@ -77 +76 @@
 #define WINSCAN_SCROLLLOCK      0x46  
 #define WINSCAN_PAD7            0x47  
+#define WINSCAN_HOME            0x47
 #define WINSCAN_UP              0x48
 #define WINSCAN_PAD8            0x48  
 #define WINSCAN_PAD9            0x49  
+#define WINSCAN_PAGEUP          0x49
 #define WINSCAN_PADMINUS        0x4a  
 #define WINSCAN_PAD4            0x4b  
@@ -88 +89 @@
 #define WINSCAN_PADPLUS         0x4e  
 #define WINSCAN_PAD1            0x4f  
+#define WINSCAN_END             0x4f
 #define WINSCAN_PAD2            0x50  
 #define WINSCAN_DOWN            0x50
 #define WINSCAN_PAD3            0x51  
+#define WINSCAN_PAGEDOWN        0x51
 #define WINSCAN_PAD0            0x52  
+#define WINSCAN_INSERT          0x52
 #define WINSCAN_PADPERIOD       0x53  
+#define WINSCAN_DELETE          0x53
 #define WINSCAN_SYSREQ          0x54  
 #define WINSCAN_RESET           0x55  
@@ -99 +104 @@
 #define WINSCAN_F12             0x58  
 #define WINSCAN_BACKTAB         0x59  
-#define WINSCAN_PADENTER        0x5a  
-#define WINSCAN_PADSLASH        0x5c  
+#define WINSCAN_WINLEFT         0x5b
+#define WINSCAN_WINRIGHT        0x5c
 #define WINSCAN_PRINT           0x5d  
+#define WINSCAN_APPLICATION     0x5d
 #define WINSCAN_ALTRIGHT        0x5e  
 #define WINSCAN_PAUSE           0x5f  
-#define WINSCAN_HOME            0x60  
-#define WINSCAN_PAGEUP          0x62  
-#define WINSCAN_END             0x65  
-#define WINSCAN_PAGEDOWN        0x67  
-#define WINSCAN_INSERT          0x68  
-#define WINSCAN_DELETE          0x69  
 #define WINSCAN_F23             0x6a  
 #define WINSCAN_F24             0x6b  
@@ -129 +129 @@
 #define WINSCAN_SIZE            0x7a  
 #define WINSCAN_NLS1            0x7b  
-#define WINSCAN_APPLICATION     0x7c  
 #define WINSCAN_YEN             0x7d  
 #define WINSCAN_E13             0x7d
-#define WINSCAN_WINLEFT         0x7e  
-#define WINSCAN_WINRIGHT        0x7f  
 #define WINSCAN_PA1             0x80  
 #define WINSCAN_F13             0x81  

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.64 2001-10-23 08:36:20 phaller Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.65 2001-10-24 13:18:59 phaller Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -605 +605 @@
       
     case WM_CHAR_SPECIAL:
-      {
+    {
         // @@@PH
         // special char message from the keyboard hook
@@ -612 +612 @@
         // AltGr is a very, very strange key!
         UCHAR ucPMScanCode = CHAR4FROMMP(os2Msg->mp1);
-        if (PMSCAN_ALTRIGHT == ucPMScanCode)
-        {
-          ULONG flags = SHORT1FROMMP(os2Msg->mp1);
+        switch (ucPMScanCode)
+        {
+          case PMSCAN_ESC:
+            // Note: ESC generates a WM_CHAR under Windows, not under PM
+            // so we've got to post it to ourself here!
+            // WM_CHAR(0x0000001bh, 000010001h)
+            // @@@PH
+            break;
           
-          // we need very special treatment here for the
-          // poor, crippled AltGr key
-          
-          if (flags & KC_KEYUP)
+          case PMSCAN_ALTRIGHT:
           {
-            // key up
-            // 1 - generate a virtual LCONTROL-keypress
-            // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-Alt!)
+            ULONG flags = SHORT1FROMMP(os2Msg->mp1);
+            
+            // we need very special treatment here for the
+            // poor, crippled AltGr key
+            
+            if (flags & KC_KEYUP)
+            {
+              // key up
+              // 1 - generate a virtual LCONTROL-keypress
+              // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-Alt!)
+            }
+            else
+            {
+              // key down:
+              // 1 - generate a virtual LCONTROL-keypress
+              // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-AltGr!)
+            }
           }
-          else
-          {
-            // key down:
-            // 1 - generate a virtual LCONTROL-keypress
-            // 2 - send LMENU-keypress (NT emulates ALtGr w/ Ctrl-Alt!)
-          }
-        }
-      }
+        } /* switch */
+    } /* case */
         // NO BREAK! FALLTHRU CASE!
       

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.20 2001-10-24 12:26:56 phaller Exp $ */
+/* $Id: winkeyboard.cpp,v 1.21 2001-10-24 13:19:00 phaller Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -175 +175 @@
 /* 0x7a PMSCAN_SIZE         */ , 0x00                       ,FALSE
 /* 0x7b PMSCAN_NLS1         */ , 0x00                       ,FALSE
-/* 0x7c PMSCAN_APPLICATION  */ , VK_APPS                    ,FALSE
+/* 0x7c PMSCAN_APPLICATION  */ , VK_APPS                    ,TRUE
 /* 0x7d PMSCAN_E13          */ , 0x00                       ,FALSE
-/* 0x7e PMSCAN              */ , 0x00                       ,FALSE
-/* 0x7f PMSCAN              */ , 0x00                       ,FALSE
+/* 0x7e PMSCAN_WINLEFT      */ , VK_LWIN                    ,TRUE
+/* 0x7f PMSCAN_WINRIGHT     */ , VK_RWIN                    ,TRUE
 /* 0x80 PMSCAN_PA1          */ , VK_PA1                     ,FALSE
 /* 0x81 PMSCAN_F13          */ , VK_F13                     ,FALSE
@@ -712 +712 @@
 /* 0x7a PMSCAN_SIZE         */ , 0x00                       ,FALSE
 /* 0x7b PMSCAN_NLS1         */ , 0x00                       ,FALSE
-/* 0x7c PMSCAN_APPLICATION  */ , WINSCAN_APPLICATION        ,FALSE
+/* 0x7c PMSCAN_APPLICATION  */ , WINSCAN_APPLICATION        ,TRUE
 /* 0x7d PMSCAN_E13          */ , 0x00                       ,FALSE
-/* 0x7e PMSCAN              */ , 0x00                       ,FALSE
-/* 0x7f PMSCAN              */ , 0x00                       ,FALSE
+/* 0x7e PMSCAN              */ , WINSCAN_WINLEFT            ,TRUE
+/* 0x7f PMSCAN              */ , WINSCAN_WINRIGHT           ,TRUE
 /* 0x80 PMSCAN_PA1          */ , WINSCAN_PA1                ,FALSE
 /* 0x81 PMSCAN_F13          */ , WINSCAN_F13                ,FALSE