Changeset 1005 for trunk/src/user32/pmwindow.cpp

Timestamp:

Sep 22, 1999, 10:58:36 AM (26 years ago)

Author:

sandervl

Message:

Rene Pronk's WM_(SYS)KEYUP/DOWN changes + SvL's dialog changes

File:

• trunk/src/user32/pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.4 1999-09-21 17:05:36 dengert Exp $ */
+/* $Id: pmwindow.cpp,v 1.5 1999-09-22 08:58:35 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -511 +511 @@
     case WM_CHAR:
     {
+        ULONG repeatCount=0, virtualKey=0, keyFlags=0, scanCode=0;
+        ULONG flags = SHORT1FROMMP(mp1);
+        BOOL keyWasPressed;
+        char c;
+        USHORT virtualKeyTable [66] = {
+               0x00,    //   OS/2 VK         Win32 VK,    Entry 0 is not used
+               0x01,    // VK_BUTTON1       VK_LBUTTON
+               0x02,    // VK_BUTTON2       VK_RBUTTON
+               0x04,    // VK_BUTTON3       VK_MBUTTON
+               0x03,    // VK_BREAK         VK_CANCEL
+               0x08,    // VK_BACKSPACE     VK_BACK
+               0x09,    // VK_TAB           VK_TAB
+               0x00,    // VK_BACKTAB       No equivalent!
+               0x0D,    // VK_NEWLINE       VK_RETURN
+               0x10,    // VK_SHIFT         VK_SHIFT
+               0x11,    // VK_CTRL          VK_CONTROL
+               0x12,    // VK_ALT           VK_MENU, best match I guess
+               0x12,    // VK_ALTGRAF       VK_MENU, best match I guess
+               0x13,    // VK_PAUSE         VK_PAUSE
+               0x14,    // VK_CAPSLOCK      VK_CAPITAL
+               0x1B,    // VK_ESC           VK_ESCAPE
+               0x20,    // VK_SPACE         VK_SPACE
+               0x00,    // VK_PAGEUP        No equivalent! At least, I think
+               0x00,    // VK_PAGEDOWN      No equivalent! At least, I think
+               0x23,    // VK_END           VK_END
+               0x24,    // VK_HOME          VK_HOME
+               0x25,    // VK_LEFT          VK_LEFT
+               0x26,    // VK_UP            VK_UP
+               0x27,    // VK_RIGHT         VK_RIGHT
+               0x28,    // VK_DOWN          VK_DOWN
+               0x2C,    // VK_PRINTSCRN     VK_SNAPSHOT
+               0x2D,    // VK_INSERT        VK_INSERT
+               0x2E,    // VK_DELETE        VK_DELETE
+               0x91,    // VK_SCRLLOCK      VK_SCROLL
+               0x90,    // VK_NUMLOCK       VK_NUMLOCK
+               0x2B,    // VK_ENTER         VK_EXECUTE, best match I guess
+               0x00,    // VK_SYSRQ         No equivalent!
+               0x70,    // VK_F1            VK_F1
+               0x71,    // VK_F2            VK_F2
+               0x72,    // VK_F3            VK_F3
+               0x73,    // VK_F4            VK_F4
+               0x74,    // VK_F5            VK_F5
+               0x75,    // VK_F6            VK_F6
+               0x76,    // VK_F7            VK_F7
+               0x77,    // VK_F8            VK_F8
+               0x78,    // VK_F9            VK_F9
+               0x79,    // VK_F10           VK_F10
+               0x7A,    // VK_F11           VK_F11
+               0x7B,    // VK_F12           VK_F12
+               0x7C,    // VK_F13           VK_F13
+               0x7D,    // VK_F14           VK_F14
+               0x7E,    // VK_F15           VK_F15
+               0x7F,    // VK_F16           VK_F16
+               0x80,    // VK_F17           VK_F17
+               0x81,    // VK_F18           VK_F18
+               0x82,    // VK_F19           VK_F19
+               0x83,    // VK_F20           VK_F20
+               0x84,    // VK_F21           VK_F21
+               0x85,    // VK_F22           VK_F22
+               0x86,    // VK_F23           VK_F23
+               0x87,    // VK_F24           VK_F24
+               0x00,    // VK_ENDDRAG       No equivalent!
+               0x0C,    // VK_CLEAR         VK_CLEAR
+               0xF9,    // VK_EREOF         VK_EREOF
+               0xFD,    // VK_PA1           VK_PA1
+               0xF6,    // VK_ATTN          VK_ATTN
+               0xF7,    // VK_CRSEL         VK_CRSEL
+               0xF8,    // VK_EXSEL         VK_EXSEL
+               0x00,    // VK_COPY          No equivalent!
+               0x00,    // VK_BLK1          No equivalent!
+               0x00};   // VK_BLK2          No equivalent!
+
+
+        repeatCount = SHORT2FROMMP (mp1) >> 8;
+        scanCode = SHORT2FROMMP (mp1) & 255;
+        keyWasPressed = ((SHORT1FROMMP (mp1) & KC_PREVDOWN) == KC_PREVDOWN);
+
+        // both WM_KEYUP & WM_KEYDOWN want a virtual key, find the right Win32 virtual key
+        // given the OS/2 virtual key and OS/2 character
+
+        if (((SHORT1FROMMP (mp1) & KC_CHAR) == KC_CHAR) ||
+            ((SHORT1FROMMP (mp1) & KC_LONEKEY) == KC_LONEKEY))
+        {
+            c = SHORT1FROMMP (mp2);
+            if ((c >= 'A') && (c <= 'Z')) {
+                virtualKey = c;
+                goto VirtualKeyFound;
+            }
+            if ((c >='a') && (c <= 'z')) {
+                virtualKey = c - 32;   // make it uppercase
+                goto VirtualKeyFound;
+            }
+            if ((c >= '0') && (c <= '9')) {
+                virtualKey = c;
+                goto VirtualKeyFound;
+            }
+        }
+
+        // convert OS/2 virtual keys to Win32 virtual key
+        if (SHORT2FROMMP (mp2) <= VK_BLK2)
+            virtualKey = virtualKeyTable [SHORT2FROMMP (mp2)];
+
+VirtualKeyFound:
+
+        if ((WinGetKeyState (HWND_DESKTOP, VK_ALT) & 0x8000) == 0)
+        {
+            //
+            // the Alt key is not pressed
+            //
+            if ((flags & KC_KEYUP) == KC_KEYUP) {
+                // send WM_KEYUP message
+
+                if(win32wnd->MsgKeyUp (repeatCount, scanCode, virtualKey)) {
+                    goto RunDefWndProc;
+                }
+            }
+            else {
+                // send WM_KEYDOWN message
+                if (win32wnd->MsgKeyDown (repeatCount, scanCode, virtualKey, keyWasPressed))
+                    goto RunDefWndProc;
+            }
+        }
+        else {
+            //
+            // the Alt key is pressed
+            //
+            if ((flags & KC_KEYUP) == KC_KEYUP) {
+                // send WM_SYSKEYUP message
+
+                if(win32wnd->MsgSysKeyUp (repeatCount, scanCode, virtualKey)) {
+                    goto RunDefWndProc;
+                }
+            }
+            else {
+                // send WM_SYSKEYDOWN message
+                if (win32wnd->MsgSysKeyDown (repeatCount, scanCode, virtualKey, keyWasPressed))
+                    goto RunDefWndProc;
+            }
+        }
+
+        break;
+    }
+#if 0
+    case WM_CHAR:
+    {
      ULONG keyflags = 0, vkey = 0;
      ULONG fl = SHORT1FROMMP(mp1);
@@ -538 +683 @@
         break;
     }
+#endif
     case WM_INITMENU:
     case WM_MENUSELECT: