Changes in trunk [168:170]

Location:

trunk

Files:

• include/qstring.h (modified) (1 diff)
• src/kernel/qapplication_pm.cpp (modified) (13 diffs)
• src/kernel/qfontengine_pm.cpp (modified) (23 diffs)
• src/kernel/qtextengine_p.h (modified) (2 diffs)
• src/tools/qstring.cpp (modified) (2 diffs)

trunk/include/qstring.h

@@ -1108 +1108 @@
 extern Q_EXPORT QCString qt_os2QString2MB( const QString& s, int len=-1 );
 extern Q_EXPORT QString qt_os2MB2QString( const char* mb, int len=-1 );
+extern Q_EXPORT const char *qt_os2UconvFirstByteTable();
 #endif
 

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_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 );
+        }
+        else
+            text = QString::fromLocal8Bit( (char*) &ch, 1 );
+    }
 }
 
@@ -2974 +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) {
@@ -2997 +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) {
@@ -3020 +3060 @@
                            const QString& text )
 {
+    if( scan == 0 && code == 0 ) // DBCS chars or user-injected keys
+        return;
+
     if ( nrecs == maxrecs ) {
 #if defined(QT_CHECK_RANGE)
-        qWarning( "Qt: Internal keyboard buffer overflow" );
+        qWarning( "Qt: Internal keyboard buffer overflow" );
 #endif
-        return;
+        return;
     }
 
@@ -3044 +3087 @@
 
     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;
+
+    // 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
@@ -3072 +3123 @@
                         // "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 +3131 @@
 //  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 +3178 @@
     }
 
-#if 0    
+#if 0
     qDebug("WM_CHAR: RESULT = %d", (k0 || k1));
-#endif    
+#endif
     return k0 || k1;
 }

trunk/src/kernel/qfontengine_pm.cpp

@@ -43 +43 @@
 #include <qpaintdevice.h>
 #include <qpainter.h>
-//@@TODO (dmik): need?
-//#include <limits.h>
-//#include <math.h>
 
 #include <private/qunicodetables_p.h>
@@ -52 +49 @@
 #include <qthreadstorage.h>
 
-//@@TODO (dmik): need?
+/// @todo need?
 //#ifndef M_PI
 //#define M_PI 3.14159265358979
@@ -59 +56 @@
 // per-thread unique screen ps to perform font operations
 
