Add Keyboard modifiers to MotionEventQt.

Also fix the mapping of Ctrl and Meta keys on Mac OSX.
On this platform Qt automatically maps Meta to Control
and vice versa. Chromium however does not expect such
behavior.

Change-Id: Ia9913322ae8ae6ffd99feb6edfc91b9ea752c5cb
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>

2 files changed, 90 insertions, 8 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 9555c85a5..e17459634 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -152,12 +152,37 @@ static inline bool compareTouchPoints(const QTouchEvent::TouchPoint &lhs, const
     return lhs.state() < rhs.state();
 }
 
+static inline int flagsFromModifiers(Qt::KeyboardModifiers modifiers)
+{
+    int modifierFlags = ui::EF_NONE;
+#if defined(Q_OS_OSX)
+    if (!qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) {
+        if ((modifiers & Qt::ControlModifier) != 0)
+            modifierFlags |= ui::EF_COMMAND_DOWN;
+        if ((modifiers & Qt::MetaModifier) != 0)
+            modifierFlags |= ui::EF_CONTROL_DOWN;
+    } else
+#endif
+    {
+        if ((modifiers & Qt::ControlModifier) != 0)
+            modifierFlags |= ui::EF_CONTROL_DOWN;
+        if ((modifiers & Qt::MetaModifier) != 0)
+            modifierFlags |= ui::EF_COMMAND_DOWN;
+    }
+    if ((modifiers & Qt::ShiftModifier) != 0)
+        modifierFlags |= ui::EF_SHIFT_DOWN;
+    if ((modifiers & Qt::AltModifier) != 0)
+        modifierFlags |= ui::EF_ALT_DOWN;
+    return modifierFlags;
+}
+
 class MotionEventQt : public ui::MotionEvent {
 public:
-    MotionEventQt(const QList<QTouchEvent::TouchPoint> &touchPoints, const base::TimeTicks &eventTime, Action action, int index = -1)
+    MotionEventQt(const QList<QTouchEvent::TouchPoint> &touchPoints, const base::TimeTicks &eventTime, Action action, const Qt::KeyboardModifiers modifiers, int index = -1)
         : touchPoints(touchPoints)
         , eventTime(eventTime)
         , action(action)
+        , flags(flagsFromModifiers(modifiers))
         , index(index)
     {
         // ACTION_DOWN and ACTION_UP must be accesssed through pointer_index 0
@@ -173,7 +198,21 @@ public:
     virtual float GetY(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).pos().y(); }
     virtual float GetRawX(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).screenPos().x(); }
     virtual float GetRawY(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).screenPos().y(); }
-    virtual float GetTouchMajor(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).rect().height(); }
+    virtual float GetTouchMajor(size_t pointer_index) const Q_DECL_OVERRIDE
+    {
+        QRectF touchRect = touchPoints.at(pointer_index).rect();
+        return std::max(touchRect.height(), touchRect.width());
+    }
+    virtual float GetTouchMinor(size_t pointer_index) const Q_DECL_OVERRIDE
+    {
+        QRectF touchRect = touchPoints.at(pointer_index).rect();
+        return std::min(touchRect.height(), touchRect.width());
+    }
+    virtual float GetOrientation(size_t pointer_index) const Q_DECL_OVERRIDE
+    {
+        return 0;
+    }
+    virtual int GetFlags() const Q_DECL_OVERRIDE { return flags; }
     virtual float GetPressure(size_t pointer_index) const Q_DECL_OVERRIDE { return touchPoints.at(pointer_index).pressure(); }
     virtual base::TimeTicks GetEventTime() const Q_DECL_OVERRIDE { return eventTime; }
 
@@ -189,6 +228,7 @@ private:
     QList<QTouchEvent::TouchPoint> touchPoints;
     base::TimeTicks eventTime;
     Action action;
+    int flags;
     int index;
 };
 
