Changeset 169 for trunk/src/kernel/qapplication_pm.cpp

Timestamp:

Mar 31, 2007, 6:22:28 PM (18 years ago)

Author:

dmik

Message:

Kernel: Added initial DBCS input/output support (thanks to Ko Myung-Hun for patches).

File:

• trunk/src/kernel/qapplication_pm.cpp (modified) (11 diffs)

trunk/src/kernel/qapplication_pm.cpp

@@ -1015 +1015 @@
     // some undocumented system values
     
-    SV_WORKAREA_YTOP = 51,            
-    SV_WORKAREA_YBOTTOM = 52,            
-    SV_WORKAREA_XRIGHT = 53,            
+    SV_WORKAREA_YTOP = 51,
+    SV_WORKAREA_YBOTTOM = 52,
+    SV_WORKAREA_XRIGHT = 53,
     SV_WORKAREA_XLEFT = 54,
 };
@@ -1252 +1252 @@
 #if 0
             qDebug( "WM_CHAR:  [%s]", widget->name() );
-#endif            
+#endif
             QWidget *g = QWidget::keyboardGrabber();
             if ( g )
@@ -1276 +1276 @@
             }
             break;
+        }
+
+        case WM_QUERYCONVERTPOS :
+        {
+            // 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( QCP_CONVERT );
         }
 
@@ -1787 +1808 @@
                     USHORT w = r.width();
                     USHORT h = r.height();
-                    // flip y coordinate 
+                    // flip y coordinate
                     y = QApplication::desktop()->height() - (y + h);
                     WinSetWindowUShort( hwnd, QWS_XRESTORE, x );
@@ -1867 +1888 @@
             // WM_MINMAXFRAME, because WM_MINMAXFRAME is a pre-process message
             // (i.e. no actual changes have been made) We need actual changes
-            // in order to update the frame strut and send WindowStateChange. 
+            // in order to update the frame strut and send WindowStateChange.
             result = TRUE;
             rc = QtOldFrameProc( hwnd, msg, mp1, mp2 );
@@ -2954 +2975 @@
     ascii = ch;
     if ( ascii > 0x7F ) ascii = 0;
-    if ( ch )
-        text = QString::fromLocal8Bit( (char*)&ch, 1 );
+    if ( ch ) {
+        // Note: Ignore the KC_CHAR flag when generating text for a key 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.
+        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.
+            text = QString::fromLocal8Bit( (char *) &chm.chr, 2 );
+        }
+        else
+            text = QString::fromLocal8Bit( (char*) &ch, 1 );
+    }
 }
 
@@ -3022 +3060 @@
     if ( nrecs == maxrecs ) {
 #if defined(QT_CHECK_RANGE)
-        qWarning( "Qt: Internal keyboard buffer overflow" );
+        qWarning( "Qt: Internal keyboard buffer overflow" );
 #endif
-        return;
+        return;
     }
 
@@ -3044 +3082 @@
 
     if ( sm_blockUserInput ) // block user interaction during session management
-        return TRUE;
+        return TRUE;
 
     translateKeyCode( chm, code, ascii, state, text );
-/// @todo (dmik) currently WM_CHARs chars with zero virtual code or zero
-//  scancode are totally ignored. -- are they?
-//    if ( !code || !chm.scancode ) return FALSE;
+
+    // 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;
 
     // Invert state logic
@@ -3072 +3114 @@
                         // "Alt depressed" event, that must preceed it, will be
                         // eaten by the system)
-                        find_key_rec( Qt::Key_Alt, TRUE ); 
+                        find_key_rec( Qt::Key_Alt, TRUE );
 /// @todo (dmik) do the same for other global keys (ALT+TAB, ALT+ESC, CTRL+ESC)
 //  by handling this situation when we obtain/loose focus)
@@ -3080 +3122 @@
 //  that find_key_rec() above should also be removed to get identical behavior for
 //  all stolen keys. This will allow to solve the problem on the Qt application
-//  level if needed (and even in a platform-independent manner). 
+//  level if needed (and even in a platform-independent manner).
                     }
                     return TRUE;
@@ -3127 +3169 @@
     }
 
-#if 0    
+#if 0
     qDebug("WM_CHAR: RESULT = %d", (k0 || k1));
-#endif    
+#endif
     return k0 || k1;
 }