Changeset 1067 for trunk/src/user32/win32wbase.cpp

Timestamp:

Sep 27, 1999, 12:24:51 AM (26 years ago)

Author:

sandervl

Message:

Keyboard msg fixes

File:

• trunk/src/user32/win32wbase.cpp (modified) (8 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.15 1999-09-26 11:09:39 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.16 1999-09-26 22:24:29 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -897 +897 @@
 }
 //******************************************************************************
+//TODO: Is this correct and complete?
+//******************************************************************************
+void Win32BaseWindow::setExtendedKey(ULONG virtualkey, ULONG *lParam)
+{
+    switch(virtualkey) {
+    case VK_DOWN:
+    case VK_UP:
+    case VK_PRIOR:
+    case VK_NEXT:
+    case VK_END:
+    case VK_DIVIDE:
+    case VK_DELETE:
+    case VK_EXECUTE: //Numeric enter key?
+    case VK_HOME:
+    case VK_INSERT:
+    case VK_RCONTROL:
+    case VK_RMENU: //is this the right alt???
+        *lParam = *lParam | (1<<24);
+    }
+}
+//******************************************************************************
 //TODO: virtual key & (possibly) scancode translation, extended keyboard bit & Unicode
 //******************************************************************************
@@ -905 +926 @@
     lParam  = repeatcnt;
     lParam |= (scancode << 16);
+    setExtendedKey(vkey, &lParam);
+
     if(keyflags & KEY_ALTDOWN)
         lParam |= (1<<29);
@@ -936 +959 @@
     dprintf(("WM_KEYUP: vkey:(%x) param:(%x)", virtualKey, lParam));
 
+    setExtendedKey(virtualKey, &lParam);
     return SendInternalMessageA (WM_KEYUP, virtualKey, lParam);
 }
@@ -953 +977 @@
                                                     // bit 31, transition state, always 0 for WM_KEYDOWN
 
+    setExtendedKey(virtualKey, &lParam);
+
     dprintf(("WM_KEYDOWN: vkey:(%x) param:(%x)", virtualKey, lParam));
 
@@ -971 +997 @@
     lParam |= 1 << 31;                              // bit 31, transition state, always 1 for WM_KEYUP
 
+    setExtendedKey(virtualKey, &lParam);
     dprintf(("WM_SYSKEYUP: vkey:(%x) param:(%x)", virtualKey, lParam));
 
@@ -990 +1017 @@
                                                     // bit 31, transition state, always 0 for WM_KEYDOWN
 
+    setExtendedKey(virtualKey, &lParam);
     dprintf(("WM_SYSKEYDOWN: vkey:(%x) param:(%x)", virtualKey, lParam));
 
@@ -1319 +1347 @@
         return HTCLIENT;
 
+    case WM_SYSKEYDOWN:
+            if(HIWORD(lParam) & KEYDATA_ALT)
+            {
+            if(wParam == VK_F4) /* try to close the window */
+            {
+                    HWND hWnd = WIN_GetTopParent( wndPtr->hwndSelf );
+                    wndPtr = WIN_FindWndPtr( hWnd );
+                    if( wndPtr && !(getClass()->getStyle() & CS_NOCLOSE) )
+                            PostMessage(WM_SYSCOMMAND, SC_CLOSE, 0);
+            }
+        }
+        return 0;
+
     default:
         return 1;