Changeset 379 for trunk/src

Timestamp:

Dec 4, 2009, 2:37:54 AM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

gui/kernel: Added support for the IME input box used on DBCS systems (see #102).

Location:

trunk/src/gui/kernel

Files:

• qapplication_pm.cpp (modified) (1 diff)
• qkeymapper_pm.cpp (modified) (4 diffs)

trunk/src/gui/kernel/qapplication_pm.cpp

@@ -889 +889 @@
                 }
                 break;
+            }
+
+            case WM_QUERYCONVERTPOS: { // IME input box position request
+                // Ooops, how to get caret pos ?
+                /// @todo (r=dmik) we should make usage of the QIMEvent
+                //  to query widgets about IME data (see how/where this event
+                //  is used across the sources)
+
+                PRECTL pcp = (PRECTL)mp1;
+                CURSORINFO ci;
+
+                WinQueryCursorInfo(HWND_DESKTOP, &ci);
+
+                memset(pcp, 0xFF, sizeof(RECTL));
+
+                pcp->xLeft = ci.x;
+                pcp->yBottom = ci.y;
+                WinMapWindowPoints(ci.hwnd, hwnd, (PPOINTL)pcp, 2);
+
+                return (MRESULT)QCP_CONVERT;
             }
 

trunk/src/gui/kernel/qkeymapper_pm.cpp

@@ -71 +71 @@
     KeyRecorder() : nrecs(0) {}
 
-    inline KeyRecord *findKey(int code, bool remove);
+    inline KeyRecord *findKey(int scan, bool remove);
     inline void storeKey(int scan, int code, int state, const QString& text);
     inline void clearKeys();
@@ -84 +84 @@
 {
     KeyRecord *result = 0;
+
+    if(scan == 0) // DBCS chars or user-injected keys
+                return result;
+
     for (int i = 0; i < nrecs; ++i) {
         if (records[i].scan == scan) {
@@ -106 +110 @@
 void KeyRecorder::storeKey(int scan, int code, int state, const QString& text)
 {
+    if(scan == 0 && code == 0) // DBCS chars or user-injected keys
+        return;
+
     Q_ASSERT_X(nrecs != QT_MAX_KEY_RECORDINGS,
                "Internal KeyRecorder",
@@ -369 +376 @@
         state = state ^ Qt::MetaModifier;
 
+    // Note: code and/or chm.scancode may be zero here. We cannot ignore such
+    // events because, for example, all non-ASCII letters have zero virtual
+    // codes, and DBCS characters entered via IME have both zero virtual codes
+    // and zero scancodes. However, if both code and chm.scancode are zero
+    // (as for DBCS), storeKey()/findKey() will do nothing which means that:
+    //
+    //   1) QKeyEvents will not have the auto-repeat flag set when a key is
+    //      being auto-repeated by the system;
+    //   2) there will be no QEvent::KeyRelease event corresponding to the
+    //      QEvent::KeyPress event.
+    //
+    // This seems to be acceptable.
+
     // KEYDOWN -----------------------------------------------------------------
     if (!(chm.fs & KC_KEYUP)) {