Changeset 54293 in webkit

Timestamp:

Feb 3, 2010 12:58:11 PM (14 years ago)

Author:

bweinstein@apple.com

Message:

Scroll does not work with IBM Thinkpad.
<​https://bugs.webkit.org/show_bug.cgi?id=14227>
<rdar://7142545>

Reviewed by Steve Falkenburg.

When initializing the WebView, add two scrollbar Windows inside of
our WebView, to allow it to receive WM_VSCROLL and WM_HSCROLL events.
(similar to what Firefox did in: <​https://bugzilla.mozilla.org/show_bug.cgi?id=507222>.

Only do this if the user has installed some kind of Trackpoint driver, using an algorithm
like <​https://bugzilla.mozilla.org/show_bug.cgi?id=514927>.

Also, add code to handle WM_HSCROLL and WM_VSCROLL messages to scroll
the WebView.

• WebView.cpp:

(WebView::verticalScroll): Handle the WM_VSCROLL messages, and scroll up and down

by lines or pages.

(WebView::horizontalScroll): Handle the WM_HSCROLL messages, and scroll left or right

by lines or pages.

(WebView::WebViewWndProc): Add cases for WM_VSCROLL and WM_HSCROLL.
(WebView::initWithFrame): Call shouldInitializeTrackPointHack, and if we should, create

vertical and horizontal scrollbars to receive WM_VSCROLL and WM_HSCROLL messages.

(WebView::shouldInitializeTrackPointHack): Check if there is a registry key for

the some kind of IBM Trackpoint driver.

• WebView.h:

Location:

trunk/WebKit/win

Files:

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

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-02-03  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Steve Falkenburg.
+
+        Scroll does not work with IBM Thinkpad.
+        <https://bugs.webkit.org/show_bug.cgi?id=14227>
+        <rdar://7142545>
+        
+        When initializing the WebView, add two scrollbar Windows inside of
+        our WebView, to allow it to receive WM_VSCROLL and WM_HSCROLL events.
+        (similar to what Firefox did in: <https://bugzilla.mozilla.org/show_bug.cgi?id=507222>.
+        
+        Only do this if the user has installed some kind of Trackpoint driver, using an algorithm
+        like <https://bugzilla.mozilla.org/show_bug.cgi?id=514927>.
+        
+        Also, add code to handle WM_HSCROLL and WM_VSCROLL messages to scroll
+        the WebView.
+
+        * WebView.cpp:
+        (WebView::verticalScroll): Handle the WM_VSCROLL messages, and scroll up and down
+            by lines or pages.
+        (WebView::horizontalScroll): Handle the WM_HSCROLL messages, and scroll left or right
+            by lines or pages.
+        (WebView::WebViewWndProc): Add cases for WM_VSCROLL and WM_HSCROLL.
+        (WebView::initWithFrame): Call shouldInitializeTrackPointHack, and if we should, create
+            vertical and horizontal scrollbars to receive WM_VSCROLL and WM_HSCROLL messages.
+        (WebView::shouldInitializeTrackPointHack): Check if there is a registry key for
+            the some kind of IBM Trackpoint driver.
+        * WebView.h:
+
 2010-02-02  Steve Falkenburg  <sfalken@apple.com>
 

trunk/WebKit/win/WebView.cpp

@@ -1589 +1589 @@
     return coreFrame->eventHandler()->handleWheelEvent(wheelEvent);
 }
+
+bool WebView::verticalScroll(WPARAM wParam, LPARAM /*lParam*/)
+{
+    ScrollDirection direction;
+    ScrollGranularity granularity;
+    switch (LOWORD(wParam)) {
+    case SB_LINEDOWN:
+        granularity = ScrollByLine;
+        direction = ScrollDown;
+        break;
+    case SB_LINEUP:
+        granularity = ScrollByLine;
+        direction = ScrollUp;
+        break;
+    case SB_PAGEDOWN:
+        granularity = ScrollByDocument;
+        direction = ScrollDown;
+        break;
+    case SB_PAGEUP:
+        granularity = ScrollByDocument;
+        direction = ScrollUp;
+        break;
+    default:
+        return false;
+        break;
+    }
+    
+    Frame* frame = m_page->focusController()->focusedOrMainFrame();
+    return frame->eventHandler()->scrollRecursively(direction, granularity);
+}
+
+bool WebView::horizontalScroll(WPARAM wParam, LPARAM /*lParam*/)
+{
+    ScrollDirection direction;
+    ScrollGranularity granularity;
+    switch (LOWORD(wParam)) {
+    case SB_LINELEFT:
+        granularity = ScrollByLine;
+        direction = ScrollLeft;
+        break;
+    case SB_LINERIGHT:
+        granularity = ScrollByLine;
+        direction = ScrollRight;
+        break;
+    case SB_PAGELEFT:
+        granularity = ScrollByDocument;
+        direction = ScrollLeft;
+        break;
+    case SB_PAGERIGHT:
+        granularity = ScrollByDocument;
+        direction = ScrollRight;
+        break;
+    default:
+        return false;
+    }
+
+    Frame* frame = m_page->focusController()->focusedOrMainFrame();
+    return frame->eventHandler()->scrollRecursively(direction, granularity);
+}
+
 
 bool WebView::execCommand(WPARAM wParam, LPARAM /*lParam*/)
@@ -2156 +2216 @@
 
             __fallthrough;
+        case WM_VSCROLL:
+            handled = webView->verticalScroll(wParam, lParam);
+            break;
+        case WM_HSCROLL:
+            handled = webView->horizontalScroll(wParam, lParam);
+            break;
         default:
             handled = false;
@@ -2388 +2454 @@
     initialized = true;
 }
