Changeset 48968 in webkit

Timestamp:

Oct 1, 2009 5:43:49 AM (15 years ago)

Author:

Simon Hausmann

Message:

Fixed software input panel support on web input elements.

Patch by Kristian Amlie <​kristian.amlie@nokia.com> on 2009-10-01
Reviewed by Simon Hausmann.

Send the RequestSoftwareInputPanel event if the element supports focus
and the element is clicked.

• Api/qwebpage.cpp:

(QWebPagePrivate::QWebPagePrivate):
(QWebPagePrivate::mousePressEvent):
(QWebPagePrivate::mouseReleaseEvent):

• Api/qwebpage_p.h:

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (4 diffs)
• Api/qwebpage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -268 +268 @@
     , inspectorIsInternalOnly(false)
     , viewportSize(QSize(0, 0))
+    , clickCausedFocus(false)
 {
     WebCore::InitializeLoggingChannelsIfNecessary();
@@ -633 +634 @@
         return;
 
+    RefPtr<WebCore::Node> oldNode;
+    if (page->focusController()->focusedFrame()
+        && page->focusController()->focusedFrame()->document())
+        oldNode = page->focusController()->focusedFrame()->document()->focusedNode();
+
     if (tripleClickTimer.isActive()
             && (ev->pos() - tripleClick).manhattanLength()
@@ -646 +652 @@
         accepted = frame->eventHandler()->handleMousePressEvent(mev);
     ev->setAccepted(accepted);
+
+    RefPtr<WebCore::Node> newNode;
+    if (page->focusController()->focusedFrame()
+        && page->focusController()->focusedFrame()->document())
+        newNode = page->focusController()->focusedFrame()->document()->focusedNode();
+
+    if (newNode && oldNode != newNode)
+        clickCausedFocus = true;
 }
 
@@ -751 +765 @@
 
     handleClipboard(ev, ev->button());
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    if (view && view->testAttribute(Qt::WA_InputMethodEnabled)
+        && ev->button() == Qt::LeftButton && qApp->autoSipEnabled()) {
+        QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel(
+            view->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
+        if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) {
+            QEvent event(QEvent::RequestSoftwareInputPanel);
+            QApplication::sendEvent(view, &event);
+        }
+    }
+
+    clickCausedFocus = false;
+#endif
 }
 

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -144 +144 @@
     QBasicTimer tripleClickTimer;
 
+    bool clickCausedFocus;
+
 #if QT_VERSION < 0x040400
     bool acceptNavigationRequest(QWebFrame *frame, const QWebNetworkRequest &request, QWebPage::NavigationType type);

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-10-01  Kristian Amlie  <kristian.amlie@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fixed software input panel support on web input elements.
+
+        Send the RequestSoftwareInputPanel event if the element supports focus
+        and the element is clicked.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::QWebPagePrivate):
+        (QWebPagePrivate::mousePressEvent):
+        (QWebPagePrivate::mouseReleaseEvent):
+        * Api/qwebpage_p.h:
+
 2009-10-01  Joe Ligman  <joseph.ligman@nokia.com>