Changeset 4498 for trunk/src

Timestamp:

Oct 18, 2000, 10:12:46 PM (25 years ago)

Author:

sandervl

Message:

ToAscii implemenation started

Location:

trunk/src/user32

Files:

• user32.cpp (modified) (2 diffs)
• winkeyboard.cpp (modified) (4 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.84 2000-08-02 20:18:24 bird Exp $ */
+/* $Id: user32.cpp,v 1.85 2000-10-18 20:12:45 sandervl Exp $ */
 
 /*
@@ -1433 +1433 @@
 }
 /*****************************************************************************
- * Name      : int WIN32API ToAscii
- * Purpose   : The ToAscii function translates the specified virtual-key code
- *             and keyboard state to the corresponding Windows character or characters.
- * Parameters: UINT   uVirtKey    virtual-key code
- *             UINT   uScanCode   scan code
- *             PBYTE  lpbKeyState address of key-state array
- *             LPWORD lpwTransKey buffer for translated key
- *             UINT   fuState     active-menu flag
- * Variables :
- * Result    : 0 The specified virtual key has no translation for the current
- *               state of the keyboard.
- *             1 One Windows character was copied to the buffer.
- *             2 Two characters were copied to the buffer. This usually happens
- *               when a dead-key character (accent or diacritic) stored in the
- *               keyboard layout cannot be composed with the specified virtual
- *               key to form a single character.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-int WIN32API ToAscii(UINT   uVirtKey,
-                        UINT   uScanCode,
-                        PBYTE  lpbKeyState,
-                        LPWORD lpwTransKey,
-                        UINT   fuState)
-{
-  dprintf(("USER32:ToAscii (%u,%u,%08xh,%08xh,%u) not implemented.\n",
-         uVirtKey,
-         uScanCode,
-         lpbKeyState,
-         lpwTransKey,
-         fuState));
-
-  return (0);
-}
-/*****************************************************************************
- * Name      : int WIN32API ToAsciiEx
- * Purpose   : The ToAscii function translates the specified virtual-key code
- *             and keyboard state to the corresponding Windows character or characters.
- * Parameters: UINT   uVirtKey    virtual-key code
- *             UINT   uScanCode   scan code
- *             PBYTE  lpbKeyState address of key-state array
- *             LPWORD lpwTransKey buffer for translated key
- *             UINT   fuState     active-menu flag
- *             HLK    hlk         keyboard layout handle
- * Variables :
- * Result    : 0 The specified virtual key has no translation for the current
- *               state of the keyboard.
- *             1 One Windows character was copied to the buffer.
- *             2 Two characters were copied to the buffer. This usually happens
- *               when a dead-key character (accent or diacritic) stored in the
- *               keyboard layout cannot be composed with the specified virtual
- *               key to form a single character.
- * Remark    :
- * Status    : UNTESTED STUB
- *
- * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
- *****************************************************************************/
-int WIN32API ToAsciiEx(UINT   uVirtKey,
-                          UINT   uScanCode,
-                          PBYTE  lpbKeyState,
-                          LPWORD lpwTransKey,
-                          UINT   fuState,
-                          HKL    hkl)
-{
-  dprintf(("USER32:ToAsciiEx (%u,%u,%08xh,%08xh,%u,%08x) not implemented.\n",
-         uVirtKey,
-         uScanCode,
-         lpbKeyState,
-         lpwTransKey,
-         fuState,
-         hkl));
-
-  return (0);
-}
-/*****************************************************************************
  * Name      : int WIN32API ToUnicode
  * Purpose   : The ToUnicode function translates the specified virtual-key code

trunk/src/user32/winkeyboard.cpp

@@ -1 @@
-/* $Id: winkeyboard.cpp,v 1.5 2000-02-16 14:28:27 sandervl Exp $ */
+/* $Id: winkeyboard.cpp,v 1.6 2000-10-18 20:12:46 sandervl Exp $ */
 /*
  * Win32 <-> PM key translation
@@ -301 +301 @@
  BOOL   rc;
 
-  dprintf(("USER32:  GetKeyboardState"));
+  dprintf(("USER32: GetKeyboardState %x", lpKeyState));
   rc = OSLibWinGetKeyboardStateTable((PBYTE)&PMKeyState );
 
@@ -315 +315 @@
 BOOL WIN32API SetKeyboardState(PBYTE lpKeyState)
 {
-  dprintf(("USER32:  SetKeyboardState, not implemented"));
+  dprintf(("USER32: SetKeyboardState %x not implemented", lpKeyState));
   return(TRUE);
 }
@@ -399 +399 @@
         return 1;
 }
-
-//******************************************************************************
-//******************************************************************************
+/*****************************************************************************
+ * Name      : int WIN32API ToAscii
+ * Purpose   : The ToAscii function translates the specified virtual-key code
+ *             and keyboard state to the corresponding Windows character or characters.
+ * Parameters: UINT   uVirtKey    virtual-key code
+ *             UINT   uScanCode   scan code
+ *             PBYTE  lpbKeyState address of key-state array
+ *             LPWORD lpwTransKey buffer for translated key
+ *             UINT   fuState     active-menu flag
+ * Variables :
+ * Result    : 0 The specified virtual key has no translation for the current
+ *               state of the keyboard.
+ *             1 One Windows character was copied to the buffer.
+ *             2 Two characters were copied to the buffer. This usually happens
+ *               when a dead-key character (accent or diacritic) stored in the
+ *               keyboard layout cannot be composed with the specified virtual
+ *               key to form a single character.
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+int WIN32API ToAscii(UINT   uVirtKey,
+                     UINT   uScanCode,
+                     PBYTE  lpbKeyState,
+                     LPWORD lpwTransKey,
+                     UINT   fuState)
+{
+  dprintf(("USER32:ToAscii (%u,%u,%08xh,%08xh,%u) not implemented.\n",
+         uVirtKey,
+         uScanCode,
+         lpbKeyState,
+         lpwTransKey,
+         fuState));
+
+  INT ret;
+
+  if (uScanCode == 0) {
+        /* This happens when doing Alt+letter : a fake 'down arrow' key press
+           event is generated by windows. Just ignore it. */
+        dprintf2(("scanCode=0, doing nothing"));
+        return 0;
+  }
+  if (uScanCode & 0x8000)
+  {
+        dprintf2(("Key UP, doing nothing"));
+        return 0;
+  }
+  /* We have a special case to handle : Shift + arrow, shift + home, ...
+     X returns a char for it, but Windows doesn't. Let's eat it. */
+  if(!(lpbKeyState[VK_NUMLOCK] & 0x01)  /* NumLock is off */
+       && (lpbKeyState[VK_SHIFT] & 0x80) /* Shift is pressed */
+       && (uVirtKey >= VK_0) && (uVirtKey >= VK_9))
+  {
+        *(char*)lpwTransKey = 0;
+        ret = 0;
+  }
+  else        
+  /* We have another special case for delete key (XK_Delete) on an
+     extended keyboard. X returns a char for it, but Windows doesn't */
+  if (uVirtKey == VK_DELETE)
+  {
+       *(char*)lpwTransKey = 0;
+       ret = 0;
+  }
+  else {
+       *(char*)lpwTransKey = uVirtKey;
+       ret = 1;
+  }
+  return ret;
+}
+/*****************************************************************************
+ * Name      : int WIN32API ToAsciiEx
+ * Purpose   : The ToAscii function translates the specified virtual-key code
+ *             and keyboard state to the corresponding Windows character or characters.
+ * Parameters: UINT   uVirtKey    virtual-key code
+ *             UINT   uScanCode   scan code
+ *             PBYTE  lpbKeyState address of key-state array
+ *             LPWORD lpwTransKey buffer for translated key
+ *             UINT   fuState     active-menu flag
+ *             HLK    hlk         keyboard layout handle
+ * Variables :
+ * Result    : 0 The specified virtual key has no translation for the current
+ *               state of the keyboard.
+ *             1 One Windows character was copied to the buffer.
+ *             2 Two characters were copied to the buffer. This usually happens
+ *               when a dead-key character (accent or diacritic) stored in the
+ *               keyboard layout cannot be composed with the specified virtual
+ *               key to form a single character.
+ * Remark    :
+ * Status    : UNTESTED STUB
+ *
+ * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
+ *****************************************************************************/
+int WIN32API ToAsciiEx(UINT   uVirtKey,
+                       UINT   uScanCode,
+                       PBYTE  lpbKeyState,
+                       LPWORD lpwTransKey,
+                       UINT   fuState,
+                       HKL    hkl)
+{
+  dprintf(("USER32:ToAsciiEx (%u,%u,%08xh,%08xh,%u,%08x) not implemented.\n",
+         uVirtKey,
+         uScanCode,
+         lpbKeyState,
+         lpwTransKey,
+         fuState,
+         hkl));
+
+  return (0);
+}
+//******************************************************************************
+//******************************************************************************