Changeset 170

Timestamp:

Apr 10, 2007, 11:12:37 PM (18 years ago)

Author:

dmik

Message:

Kernel: Fixed DBCS input/output support (thanks again to Ko Myung-Hun).

Location:

trunk/src/kernel

Files:

• qapplication_pm.cpp (modified) (5 diffs)
• qfontengine_pm.cpp (modified) (1 diff)

trunk/src/kernel/qapplication_pm.cpp

@@ -2980 +2980 @@
         // don't have KC_CHAR set) because processing Alt+Letter shortcuts
         // for non-ASCII letters in widgets (e.g. QPushButton) depends on that.
-        if ( !(chm.fs & KC_KEYUP) && (chm.chr & 0xFF) && (chm.chr & 0xFF00) &&
-             qt_os2UconvFirstByteTable()[ (chm.chr & 0xFF) ] == 2 ) {
-            // We assime we get a DBCS char if both hi and lo bytes of chr are
-            // non-zero. Note that this check is performed only for key press
-            // events, because key release events (at least for SBCS) often
-            // contain a scancode in the hi byte of chr, which is of course
-            // doesn't mean DBCS. We also perform a DBCS lead byte check to
-            // ensure keys like ESC (that always gives chm=0x011B) are not 
-            // mistakenly recognized as DBCS.
+        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.
+            // 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 );
         }
@@ -3012 +3008 @@
 {
     KeyRec *result = 0;
+    if( scan == 0 ) // DBCS chars or user-injected keys
+        return result;
+
     for (int i=0; i<nrecs; i++) {
         if (key_rec[i].scan == scan) {
@@ -3035 +3034 @@
 {
     KeyRec *result = 0;
+    if( code == 0 ) // DBCS chars or user-injected keys
+        return result;
+
     for (int i=0; i<nrecs; i++) {
         if (key_rec[i].code == code) {
@@ -3058 +3060 @@
                            const QString& text )
 {
+    if( scan == 0 && code == 0 ) // DBCS chars or user-injected keys
+        return;
+
     if ( nrecs == maxrecs ) {
 #if defined(QT_CHECK_RANGE)
@@ -3086 +3091 @@
     translateKeyCode( chm, code, ascii, state, text );
 
-    // code will be zero for all non-ASCII letters, but I'm not sure when
-    // scancode is oficially allowed to be zero and what it means. Anyway,
-    // ignore key events when both are zero, because it will not make sense
-    // (we will not be able to properly report key releases for such events
-    // since all of them will be indexed by the same zero number in key_rec).
-    if ( !code && !chm.scancode ) return FALSE;
+    // 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), store_key_rec()/find_key_rec() 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.
 
     // Invert state logic

trunk/src/kernel/qfontengine_pm.cpp

@@ -232 +232 @@
     int realLen = 0;
     for( int i = 0; i < slen; i++ ) {
-        bool isDBCSLeadByte = uconvFirstByteTable[ s[ i ] ] == 2;
+        bool isDBCSLeadByte = uconvFirstByteTable[ (uchar) s[ i ] ] == 2;
         if ( realLen < givenLen ) {
             // enough space, store the glyph