Changeset 48446 in webkit

Timestamp:

Sep 16, 2009 4:25:58 PM (15 years ago)

Author:

andersca@apple.com

Message:

<rdar://problem/7155710>
HTML selects on windows cause containing window to become inactive when opened

Reviewed by Adam Roben.

Redo the way we handle events when a popup menu is shown, based on
​http://blogs.msdn.com/oldnewthing/archive/2004/08/20/217684.aspx

Since a non-active window can't capture the mouse, we use the owning window
(the WebView) as the capture window. We then run a recursive message pump that
forwards all mouse and keyboard events to the popup menu.

• platform/PopupMenu.h:
• platform/win/PopupMenuWin.cpp:

(WebCore::PopupMenu::PopupMenu):
(WebCore::PopupMenu::show):
(WebCore::PopupMenu::hide):
(WebCore::PopupMenu::wndProc):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/PopupMenu.h (modified) (1 diff)
• platform/win/PopupMenuWin.cpp (modified) (13 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-16  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Adam Roben.
+
+        <rdar://problem/7155710>
+        HTML selects on windows cause containing window to become inactive when opened
+        
+        Redo the way we handle events when a popup menu is shown, based on
+        http://blogs.msdn.com/oldnewthing/archive/2004/08/20/217684.aspx
+        
+        Since a non-active window can't capture the mouse, we use the owning window 
+        (the WebView) as the capture window. We then run a recursive message pump that 
+        forwards all mouse and keyboard events to the popup menu.
+        
+        * platform/PopupMenu.h:
+        * platform/win/PopupMenuWin.cpp:
+        (WebCore::PopupMenu::PopupMenu):
+        (WebCore::PopupMenu::show):
+        (WebCore::PopupMenu::hide):
+        (WebCore::PopupMenu::wndProc):
+
 2009-09-16  Dan Bernstein  <mitz@apple.com>
 

trunk/WebCore/platform/PopupMenu.h

@@ -173 +173 @@
     int m_focusedIndex;
     bool m_scrollbarCapturingMouse;
+    bool m_showPopup;
 #elif PLATFORM(GTK)
     IntPoint m_menuPosition;

trunk/WebCore/platform/win/PopupMenuWin.cpp

@@ -62 +62 @@
 static LPCTSTR kPopupWindowClassName = _T("PopupWindowClass");
 
+// This is used from within our custom message pump when we want to send a
+// WM_CHAR message to the web view and not have our message stolen and sent to
+// the popup window.
+static const UINT WM_HOST_WINDOW_CHAR = WM_USER;
+
 // FIXME: Remove this as soon as practical.
 static inline bool isASCIIPrintable(unsigned c)
@@ -80 +85 @@
     , m_focusedIndex(0)
     , m_scrollbarCapturingMouse(false)
+    , m_showPopup(false)
 {
 }
@@ -126 +132 @@
         if (!m_popup)
             return;
+    } else {
+        // We need to reposition the popup window.
+        ::MoveWindow(m_popup, m_windowRect.x(), m_windowRect.y(), m_windowRect.width(), m_windowRect.height(), false);
     }
 
@@ -143 +152 @@
             DWORD slideDirection = (m_windowRect.y() < viewRect.top + view->contentsToWindow(r.location()).y()) ? AW_VER_NEGATIVE : AW_VER_POSITIVE;
 
-            ::AnimateWindow(m_popup, defaultAnimationDuration, AW_SLIDE | slideDirection | AW_ACTIVATE);
+            ::AnimateWindow(m_popup, defaultAnimationDuration, AW_SLIDE | slideDirection);
         }
     } else
 #endif
-        ::ShowWindow(m_popup, SW_SHOWNORMAL);
-    ::SetCapture(m_popup);
+        ::ShowWindow(m_popup, SW_SHOWNOACTIVATE);
 
     if (client()) {
@@ -155 +163 @@
             setFocusedIndex(index);
     }
+
+    m_showPopup = true;
+
+    ::SetCapture(hostWindow);
+
+    MSG msg;
+    HWND activeWindow;
+
+    while (::GetMessage(&msg, 0, 0, 0)) {
+        switch (msg.message) {
+            case WM_HOST_WINDOW_CHAR: 
+                if (msg.hwnd == m_popup) {
+                    // This message should be sent to the host window as a WM_CHAR.
+                    msg.hwnd = hostWindow;
+                    msg.message = WM_CHAR;
+                }
+                break;
+
+            // Steal mouse messages.
+            case WM_NCMOUSEMOVE:
+            case WM_NCLBUTTONDOWN:
+            case WM_NCLBUTTONUP:
+            case WM_NCLBUTTONDBLCLK:
+            case WM_NCRBUTTONDOWN:
+            case WM_NCRBUTTONUP:
+            case WM_NCRBUTTONDBLCLK:
+            case WM_NCMBUTTONDOWN:
+            case WM_NCMBUTTONUP:
+            case WM_NCMBUTTONDBLCLK:
+            case WM_MOUSEWHEEL:
+                msg.hwnd = m_popup;
+                break;
+
+            // These mouse messages use client coordinates so we need to convert them.
+            case WM_MOUSEMOVE:
+            case WM_LBUTTONDOWN:
+            case WM_LBUTTONUP:
+            case WM_LBUTTONDBLCLK:
+            case WM_RBUTTONDOWN:
+            case WM_RBUTTONUP:
+            case WM_RBUTTONDBLCLK:
+            case WM_MBUTTONDOWN:
+            case WM_MBUTTONUP:
+            case WM_MBUTTONDBLCLK: {
+                POINT pt;
+                pt.x = (short)LOWORD(msg.lParam);
+                pt.y = (short)HIWORD(msg.lParam);
+                ::MapWindowPoints(msg.hwnd, m_popup, &pt, 1);
+                msg.lParam = MAKELPARAM(pt.x, pt.y);
+                msg.hwnd = m_popup;
+                break;
+            }
+
+            // Steal all keyboard messages.
+            case WM_KEYDOWN:
+            case WM_KEYUP:
+            case WM_CHAR:
+            case WM_DEADCHAR:
+            case WM_SYSKEYUP:
+            case WM_SYSCHAR:
+            case WM_SYSDEADCHAR:
+                msg.hwnd = m_popup;
+                break;
+        }
+
+        ::TranslateMessage(&msg);
+        ::DispatchMessage(&msg);
+
+        if (!m_showPopup)
+            break;
+        activeWindow = ::GetActiveWindow();
+        if (activeWindow != hostWindow && !::IsChild(activeWindow, hostWindow))
+            break;
+        if (::GetCapture() != hostWindow)
+            break;
+    }
+
+    if (::GetCapture() == hostWindow)
+        ::ReleaseCapture();
+
+    // We're done, hide the popup if necessary.
+    hide();
 }
 
 void PopupMenu::hide()
 {
+    if (!m_showPopup)
+        return;
+
+    m_showPopup = false;
+
     ::ShowWindow(m_popup, SW_HIDE);
 
     if (client())
         client()->popupDidHide();
+
+    // Post a WM_NULL message to wake up the message pump if necessary.
+    ::PostMessage(m_popup, WM_NULL, 0, 0);
 }
 
