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 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 // 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)              // [email protected]+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)  // [email protected]+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 
+                // 
+                // 
+                // 
+                // 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 assme 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);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
                 }
 
                 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);
                 }
             }