Changeset 10600 for trunk/src/gdi32/text.cpp

Timestamp:

May 7, 2004, 12:27:50 PM (21 years ago)

Author:

sandervl

Message:

KOM: DBCS updates

File:

• trunk/src/gdi32/text.cpp (modified) (3 diffs)

trunk/src/gdi32/text.cpp

@@ -1 @@
-/* $Id: text.cpp,v 1.44 2004-04-30 13:27:19 sandervl Exp $ */
+/* $Id: text.cpp,v 1.45 2004-05-07 10:27:50 sandervl Exp $ */
 
 /*
@@ -306 +306 @@
   if(fUnicode)
        hits = FT2Module.Ft2CharStringPosAtW(pHps->hps,&ptl,&pmRect,flOptions,cbCount,lpszStringW,lpDx, fuOptions & ETO_GLYPH_INDEX);
-  else hits = FT2Module.Ft2CharStringPosAtA(pHps->hps,&ptl,&pmRect,flOptions,cbCount,lpszStringA,lpDx, fuOptions & ETO_GLYPH_INDEX);
+  else
+  {
+       INT *lpDxNew = NULL;
+
+       // KOMH : OS/2 uses width of lead byte for whole DBCS width and is not concerned about
+       //        trail byte, while Win can apportion width between lead byte and trail byte
+       if( IsDBCSEnv() && lpDx  )
+       {
+            int i;
+
+            lpDxNew = ( INT * )malloc(( cbCount + 1 ) * sizeof( INT )); // 1 for broken DBCS char
+            for( i = 0; i < cbCount; i++ )
+            {
+                lpDxNew[ i ] = lpDx[ i ];
+                if( IsDBCSLeadByte( lpszStringA[ i ] ))
+                {
+                    lpDxNew[ i ] += lpDx[ i + 1 ];
+                    lpDxNew[ ++i ] = 0; // for the sake of possibility
+                }
+            }
+
+            lpDx = lpDxNew;
+       }
+
+       hits = FT2Module.Ft2CharStringPosAtA(pHps->hps,&ptl,&pmRect,flOptions,cbCount,lpszStringA,lpDx, fuOptions & ETO_GLYPH_INDEX);
+
+       if( lpDxNew )
+            free( lpDxNew );
+  }
 
   if (lprc && ((align & 0x18) == TA_BASELINE))
@@ -356 +384 @@
       }
   }
+
   rc = InternalTextOutAW(hdc, X, Y, fuOptions, lprc, lpszString, NULL, cbCount, lpDx, TRUE, FALSE);