Changeset 180 for trunk/src/gui/kernel/qkeymapper_pm.cpp

Timestamp:

Sep 12, 2009, 3:30:48 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Fixed: Ctrl+A..Z should generate characters with codes 0x01-0x1F.

File:

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

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -223 +223 @@
     }
 
-    // otherwise, return unmodified unicode value (similar to charToKeycode())
+    // otherwise, return unmodified uppercase unicode value (similar to other
+    // cases)
     return ch.unicode();
 }
@@ -267 +268 @@
         result << int(e->text().at(0).unicode() + e->modifiers());
     return result;
-
-    return result;
-}
-
-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)  // [email protected]+A..CTRL+Z..Ctrl+_
-                return ascii + '@';         // to @..A..Z.._
-        }
-    }
-
-    return ch.toUpper().unicode();
 }
 
@@ -414 +400 @@
         else {
             QString text;
-            if (chm.chr) {
-                // 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 assume that we have a correct 8-bit character not only when
+            // KC_CHAR is set but also when there are one or more modifiers
+            // (in which case KC_CHAR is not present) but no KC_VIRTUALKEY.
+            // The latter is in particular important for Alt+Letter combos
+            // processing Alt+Letter shortcuts for non-ASCII letters in widgets
+            // (e.g. QPushButton) depends on that.
+            if (((chm.fs & KC_CHAR) ||
+                 (!(chm.fs & KC_VIRTUALKEY) && (chm.fs & (KC_CTRL | KC_ALT | KC_SHIFT)))) &&
+                chm.chr) {
+                if (chm.chr & 0xFF00) {
                     // 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
-                    // non-zero high byte to be mistakenly recognized as DBCS.
                     text = QString::fromLocal8Bit((char *)&chm.chr, 2);
-                } else if (chm.chr & 0xFF) {
+                } else {
                     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();
-                    }
+                }
+
+                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 uppercase unicode
+                    // value (similar to other cases) 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()) {
-                    code = charToKeycode(text[0], state);
+                    code = text[0].toUpper().unicode();
+                }
+
+                if ((state & Qt::ControlModifier) &&
+                    !(state & Qt::KeypadModifier) && !(state & Qt::AltModifier) &&
+                    !text.isEmpty() && !text[0].row()) {
+                    // Ctrl + A..Z etc. produce ascii from 0x01 to 0x1F
+                    int ascii = text[0].toUpper().cell();
+                    if (ascii >= 0x41 && ascii <= 0x5F)
+                        ascii -= 0x40;
+                    // the below emulates OS/2 functionality. It differs from
+                    // e.g. Win32.
+                    else if (ascii == 0x36 && !(state & Qt::KeypadModifier))
+                        ascii = 0x1E;
+                    else if (ascii == 0x2D)
+                        ascii = 0x1F;
+                    else if (ascii >= 0x7B && ascii <= 0x7D)
+                        ascii -= 0x60;
+                    text = QChar(ascii);
                 }
             }