@@ -661 +759 @@
 
     switch (message) {
+        case WM_MOUSEACTIVATE:
+            return MA_NOACTIVATE;
+
         case WM_SIZE: {
             if (!scrollbar())
@@ -675 +776 @@
             break;
         }
-        case WM_ACTIVATE:
-            if (wParam == WA_INACTIVE)
-                hide();
-            break;
-        case WM_KILLFOCUS:
-            if ((HWND)wParam != popupHandle())
-                // Focus is going elsewhere, so hide
-                hide();
-            break;
         case WM_KEYDOWN:
             if (!client())
@@ -735 +827 @@
                     if (isASCIIPrintable(wParam))
                         // Send the keydown to the WebView so it can be used for type-to-select.
-                        ::PostMessage(client()->hostWindow()->platformWindow(), message, wParam, lParam);
+                        // Since we know that the virtual key is ASCII printable, it's OK to convert this to
+                        // a WM_CHAR message. (We don't want to call TranslateMessage because that will post a
+                        // WM_CHAR message that will be stolen and redirected to the popup HWND.
+                        ::PostMessage(m_popup, WM_HOST_WINDOW_CHAR, wParam, lParam);
                     else
                         lResult = 1;
@@ -789 +884 @@
                 setFocusedIndex(listIndexAtPoint(mousePoint), true);
 
-            // Release capture if the left button isn't down, and the mousePoint is outside the popup window.
-            // This way, the WebView will get future mouse events in the rest of the window.
-            if (!(wParam & MK_LBUTTON) && !::PtInRect(&bounds, mousePoint))
-                ::ReleaseCapture();
-
             break;
         }
         case WM_LBUTTONDOWN: {
-            ::SetCapture(popupHandle());
             IntPoint mousePoint(MAKEPOINTS(lParam));
             if (scrollbar()) {
@@ -811 +900 @@
             }
 
-            setFocusedIndex(listIndexAtPoint(mousePoint), true);
+            // If the mouse is inside the window, update the focused index. Otherwise, 
+            // hide the popup.
+            RECT bounds;
+            GetClientRect(m_popup, &bounds);
+            if (::PtInRect(&bounds, mousePoint))
+                setFocusedIndex(listIndexAtPoint(mousePoint), true);
+            else
+                hide();
             break;
         }
@@ -817 +913 @@
             IntPoint mousePoint(MAKEPOINTS(lParam));
             if (scrollbar()) {
-                ::ReleaseCapture();
                 IntRect scrollBarRect = scrollbar()->frameRect();
                 if (scrollbarCapturingMouse() || scrollBarRect.contains(mousePoint)) {
@@ -831 +926 @@
                 }
             }
-            // Only release capture and hide the popup if the mouse is inside the popup window.
+            // Only hide the popup if the mouse is inside the popup window.
             RECT bounds;
             GetClientRect(popupHandle(), &bounds);
             if (client() && ::PtInRect(&bounds, mousePoint)) {
-                ::ReleaseCapture();
                 hide();
                 int index = focusedIndex();
@@ -843 +937 @@
             break;
         }
-        case WM_MOUSEWHEEL:
-            if (scrollbar()) {
-                int i = 0;
-                for (incrementWheelDelta(GET_WHEEL_DELTA_WPARAM(wParam)); abs(wheelDelta()) >= WHEEL_DELTA; reduceWheelDelta(WHEEL_DELTA)) {
-                    if (wheelDelta() > 0)
-                        ++i;
-                    else
-                        --i;
-                }
-                scrollbar()->scroll(i > 0 ? ScrollUp : ScrollDown, ScrollByLine, abs(i));
+
+        case WM_MOUSEWHEEL: {
+            if (!scrollbar())
+                break;
+
+            int i = 0;
+            for (incrementWheelDelta(GET_WHEEL_DELTA_WPARAM(wParam)); abs(wheelDelta()) >= WHEEL_DELTA; reduceWheelDelta(WHEEL_DELTA)) {
+                if (wheelDelta() > 0)
+                    ++i;
+                else
+                    --i;
             }
-            break;
+            scrollbar()->scroll(i > 0 ? ScrollUp : ScrollDown, ScrollByLine, abs(i));
+            break;
+        }
+
         case WM_PAINT: {
             PAINTSTRUCT paintInfo;