-//@@TODO (dmik): optimize: use small mem hps'es 1x1 px instead of screen ps?
+/// @todo (r=dmik) optimize: use small mem hps'es 1x1 px instead of screen ps?
 class QDisplayPS
 {
@@ -70 +67 @@
 
 
-//@@TODO (dmik): remove?
-//// defined in qtextengine_win.cpp
-//typedef void *SCRIPT_CACHE;
-//typedef HRESULT (WINAPI *fScriptFreeCache)( SCRIPT_CACHE *);
-//extern fScriptFreeCache ScriptFreeCache;
-
-
-//@@TODO (dmik): remove?
-//static unsigned char *getCMap( HDC hdc, bool & );
-//static Q_UINT16 getGlyphIndex( unsigned char *table, unsigned short unicode );
-
-
-//@@TODO (dmik): remove?
-//HDC   shared_dc           = 0;                // common dc for all fonts
-//static HFONT shared_dc_font = 0;              // used by Windows 95/98
-//static HFONT stock_sysfont  = 0;
-//
-//static inline HFONT systemFont()
-//{
-//    if ( stock_sysfont == 0 )
-//      stock_sysfont = (HFONT)GetStockObject(SYSTEM_FONT);
-//    return stock_sysfont;
-//}
-
 // general font engine
 
@@ -100 +73 @@
     hps = 0;
     delete pfm;
-//@@TODO (dmik): remove...
-//    QT_WA( {
-//      if ( hdc ) {                            // one DC per font (Win NT)
-//          //SelectObject( hdc, systemFont() );
-//          if ( !stockFont )
-//              DeleteObject( hfont );
-//          if ( !paintDevice )
-//              ReleaseDC( 0, hdc );
-//          hdc = 0;
-//          hfont = 0;
-//      }
-//    } , {
-//      if ( hfont ) {                          // shared DC (Windows 95/98)
-//          if ( shared_dc_font == hfont ) {    // this is the current font
-//              Q_ASSERT( shared_dc != 0 );
-//              SelectObject( shared_dc, systemFont() );
-//              shared_dc_font = 0;
-//          }
-//          if ( !stockFont )
-//              DeleteObject( hfont );
-//          hfont = 0;
-//      }
-//    } );
-//    delete [] cmap;
-//
-//    // for Uniscribe
-//    if ( ScriptFreeCache )
-//      ScriptFreeCache( &script_cache );
 }
 
 int QFontEngine::lineThickness() const
 {
-//@@TODO (dmik): values from FONTMETRICS are not always good (line is too
+/// @todo (r=dmik) values from FONTMETRICS are not always good (line is too
 //  thick or too close to glyphs). The algorithm below is not always perfect
 //  either. Which one to leave?
@@ -149 +94 @@
 int QFontEngine::underlinePosition() const
 {
-//@@TODO (dmik): values from FONTMETRICS are not always good (line is too
+/// @todo (r=dmik) values from FONTMETRICS are not always good (line is too
 //  thick or too close to glyphs). The algorithm below is not always perfect
 //  either. Which one to leave?
@@ -228 +173 @@
 }
 
-//@@TODO (dmik): remove?
-//HDC QFontEngine::dc() const
-//{
-//    if ( hdc || (qt_winver & Qt::WV_NT_based) ) // either NT_based or Printer
-//      return hdc;
-//    Q_ASSERT( shared_dc != 0 && hfont != 0 );
-//    if ( shared_dc_font != hfont ) {
-//      SelectObject( shared_dc, hfont );
-//      shared_dc_font = hfont;
-//    }
-//    return shared_dc;
-//}
-
-//@@TODO (dmik): remove?
-//void QFontEngine::getCMap()
-//{
-//    QT_WA( {
-//      ttf = (bool)(tm.w.tmPitchAndFamily & TMPF_TRUETYPE);
-//    } , {
-//      ttf = (bool)(tm.a.tmPitchAndFamily & TMPF_TRUETYPE);
-//    } );
-//    HDC hdc = dc();
-//    SelectObject( hdc, hfont );
-//    bool symb = false;
-//    cmap = ttf ? ::getCMap( hdc, symb ) : 0;
-//    if ( !cmap ) {
-//      ttf = false;
-//      symb = false;
-//    }
-//    symbol = symb;
-//    script_cache = 0;
-//}
-
-//@@TODO (dmik): remove
-//void QFontEngine::getGlyphIndexes( const QChar *ch, int numChars, glyph_t *glyphs, bool mirrored ) const
-//{
-//    if ( mirrored ) {
-//      if ( symbol ) {
-//          while( numChars-- ) {
-//              *glyphs = getGlyphIndex(cmap, ch->unicode() );
-//              if(!*glyphs && ch->unicode() < 0x100)
-//                  *glyphs = getGlyphIndex(cmap, ch->unicode()+0xf000 );
-//              glyphs++;
-//              ch++;
-//          }
-//      } else if ( ttf ) {
-//          while( numChars-- ) {
-//              *glyphs = getGlyphIndex(cmap, ::mirroredChar(*ch).unicode() );
-//              glyphs++;
-//              ch++;
-//          }
-//      } else {
-//          while( numChars-- ) {
-//              *glyphs = ::mirroredChar(*ch).unicode();
-//              glyphs++;
-//              ch++;
-//          }
-//      }
-//    } else {
-//      if ( symbol ) {
-//          while( numChars-- ) {
-//              *glyphs = getGlyphIndex(cmap, ch->unicode() );
-//              if(!*glyphs && ch->unicode() < 0x100)
-//                  *glyphs = getGlyphIndex(cmap, ch->unicode()+0xf000 );
-//              glyphs++;
-//              ch++;
-//          }
-//      } else if ( ttf ) {
-//          while( numChars-- ) {
-//              *glyphs = getGlyphIndex(cmap, ch->unicode() );
-//              glyphs++;
-//              ch++;
-//          }
-//      } else {
-//          while( numChars-- ) {
-//              *glyphs = ch->unicode();
-//              glyphs++;
-//              ch++;
-//          }
-//      }
-//    }
-//}
-
 QFontEnginePM::QFontEnginePM( HPS ps, PFATTRS pfa, int pixelSize, int pointSize )
 {
@@ -325 +187 @@
     // cache cost here should be in bytes. it is converted to
     // kbytes by QFontCache::increaseCost()
-//@@TODO (dmik): is this formula for cost ok?
+    /// @todo is this formula for cost ok?
     cache_cost = pfm->lMaxBaselineExt * pfm->lAveCharWidth * 2000;
 
@@ -332 +194 @@
 }
 
-//@@TODO (dmik): remove
-//QFontEngineWin::QFontEngineWin( const char * name, HDC _hdc, HFONT _hfont, bool stockFont, LOGFONT lf )
-//{
-//    paintDevice = FALSE;
-//    //qDebug("regular windows font engine created: font='%s', size=%d", name, lf.lfHeight);
-//
-//    _name = name;
-//
-//    hdc = _hdc;
-//    hfont = _hfont;
-//    logfont = lf;
-//    SelectObject( dc(), hfont );
-//    this->stockFont = stockFont;
-//
-//    lbearing = SHRT_MIN;
-//    rbearing = SHRT_MIN;
-//
-//    BOOL res;
-//    QT_WA( {
-//      res = GetTextMetricsW( dc(), &tm.w );
-//    } , {
-//      res = GetTextMetricsA( dc(), &tm.a );
-//    } );
-//#ifndef QT_NO_DEBUG
-//    if ( !res )
-//      qSystemWarning( "QFontPrivate: GetTextMetrics failed" );
-//#endif
-//    cache_cost = tm.w.tmHeight * tm.w.tmAveCharWidth * 2000;
-//    getCMap();
-//
-//    useTextOutA = FALSE;
-//#ifndef Q_OS_TEMP
-//    // TextOutW doesn't work for symbol fonts on Windows 95!
-//    // since we're using glyph indices we don't care for ttfs about this!
-//    if ( qt_winver == Qt::WV_95 && !ttf &&
-//       ( _name == "Marlett" || _name == "Symbol" || _name == "Webdings" || _name == "Wingdings" ) )
-//          useTextOutA = TRUE;
-//#endif
-//    memset( widthCache, 0, sizeof(widthCache) );
-//}
-
-//@@TODO (dmik): current implementation of this fn uses the local8bit QChar
+#define isDBCSGlyph(g) ( (g) & 0xFF00 )
+
+#define queryGlyphSize(g) ( isDBCSGlyph( g ) ? 2 : 1 )
+
+/// @todo (r=dmik) current implementation of this fn uses the local8bit QChar
 //  code as the glyph index, i.e. glyphs are just unicode chars converted to
 //  8 bit chars according to the current (system) code page. This will be
-//  changed when all font-related code will be rewritten to support true unicode
+//  changed when all font-related code is rewritten to support true unicode
 //  (for example, by using innotek ft2lib, since native OS/2 unicode support
 //  relative to text output using GPI is pretty buggy).
-QFontEngine::Error QFontEnginePM::stringToCMap( const QChar *str, int len, glyph_t *glyphs, advance_t *advances, int *nglyphs, bool mirrored ) const
-{
-    if ( *nglyphs < len ) {
-        *nglyphs = len;
-        return OutOfMemory;
-    }
-
-//@@TODO (dmik): mirrored is currently ignored.
-    Q_UNUSED(mirrored);
-
-    // convert chars to glyphs
+QFontEngine::Error QFontEnginePM::stringToCMap( const QChar *str, int len,
+                                                glyph_t *glyphs, advance_t *advances,
+                                                int *nglyphs, bool mirrored ) const
+{
+    /// @todo mirrored is currently ignored.
+    Q_UNUSED( mirrored );
+
+    const char *uconvFirstByteTable = qt_os2UconvFirstByteTable();
+
+    // convert multibyte chars to "wide char" glyphs
     QCString s = QConstString( str, len ).string().local8Bit();
-    for ( int i = 0; i < len; i++ ) {
-        glyphs[i] = (uchar) s[i];
+    // sanity check (uint value must fit into positive int)
+    Q_ASSERT( (int) s.size() >= 1 );
+    if ( (int) s.size() < 1 ) {
+        *nglyphs = 0;
+        return OutOfMemory;
+    }
+    // we use QCString::size() instead of length() because the str array may
+    // contain embedded zero chars that must be also processed
+    int slen = (int) s.size() - 1; // exclude terminating zero
+    if ( slen == 0 ) {
+        // null string or no valid conversion, nothing to do
+        *nglyphs = 0;
+        return NoError;
+    }
+    int givenLen = *nglyphs;
+    int realLen = 0;
+    for( int i = 0; i < slen; i++ ) {
+        bool isDBCSLeadByte = uconvFirstByteTable[ (uchar) s[ i ] ] == 2;
+        if ( realLen < givenLen ) {
+            // enough space, store the glyph
+            glyphs[ realLen ] = s[ i ] & 0xFF;
+            if( isDBCSLeadByte )
+                glyphs[ realLen ] |= ( s[ ++i ] << 8 ) & 0xFF00;
+        } else {
+            // not enough space, keep calulating the length
+            if( isDBCSLeadByte )
+                ++i;
+        }
+        realLen++;
+    }
+
+    if ( givenLen < realLen ) {
+        *nglyphs = realLen;
+        return OutOfMemory;
     }
 
     if ( advances ) {
-        HPS ps = 0;
-        glyph_t glyph;
-        for( register int i = 0; i < len; i++ ) {
-            glyph = *(glyphs + i);
-            advances[i] = (glyph < widthCacheSize) ? widthCache[glyph] : 0;
-            // font-width cache failed
-            if ( !advances[i] ) {
+        HPS ps = 0;
+        glyph_t glyph;
+        for( register int i = 0; i < realLen; i++ ) {
+            glyph = *(glyphs + i);
+            advances[i] = (glyph < widthCacheSize) ? widthCache[glyph] : 0;
+            // font-width cache failed
+            if ( !advances[i] ) {
                 if ( !ps ) ps = this->ps();
                 POINTL ptls [TXTBOX_COUNT];
-                GpiQueryTextBox( ps, 1, &s[i], TXTBOX_COUNT, ptls);
+                GpiQueryTextBox( ps, queryGlyphSize( glyph ),
+                                 (PCH) &glyph, TXTBOX_COUNT, ptls );
                 advances[i] = ptls[4].x;
-                // if glyph's within cache range, store it for later
-                if ( glyph < widthCacheSize && advances[i] < 0x100 )
-                    ((QFontEnginePM *)this)->widthCache[glyph] = advances[i];
-            }
-        }
-    }
-
-    *nglyphs = len;
+                // if glyph's within cache range, store it for later
+                if ( glyph < widthCacheSize && advances[i] < 0x100 )
+                    ((QFontEnginePM *)this)->widthCache[glyph] = advances[i];
+            }
+        }
+    }
+
+    *nglyphs = realLen;
     return NoError;
-
-//@@TODO (dmik): remove
-//    if ( *nglyphs < len ) {
-//      *nglyphs = len;
-//      return OutOfMemory;
-//    }
-//
-//    getGlyphIndexes( str, len, glyphs, mirrored );
-//
-//    if ( advances ) {
-//      HDC hdc = dc();
-//      unsigned int glyph;
-//      int overhang = (qt_winver & Qt::WV_DOS_based) ? tm.a.tmOverhang : 0;
-//      for( register int i = 0; i < len; i++ ) {
-//          glyph = *(glyphs + i);
-//          advances[i] = (glyph < widthCacheSize) ? widthCache[glyph] : 0;
-//          // font-width cache failed
-//          if ( !advances[i] ) {
-//              SIZE size;
-//              GetTextExtentPoint32W( hdc, (wchar_t *)str, 1, &size );
-//              advances[i] = size.cx - overhang;
-//              // if glyph's within cache range, store it for later
-//              if ( glyph < widthCacheSize && (size.cx - overhang) < 0x100 )
-//                  ((QFontEngineWin *)this)->widthCache[glyph] = size.cx - overhang;
-//          }
-//          str++;
-//      }
-//    }
-//
-//    *nglyphs = len;
-//    return NoError;
 }
 
@@ -456 +282 @@
 extern const LONG qt_ropCodes_2ROP[];
 
-void QFontEnginePM::draw( QPainter *p, int x, int y, const QTextEngine *engine, const QScriptItem *si, int textFlags )
+void QFontEnginePM::draw( QPainter *p, int x, int y, const QTextEngine
+                          *engine, const QScriptItem *si, int textFlags )
 {
     HPS ps = p->handle();
@@ -463 +290 @@
     advance_t *advances = engine->advances( si );
     qoffset_t *offsets = engine->offsets( si );
-
-    /// @todo (dmik)
-    //      glyphs here are just 8 bit chars (see stringToCMap()),
-    //      and glyph_t is temporarly defined as unsigned char.
-    //      it should be changed later.
-    PSZ cglyphs = (PSZ) glyphs;
-    /*
-    QConstString str( (QChar *)glyphs, si->num_glyphs );
-    QCString cglyphs = str.string().latin1();
-    */
 
     // GPI version of the opaque rectangle below the text is rather strange,
@@ -480 +297 @@
         GpiSetMix( ps, FM_LEAVEALONE );
         // use drawRect to have the rectangle properly transformed
-        /// @todo (dmik)
+        /// @todo (r=dmik)
         //      we don't add 1 to si->ascent + si->descent to exactly match
         //      QFontMetrics::boundingRect(). This stuff needs to be reviewed
@@ -563 +380 @@
 
     if ( p->txop == QPainter::TxTranslate ) {
-        p->map( x, y, &x, &y );
+        p->map( x, y, &x, &y );
     } else if ( p->txop > QPainter::TxTranslate ) {
         y = -y;
         ySign = -1;
         nativexform = p->setNativeXForm( TRUE /* assumeYNegation */ );
-        if( !nativexform )
-            return;
+        if( !nativexform )
+            return;
     }
 
@@ -598 +415 @@
         if ( haveOffsets ) {
             for( int i = 0; i < si->num_glyphs; i++ ) {
-                char chr = *glyphs;
                 ptl.x = x + offsets->x;
                 ptl.y = y + ySign * offsets->y;
@@ -604 +420 @@
                 if ( !nativexform && p->devh )
                     ptl.y = p->devh - (ptl.y + 1);
-                GpiCharStringPosAt( ps, &ptl, NULL, options, 1, &chr, NULL );
+                GpiCharStringPosAt( ps, &ptl, NULL, options,
+                                    queryGlyphSize( *glyphs ), (PCH) glyphs, NULL );
                 x += *advances;
                 glyphs++;
@@ -617 +434 @@
             if ( !nativexform && p->devh )
                 ptl.y = p->devh - (ptl.y + 1);
+            GpiMove( ps, &ptl );
             // draw glyphs in 512 char chunks: it's a GpiCharString* limitation
-            GpiMove( ps, &ptl );
-            for ( int i = 0; i < si->num_glyphs; i += 512 ) {  
-                GpiCharStringPos( ps, NULL, options | CHS_VECTOR,
-                    QMIN( si->num_glyphs - i, 512 ),  cglyphs, (PLONG) advances );
-                cglyphs += 512;
-                advances += 512;
+            advance_t adv[ 512 ];
+            char str[ 512 ];
+            int len = 0;
+            // convert "wide char" glyphs to a multi byte string
+            glyph_t *pg = glyphs;
+            advance_t *pa = advances;
+            for( int i = 0; i < si->num_glyphs; i++, pg++, pa++ ) {
+                str[ len ] = *pg & 0xFF;
+                adv[ len++ ] = *pa;
+
+                if( isDBCSGlyph( *pg ) ) {
+                    str[ len ] = ( *pg & 0xFF00 ) >> 8;
+                    adv[ len++ ] = 0;
+                }
+
+                if( len > 510 ) {
+                    GpiCharStringPos( ps, NULL, options | CHS_VECTOR, len, str, (PLONG) adv );
+                    len = 0;
+                }
             }
+
+            if( len > 0 )
+                GpiCharStringPos( ps, NULL, options | CHS_VECTOR, len, str, (PLONG) adv );
+
             x += w;
         }
     } else {
-        offsets += si->num_glyphs;
-        advances += si->num_glyphs;
-        glyphs += si->num_glyphs;
-        for( int i = 0; i < si->num_glyphs; i++ ) {
-            glyphs--;
-            offsets--;
-            advances--;
-            char chr = *glyphs;
-            ptl.x = x + offsets->x;
-            ptl.y = y + ySign * offsets->y;
+        offsets += si->num_glyphs;
+        advances += si->num_glyphs;
+        glyphs += si->num_glyphs;
+        for( int i = 0; i < si->num_glyphs; i++ ) {
+            glyphs--;
+            offsets--;
+            advances--;
+            ptl.x = x + offsets->x;
+            ptl.y = y + ySign * offsets->y;
             // flip y coordinate
             if ( !nativexform && p->devh )
                 ptl.y = p->devh - (ptl.y + 1);
-            GpiCharStringPosAt( ps, &ptl, NULL, options, 1, &chr, NULL );
-            x += *advances;
-        }
+            GpiCharStringPosAt( ps, &ptl, NULL, options,
+                                queryGlyphSize( *glyphs ), (PCH) glyphs, NULL );
+            x += *advances;
+        }
     }
 
@@ -710 +545 @@
         w += *(--end);
 
-//@@TODO (dmik): look at usage of this fn, is the return correct?
+    /// @todo (r=dmik) look at usage of this fn, is the return correct?
     return glyph_metrics_t(
         0, -pfm->lMaxAscender, w, pfm->lMaxAscender + pfm->lMaxDescender, w, 0
@@ -718 +553 @@
 glyph_metrics_t QFontEnginePM::boundingBox( glyph_t glyph )
 {
-//@@TODO (dmik): glyphs here are just 8 bit chars (see stringToCMap()),
-//  it should be changed later.
     POINTL ptls [TXTBOX_COUNT];
-    GpiQueryTextBox( ps(), 1, (char *)&glyph, TXTBOX_COUNT, ptls );
+    GpiQueryTextBox( ps(), queryGlyphSize( glyph ),
+                     (PCH) &glyph, TXTBOX_COUNT, ptls );
     int minx = 0, miny = 0, maxx = 0, maxy = 0;
     for ( int i = 0; i < 4; i++ ) {
@@ -732 +566 @@
         minx, -maxy, maxx - minx + 1, maxy - miny + 1, ptls[4].x, -ptls[4].y
     );
-
-//@@TODO (dmik): remove
-//#ifndef Q_OS_TEMP
-//    GLYPHMETRICS gm;
-//
-//    if( !ttf ) {
-//      SIZE s;
-//      WCHAR ch = glyph;
-//      BOOL res = GetTextExtentPoint32W( dc(), &ch, 1, &s );
-//      Q_UNUSED( res );
-//      int overhang = (qt_winver & Qt::WV_DOS_based) ? tm.a.tmOverhang : 0;
-//      return glyph_metrics_t( 0, -tm.a.tmAscent, s.cx, tm.a.tmHeight, s.cx-overhang, 0 );
-//    } else {
-//      DWORD res = 0;
-//      MAT2 mat;
-//      mat.eM11.value = mat.eM22.value = 1;
-//      mat.eM11.fract = mat.eM22.fract = 0;
-//      mat.eM21.value = mat.eM12.value = 0;
-//      mat.eM21.fract = mat.eM12.fract = 0;
-//      QT_WA( {
-//          res = GetGlyphOutlineW( dc(), glyph, GGO_METRICS|GGO_GLYPH_INDEX, &gm, 0, 0, &mat );
-//      } , {
-//          res = GetGlyphOutlineA( dc(), glyph, GGO_METRICS|GGO_GLYPH_INDEX, &gm, 0, 0, &mat );
-//      } );
-//      if ( res != GDI_ERROR )
-//          return glyph_metrics_t( gm.gmptGlyphOrigin.x, -gm.gmptGlyphOrigin.y,
-//                                gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY );
-//    }
-//#endif
-//    return glyph_metrics_t();
 }
 
@@ -784 +588 @@
 }
 
-//@@TODO (dmik): remove?
-//enum { max_font_count = 256 };
-//static const ushort char_table[] = {
-//      40,
-//      67,
-//      70,
-//      75,
-//      86,
-//      88,
-//      89,
-//      91,
-//      102,
-//      114,
-//      124,
-//      127,
-//      205,
-//      645,
-//      884,
-//      922,
-//      1070,
-//      12386,
-//      0
-//};
-//
-//static const int char_table_entries = sizeof(char_table)/sizeof(ushort);
-
-
 int QFontEnginePM::minLeftBearing() const
 {
-//@@TODO (dmik): later
+    /// @todo (r=dmik) later
     return 0;
 //    if ( lbearing == SHRT_MIN )
@@ -823 +600 @@
 int QFontEnginePM::minRightBearing() const
 {
-//@@TODO (dmik): later
+    /// @todo (r=dmik) later
     return 0;
 //#ifdef Q_OS_TEMP
@@ -905 +682 @@
 }
 
-//@@TODO (dmik): remove
-//const char *QFontEngineWin::name() const
-//{
-//    return 0;
-//}
-
 bool QFontEnginePM::canRender( const QChar *string,  int len )
 {
-//@@TODO (dmik): later
+    /// @todo (r=dmik) later
     return TRUE;
 
@@ -962 +733 @@
 
 
-/// @todo (dmik) need this all?
+/// @todo (r=dmik) all this may be necessary when ft2lib is used
 #if 0
 #define MAKE_TAG(ch1, ch2, ch3, ch4) (\

trunk/src/kernel/qtextengine_p.h

@@ -180 +180 @@
 #elif defined( Q_WS_PM )
 
-//@@TODO (dmik): the definitions below is almost unchecked (no true unicode
+/// @todo (r=dmik) the definitions below is almost unchecked (no true unicode
 //  support yet)
 
-//@@TODO (dmik): curretnly glyphs are just 8 bit chars (see
-//  QFontEnginePM::stringToCMap()), so glyph_t is temporarily defined as
-//  unsigned char. it should be changed later.
-typedef unsigned char glyph_t;
-//typedef unsigned short glyph_t;
+// Use wide char to contain DBCS char in one glyph
+typedef unsigned short glyph_t;
 
 struct qoffset_t {
@@ -196 +193 @@
 typedef int advance_t;
 
-//@@TODO (dmik): it's a dummy version...
+/// @todo (r=dmik) it's a dummy version...
 struct QScriptAnalysis {
     unsigned short script         :10;

trunk/src/tools/qstring.cpp

@@ -7019 +7019 @@
 }
 
-// WATCH OUT: mblen must NOT include the NUL (in contrast with qt_winMB2QString) 
+// WATCH OUT: mblen must NOT include the NUL (in contrast with qt_winMB2QString)
 QString qt_os2MB2QString( const char* mb, int mblen )
 {
@@ -7070 +7070 @@
 }
 
+const char *qt_os2UconvFirstByteTable()
+{
+    static char achFirst[ 256 ] = { -1, };
+
+    if( achFirst[ 0 ] == -1 )
+        UniQueryUconvObject( qt_os2DefUconvObj(), NULL, 0, achFirst, NULL, NULL );
+
+    return achFirst;
+}
+
 #endif // Q_OS_OS2