X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=inline;f=text%2Fdali%2Finternal%2Ftext-abstraction%2Ffont-client-plugin-impl.cpp;h=1ba5361dd86827224186c94b45f888b78f398016;hb=ecba8c169acadd29e7728a2771d33e86e2f0d9ac;hp=d1ea359d024be1b80a2bff091f2598ef3fd2d499;hpb=9405aa84cdcd2e43f67a3f5035418a85a13d45a7;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp index d1ea359..1ba5361 100644 --- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp +++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp @@ -41,6 +41,7 @@ Dali::Integration::Log::Filter* gLogFilter = Dali::Integration::Log::Filter::New * Conversion from Fractional26.6 to float */ const float FROM_266 = 1.0f / 64.0f; +const float POINTS_PER_INCH = 72.f; const std::string FONT_FORMAT( "TrueType" ); const std::string DEFAULT_FONT_FAMILY_NAME( "Tizen" ); @@ -54,6 +55,7 @@ const bool FONT_FIXED_SIZE_BITMAP( true ); // http://www.freedesktop.org/software/fontconfig/fontconfig-user.html +// NONE -1 --> DEFAULT_FONT_WIDTH (NORMAL) will be used. // ULTRA_CONDENSED 50 // EXTRA_CONDENSED 63 // CONDENSED 75 @@ -63,9 +65,10 @@ const bool FONT_FIXED_SIZE_BITMAP( true ); // EXPANDED 125 // EXTRA_EXPANDED 150 // ULTRA_EXPANDED 200 -const int FONT_WIDTH_TYPE_TO_INT[] = { 50, 63, 75, 87, 100, 113, 125, 150, 200 }; +const int FONT_WIDTH_TYPE_TO_INT[] = { -1, 50, 63, 75, 87, 100, 113, 125, 150, 200 }; const unsigned int NUM_FONT_WIDTH_TYPE = sizeof( FONT_WIDTH_TYPE_TO_INT ) / sizeof( int ); +// NONE -1 --> DEFAULT_FONT_WEIGHT (NORMAL) will be used. // THIN 0 // ULTRA_LIGHT, EXTRA_LIGHT 40 // LIGHT 50 @@ -77,13 +80,14 @@ const unsigned int NUM_FONT_WIDTH_TYPE = sizeof( FONT_WIDTH_TYPE_TO_INT ) / size // BOLD 200 // ULTRA_BOLD, EXTRA_BOLD 205 // BLACK, HEAVY, EXTRA_BLACK 210 -const int FONT_WEIGHT_TYPE_TO_INT[] = { 0, 40, 50, 55, 75, 80, 100, 180, 200, 205, 210 }; +const int FONT_WEIGHT_TYPE_TO_INT[] = { -1, 0, 40, 50, 55, 75, 80, 100, 180, 200, 205, 210 }; const unsigned int NUM_FONT_WEIGHT_TYPE = sizeof( FONT_WEIGHT_TYPE_TO_INT ) / sizeof( int ); -// NORMAL, ROMAN 0 -// ITALIC 100 -// OBLIQUE 110 -const int FONT_SLANT_TYPE_TO_INT[] = { 0, 100, 110 }; +// NONE -1 --> DEFAULT_FONT_SLANT (NORMAL) will be used. +// NORMAL, ROMAN 0 +// ITALIC 100 +// OBLIQUE 110 +const int FONT_SLANT_TYPE_TO_INT[] = { -1, 0, 100, 110 }; const unsigned int NUM_FONT_SLANT_TYPE = sizeof( FONT_SLANT_TYPE_TO_INT ) / sizeof( int ); } // namespace @@ -149,22 +153,22 @@ FontClient::Plugin::FontDescriptionCacheItem::FontDescriptionCacheItem( const Fo } FontClient::Plugin::FontIdCacheItem::FontIdCacheItem( FontDescriptionId validatedFontId, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FontId fontId ) : validatedFontId( validatedFontId ), - pointSize( pointSize ), + requestedPointSize( requestedPointSize ), fontId( fontId ) { } -FontClient::Plugin::CacheItem::CacheItem( FT_Face ftFace, - const FontPath& path, - PointSize26Dot6 pointSize, - FaceIndex face, - const FontMetrics& metrics ) +FontClient::Plugin::FontFaceCacheItem::FontFaceCacheItem( FT_Face ftFace, + const FontPath& path, + PointSize26Dot6 requestedPointSize, + FaceIndex face, + const FontMetrics& metrics ) : mFreeTypeFace( ftFace ), mPath( path ), - mPointSize( pointSize ), + mRequestedPointSize( requestedPointSize ), mFaceIndex( face ), mMetrics( metrics ), mFixedWidthPixels( 0.0f ), @@ -174,16 +178,16 @@ FontClient::Plugin::CacheItem::CacheItem( FT_Face ftFace, { } -FontClient::Plugin::CacheItem::CacheItem( FT_Face ftFace, - const FontPath& path, - PointSize26Dot6 pointSize, - FaceIndex face, - const FontMetrics& metrics, - float fixedWidth, - float fixedHeight ) +FontClient::Plugin::FontFaceCacheItem::FontFaceCacheItem( FT_Face ftFace, + const FontPath& path, + PointSize26Dot6 requestedPointSize, + FaceIndex face, + const FontMetrics& metrics, + float fixedWidth, + float fixedHeight ) : mFreeTypeFace( ftFace ), mPath( path ), - mPointSize( pointSize ), + mRequestedPointSize( requestedPointSize ), mFaceIndex( face ), mMetrics( metrics ), mFixedWidthPixels( fixedWidth ), @@ -390,7 +394,7 @@ PointSize26Dot6 FontClient::Plugin::GetPointSize( FontId id ) if( id > 0u && index < mFontCache.size() ) { - return ( *( mFontCache.begin() + index ) ).mPointSize; + return ( *( mFontCache.begin() + index ) ).mRequestedPointSize; } else { @@ -402,17 +406,16 @@ PointSize26Dot6 FontClient::Plugin::GetPointSize( FontId id ) FontId FontClient::Plugin::FindFontForCharacter( const FontList& fontList, Character charcode, - PointSize26Dot6 requestedSize, + PointSize26Dot6 requestedPointSize, bool preferColor ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindFontForCharacter\n"); - FontId fontId(0); - bool foundColor(false); + FontId fontId = 0u; + bool foundColor = false; // Traverse the list of fonts. - // Check for each default font if supports the character. - + // Check for each font if supports the character. for( FontList::const_iterator it = fontList.begin(), endIt = fontList.end(); it != endIt; ++it ) @@ -433,37 +436,35 @@ FontId FontClient::Plugin::FindFontForCharacter( const FontList& fontList, GetFixedSizes( description, fixedSizes ); + PointSize26Dot6 actualPointSize = requestedPointSize; + const Vector< PointSize26Dot6 >::SizeType count = fixedSizes.Count(); + if( 0 != count ) { - // If the font is not scalable, pick the largest size <= requestedSize - PointSize26Dot6 size = fixedSizes[0]; + // If the font is not scalable, pick the largest size <= requestedPointSize + actualPointSize = fixedSizes[0]; for( unsigned int i=1; i size ) + if( fixedSizes[i] <= requestedPointSize && + fixedSizes[i] > actualPointSize ) { - size = fixedSizes[i]; + actualPointSize = fixedSizes[i]; } } - requestedSize = size; } fontId = GetFontId( description, - requestedSize, + requestedPointSize, + actualPointSize, 0u ); if( preferColor ) { - BufferImage bitmap = CreateBitmap( fontId, GetGlyphIndex(fontId,charcode) ); - if( bitmap && - Pixel::BGRA8888 == bitmap.GetPixelFormat() ) - { - foundColor = true; - } + foundColor = IsColorGlyph( fontId, GetGlyphIndex( fontId, charcode ) ); } - // Keep going unless we prefer a different (color) font + // Keep going unless we prefer a different (color) font. if( !preferColor || foundColor ) { FcPatternDestroy( match ); @@ -480,7 +481,7 @@ FontId FontClient::Plugin::FindFontForCharacter( const FontList& fontList, } FontId FontClient::Plugin::FindDefaultFont( Character charcode, - PointSize26Dot6 requestedSize, + PointSize26Dot6 requestedPointSize, bool preferColor ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindDefaultFont DefaultFontsList(%s)\n", (mDefaultFonts.empty()?"empty":"created") ); @@ -495,26 +496,32 @@ FontId FontClient::Plugin::FindDefaultFont( Character charcode, fontDescription.width = IntToWidthType( DEFAULT_FONT_WIDTH ); fontDescription.weight = IntToWeightType( DEFAULT_FONT_WEIGHT ); fontDescription.slant = IntToSlantType( DEFAULT_FONT_SLANT ); + SetFontList( fontDescription, mDefaultFonts ); } // Traverse the list of default fonts. // Check for each default font if supports the character. - fontId = FindFontForCharacter( mDefaultFonts, charcode, requestedSize, preferColor ); + fontId = FindFontForCharacter( mDefaultFonts, charcode, requestedPointSize, preferColor ); return fontId; } -FontId FontClient::Plugin::FindFallbackFont( FontId preferredFont, - Character charcode, - PointSize26Dot6 requestedSize, +FontId FontClient::Plugin::FindFallbackFont( Character charcode, + const FontDescription& preferredFontDescription, + PointSize26Dot6 requestedPointSize, bool preferColor ) { // The font id to be returned. FontId fontId = 0u; FontDescription fontDescription; - GetDescription( preferredFont, fontDescription ); + + // Fill the font description with the preferred font description and complete with the defaults. + fontDescription.family = preferredFontDescription.family.empty() ? DEFAULT_FONT_FAMILY_NAME : preferredFontDescription.family; + fontDescription.weight = ( ( FontWeight::NONE == preferredFontDescription.weight ) ? IntToWeightType( DEFAULT_FONT_WEIGHT ) : preferredFontDescription.weight ); + fontDescription.width = ( ( FontWidth::NONE == preferredFontDescription.width ) ? IntToWidthType( DEFAULT_FONT_WIDTH ) : preferredFontDescription.width ); + fontDescription.slant = ( ( FontSlant::NONE == preferredFontDescription.slant ) ? IntToSlantType( DEFAULT_FONT_SLANT ) : preferredFontDescription.slant ); // Check first if the font's description has been queried before. FontList* fontList( NULL ); @@ -525,19 +532,20 @@ FontId FontClient::Plugin::FindFallbackFont( FontId preferredFont, SetFontList( fontDescription, *fontList ); // Add the font-list to the cache. - mFallbackCache.push_back( FallbackCacheItem(fontDescription, fontList) ); + mFallbackCache.push_back( FallbackCacheItem( fontDescription, fontList ) ); } if( fontList ) { - fontId = FindFontForCharacter( *fontList, charcode, requestedSize, preferColor ); + fontId = FindFontForCharacter( *fontList, charcode, requestedPointSize, preferColor ); } return fontId; } FontId FontClient::Plugin::GetFontId( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, + PointSize26Dot6 actualPointSize, FaceIndex faceIndex, bool cacheDescription ) { @@ -548,13 +556,13 @@ FontId FontClient::Plugin::GetFontId( const FontPath& path, if( NULL != mFreeTypeLibrary ) { FontId foundId(0); - if( FindFont( path, pointSize, faceIndex, foundId ) ) + if( FindFont( path, requestedPointSize, faceIndex, foundId ) ) { id = foundId; } else { - id = CreateFont( path, pointSize, faceIndex, cacheDescription ); + id = CreateFont( path, requestedPointSize, actualPointSize, faceIndex, cacheDescription ); } } @@ -562,7 +570,8 @@ FontId FontClient::Plugin::GetFontId( const FontPath& path, } FontId FontClient::Plugin::GetFontId( const FontDescription& fontDescription, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, + PointSize26Dot6 actualPointSize, FaceIndex faceIndex ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetFontId font family(%s)\n", fontDescription.family.c_str() ); @@ -598,21 +607,22 @@ FontId FontClient::Plugin::GetFontId( const FontDescription& fontDescription, validatedFontId ); } - // Check if exists a pair 'validatedFontId, pointSize' in the cache. - if( !FindFont( validatedFontId, pointSize, fontId ) ) + // Check if exists a pair 'validatedFontId, requestedPointSize' in the cache. + if( !FindFont( validatedFontId, requestedPointSize, fontId ) ) { // Retrieve the font file name path. const FontDescription& description = *( mFontDescriptionCache.begin() + validatedFontId ); // Retrieve the font id. Do not cache the description as it has been already cached. fontId = GetFontId( description.path, - pointSize, + requestedPointSize, + actualPointSize, faceIndex, false ); - // Cache the pair 'validatedFontId, pointSize' to improve the following queries. + // Cache the pair 'validatedFontId, requestedPointSize' to improve the following queries. mFontIdCache.push_back( FontIdCacheItem( validatedFontId, - pointSize, + requestedPointSize, fontId ) ); } @@ -671,27 +681,30 @@ void FontClient::Plugin::ValidateFont( const FontDescription& fontDescription, } void FontClient::Plugin::GetFontMetrics( FontId fontId, - FontMetrics& metrics, - int desiredFixedSize ) + FontMetrics& metrics ) { - if( fontId > 0 && - fontId-1 < mFontCache.size() ) + if( ( fontId > 0 ) && + ( fontId - 1u < mFontCache.size() ) ) { - const CacheItem& font = mFontCache[fontId-1]; + const FontFaceCacheItem& font = mFontCache[fontId-1]; metrics = font.mMetrics; // Adjust the metrics if the fixed-size font should be down-scaled - if( font.mIsFixedSizeBitmap && - ( desiredFixedSize > 0 ) ) + if( font.mIsFixedSizeBitmap ) { - float scaleFactor = static_cast(desiredFixedSize) / static_cast(font.mFixedHeightPixels); + const float desiredFixedSize = static_cast( font.mRequestedPointSize ) * FROM_266 / POINTS_PER_INCH * mDpiVertical; - metrics.ascender *= scaleFactor; - metrics.descender *= scaleFactor; - metrics.height *= scaleFactor; - metrics.underlinePosition *= scaleFactor; - metrics.underlineThickness *= scaleFactor; + if( desiredFixedSize > 0.f ) + { + const float scaleFactor = desiredFixedSize / static_cast( font.mFixedHeightPixels ); + + metrics.ascender = floorf( metrics.ascender * scaleFactor ); + metrics.descender = floorf( metrics.descender * scaleFactor ); + metrics.height = floorf( metrics.height * scaleFactor ); + metrics.underlinePosition = floorf( metrics.underlinePosition * scaleFactor ); + metrics.underlineThickness = floorf( metrics.underlineThickness * scaleFactor ); + } } } else @@ -719,32 +732,32 @@ GlyphIndex FontClient::Plugin::GetGlyphIndex( FontId fontId, bool FontClient::Plugin::GetGlyphMetrics( GlyphInfo* array, uint32_t size, GlyphType type, - bool horizontal, - int desiredFixedSize ) + bool horizontal ) { if( VECTOR_GLYPH == type ) { - return GetVectorMetrics( array, size, horizontal, desiredFixedSize ); + return GetVectorMetrics( array, size, horizontal ); } - return GetBitmapMetrics( array, size, horizontal, desiredFixedSize ); + return GetBitmapMetrics( array, size, horizontal ); } bool FontClient::Plugin::GetBitmapMetrics( GlyphInfo* array, uint32_t size, - bool horizontal, - int desiredFixedSize ) + bool horizontal ) { bool success( true ); for( unsigned int i=0; i 0 && fontId-1 < mFontCache.size() ) { - const CacheItem& font = mFontCache[fontId-1]; + const FontFaceCacheItem& font = mFontCache[fontId-1]; FT_Face ftFace = font.mFreeTypeFace; @@ -752,27 +765,29 @@ bool FontClient::Plugin::GetBitmapMetrics( GlyphInfo* array, // Check to see if we should be loading a Fixed Size bitmap? if ( font.mIsFixedSizeBitmap ) { - int error = FT_Load_Glyph( ftFace, array[i].index, FT_LOAD_COLOR ); + int error = FT_Load_Glyph( ftFace, glyph.index, FT_LOAD_COLOR ); if ( FT_Err_Ok == error ) { - array[i].width = font.mFixedWidthPixels; - array[i].height = font.mFixedHeightPixels; - array[i].advance = font.mFixedWidthPixels; - array[i].xBearing = 0.0f; - array[i].yBearing = font.mFixedHeightPixels; + glyph.width = font.mFixedWidthPixels; + glyph.height = font.mFixedHeightPixels; + glyph.advance = font.mFixedWidthPixels; + glyph.xBearing = 0.0f; + glyph.yBearing = font.mFixedHeightPixels; // Adjust the metrics if the fixed-size font should be down-scaled - if( desiredFixedSize > 0 ) + const float desiredFixedSize = static_cast( font.mRequestedPointSize ) * FROM_266 / POINTS_PER_INCH * mDpiVertical; + + if( desiredFixedSize > 0.f ) { - float scaleFactor = static_cast(desiredFixedSize) / static_cast(font.mFixedHeightPixels); + const float scaleFactor = desiredFixedSize / static_cast( font.mFixedHeightPixels ); - array[i].width *= scaleFactor; - array[i].height *= scaleFactor; - array[i].advance *= scaleFactor; - array[i].xBearing *= scaleFactor; - array[i].yBearing *= scaleFactor; + glyph.width = floorf( glyph.width * scaleFactor ); + glyph.height = floorf( glyph.height * scaleFactor ); + glyph.advance = floorf( glyph.advance * scaleFactor ); + glyph.xBearing = floorf( glyph.xBearing * scaleFactor ); + glyph.yBearing = floorf( glyph.yBearing * scaleFactor ); - array[i].scaleFactor = scaleFactor; + glyph.scaleFactor = scaleFactor; } } else @@ -784,21 +799,21 @@ bool FontClient::Plugin::GetBitmapMetrics( GlyphInfo* array, else #endif { - int error = FT_Load_Glyph( ftFace, array[i].index, FT_LOAD_DEFAULT ); + int error = FT_Load_Glyph( ftFace, glyph.index, FT_LOAD_DEFAULT ); if( FT_Err_Ok == error ) { - array[i].width = static_cast< float >( ftFace->glyph->metrics.width ) * FROM_266; - array[i].height = static_cast< float >( ftFace->glyph->metrics.height ) * FROM_266 ; + glyph.width = static_cast< float >( ftFace->glyph->metrics.width ) * FROM_266; + glyph.height = static_cast< float >( ftFace->glyph->metrics.height ) * FROM_266 ; if( horizontal ) { - array[i].xBearing += static_cast< float >( ftFace->glyph->metrics.horiBearingX ) * FROM_266; - array[i].yBearing += static_cast< float >( ftFace->glyph->metrics.horiBearingY ) * FROM_266; + glyph.xBearing += static_cast< float >( ftFace->glyph->metrics.horiBearingX ) * FROM_266; + glyph.yBearing += static_cast< float >( ftFace->glyph->metrics.horiBearingY ) * FROM_266; } else { - array[i].xBearing += static_cast< float >( ftFace->glyph->metrics.vertBearingX ) * FROM_266; - array[i].yBearing += static_cast< float >( ftFace->glyph->metrics.vertBearingY ) * FROM_266; + glyph.xBearing += static_cast< float >( ftFace->glyph->metrics.vertBearingX ) * FROM_266; + glyph.yBearing += static_cast< float >( ftFace->glyph->metrics.vertBearingY ) * FROM_266; } } else @@ -818,8 +833,7 @@ bool FontClient::Plugin::GetBitmapMetrics( GlyphInfo* array, bool FontClient::Plugin::GetVectorMetrics( GlyphInfo* array, uint32_t size, - bool horizontal, - int desiredFixedSize ) + bool horizontal ) { #ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING bool success( true ); @@ -831,7 +845,7 @@ bool FontClient::Plugin::GetVectorMetrics( GlyphInfo* array, if( fontId > 0 && fontId-1 < mFontCache.size() ) { - CacheItem& font = mFontCache[fontId-1]; + FontFaceCacheItem& font = mFontCache[fontId-1]; if( ! font.mVectorFontId ) { @@ -841,7 +855,7 @@ bool FontClient::Plugin::GetVectorMetrics( GlyphInfo* array, mVectorFontCache->GetGlyphMetrics( font.mVectorFontId, array[i] ); // Vector metrics are in EMs, convert to pixels - float scale = (static_cast(font.mPointSize)/64.0f) * mDpiVertical/72.0f; + const float scale = ( static_cast( font.mRequestedPointSize ) * FROM_266 ) * static_cast( mDpiVertical ) / POINTS_PER_INCH; array[i].width *= scale; array[i].height *= scale; array[i].xBearing *= scale; @@ -860,21 +874,18 @@ bool FontClient::Plugin::GetVectorMetrics( GlyphInfo* array, #endif } -BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, - GlyphIndex glyphIndex ) +void FontClient::Plugin::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, Dali::TextAbstraction::FontClient::GlyphBufferData& data ) { - BufferImage bitmap; - - if( fontId > 0 && - fontId-1 < mFontCache.size() ) + if( ( fontId > 0 ) && + ( fontId - 1u < mFontCache.size() ) ) { - FT_Face ftFace = mFontCache[fontId-1].mFreeTypeFace; + FT_Face ftFace = mFontCache[fontId - 1u].mFreeTypeFace; FT_Error error; #ifdef FREETYPE_BITMAP_SUPPORT // Check to see if this is fixed size bitmap - if ( mFontCache[fontId-1].mIsFixedSizeBitmap ) + if ( mFontCache[fontId - 1u].mIsFixedSizeBitmap ) { error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_COLOR ); } @@ -897,7 +908,7 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, if ( FT_Err_Ok == error ) { FT_BitmapGlyph bitmapGlyph = (FT_BitmapGlyph)glyph; - ConvertBitmap( bitmap, bitmapGlyph->bitmap ); + ConvertBitmap( data, bitmapGlyph->bitmap ); } else { @@ -906,7 +917,7 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, } else { - ConvertBitmap( bitmap, ftFace->glyph->bitmap ); + ConvertBitmap( data, ftFace->glyph->bitmap ); } // Created FT_Glyph object must be released with FT_Done_Glyph @@ -918,8 +929,21 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, DALI_LOG_ERROR( "FT_Load_Glyph Failed with error: %d\n", error ); } } +} + +PixelData FontClient::Plugin::CreateBitmap( FontId fontId, + GlyphIndex glyphIndex ) +{ + TextAbstraction::FontClient::GlyphBufferData data; + + CreateBitmap( fontId, glyphIndex, data ); - return bitmap; + return PixelData::New( data.buffer, + data.width * data.height * Pixel::GetBytesPerPixel( data.format ), + data.width, + data.height, + data.format, + PixelData::DELETE_ARRAY ); } void FontClient::Plugin::CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, VectorBlob*& blob, unsigned int& blobLength, unsigned int& nominalWidth, unsigned int& nominalHeight ) @@ -931,7 +955,7 @@ void FontClient::Plugin::CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, if( fontId > 0 && fontId-1 < mFontCache.size() ) { - CacheItem& font = mFontCache[fontId-1]; + FontFaceCacheItem& font = mFontCache[fontId-1]; if( ! font.mVectorFontId ) { @@ -943,7 +967,7 @@ void FontClient::Plugin::CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, #endif } -const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 pointSize ) +const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 requestedPointSize ) { // First look into the cache if there is an ellipsis glyph for the requested point size. for( Vector::ConstIterator it = mEllipsisCache.Begin(), @@ -953,7 +977,7 @@ const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 pointSize { const EllipsisItem& item = *it; - if( fabsf( item.size - pointSize ) < Math::MACHINE_EPSILON_1000 ) + if( fabsf( item.requestedPointSize - requestedPointSize ) < Math::MACHINE_EPSILON_1000 ) { // Use the glyph in the cache. return item.glyph; @@ -964,22 +988,44 @@ const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 pointSize mEllipsisCache.PushBack( EllipsisItem() ); EllipsisItem& item = *( mEllipsisCache.End() - 1u ); - item.size = pointSize; + item.requestedPointSize = requestedPointSize; // Find a font for the ellipsis glyph. item.glyph.fontId = FindDefaultFont( ELLIPSIS_CHARACTER, - pointSize, + requestedPointSize, false ); // Set the character index to access the glyph inside the font. item.glyph.index = FT_Get_Char_Index( mFontCache[item.glyph.fontId-1].mFreeTypeFace, ELLIPSIS_CHARACTER ); - GetBitmapMetrics( &item.glyph, 1u, true, 0 ); + GetBitmapMetrics( &item.glyph, 1u, true ); return item.glyph; } +bool FontClient::Plugin::IsColorGlyph( FontId fontId, GlyphIndex glyphIndex ) +{ + FT_Error error = -1; + +#ifdef FREETYPE_BITMAP_SUPPORT + if( ( fontId > 0 ) && + ( fontId - 1u < mFontCache.size() ) ) + { + const FontFaceCacheItem& item = mFontCache[fontId - 1u]; + FT_Face ftFace = item.mFreeTypeFace; + + // Check to see if this is fixed size bitmap + if( item.mIsFixedSizeBitmap ) + { + error = FT_Load_Glyph( ftFace, glyphIndex, FT_LOAD_COLOR ); + } + } +#endif + + return FT_Err_Ok == error; +} + void FontClient::Plugin::InitSystemFonts() { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::InitSystemFonts \n"); @@ -1045,6 +1091,7 @@ bool FontClient::Plugin::MatchFontDescriptionToPattern( FcPattern* pattern, Dali fontDescription.width = IntToWidthType( width ); fontDescription.weight = IntToWeightType( weight ); fontDescription.slant = IntToSlantType( slant ); + // destroyed the matched pattern FcPatternDestroy( match ); ret = true; @@ -1062,9 +1109,30 @@ FcPattern* FontClient::Plugin::CreateFontFamilyPattern( const FontDescription& f // add a property to the pattern for the font family FcPatternAddString( fontFamilyPattern, FC_FAMILY, reinterpret_cast( fontDescription.family.c_str() ) ); - FcPatternAddInteger( fontFamilyPattern, FC_WIDTH, FONT_WIDTH_TYPE_TO_INT[fontDescription.width] ); - FcPatternAddInteger( fontFamilyPattern, FC_WEIGHT, FONT_WEIGHT_TYPE_TO_INT[fontDescription.weight] ); - FcPatternAddInteger( fontFamilyPattern, FC_SLANT, FONT_SLANT_TYPE_TO_INT[fontDescription.slant] ); + int width = FONT_WIDTH_TYPE_TO_INT[fontDescription.width]; + if( width < 0 ) + { + // Use default. + width = DEFAULT_FONT_WIDTH; + } + + int weight = FONT_WEIGHT_TYPE_TO_INT[fontDescription.weight]; + if( weight < 0 ) + { + // Use default. + weight = DEFAULT_FONT_WEIGHT; + } + + int slant = FONT_SLANT_TYPE_TO_INT[fontDescription.slant]; + if( slant < 0 ) + { + // Use default. + slant = DEFAULT_FONT_SLANT; + } + + FcPatternAddInteger( fontFamilyPattern, FC_WIDTH, width ); + FcPatternAddInteger( fontFamilyPattern, FC_WEIGHT, weight ); + FcPatternAddInteger( fontFamilyPattern, FC_SLANT, slant ); // Add a property of the pattern, to say we want to match TrueType fonts FcPatternAddString( fontFamilyPattern , FC_FONTFORMAT, reinterpret_cast( FONT_FORMAT.c_str() ) ); @@ -1144,7 +1212,8 @@ bool FontClient::Plugin::GetFcInt( const _FcPattern* const pattern, const char* } FontId FontClient::Plugin::CreateFont( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, + PointSize26Dot6 actualPointSize, FaceIndex faceIndex, bool cacheDescription ) { @@ -1165,7 +1234,7 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, // Ensure this size is available for ( int i = 0; i < ftFace->num_fixed_sizes; ++i ) { - if ( static_cast(pointSize) == ftFace->available_sizes[ i ].size ) + if ( static_cast( actualPointSize ) == ftFace->available_sizes[ i ].size ) { // Tell Freetype to use this size error = FT_Select_Size( ftFace, i ); @@ -1185,13 +1254,14 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, 0.0f, 0.0f ); - mFontCache.push_back( CacheItem( ftFace, path, pointSize, faceIndex, metrics, fixedWidth, fixedHeight ) ); + mFontCache.push_back( FontFaceCacheItem( ftFace, path, requestedPointSize, faceIndex, metrics, fixedWidth, fixedHeight ) ); id = mFontCache.size(); if( cacheDescription ) { - CacheFontPath( ftFace, id, pointSize, path ); + CacheFontPath( ftFace, id, requestedPointSize, path ); } + return id; } } @@ -1208,13 +1278,13 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, sizes << ftFace->available_sizes[ i ].size; } DALI_LOG_ERROR( "FreeType Font: %s, does not contain Bitmaps of size: %d. Available sizes are: %s\n", - path.c_str(), pointSize, sizes.str().c_str() ); + path.c_str(), actualPointSize, sizes.str().c_str() ); } else { error = FT_Set_Char_Size( ftFace, 0, - pointSize, + actualPointSize, mDpiHorizontal, mDpiVertical ); @@ -1229,17 +1299,17 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, static_cast< float >( ftFace->underline_position ) * FROM_266, static_cast< float >( ftFace->underline_thickness ) * FROM_266 ); - mFontCache.push_back( CacheItem( ftFace, path, pointSize, faceIndex, metrics ) ); + mFontCache.push_back( FontFaceCacheItem( ftFace, path, requestedPointSize, faceIndex, metrics ) ); id = mFontCache.size(); if( cacheDescription ) { - CacheFontPath( ftFace, id, pointSize, path ); + CacheFontPath( ftFace, id, requestedPointSize, path ); } } else { - DALI_LOG_ERROR( "FreeType Set_Char_Size error: %d for pointSize %d\n", error, pointSize ); + DALI_LOG_ERROR( "FreeType Set_Char_Size error: %d for pointSize %d\n", error, actualPointSize ); } } } @@ -1251,8 +1321,7 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, return id; } -void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap, - FT_Bitmap srcBitmap ) +void FontClient::Plugin::ConvertBitmap( TextAbstraction::FontClient::GlyphBufferData& data, FT_Bitmap srcBitmap ) { if( srcBitmap.width*srcBitmap.rows > 0 ) { @@ -1260,19 +1329,14 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap, { case FT_PIXEL_MODE_GRAY: { - if( srcBitmap.pitch == static_cast< int >( srcBitmap.width ) ) + if( srcBitmap.pitch == static_cast( srcBitmap.width ) ) { - destBitmap = BufferImage::New( srcBitmap.width, srcBitmap.rows, Pixel::L8 ); - - PixelBuffer* destBuffer = destBitmap.GetBuffer(); - if( destBuffer ) - { - memcpy( destBuffer, srcBitmap.buffer, srcBitmap.width*srcBitmap.rows ); - } - else - { - DALI_LOG_ERROR( "GetBuffer returns null\n" ); - } + const unsigned int bufferSize = srcBitmap.width * srcBitmap.rows; + data.buffer = new unsigned char[bufferSize]; + data.width = srcBitmap.width; + data.height = srcBitmap.rows; + data.format = Pixel::L8; + memcpy( data.buffer, srcBitmap.buffer, bufferSize ); } break; } @@ -1280,19 +1344,14 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap, #ifdef FREETYPE_BITMAP_SUPPORT case FT_PIXEL_MODE_BGRA: { - if ( srcBitmap.pitch == static_cast< int >( srcBitmap.width << 2 ) ) + if( srcBitmap.pitch == static_cast( srcBitmap.width << 2u ) ) { - destBitmap = BufferImage::New( srcBitmap.width, srcBitmap.rows, Pixel::BGRA8888 ); - - PixelBuffer* destBuffer = destBitmap.GetBuffer(); - if( destBuffer ) - { - memcpy( destBuffer, srcBitmap.buffer, srcBitmap.width*srcBitmap.rows*4 ); - } - else - { - DALI_LOG_ERROR( "GetBuffer returns null\n" ); - } + const unsigned int bufferSize = srcBitmap.width * srcBitmap.rows * 4u; + data.buffer = new unsigned char[bufferSize]; + data.width = srcBitmap.width; + data.height = srcBitmap.rows; + data.format = Pixel::BGRA8888; + memcpy( data.buffer, srcBitmap.buffer, bufferSize ); } break; } @@ -1307,19 +1366,19 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap, } bool FontClient::Plugin::FindFont( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FaceIndex faceIndex, FontId& fontId ) const { fontId = 0u; - for( std::vector::const_iterator it = mFontCache.begin(), + for( std::vector::const_iterator it = mFontCache.begin(), endIt = mFontCache.end(); it != endIt; ++it, ++fontId ) { - const CacheItem& cacheItem = *it; + const FontFaceCacheItem& cacheItem = *it; - if( cacheItem.mPointSize == pointSize && + if( cacheItem.mRequestedPointSize == requestedPointSize && cacheItem.mFaceIndex == faceIndex && cacheItem.mPath == path ) { @@ -1397,7 +1456,7 @@ bool FontClient::Plugin::FindFallbackFontList( const FontDescription& fontDescri } bool FontClient::Plugin::FindFont( FontDescriptionId validatedFontId, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FontId& fontId ) { fontId = 0u; @@ -1410,7 +1469,7 @@ bool FontClient::Plugin::FindFont( FontDescriptionId validatedFontId, const FontIdCacheItem& item = *it; if( ( validatedFontId == item.validatedFontId ) && - ( pointSize == item.pointSize ) ) + ( requestedPointSize == item.requestedPointSize ) ) { fontId = item.fontId; return true; @@ -1520,14 +1579,14 @@ void FontClient::Plugin::GetFixedSizes( const FontDescription& fontDescription, FcPatternDestroy( fontFamilyPattern ); } -void FontClient::Plugin::CacheFontPath( FT_Face ftFace, FontId id, PointSize26Dot6 pointSize, const FontPath& path ) +void FontClient::Plugin::CacheFontPath( FT_Face ftFace, FontId id, PointSize26Dot6 requestedPointSize, const FontPath& path ) { FontDescription description; description.path = path; description.family = FontFamily( ftFace->family_name ); - description.weight = FontWeight::NORMAL; - description.width = FontWidth::NORMAL; - description.slant = FontSlant::NORMAL; + description.weight = FontWeight::NONE; + description.width = FontWidth::NONE; + description.slant = FontSlant::NONE; // Note FreeType doesn't give too much info to build a proper font style. if( ftFace->style_flags & FT_STYLE_FLAG_ITALIC ) @@ -1555,9 +1614,9 @@ void FontClient::Plugin::CacheFontPath( FT_Face ftFace, FontId id, PointSize26Do mValidatedFontCache.push_back( item ); - // Cache the pair 'validatedFontId, pointSize' to improve the following queries. + // Cache the pair 'validatedFontId, requestedPointSize' to improve the following queries. mFontIdCache.push_back( FontIdCacheItem( validatedFontId, - pointSize, + requestedPointSize, id ) ); } }