diff -r d39add9822e2 -r 5bfc169077b2 webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Tue Feb 02 00:56:45 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Fri Mar 19 09:52:28 2010 +0200 @@ -11,11 +11,11 @@ * * Contributors: * -* Description: +* Description: * */ -#include +#include #include "config.h" #include "../../bidi.h" #include @@ -23,7 +23,7 @@ #include #endif // BRDO_TOUCH_ENABLED_FF #include "brctl.h" -#include +#include "BrCtlDefs.h" #include "WebPointerEventHandler.h" #include "WebView.h" #include "WebFrame.h" @@ -44,7 +44,6 @@ #include "EventHandler.h" #include "EventNames.h" #include "HitTestResult.h" -#include "HitTestRequest.h" #include "MouseEvent.h" #include "WebPageFullScreenHandler.h" #include "PluginSkin.h" @@ -57,19 +56,11 @@ #include "WebTabbedNavigation.h" #include "SettingsContainer.h" #include "PluginHandler.h" -#include "WebCoreGraphicsContext.h" -#include "GraphicsContext.h" -#include "RenderStyle.h" -#include "RenderObject.h" -#include "CSSStyleSelector.h" -#include "CSSValueKeywords.h" -#include "Settings.h" -#include "WebGestureInterface.h" -#include "WebPagePinchZoomHandler.h" #include "WebKitLogger.h" using namespace WebCore; using namespace EventNames; +using namespace RT_GestureHelper; static const int KMinScrollAndTapInterval = 200000; // 200 ms static const int KDoubleTapMinActivationInterval = 100000; // 100 ms @@ -98,8 +89,7 @@ m_isHighlighted(false), m_highlightedNode(NULL), m_buttonDownTimer( this, &WebPointerEventHandler::buttonDownTimerCB ), - m_ignoreTap(false), - m_gestureInterface(NULL) + m_ignoreTap(false) { } @@ -108,7 +98,7 @@ //----------------------------------------------------------------------------- WebPointerEventHandler::~WebPointerEventHandler() { - delete m_gestureInterface; + delete m_gestureHelper; delete m_waiter; } @@ -117,115 +107,129 @@ //----------------------------------------------------------------------------- void WebPointerEventHandler::ConstructL() { -#ifdef BRDO_USE_GESTURE_HELPER - m_gestureInterface = WebGestureInterface::NewL(m_webview); +#ifdef BRDO_USE_GESTURE_HELPER + m_gestureHelper = CGestureHelper::NewL( *this ); + m_gestureHelper->SetDoubleTapEnabled(true); + m_gestureHelper->SetHoldingEnabled(false); #else - m_gestureInterface = NULL; -#endif + m_gestureHelper = NULL; +#endif m_waiter = new(ELeave) CActiveSchedulerWait(); } - - -// ====================================================================== -// WebPointerEventHandler::HandleGestureEventL -// ====================================================================== -void WebPointerEventHandler::HandleGestureEventL(const TStmGestureEvent& aGesture) +/** + * EGestureStart is sent on touch down + * EGestureReleased is sent on touch up + * EGestureTap = touch down + touch up - events sent: EGestureStart, EGestureTap + * EGestureReleased + * EGestureDrag = touch down + "move" - events sent: EGestureStart, EGestureDrag + * EGestureDoubleTap = 2 * (touch down + touch up) - events sent EGestureStart, + * EGestureDoubleTap, EGestureReleased + * EGestureLongTap = touch down + "long touch" - events sent: EGestureStart, + * EGestureLongTap + * EGestureSwipe - drag + touch up, where movements is + * close to particular direction - event sent: EGestureSwipe, + * EGestureReleased + * EGestureFlick - "fast" drag + touch up - events sent: EGestureFlick, + * EGestureReleased + * EGestureDrop - drag + touch up, !(EGestureSwipe || EGestureFlick) - events + * sent: EGestureDrop, EGestureReleased + */ +void WebPointerEventHandler::HandleGestureL( const TGestureEvent& aEvent ) { - TStmGestureUid uid = aGesture.Code(); - - if (m_webview->pinchZoomHandler()->isPinchActive() && uid != stmGesture::EGestureUidPinch) - return; - + TGestureCode gtype = aEvent.Code(EAxisBoth); + TPoint gpos = aEvent.CurrentPos(); + TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType(); - + PluginSkin* plugin = m_webview->mainFrame()->focusedPlugin(); if (plugin && plugin->pluginWin()) { - if (plugin->pluginWin()->HandleGesture(aGesture)) { - if(!plugin->isActive()) - plugin->activate(); - return; - } + if (plugin->pluginWin()->HandleGesture(aEvent)) { + return; + } } - - updateCursor(aGesture.CurrentPos()); + updateCursor(aEvent.CurrentPos()); if (IS_TABBED_NAVIGATION) { - m_webview->tabbedNavigation()->updateCursorPosition(aGesture.CurrentPos()); + m_webview->tabbedNavigation()->updateCursorPosition(m_highlightPos); } - - - switch(uid) { - case stmGesture::EGestureUidTouch: - { - if (m_webview->viewIsScrolling()) { - m_ignoreTap = true; - m_webview->pageScrollHandler()->handleTouchDownGH(aGesture); - } - else { - handleTouchDownL(aGesture); - } - break; - } - - - case stmGesture::EGestureUidTap: - { - if (aGesture.Type() == stmGesture::ETapTypeSingle) { - if (!m_ignoreTap) { - handleTapL(aGesture); - } - } - else { - handleDoubleTap(aGesture); - } + switch (gtype) { + // sent on touch down + case EGestureStart: + { + if (m_webview->viewIsScrolling()) { + m_ignoreTap = true; + m_webview->pageScrollHandler()->handleTouchDownGH(aEvent); + } + else { + handleTouchDownL(aEvent); + } + break; + } + + // sent on tap + case EGestureTap: + { + if (!m_ignoreTap) { + handleTapL(aEvent); + } + break; + } + + // sent on double tap + case EGestureDoubleTap: + { + handleDoubleTap(aEvent); + break; + } + + // sent on long tap + case EGestureLongTap: + { + break; + } - break; - } - - case stmGesture::EGestureUidRelease: - { - m_ignoreTap = false; - handleTouchUp(aGesture); - break; - } - - case stmGesture::EGestureUidPan: - { - handleMove(aGesture); - break; - } - case stmGesture::EGestureUidFlick: - { - m_ignoreTap = false; - if (!IS_NAVIGATION_NONE) { - handleTouchUp(aGesture); - } - else { - Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame(); - m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up, m_highlightPos, frm); - } - break; - } - - case stmGesture::EGestureUidPinch: - { - handlePinchZoomL(aGesture); - break; - } - default: - break; - + // sent on touch up after drag + case EGestureDrop: + case EGestureFlick: + case EGestureSwipeLeft: + case EGestureSwipeRight: + case EGestureSwipeUp: + case EGestureSwipeDown: + { + m_ignoreTap = false; + if (!IS_NAVIGATION_NONE) { + handleTouchUp(aEvent); + } + else { + Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame(); + m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up, m_highlightPos, frm); + } + break; + } + // sent on move + case EGestureDrag: + { + handleMove(aEvent); + break; + } + + // sent on touch up after tap double tap and long tap + case EGestureReleased: + { + m_ignoreTap = false; + handleTouchUp(aEvent); + break; + } } - return; } // ====================================================================== // WebPointerEventHandler::handleTap // ====================================================================== -void WebPointerEventHandler::handleTapL(const TStmGestureEvent& aGesture) +void WebPointerEventHandler::handleTapL(const TGestureEvent& aEvent) { m_buttonDownTimer.stop(); - m_lastTapEvent = m_currentEvent; + m_lastTapEvent = m_currentEvent; if(!m_webview->inPageViewMode()){ doTapL(); } @@ -233,12 +237,12 @@ // ====================================================================== // WebPointerEventHandler::handleDoubleTap //====================================================================== -void WebPointerEventHandler::handleDoubleTap(const TStmGestureEvent& aGesture) +void WebPointerEventHandler::handleDoubleTap(const TGestureEvent& aEvent) { if ( !m_webview->viewIsScrolling() && (m_webview->brCtl()->capabilities() & TBrCtlDefs::ECapabilityFitToScreen)) { if (m_isHighlighted){ - dehighlight(); + dehighlight(); } m_webview->setZoomLevelAdaptively(); } @@ -250,20 +254,20 @@ // ====================================================================== // WebPointerEventHandler::handleTouchDownL //====================================================================== -void WebPointerEventHandler::handleTouchDownL(const TStmGestureEvent& aGesture) +void WebPointerEventHandler::handleTouchDownL(const TGestureEvent& aEvent) { TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType(); PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler(); PluginSkin* pluginToActivate = pluginHandler->pluginToActivate(); m_buttonDownEvent = m_currentEvent; - m_highlightPos = aGesture.CurrentPos(); - + m_highlightPos = aEvent.CurrentPos(); + if ( !m_buttonDownTimer.isActive() && !m_webview->inPageViewMode()){ - m_buttonDownTimer.startOneShot(0.1f); + m_buttonDownTimer.startOneShot(0.1f); } if (!IS_NAVIGATION_NONE) { - m_webview->pageScrollHandler()->handleTouchDownGH(aGesture); + m_webview->pageScrollHandler()->handleTouchDownGH(aEvent); } if ( TBrCtlDefs::EElementActivatedObjectBox == elType) { @@ -277,43 +281,43 @@ } } } - + /* - * After introducing "link selection" pointer down action is done in - * buttondown timer callback. When "down" gesture event is arrived we start - * timer end exit, so gesture helper is ready to deliver next gesture event. - * Meanwhile the processing of the first gesture event hasn't been finished yet. - * The gesture helper doesn't "know" about our plans to handle the event inside - * timer callback and only way for us to "tell" about this is to stop RunL() - * of CGestureEventSender (HandleGestureL() is inside it) and finish buttondown - * timer callback first. - */ + * After introducing "link selection" pointer down action is done in + * buttondown timer callback. When "down" gesture event is arrived we start + * timer end exit, so gesture helper is ready to deliver next gesture event. + * Meanwhile the processing of the first gesture event hasn't been finished yet. + * The gesture helper doesn't "know" about our plans to handle the event inside + * timer callback and only way for us to "tell" about this is to stop RunL() + * of CGestureEventSender (HandleGestureL() is inside it) and finish buttondown + * timer callback first. + */ if ( m_buttonDownTimer.isActive()){ - m_waiter->Start(); + m_waiter->Start(); } } // ====================================================================== -// WebPointerEventHandler::handleTouchUp +// WebPointerEventHandler::handleTouchUp // ====================================================================== -void WebPointerEventHandler::handleTouchUp(const TStmGestureEvent& aGesture) +void WebPointerEventHandler::handleTouchUp(const TGestureEvent& aEvent) { m_highlightPos = TPoint(-1,-1); m_highlightedNode = NULL; PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler(); pluginHandler->setPluginToActivate(NULL); if (!IS_NAVIGATION_NONE) { - m_webview->pageScrollHandler()->handleTouchUpGH(aGesture); + m_webview->pageScrollHandler()->handleTouchUpGH(aEvent); } } // ====================================================================== // WebPointerEventHandler::handleMoveL // ====================================================================== -void WebPointerEventHandler::handleMove(const TStmGestureEvent& aGesture) +void WebPointerEventHandler::handleMove(const TGestureEvent& aEvent) { TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType(); - TPoint curPos = aGesture.CurrentPos(); + TPoint curPos = aEvent.CurrentPos(); PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler(); pluginHandler->setPluginToActivate(NULL); m_buttonDownTimer.stop(); @@ -323,8 +327,8 @@ } else { HandleHighlightChange(curPos); - - m_webview->pageScrollHandler()->handleScrollingGH(aGesture); + + m_webview->pageScrollHandler()->handleScrollingGH(aEvent); } } @@ -335,11 +339,11 @@ void WebPointerEventHandler::HandlePointerEventL(const TPointerEvent& aPointerEvent) { m_currentEvent = aPointerEvent; - - if (m_webview->isSynchRequestPending()) { + + if (m_webview->isSynchRequestPending()) { return; } - + // Handle graphical history - should never happen, as HistoryView handles this event by itself if ( m_webview->brCtl()->historyHandler()->historyController()->historyView()) { return; @@ -350,10 +354,19 @@ m_webview->formFillPopup()->HandlePointerEventL(aPointerEvent); return; } + + if (!m_webview->inPageViewMode()) { + if (aPointerEvent.iType == TPointerEvent::EButton1Down) { + m_webview->GetContainerWindow().EnablePointerMoveBuffer(); + } + else if (aPointerEvent.iType == TPointerEvent::EButton1Up) { + m_webview->GetContainerWindow().DisablePointerMoveBuffer(); + } + } #ifdef BRDO_USE_GESTURE_HELPER - m_gestureInterface->HandlePointerEventL(aPointerEvent); -#endif + m_gestureHelper->HandlePointerEventL(aPointerEvent); +#endif } //----------------------------------------------------------------------------- @@ -395,20 +408,16 @@ TBrCtlDefs::TBrCtlElementType elType = TBrCtlDefs::EElementNone; Frame* coreFrame = core(m_webview->mainFrame()); WebCursor* cursor = StaticObjectsContainer::instance()->webCursor(); - + TPointerEvent event; TPoint pos = cursor->position(); WebFrame* wfrm = cursor->getFrameAtPoint(pos); Frame* frm = core(wfrm); TPoint pt(wfrm->frameView()->viewCoordsInFrameCoords(pos)); TPoint nodePoint; - - Element* eventNode = frm->document()->elementFromPoint(pt.iX, pt.iY); - - if (m_isHighlighted){ - dehighlight(); - } - + + Element* eventNode = frm->document()->elementFromPoint(pos.iX, pos.iY); + m_highlightedNode = NULL; Node* retNode = 0; @@ -416,12 +425,10 @@ if (elType == TBrCtlDefs::EElementNone) { Node* n = wfrm->getClosestAnchorElement(cursor->position(), pos); - if (n) { + if (n) { wfrm = cursor->getFrameAtPoint(pos); frm = core(wfrm); - //eventNode = frm->document()->elementFromPoint(pos.iX, pos.iY); - TPoint newPos(wfrm->frameView()->viewCoordsInFrameCoords(pos)); - eventNode = frm->document()->elementFromPoint(newPos.iX, newPos.iY); + eventNode = frm->document()->elementFromPoint(pos.iX, pos.iY); frm->bridge()->getTypeFromElement(eventNode, elType, elRect, retNode); TPoint nodePoint = n->getRect().Rect().Center(); m_offset = (pt.iX- nodePoint.iX)*(pt.iX- nodePoint.iX) + @@ -466,7 +473,7 @@ { TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType(); Frame* coreFrame = core(m_webview->mainFrame()); - + #ifdef BRDO_TOUCH_ENABLED_FF if (m_isHighlighted) { @@ -477,21 +484,17 @@ } } #endif // BRDO_TOUCH_ENABLED_FF - - if (!IS_NAVIGATION_NONE) { - m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, coreFrame); - } - + /* - * We assume that if element visibility has been changed - * between "up" and "down" that means that some node event - * listener (onMouseOver etc) handling happened and we don't - * want to send a click (mouse press + mouse release) event. + * We assume that if element visibility has been changed + * between "up" and "down" that means that some node event + * listener (onMouseOver etc) handling happened and we don't + * want to send a click (mouse press = mouse release) event. * The exception is editable element, since we want VKB anyway */ if (!IS_NAVIGATION_NONE && - elType != TBrCtlDefs::EElementActivatedInputBox && - elType != TBrCtlDefs::EElementTextAreaBox && + elType != TBrCtlDefs::EElementActivatedInputBox && + elType != TBrCtlDefs::EElementTextAreaBox && m_webview->page()->chrome()->client()->elementVisibilityChangedByMouse()) { return; } @@ -501,12 +504,8 @@ m_lastTapEvent.iModifiers = 0; // don't pass the event if the text input is not in valid format - if (m_webview->fepTextEditor()->validateTextFormat()) { - if (!IS_NAVIGATION_NONE) { - // in case of navigation none button down was sent in buttonDownTimerCB() - m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame); - } - m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up, m_highlightPos, coreFrame); + if (isHighlitableElement(elType) || m_webview->fepTextEditor()->validateTextFormat()) { + m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up, m_lastTapEvent.iPosition, coreFrame); } // special handling for broken image (why is this here??) @@ -538,10 +537,10 @@ Frame* frm = m_webview->page()->focusController()->focusedOrMainFrame(); m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, frm); - + m_highlightedNode = NULL; - - m_webview->syncRepaint(); + + m_webview->syncRepaint(); } @@ -586,44 +585,36 @@ { m_buttonDownTimer.stop(); + Frame* coreFrame = core(m_webview->mainFrame()); TPointerEvent event; - + TBrCtlDefs::TBrCtlElementType elType = highlitableElement(); - + if (!isHighlitableElement(elType)) { elType = TBrCtlDefs::EElementNone; } m_isHighlighted = (m_highlightedNode != NULL) && (elType != TBrCtlDefs::EElementNone) ; - + + m_webview->page()->chrome()->client()->setElementVisibilityChanged(false); + /* * Tabbed navigation might already set the focused node. * If it's the same as m_highlightedNode FocuseController::setFocusedNode() * wouldn't do anything and setEditable won't be called. * So we are setting focused node to NULL here and let mouse event handler - * set it through FocuseController::setFocusedNode() + * set it through ocuseController::setFocusedNode() */ if (IS_TABBED_NAVIGATION && - elType == TBrCtlDefs::EElementInputBox || + elType == TBrCtlDefs::EElementInputBox || elType == TBrCtlDefs::EElementTextAreaBox) { coreFrame->document()->setFocusedNode(NULL); } - - if (!IS_NAVIGATION_NONE) { - m_webview->page()->chrome()->client()->setElementVisibilityChanged(false); - //to initiate hover - if (m_isHighlighted) { - setFocusRing(); - } + + m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame); - } - else { - m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame); - } - - if (m_waiter->IsStarted()) { - m_waiter->AsyncStop(); - } + m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, coreFrame); + m_waiter->AsyncStop(); } @@ -640,39 +631,7 @@ if (m_webview->showCursor()) { cursor->resetTransparency(); m_webview->setShowCursor(false); - cursor->cursorUpdate(false); + cursor->cursorUpdate(false); } } } - -//----------------------------------------------------------------------------- -// WebPointerEventHandler::setFocusRing -//---------------------------------------------------------------------------- -void WebPointerEventHandler::setFocusRing() -{ - Element* e = static_cast(m_highlightedNode); - RenderStyle* rs = e->renderStyle(); - RenderStyle* style = new (e->document()->renderArena()) RenderStyle(*rs); - Color col(0xffaaaaff); - - style->ref(); - style->setOutlineColor(col); - style->setOutlineStyle(DOTTED, true); - style->setOutlineWidth(4); - style->setOutlineOffset(2); - e->setRenderStyle(style); - style->deref(e->document()->renderArena()); - e->setChanged(); -} - -//----------------------------------------------------------------------------- -// WebPointerEventHandler::handlePinchZoom -//---------------------------------------------------------------------------- -void WebPointerEventHandler::handlePinchZoomL(const TStmGestureEvent& aGesture) -{ - //dehighlight anything which is highlighted already - if (m_isHighlighted){ - dehighlight(); - } - m_webview->pinchZoomHandler()->handlePinchGestureEventL(aGesture); -}