Lighthouse: Fix keyboard modifier handling

QApplication allready knows the modifiers

3 files changed, 23 insertions, 15 deletions

diff --git a/src/gui/kernel/qapplication_qpa.cpp b/src/gui/kernel/qapplication_qpa.cpp
index fdbb931..cd76adf 100644
--- a/src/gui/kernel/qapplication_qpa.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -79,7 +79,6 @@ int qt_last_x = 0;
 int qt_last_y = 0;
 QPointer<QWidget> qt_last_mouse_receiver = 0;
 
-static Qt::KeyboardModifiers modifiers = Qt::NoModifier;
 static Qt::MouseButtons buttons = Qt::NoButton;
 static ulong mousePressTime;
 static Qt::MouseButton mousePressButton = Qt::NoButton;
@@ -731,7 +730,7 @@ void QApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mouse
 
     // qDebug() << "sending mouse ev." << ev.type() << localPoint << globalPoint << ev.button() << ev.buttons() << mouseWidget << "mouse grabber" << implicit_mouse_grabber;
 
-    QMouseEvent ev(type, localPoint, globalPoint, button, buttons, modifiers);
+    QMouseEvent ev(type, localPoint, globalPoint, button, buttons, QApplication::keyboardModifiers());
 
     QList<QWeakPointer<QPlatformCursor> > cursors = QPlatformCursorPrivate::getInstances();
     foreach (QWeakPointer<QPlatformCursor> cursor, cursors) {
@@ -744,7 +743,7 @@ void QApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mouse
 
 #ifndef QT_NO_CONTEXTMENU
     if (type == QEvent::MouseButtonPress && button == Qt::RightButton && (openPopupCount == oldOpenPopupCount)) {
-        QContextMenuEvent e(QContextMenuEvent::Mouse, localPoint, globalPoint, modifiers);
+        QContextMenuEvent e(QContextMenuEvent::Mouse, localPoint, globalPoint, QApplication::keyboardModifiers());
         QApplication::sendSpontaneousEvent(mouseWidget, &e);
     }
 #endif // QT_NO_CONTEXTMENU
@@ -786,7 +785,7 @@ void QApplicationPrivate::processWheelEvent(QWindowSystemInterfacePrivate::Wheel
          p = mouseWidget->mapFromGlobal(globalPoint);
      }
 
-     QWheelEvent ev(p, globalPoint, e->delta, buttons, modifiers,
+     QWheelEvent ev(p, globalPoint, e->delta, buttons, QApplication::keyboardModifiers(),
                    e->orient);
      QApplication::sendSpontaneousEvent(mouseWidget, &ev);
 }
@@ -817,7 +816,6 @@ void QApplicationPrivate::processKeyEvent(QWindowSystemInterfacePrivate::KeyEven
     if (app_do_modal && !qt_try_modal(focusW, e->keyType))
         return;
 
-    modifiers = e->modifiers;
     QKeyEvent ev(e->keyType, e->key, e->modifiers, e->unicode, e->repeat, e->repeatCount);
     QApplication::sendSpontaneousEvent(focusW, &ev);
 }
diff --git a/src/plugins/platforms/testlite/qtestlitekeyboard.cpp b/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
index 93d21b3..ca4c203 100644
--- a/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
+++ b/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
@@ -1,5 +1,7 @@
 #include "qtestlitekeyboard.h"
 
+#include <QDebug>
+
 #include "qtestlitescreen.h"
 
 #include <QtGui/QWindowSystemInterface>
@@ -710,8 +712,8 @@ Qt::KeyboardModifiers QTestLiteKeyboard::translateModifiers(int s)
         ret |= Qt::AltModifier;
     if (s & m_meta_mask)
         ret |= Qt::MetaModifier;
-    if (s & m_mode_switch_mask)
-        ret |= Qt::GroupSwitchModifier;
+//    if (s & m_mode_switch_mask) //doesn't seem to work correctly
+//        ret |= Qt::GroupSwitchModifier;
     return ret;
 }
 
@@ -947,14 +949,21 @@ static Qt::KeyboardModifiers modifierFromKeyCode(int qtcode)
 
 void QTestLiteKeyboard::handleKeyEvent(QWidget *widget, QEvent::Type type, XKeyEvent *ev)
 {
-    int qtcode = 0;
-    Qt::KeyboardModifiers modifiers = translateModifiers(ev->state);
+    const int xkeycode = ev->keycode;
+    const uint xmodifiers = ev->state;
+
+    KeySym baseKeySym;
+    uint consumedModifiers;
+    if (!XkbLookupKeySym(m_screen->display(), xkeycode, (xmodifiers & (LockMask | m_num_lock_mask)),
+                         &consumedModifiers, &baseKeySym))
+        return;
+
+    Qt::KeyboardModifiers baseModifiers = 0;
+    int baseCode = -1;
     QByteArray chars;
-    chars.resize(513);
     int count = 0;
-    KeySym keySym;
-    count = XLookupString(ev,chars.data(),chars.size(),&keySym,0);
-    QString text = translateKeySym(keySym,ev->state,qtcode,modifiers,chars,count);
-    modifiers ^= modifierFromKeyCode(qtcode);
-    QWindowSystemInterface::handleKeyEvent(widget,ev->time,type,qtcode,modifiers,text.left(count));
+    QString text = translateKeySym(baseKeySym, xmodifiers, baseCode, baseModifiers, chars, count);
+
+    QWindowSystemInterface::handleKeyEvent(widget,ev->time,type,baseCode,baseModifiers,text.left(count));
+
 }
diff --git a/src/plugins/platforms/testlite/qtestlitekeyboard.h b/src/plugins/platforms/testlite/qtestlitekeyboard.h
index 65ead16..4e9d98d 100644
--- a/src/plugins/platforms/testlite/qtestlitekeyboard.h
+++ b/src/plugins/platforms/testlite/qtestlitekeyboard.h
@@ -14,6 +14,7 @@ public:
 
     Qt::KeyboardModifiers translateModifiers(int s);
 
+    enum { MaxBits = sizeof(uint) * 8 };
 private:
 
     void setMask(KeySym sym, uint mask);