+
+bool WebView::shouldInitializeTrackPointHack()
+{
+    static bool shouldCreateScrollbars;
+    static bool hasRunTrackPointCheck;
+
+    if (hasRunTrackPointCheck)
+        return shouldCreateScrollbars;
+
+    hasRunTrackPointCheck = true;
+    const TCHAR trackPointKeys[][50] = { TEXT("Software\\Lenovo\\TrackPoint"),
+        TEXT("Software\\Lenovo\\UltraNav"),
+        TEXT("Software\\Alps\\Apoint\\TrackPoint"),
+        TEXT("Software\\Synaptics\\SynTPEnh\\UltraNavUSB"),
+        TEXT("Software\\Synaptics\\SynTPEnh\\UltraNavPS2") };
+
+    for (int i = 0; i < 5; ++i) {
+        HKEY trackPointKey;
+        int readKeyResult = ::RegOpenKeyEx(HKEY_CURRENT_USER, trackPointKeys[i], 0, KEY_READ, &trackPointKey);
+        ::RegCloseKey(trackPointKey);
+        if (readKeyResult == ERROR_SUCCESS) {
+            shouldCreateScrollbars = true;
+            return shouldCreateScrollbars;
+        }
+    }
+
+    return shouldCreateScrollbars;
+}
     
 HRESULT STDMETHODCALLTYPE WebView::initWithFrame( 
@@ -2404 +2498 @@
         frame.left, frame.top, frame.right - frame.left, frame.bottom - frame.top, m_hostWindow ? m_hostWindow : HWND_MESSAGE, 0, gInstance, 0);
     ASSERT(::IsWindow(m_viewWindow));
+
+    if (shouldInitializeTrackPointHack()) {
+        // If we detected a registry key belonging to a TrackPoint driver, then create fake trackpoint
+        // scrollbars, so the WebView will receive WM_VSCROLL and WM_HSCROLL messages. We create one
+        // vertical scrollbar and one horizontal to allow for receiving both types of messages.
+        ::CreateWindow(TEXT("SCROLLBAR"), TEXT("FAKETRACKPOINTHSCROLLBAR"), WS_CHILD | WS_VISIBLE | SBS_HORZ, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
+        ::CreateWindow(TEXT("SCROLLBAR"), TEXT("FAKETRACKPOINTVSCROLLBAR"), WS_CHILD | WS_VISIBLE | SBS_VERT, 0, 0, 0, 0, m_viewWindow, 0, gInstance, 0);
+    }
 
     hr = registerDragDrop();

trunk/WebKit/win/WebView.h

@@ -794 +794 @@
     void performContextMenuAction(WPARAM, LPARAM, bool byPosition);
     bool mouseWheel(WPARAM, LPARAM, bool isMouseHWheel);
+    bool verticalScroll(WPARAM, LPARAM);
+    bool horizontalScroll(WPARAM, LPARAM);
     bool gesture(WPARAM, LPARAM);
     bool gestureNotify(WPARAM, LPARAM);
@@ -919 +921 @@
     LRESULT onIMERequestReconvertString(WebCore::Frame*, RECONVERTSTRING*);
     bool developerExtrasEnabled() const;
+
+    bool shouldInitializeTrackPointHack();
 
     // AllWebViewSet functions