From 2bc7d2af6be2b09c38e989f339ec2ee33cc204eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@nokia.com>
Date: Fri, 7 Jan 2011 17:38:59 +0100
Subject: Lighthouse: Fix keyboard on testlite

Remove code which was wrong
---
 .../platforms/testlite/qtestlitekeyboard.cpp       | 24 +++++++---------------
 src/plugins/platforms/testlite/qtestlitekeyboard.h |  1 -
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/plugins/platforms/testlite/qtestlitekeyboard.cpp b/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
index ca4c203..72e6d50 100644
--- a/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
+++ b/src/plugins/platforms/testlite/qtestlitekeyboard.cpp
@@ -1,7 +1,5 @@
 #include "qtestlitekeyboard.h"
 
-#include <QDebug>
-
 #include "qtestlitescreen.h"
 
 #include <QtGui/QWindowSystemInterface>
@@ -949,21 +947,13 @@ static Qt::KeyboardModifiers modifierFromKeyCode(int qtcode)
 
 void QTestLiteKeyboard::handleKeyEvent(QWidget *widget, QEvent::Type type, XKeyEvent *ev)
 {
-    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;
+    int qtcode = 0;
+    Qt::KeyboardModifiers modifiers = translateModifiers(ev->state);
     QByteArray chars;
+    chars.resize(513);
     int count = 0;
-    QString text = translateKeySym(baseKeySym, xmodifiers, baseCode, baseModifiers, chars, count);
-
-    QWindowSystemInterface::handleKeyEvent(widget,ev->time,type,baseCode,baseModifiers,text.left(count));
-
+    KeySym keySym;
+    count = XLookupString(ev,chars.data(),chars.size(),&keySym,0);
+    QString text = translateKeySym(keySym,ev->state,qtcode,modifiers,chars,count);
+    QWindowSystemInterface::handleKeyEvent(widget,ev->time,type,qtcode,modifiers,text.left(count));
 }
diff --git a/src/plugins/platforms/testlite/qtestlitekeyboard.h b/src/plugins/platforms/testlite/qtestlitekeyboard.h
index 4e9d98d..65ead16 100644
--- a/src/plugins/platforms/testlite/qtestlitekeyboard.h
+++ b/src/plugins/platforms/testlite/qtestlitekeyboard.h
@@ -14,7 +14,6 @@ public:
 
     Qt::KeyboardModifiers translateModifiers(int s);
 
-    enum { MaxBits = sizeof(uint) * 8 };
 private:
 
     void setMask(KeySym sym, uint mask);
-- 
cgit v0.12