Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits)
  probably need to update user configurations once in a while too
  use dynamicstore instead
  Define JS_NO_EXPORT to avoid JSC C API functions being exported
  Don't use QScriptValueIterator to iterate over an array
  QtScript: Fix regression when calling newQObject() from native constructor
  Added note to OS X installation instructions.
  Keypress events ignored in listview on Cocoa (64 Bit) with Japanese IME
  Update only appropriate rectangles during update_sys().
  Marked QTDS obsolete from Qt 4.7.
  QNetworkReply: Fix canReadLine()
  Abort waiting replies on session error.
  different approach to fixing "the other" aliasing issue
  fix aliasing issue in node_construct()
  detach in fewer cases, remove redundant calculation
  SSL: Fix memleak related to local certificate
  Improve keyboard layout detection on X11
  Compile on ARM with -Werror -Wold-style-cast
  Use the vista-style native dialog for QFileDialog::getExistingDirectory
  Apply the stdset attribute for resource properties
  doc: Completed sentence about HideNameFilterDetails
  ...

1 files changed, 17 insertions, 17 deletions

diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
index d6d1042..428ac3e 100644
--- a/src/gui/kernel/qkeymapper_x11.cpp
+++ b/src/gui/kernel/qkeymapper_x11.cpp
@@ -248,22 +248,17 @@ qt_XTranslateKey(register QXCoreDesc *dpy,
 
 
 QKeyMapperPrivate::QKeyMapperPrivate()
-    : keyboardInputDirection(Qt::LeftToRight), useXKB(false)
+    : keyboardInputDirection(Qt::LeftToRight), xkb_currentGroup(0)
 {
     memset(&coreDesc, 0, sizeof(coreDesc));
 
 #ifndef QT_NO_XKB
-    int opcode = -1;
-    int xkbEventBase = -1;
-    int xkbErrorBase = -1;
-    int xkblibMajor = XkbMajorVersion;
-    int xkblibMinor = XkbMinorVersion;
-    if (XkbQueryExtension(X11->display, &opcode, &xkbEventBase, &xkbErrorBase, &xkblibMajor, &xkblibMinor))
-        useXKB = true;
-#endif
-
-#if 0
-    qDebug() << "useXKB =" << useXKB;
+    if (X11->use_xkb) {
+        // get the current group
+        XkbStateRec xkbState;
+        if (XkbGetState(X11->display, XkbUseCoreKbd, &xkbState) == Success)
+            xkb_currentGroup = xkbState.group;
+    }
 #endif
 }
 
@@ -276,7 +271,7 @@ QKeyMapperPrivate::~QKeyMapperPrivate()
 QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *event)
 {
 #ifndef QT_NO_XKB
-    if (useXKB)
+    if (X11->use_xkb)
         return possibleKeysXKB(event);
 #endif
     return possibleKeysCore(event);
@@ -486,7 +481,7 @@ enum {
 void QKeyMapperPrivate::clearMappings()
 {
 #ifndef QT_NO_XKB
-    if (useXKB) {
+    if (X11->use_xkb) {
         // try to determine the layout name and input direction by reading the _XKB_RULES_NAMES property off
         // the root window
         QByteArray layoutName;
@@ -515,8 +510,13 @@ void QKeyMapperPrivate::clearMappings()
                 p += qstrlen(p) + 1;
             } while (p < end);
 
-            layoutName = QByteArray::fromRawData(names[2], qstrlen(names[2]));
-            variantName = QByteArray::fromRawData(names[3], qstrlen(names[3]));
+            // the layout names and variants are saved in the _XKB_RULES_NAMES property as a comma separated list
+            QList<QByteArray> layoutNames = QByteArray::fromRawData(names[2], qstrlen(names[2])).split(',');
+            if (uint(xkb_currentGroup) < uint(layoutNames.count()))
+                layoutName = layoutNames.at(xkb_currentGroup);
+            QList<QByteArray> variantNames = QByteArray::fromRawData(names[3], qstrlen(names[3])).split(',');
+            if (uint(xkb_currentGroup) < uint(variantNames.count()))
+                variantName = variantNames.at(xkb_currentGroup);
         }
 
         // ### ???
@@ -574,7 +574,7 @@ void QKeyMapperPrivate::clearMappings()
 
     // look at the modifier mapping, and get the correct masks for alt, meta, super, hyper, and mode_switch
 #ifndef QT_NO_XKB
-    if (useXKB) {
+    if (X11->use_xkb) {
         XkbDescPtr xkbDesc = XkbGetMap(X11->display, XkbAllClientInfoMask, XkbUseCoreKbd);
         for (int i = xkbDesc->min_key_code; i < xkbDesc->max_key_code; ++i) {
             const uint mask = xkbDesc->map->modmap ? xkbDesc->map->modmap[i] : 0;