@@ -929,7 +969,7 @@ void RenderWidgetHostViewQt::handleTouchEvent(QTouchEvent *ev)
     QList<QTouchEvent::TouchPoint> touchPoints = mapTouchPointIds(ev->touchPoints());
 
     if (ev->type() == QEvent::TouchCancel) {
-        MotionEventQt cancelEvent(touchPoints, eventTimestamp, ui::MotionEvent::ACTION_CANCEL);
+        MotionEventQt cancelEvent(touchPoints, eventTimestamp, ui::MotionEvent::ACTION_CANCEL, ev->modifiers());
         processMotionEvent(cancelEvent);
         return;
     }
@@ -962,7 +1002,7 @@ void RenderWidgetHostViewQt::handleTouchEvent(QTouchEvent *ev)
             continue;
         }
 
-        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, i);
+        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, ev->modifiers(), i);
         processMotionEvent(motionEvent);
     }
 }
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 36e96121c..8dfb2c574 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -64,6 +64,7 @@
 #include "web_event_factory.h"
 #include "third_party/WebKit/Source/platform/WindowsKeyboardCodes.h"
 
+#include <QCoreApplication>
 #include <QElapsedTimer>
 #include <QKeyEvent>
 #include <QMouseEvent>
@@ -478,14 +479,52 @@ static unsigned mouseButtonsModifiersForEvent(const T* event)
     return ret;
 }
 
+// If only a modifier key is pressed, Qt only reports the key code.
+// But Chromium also expects the modifier being set.
+static inline WebInputEvent::Modifiers modifierForKeyCode(int key)
+{
+    switch (key) {
+        case Qt::Key_Shift:
+            return WebInputEvent::ShiftKey;
+        case Qt::Key_Alt:
+            return WebInputEvent::AltKey;
+#if defined(Q_OS_OSX)
+        case Qt::Key_Control:
+            return (!qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) ? WebInputEvent::MetaKey : WebInputEvent::ControlKey;
+        case Qt::Key_Meta:
+            return (!qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) ? WebInputEvent::ControlKey : WebInputEvent::MetaKey;
+#else
+        case Qt::Key_Control:
+            return WebInputEvent::ControlKey;
+        case Qt::Key_Meta:
+            return WebInputEvent::MetaKey;
+#endif
+        default:
+            return static_cast<WebInputEvent::Modifiers>(0);
+    }
+}
+
 static inline WebInputEvent::Modifiers modifiersForEvent(const QInputEvent* event)
 {
     unsigned result = 0;
     Qt::KeyboardModifiers modifiers = event->modifiers();
+#if defined(Q_OS_OSX)
+    if (!qApp->testAttribute(Qt::AA_MacDontSwapCtrlAndMeta)) {
+        if (modifiers & Qt::ControlModifier)
+            result |= WebInputEvent::MetaKey;
+        if (modifiers & Qt::MetaModifier)
+            result |= WebInputEvent::ControlKey;
+    } else
+#endif
+    {
+        if (modifiers & Qt::ControlModifier)
+            result |= WebInputEvent::ControlKey;
+        if (modifiers & Qt::MetaModifier)
+            result |= WebInputEvent::MetaKey;
+    }
+
     if (modifiers & Qt::ShiftModifier)
         result |= WebInputEvent::ShiftKey;
-    if (modifiers & Qt::ControlModifier)
-        result |= WebInputEvent::ControlKey;
     if (modifiers & Qt::AltModifier)
         result |= WebInputEvent::AltKey;
     if (modifiers & Qt::MetaModifier)
@@ -503,9 +542,12 @@ static inline WebInputEvent::Modifiers modifiersForEvent(const QInputEvent* even
         result |= mouseButtonsModifiersForEvent(static_cast<const QWheelEvent*>(event));
         break;
     case QEvent::KeyPress:
-    case QEvent::KeyRelease:
-        if (static_cast<const QKeyEvent*>(event)->isAutoRepeat())
+    case QEvent::KeyRelease: {
+        const QKeyEvent *keyEvent = static_cast<const QKeyEvent*>(event);
+        if (keyEvent->isAutoRepeat())
             result |= WebInputEvent::IsAutoRepeat;
+        result |= modifierForKeyCode(keyEvent->key());
+    }
     default:
         break;
     }