Changeset 7191 for trunk/src

Timestamp:

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

Author:

phaller

Message:

.

Location:

trunk/src/user32

Files:

• oslibmsgtranslate.cpp (modified) (3 diffs)
• winkeyboard.cpp (modified) (3 diffs)

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