Changeset 179 for trunk/src

Timestamp:

Sep 12, 2009, 2:10:36 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Implemented support for entering dead keys from the keyboard (#68).

File:

• trunk/src/gui/kernel/qkeymapper_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -197 +197 @@
 };
 
+// Converts known accent symbols to their Key_Dead_ equivalents.
+static inline int deadCharToDeadKeyCode(const QChar &ch)
+{
+    switch (ch.unicode()) {
+    case 0x0060: return Qt::Key_Dead_Grave;
+    case 0x00B4: return Qt::Key_Dead_Acute;
+    case 0x005E: return Qt::Key_Dead_Circumflex;
+    case 0x007E: return Qt::Key_Dead_Tilde;
+    case 0x00AF: return Qt::Key_Dead_Macron;
+    case 0x02D8: return Qt::Key_Dead_Breve;
+    case 0x02D9: return Qt::Key_Dead_Abovedot;
+    case 0x00A8: return Qt::Key_Dead_Diaeresis;
+    case 0x02DA: return Qt::Key_Dead_Abovering;
+    case 0x02DD: return Qt::Key_Dead_Doubleacute;
+    case 0x02C7: return Qt::Key_Dead_Caron;
+    case 0x00B8: return Qt::Key_Dead_Cedilla;
+    case 0x02DB: return Qt::Key_Dead_Ogonek;
+    case 0x1DA5: return Qt::Key_Dead_Iota; // @todo is that correct???
+    case 0x3099: return Qt::Key_Dead_Voiced_Sound;
+    case 0x309A: return Qt::Key_Dead_Semivoiced_Sound;
+    case 0x0323: return Qt::Key_Dead_Belowdot;
+    case 0x02DE: return Qt::Key_Dead_Hook;
+    case 0x031B: return Qt::Key_Dead_Horn;
+    default: break;
+    }
+
+    // otherwise, return unmodified unicode value (similar to charToKeycode())
+    return ch.unicode();
+}
+
 // Key translation ---------------------------------------------------[ end ]---
 
@@ -241 +271 @@
 }
 
-static inline int asciiToKeycode(char a, int state)
-{
-    if (a >= 'a' && a <= 'z')
-        a = toupper(a);
-    if ((state & Qt::ControlModifier) != 0) {
-        if (a >= 0 && a <= 31)              // Ctrl+@..Ctrl+A..CTRL+Z..Ctrl+_
-            a += '@';                       // to @..A..Z.._
-    }
-    return a & 0xff;
+static inline int charToKeycode(const QChar &ch, int state)
+{
+    if (!ch.row()) {
+        if ((state & Qt::ControlModifier) != 0) {
+            int ascii = ch.cell();
+            if (ascii >= 0 && ascii <= 31)  // Ctrl+@..Ctrl+A..CTRL+Z..Ctrl+_
+                return ascii + '@';         // to @..A..Z.._
+        }
+    }
+
+    return ch.toUpper().unicode();
 }
 
@@ -383 +415 @@
             QString text;
             if (chm.chr) {
-                // Note: We ignore the KC_CHAR flag when generating text for the
-                // key in order to get correct (non-null) text even for Alt+Letter
-                // combinations (that don't have KC_CHAR set) because processing
-                // Alt+Letter shortcuts for non-ASCII letters in widgets (e.g.
-                // QPushButton) depends on that.
+                // Note: We ignore the KC_CHAR flag when deciding whether to
+                // generate text for the key because we want to get correct
+                // (non-null) text for Alt+Letter combinations (that don't have
+                // KC_CHAR set): processing Alt+Letter shortcuts for non-ASCII
+                // letters in widgets (e.g. QPushButton) depends on that.
                 if ((chm.fs & (KC_VIRTUALKEY | KC_CHAR)) == KC_CHAR && (chm.chr & 0xFF00)) {
-                    // We assime we get a DBCS char if the above condition is met.
+                    // We assume we get a DBCS char if the above condition is met.
                     // DBCS chars seem to have KC_CHAR set but not KC_VIRTUALKEY; we
                     // use this to prevent keys like ESC (chm=0x011B) with the
@@ -396 +428 @@
                 } else if (chm.chr & 0xFF) {
                     text = QString::fromLocal8Bit((char*)&chm.chr, 1);
+                    if (chm.fs & KC_DEADKEY) {
+                        // convert dead keys to Key_Dead_* codes and set text to
+                        // null to avoid interpreting them as normal chars
+                        Q_ASSERT(text.size() == 1);
+                        code = deadCharToDeadKeyCode(text[0]);
+                        text = QString();
+                    } else if (chm.fs & KC_INVALIDCOMP) {
+                        // if the pressed letter is invalid for the given dead
+                        // key, we set text to null as well (to meet the PM
+                        // behavior) and set the code to the value of the char
+                        // (similar to charToKeycode()) to have it recognized
+                        Q_ASSERT(text.size() == 1);
+                        code = text[0].toUpper().unicode();
+                        text = QString();
+                    }
                 }
 
                 Q_ASSERT(code || !text.isEmpty()); // we must provide the key code
                 if (!code && !text.isEmpty()) {
-                    if (!text[0].row())
-                        code = asciiToKeycode(text[0].cell(), state);
-                    else
-                        code = text[0].toUpper().unicode();
+                    code = charToKeycode(text[0], state);
                 }
             }