Changeset 25377 in webkit

Timestamp:

Sep 5, 2007, 4:02:38 PM (18 years ago)

Author:

hyatt

Message:

Fix ALT+key combos so that they go into the DOM.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebView.cpp (modified) (3 diffs)
• WebView.h (modified) (1 diff)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2007-09-05  Dave Hyatt <hyatt@apple.com>
+
+        Make sure ALT+other keys is properly sent into the DOM so that Web pages (and editing fields) can
+        detect key combos like ALT+Enter.
+       
+        Reviewed by Steve
+
+        * WebView.cpp:
+        (WebView::keyUp):
+        (WebView::keyDown):
+        (WebViewWndProc):
+        * WebView.h:
+
 2007-09-04  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit/win/WebView.cpp

@@ -871 +871 @@
 bool WebView::keyUp(WPARAM virtualKeyCode, LPARAM keyData)
 {
-    // Don't send key events for shift, ctrl, and capslock keys when they're by themselves
-    if (virtualKeyCode == VK_SHIFT || virtualKeyCode == VK_CONTROL || virtualKeyCode == VK_CAPITAL) {
+    // Don't send key events for shift, ctrl, alt and capslock keys when they're by themselves
+    if (virtualKeyCode == VK_SHIFT || virtualKeyCode == VK_CONTROL || virtualKeyCode == VK_MENU || virtualKeyCode == VK_CAPITAL)
         return false;
-    }
 
     PlatformKeyboardEvent keyEvent(m_viewWindow, virtualKeyCode, keyData, m_currentCharacterCode);
+
+    // Don't send key events for alt+space.
+    if (keyEvent.altKey() && virtualKeyCode == VK_SPACE)
+        return false;
+
     Frame* frame = m_page->focusController()->focusedOrMainFrame();
     m_currentCharacterCode = 0;
@@ -1000 +1004 @@
 }
 
-bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData)
-{
+bool WebView::keyDown(WPARAM virtualKeyCode, LPARAM keyData, bool systemKeyDown)
+{
+    // Don't send key events for shift, ctrl, alt and capslock keys when they're by themselves
+    if (virtualKeyCode == VK_SHIFT || virtualKeyCode == VK_CONTROL ||  virtualKeyCode == VK_MENU || virtualKeyCode == VK_CAPITAL)
+        return false;
+
+    // Don't send key events for alt+space, since the OS needs to handle that.
+    if (virtualKeyCode == VK_SPACE && systemKeyDown)
+        return false;
+
     MSG msg;
     // If the next message is a WM_CHAR message, then take it out of the queue, and use
     // the message parameters to get the character code to construct the PlatformKeyboardEvent.
-    if (::PeekMessage(&msg, m_viewWindow, WM_CHAR, WM_CHAR, PM_REMOVE)) 
+    if (systemKeyDown) {
+        if (::PeekMessage(&msg, m_viewWindow, WM_SYSCHAR, WM_SYSCHAR, PM_REMOVE)) 
+            m_currentCharacterCode = (UChar)msg.wParam;
+    } else if (::PeekMessage(&msg, m_viewWindow, WM_CHAR, WM_CHAR, PM_REMOVE)) 
         m_currentCharacterCode = (UChar)msg.wParam;
 
     // FIXME: We need to check WM_UNICHAR to support supplementary characters.
     // FIXME: We may need to handle other messages for international text.
-
-    // Don't send key events for shift, ctrl, and capslock keys when they're by themselves
-    if (virtualKeyCode == VK_SHIFT || virtualKeyCode == VK_CONTROL || virtualKeyCode == VK_CAPITAL)
-        return false;
 
     m_inIMEKeyDown = virtualKeyCode == VK_PROCESSKEY;
@@ -1203 +1214 @@
                     handled = webView->mouseWheel(wParam, lParam, (wParam & MK_SHIFT) || message == WM_VISTA_MOUSEHWHEEL);
             break;
+        case WM_SYSKEYDOWN:
+            handled = webView->keyDown(wParam, lParam, true);
+            break;
         case WM_KEYDOWN:
             handled = webView->keyDown(wParam, lParam);
             break;
+        case WM_SYSKEYUP:
         case WM_KEYUP:
             handled = webView->keyUp(wParam, lParam);

trunk/WebKit/win/WebView.h

@@ -623 +623 @@
     bool mouseWheel(WPARAM, LPARAM, bool isHorizontal);
     bool execCommand(WPARAM wParam, LPARAM lParam);
-    bool keyDown(WPARAM, LPARAM);
+    bool keyDown(WPARAM, LPARAM, bool systemKeyDown = false);
     bool keyUp(WPARAM, LPARAM);
     HRESULT updateWebCoreSettingsFromPreferences(IWebPreferences* preferences);