Changeset 434

Timestamp:

Dec 22, 2009, 2:34:55 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented proper generation of possible key and modifier combinations for a given key event. This in particular enables Ctrl+<letter> shortcuts for non-Latin languages and also makes Ctrl+<letter>, Alt+<letter> and similar shortcuts language-neutral. See #50 for details.

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (4 diffs)
• qkeymapper.cpp (modified) (1 diff)
• qkeymapper_p.h (modified) (1 diff)
• qkeymapper_pm.cpp (modified) (6 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -65 +65 @@
 #include "qcursor_p.h"
 
+
+
 //#define QT_DEBUGMSGFLOW
 
@@ -944 +946 @@
 
             case WM_CHAR: { // keyboard event
+
+
+
                 QWidget *g = QWidget::keyboardGrabber();
                 if (g)
@@ -966 +971 @@
                         return (MRESULT)TRUE;
                 }
+
+
+
+
+
                 break;
             }
@@ -2529 +2539 @@
     myCaseEnd()
 
+
+
+
+
+
     myCaseBegin(WM_PAINT)
         break;

trunk/src/gui/kernel/qkeymapper.cpp

@@ -91 +91 @@
 void QKeyMapper::changeKeyboard()
 {
+
+
+
+
     instance()->d_func()->clearMappings();
+
 
     // inform all toplevel widgets of the change

trunk/src/gui/kernel/qkeymapper_p.h

@@ -166 +166 @@
 #elif defined(Q_WS_PM)
 
+
     bool translateKeyEvent(QWidget *receiver, const QMSG &qmsg, bool grab);
 
     int extraKeyState;
+
+
 
 #elif defined(Q_WS_X11)

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -49 +49 @@
 #include "qt_os2.h"
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QT_BEGIN_NAMESPACE
-
-//#define DEBUG_KEYMAPPER
 
 // Key recorder ----------------------------------------------------[ start ] --
@@ -246 +265 @@
 // Keyboard map private --------------------------------------------[ start ]---
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 QKeyMapperPrivate::QKeyMapperPrivate()
 {
@@ -252 +315 @@
     extraKeyState = 0;
 
-   // @todo implement
+   
 }
 
@@ -262 +325 @@
 void QKeyMapperPrivate::clearMappings()
 {
-    // @todo implement
+    for (int i = 0; i < KeyLayoutSize; ++i) {
+        if (keyLayout[i]) {
+            delete keyLayout[i];
+            keyLayout[i] = 0;
+        }
+    }
 }
 
@@ -269 +337 @@
     QList<int> result;
 
-    // @todo implement; so far do the same as QKeyMapper::possibleKeys()
-    if (e->key() && (e->key() != Qt::Key_unknown))
-        result << int(e->key() + e->modifiers());
-    else if (!e->text().isEmpty())
-        result << int(e->text().at(0).unicode() + e->modifiers());
+    KeyboardLayoutItem *kbItem = keyLayout[e->nativeScanCode()];
+    if(!kbItem) {
+#ifdef DEBUG_KEYMAPPER
+        qDebug("QKeyMapperPrivate::possibleKeys: none");
+#endif
+        return result;
+    }
+
+    int baseKey0 = kbItem->qtKey[0][0] ? kbItem->qtKey[0][0] :
+                   e->key() && e->key() != Qt::Key_unknown ? e->key() :
+                   e->text().at(0).unicode();
+
+    int baseKey1 = baseKey0;
+    if (kbItem->layoutIds[1])
+        kbItem->qtKey[0][1] ? kbItem->qtKey[0][1] :
+                   e->key() && e->key() != Qt::Key_unknown ? e->key() :
+                   e->text().at(0).unicode();
+
+    Qt::KeyboardModifiers keyMods = e->modifiers();
+
+    // The base key is _always_ valid, of course
+    result << int(baseKey0 + keyMods);
+    if (baseKey1 != baseKey0)
+        result << int(baseKey1 + keyMods);
+
+    // go through both keyboard layouts
+    for (int j = 0; j < 2; ++j) {
+        // check if we skipped the layout in updateKeyMap() and skip too if so
+        if (!kbItem->layoutIds[j])
+            continue;
+        // go through all modifiers
+        for(int i = 0; i < KeyboardLayoutItem::QtKeySize; ++i) {
+            Qt::KeyboardModifiers neededMods = QtModsTbl[i];
+            int key = kbItem->qtKey[i][j];
+            if (key && key != baseKey0 && key != baseKey1 &&
+                ((keyMods & neededMods) == neededMods)) {
+                int k = int(key + (keyMods & ~neededMods));
+                if (!result.contains(k))
+                    result << k;
+            }
+        }
+    }
+
+#ifdef DEBUG_KEYMAPPER
+    qDebug("QKeyMapperPrivate::possibleKeys:");
+    foreach(int k, result)
+        qDebug("    0x%x", k);
+#endif
+
     return result;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -334 +520 @@
     // char code in the high byte of chm.chr (probably this is less
     // device-dependent than scancode)
-    switch (chm.chr) {
-        case 0xEC00: // LWIN
-        case 0xED00: // RWIN
-            code = Qt::Key_Meta;
-            if (!(chm.fs & KC_KEYUP))
-                extraKeyState |= Qt::MetaModifier;
-            else
-                extraKeyState &= ~Qt::MetaModifier;
-            break;
-        case 0xEE00: // WINAPP (menu with arrow)
-            code = Qt::Key_Menu;
-            break;
-        case 0x5600: // additional '\' (0x56 is actually its scancode)
-            chm.chr = state & Qt::ShiftModifier ? '|' : '\\';
-            break;
-        case 0xFA00: // Back
-            code = Qt::Key_Back;
-            break;
-        case 0xF900: // Forward
-            code = Qt::Key_Forward;
-            break;
-        case 0x2064: // Volume Mute
-            code = Qt::Key_VolumeMute;
-            break;
-        case 0x2E63: // Volume Down
-            code = Qt::Key_VolumeDown;
-            break;
-        case 0x3062: // Volume Up
-            code = Qt::Key_VolumeUp;
-            break;
-        case 0x2267: // Play/Pause
-            code = Qt::Key_MediaPlay;
-            break;
-        case 0x326D: // Web/Home
-            code = Qt::Key_HomePage;
-            break;
-        case 0xF500: // Search
-            code = Qt::Key_Search;
-            break;
-        case 0xF600: // Favorites
-            code = Qt::Key_Favorites;
-            break;
-        }
+    if (!code){
+        switch (chm.chr) {
+            case 0xEC00: // LWIN
+            case 0xED00: // RWIN
+                code = Qt::Key_Meta;
+                if (!(chm.fs & KC_KEYUP))
+                    extraKeyState |= Qt::MetaModifier;
+                else
+                    extraKeyState &= ~Qt::MetaModifier;
+                break;
+            case 0xEE00: // WINAPP (menu with arrow)
+                code = Qt::Key_Menu;
+                break;
+            case 0x5600: // additional '\' (0x56 is actually its scancode)
+                chm.chr = state & Qt::ShiftModifier ? '|' : '\\';
+                break;
+            case 0xFA00: // Back
+                code = Qt::Key_Back;
+                break;
+            case 0xF900: // Forward
+                code = Qt::Key_Forward;
+                break;
+            case 0x2064: // Volume Mute
+                code = Qt::Key_VolumeMute;
+                break;
+            case 0x2E63: // Volume Down
+                code = Qt::Key_VolumeDown;
+                break;
+            case 0x3062: // Volume Up
+                code = Qt::Key_VolumeUp;
+                break;
+            case 0x2267: // Play/Pause
+                code = Qt::Key_MediaPlay;
+                break;
+            case 0x326D: // Web/Home
+                code = Qt::Key_HomePage;
+                break;
+            case 0xF500: // Search
+                code = Qt::Key_Search;
+                break;
+            case 0xF600: // Favorites
+                code = Qt::Key_Favorites;
+                break;
+        }
+    }
 
     // update state after updating extraKeyState