Refactored gesture api

Rewritten the api almost from scratch, making it simplier and more
flexible at the same time.

The current implementation will not have complex gseturemanager class
inside Qt, but the QGesture base class, which represents both a
gesture recognizer and a gesture itself with a set of properties. A
set of common gestures that can use used in third-party applications
(and in Qt itself internally) is supposed to be found in
qstandardgestures.h, and a base class for user-defined gestures is in
qgesture.h

Gesture implementation for Pan on Windows7 has also been added as a
reference implementation for platform gestures.

1 files changed, 13 insertions, 71 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index a7b7a0a..0e8978f 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -90,8 +90,6 @@
 
 #include "qapplication.h"
 
-#include <private/qgesturemanager_p.h>
-
 #ifdef Q_WS_WINCE
 #include "qdatetime.h"
 #include "qguifunctions_wince.h"
@@ -137,14 +135,6 @@ int QApplicationPrivate::autoMaximizeThreshold = -1;
 bool QApplicationPrivate::autoSipEnabled = false;
 #endif
 
-QGestureManager* QGestureManager::instance()
-{
-    QApplicationPrivate *d = qApp->d_func();
-    if (!d->gestureManager)
-        d->gestureManager = new QGestureManager(qApp);
-    return d->gestureManager;
-}
-
 QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::Type type)
     : QCoreApplicationPrivate(argc, argv)
 {
@@ -168,8 +158,6 @@ QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, QApplication::T
     directPainters = 0;
 #endif
 
-    gestureManager = 0;
-
     if (!self)
         self = this;
 }
@@ -3595,14 +3583,6 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
 #endif // !QT_NO_WHEELEVENT || !QT_NO_TABLETEVENT
     }
 
-    if (!d->grabbedGestures.isEmpty() && e->spontaneous() && receiver->isWidgetType()) {
-        const QEvent::Type t = e->type();
-        if (t != QEvent::Gesture && t != QEvent::GraphicsSceneGesture) {
-            if (QGestureManager::instance()->filterEvent(static_cast<QWidget*>(receiver), e))
-                return true;
-        }
-    }
-
     // User input and window activation makes tooltips sleep
     switch (e->type()) {
     case QEvent::Wheel:
@@ -4061,6 +4041,19 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
         touchEvent->setAccepted(eventAccepted);
         break;
     }
+    case QEvent::WinGesture:
+    {
+        // only propagate the first gesture event (after the GID_BEGIN)
+        QWidget *w = static_cast<QWidget *>(receiver);
+        while (w) {
+            e->ignore();
+            res = d->notify_helper(w, e);
+            if ((res && e->isAccepted()) || w->isWindow())
+                break;
+            w = w->parentWidget();
+        }
+        break;
+    }
     default:
         res = d->notify_helper(receiver, e);
         break;
@@ -5057,57 +5050,6 @@ bool QApplicationPrivate::shouldSetFocus(QWidget *w, Qt::FocusPolicy policy)
     return true;
 }
 
-/*!
-    \since 4.6
-
-    Adds custom gesture \a recognizer object.
-
-    Qt takes ownership of the provided \a recognizer.
-
-    \sa QGestureEvent
-*/
-void QApplication::addGestureRecognizer(QGestureRecognizer *recognizer)
-{
-    QGestureManager::instance()->addRecognizer(recognizer);
-}
-
-/*!
-    \since 4.6
-
-    Removes custom gesture \a recognizer object.
-
-    \sa QGestureEvent
-*/
-void QApplication::removeGestureRecognizer(QGestureRecognizer *recognizer)
-{
-    Q_D(QApplication);
-    if (!d->gestureManager)
-        return;
-    d->gestureManager->removeRecognizer(recognizer);
-}
-
-/*!
-    \property QApplication::eventDeliveryDelayForGestures
-    \since 4.6
-
-    Specifies the \a delay before input events are delivered to the
-    gesture enabled widgets.
-
-    The delay allows to postpone widget's input event handling until
-    gestures framework can successfully recognize a gesture.
-
-    \sa QWidget::grabGesture()
-*/
-void QApplication::setEventDeliveryDelayForGestures(int delay)
-{
-    QGestureManager::instance()->setEventDeliveryDelay(delay);
-}
-
-int QApplication::eventDeliveryDelayForGestures()
-{
-    return QGestureManager::instance()->eventDeliveryDelay();
-}
-
 /*! \fn QDecoration &QApplication::qwsDecoration()
     Return the QWSDecoration used for decorating windows.