X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=text%2Fdali%2Finternal%2Ftext-abstraction%2Ffont-client-plugin-impl.cpp;h=a1e4cc68fa8b1b6ac19ad6f8fa0d5adf123cf932;hb=d8a28c83a0d0671086393c42275e4a2598445db5;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..a1e4cc6 100644 --- a/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp +++ b/text/dali/internal/text-abstraction/font-client-plugin-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ #include #include #include +#include #include // EXTERNAL INCLUDES @@ -41,6 +42,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" ); @@ -50,10 +52,9 @@ const int DEFAULT_FONT_SLANT = 0; // normal const uint32_t ELLIPSIS_CHARACTER = 0x2026; -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 +64,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 +79,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 @@ -135,9 +138,10 @@ FontSlant::Type IntToSlantType( int slant ) return static_cast( ValueToIndex( slant, FONT_SLANT_TYPE_TO_INT, NUM_FONT_SLANT_TYPE - 1u ) ); } -FontClient::Plugin::FallbackCacheItem::FallbackCacheItem( const FontDescription& font, FontList* list ) + FontClient::Plugin::FallbackCacheItem::FallbackCacheItem( const FontDescription& font, FontList* fallbackFonts, CharacterSetList* characterSets ) : fontDescription( font ), - fallbackFonts( list ) + fallbackFonts( fallbackFonts ), + characterSets( characterSets ) { } @@ -149,47 +153,52 @@ 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 ), + mCharacterSet( NULL ), mFixedWidthPixels( 0.0f ), mFixedHeightPixels( 0.0f ), mVectorFontId( 0 ), - mIsFixedSizeBitmap( false ) + mIsFixedSizeBitmap( false ), + mHasColorTables( false ) { } -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, + bool hasColorTables ) : mFreeTypeFace( ftFace ), mPath( path ), - mPointSize( pointSize ), + mRequestedPointSize( requestedPointSize ), mFaceIndex( face ), mMetrics( metrics ), + mCharacterSet( NULL ), mFixedWidthPixels( fixedWidth ), mFixedHeightPixels( fixedHeight ), mVectorFontId( 0 ), - mIsFixedSizeBitmap( true ) + mIsFixedSizeBitmap( true ), + mHasColorTables( hasColorTables ) { } @@ -204,15 +213,18 @@ FontClient::Plugin::Plugin( unsigned int horizontalDpi, mFontCache(), mValidatedFontCache(), mFontDescriptionCache( 1u ), + mCharacterSetCache(), mFontIdCache(), mVectorFontCache( NULL ), mEllipsisCache(), mDefaultFontDescriptionCached( false ) { + mCharacterSetCache.Resize( 1u ); + int error = FT_Init_FreeType( &mFreeTypeLibrary ); if( FT_Err_Ok != error ) { - DALI_LOG_ERROR( "FreeType Init error: %d\n", error ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FreeType Init error: %d\n", error ); } #ifdef ENABLE_VECTOR_BASED_TEXT_RENDERING @@ -231,7 +243,9 @@ FontClient::Plugin::~Plugin() if( item.fallbackFonts ) { delete item.fallbackFonts; + delete item.characterSets; item.fallbackFonts = NULL; + item.characterSets = NULL; } } @@ -254,9 +268,13 @@ void FontClient::Plugin::ResetSystemDefaults() mDefaultFontDescriptionCached = false; } -void FontClient::Plugin::SetFontList( const FontDescription& fontDescription, FontList& fontList ) +void FontClient::Plugin::SetFontList( const FontDescription& fontDescription, FontList& fontList, CharacterSetList& characterSetList ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::SetFontList family(%s)\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::SetFontList\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); fontList.clear(); @@ -273,6 +291,7 @@ void FontClient::Plugin::SetFontList( const FontDescription& fontDescription, Fo if( NULL != fontSet ) { + DALI_LOG_INFO( gLogFilter, Debug::General, " number of fonts found : [%d]\n", fontSet->nfont ); // Reserve some space to avoid reallocations. fontList.reserve( fontSet->nfont ); @@ -285,6 +304,10 @@ void FontClient::Plugin::SetFontList( const FontDescription& fontDescription, Fo // Skip fonts with no path if( GetFcString( fontPattern, FC_FILE, path ) ) { + FcCharSet* characterSet = NULL; + FcPatternGetCharSet( fontPattern, FC_CHARSET, 0u, &characterSet ); + + characterSetList.PushBack( characterSet ); fontList.push_back( FontDescription() ); FontDescription& newFontDescription = fontList.back(); @@ -300,18 +323,29 @@ void FontClient::Plugin::SetFontList( const FontDescription& fontDescription, Fo newFontDescription.width = IntToWidthType( width ); newFontDescription.weight = IntToWeightType( weight ); newFontDescription.slant = IntToSlantType( slant ); + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " description; family : [%s]\n", newFontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", newFontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[newFontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[newFontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[newFontDescription.slant] ); } } FcFontSetDestroy( fontSet ); } + else + { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " No fonts found.\n" ); + } FcPatternDestroy( fontFamilyPattern ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::SetFontList\n" ); } void FontClient::Plugin::GetDefaultFonts( FontList& defaultFonts ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetDefaultFonts mDefaultFonts(%s)\n", ( mDefaultFonts.empty()?"empty":"valid" ) ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetDefaultFonts\n" ); if( mDefaultFonts.empty() ) { @@ -320,26 +354,89 @@ void FontClient::Plugin::GetDefaultFonts( FontList& defaultFonts ) fontDescription.width = IntToWidthType( DEFAULT_FONT_WIDTH ); fontDescription.weight = IntToWeightType( DEFAULT_FONT_WEIGHT ); fontDescription.slant = IntToSlantType( DEFAULT_FONT_SLANT ); - SetFontList( fontDescription, mDefaultFonts ); + SetFontList( fontDescription, mDefaultFonts, mDefaultFontCharacterSets ); } defaultFonts = mDefaultFonts; + + DALI_LOG_INFO( gLogFilter, Debug::General, " number of default fonts : [%d]\n", mDefaultFonts.size() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetDefaultFonts\n" ); } void FontClient::Plugin::GetDefaultPlatformFontDescription( FontDescription& fontDescription ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetDefaultPlatformFontDescription\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetDefaultPlatformFontDescription\n"); if( !mDefaultFontDescriptionCached ) { - FcInitReinitialize(); // FcInitBringUptoDate did not seem to reload config file as was still getting old default font. + // Clear any font config stored info in the caches. + mDefaultFontCharacterSets.Clear(); + mCharacterSetCache.Clear(); + + for( std::vector::iterator it = mFallbackCache.begin(), endIt = mFallbackCache.end(); it != endIt; ++it ) + { + FallbackCacheItem& item = *it; + + item.characterSets->Clear(); + } + + for( std::vector::iterator it = mFontCache.begin(), endIt = mFontCache.end(); it != endIt; ++it ) + { + FontFaceCacheItem& item = *it; + + // Set the character set pointer as null. Will be created again the next time IsCharacterSupportedByFont() + item.mCharacterSet = NULL; + } + + // FcInitBringUptoDate did not seem to reload config file as was still getting old default font. + FcInitReinitialize(); FcPattern* matchPattern = FcPatternCreate(); - FcConfigSubstitute(NULL, matchPattern, FcMatchPattern); - FcDefaultSubstitute( matchPattern ); - MatchFontDescriptionToPattern( matchPattern, mDefaultFontDescription ); - FcPatternDestroy( matchPattern ); + if( matchPattern ) + { + FcConfigSubstitute( NULL, matchPattern, FcMatchPattern ); + FcDefaultSubstitute( matchPattern ); + + FcCharSet* characterSet = NULL; + MatchFontDescriptionToPattern( matchPattern, mDefaultFontDescription, &characterSet ); + FcPatternDestroy( matchPattern ); + } + + // Create again the character sets as they are not valid after FcInitReinitialize() + + for( FontList::const_iterator it = mDefaultFonts.begin(), endIt = mDefaultFonts.end(); it != endIt; ++it ) + { + const FontDescription& description = *it; + + mDefaultFontCharacterSets.PushBack( CreateCharacterSetFromDescription( description ) ); + } + + for( FontList::const_iterator it = mFontDescriptionCache.begin(), endIt = mFontDescriptionCache.end(); it != endIt; ++it ) + { + const FontDescription& description = *it; + + mCharacterSetCache.PushBack( CreateCharacterSetFromDescription( description ) ); + } + + for( std::vector::iterator it = mFallbackCache.begin(), endIt = mFallbackCache.end(); it != endIt; ++it ) + { + FallbackCacheItem& item = *it; + + if( NULL != item.fallbackFonts ) + { + if( NULL == item.characterSets ) + { + item.characterSets = new CharacterSetList; + } + + for( FontList::const_iterator flIt = item.fallbackFonts->begin(), flEndIt = item.fallbackFonts->end(); flIt != flEndIt; ++flIt ) + { + const FontDescription& description = *flIt; + item.characterSets->PushBack( CreateCharacterSetFromDescription( description ) ); + } + } + } mDefaultFontDescriptionCached = true; } @@ -349,11 +446,18 @@ void FontClient::Plugin::GetDefaultPlatformFontDescription( FontDescription& fon fontDescription.width = mDefaultFontDescription.width; fontDescription.weight = mDefaultFontDescription.weight; fontDescription.slant = mDefaultFontDescription.slant; + + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetDefaultPlatformFontDescription\n"); } void FontClient::Plugin::GetSystemFonts( FontList& systemFonts ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetSystemFonts\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetSystemFonts\n"); if( mSystemFonts.empty() ) { @@ -361,11 +465,16 @@ void FontClient::Plugin::GetSystemFonts( FontList& systemFonts ) } systemFonts = mSystemFonts; + DALI_LOG_INFO( gLogFilter, Debug::General, " number of system fonts : [%d]\n", mSystemFonts.size() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetSystemFonts\n"); } void FontClient::Plugin::GetDescription( FontId id, FontDescription& fontDescription ) const { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetDescription\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", id ); + for( std::vector::const_iterator it = mFontIdCache.begin(), endIt = mFontIdCache.end(); it != endIt; @@ -376,114 +485,174 @@ void FontClient::Plugin::GetDescription( FontId id, if( item.fontId == id ) { fontDescription = *( mFontDescriptionCache.begin() + item.validatedFontId ); + + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetDescription\n"); return; } } - DALI_LOG_ERROR( "FontClient::Plugin::GetDescription. No description found for the font ID %d\n", id ); + DALI_LOG_INFO( gLogFilter, Debug::General, " No description found for the font ID %d\n", id ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetDescription\n"); } PointSize26Dot6 FontClient::Plugin::GetPointSize( FontId id ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetPointSize\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", id ); const FontId index = id - 1u; - if( id > 0u && - index < mFontCache.size() ) + if( ( id > 0u ) && + ( index < mFontCache.size() ) ) { - return ( *( mFontCache.begin() + index ) ).mPointSize; + DALI_LOG_INFO( gLogFilter, Debug::General, " point size : %d\n", ( *( mFontCache.begin() + index ) ).mRequestedPointSize ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetPointSize\n"); + return ( *( mFontCache.begin() + index ) ).mRequestedPointSize; } else { - DALI_LOG_ERROR( "FontClient::Plugin::GetPointSize. Invalid font ID %d\n", id ); + DALI_LOG_INFO( gLogFilter, Debug::General, " Invalid font ID %d\n", id ); } + DALI_LOG_INFO( gLogFilter, Debug::General, " default point size : %d\n", TextAbstraction::FontClient::DEFAULT_POINT_SIZE ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetPointSize\n"); return TextAbstraction::FontClient::DEFAULT_POINT_SIZE; } -FontId FontClient::Plugin::FindFontForCharacter( const FontList& fontList, - Character charcode, - PointSize26Dot6 requestedSize, - bool preferColor ) +bool FontClient::Plugin::IsCharacterSupportedByFont( FontId fontId, Character character ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindFontForCharacter\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::IsCharacterSupportedByFont\n"); + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, " character : %p\n", character ); - FontId fontId(0); - bool foundColor(false); + if( ( fontId < 1u ) || ( fontId > mFontCache.size() ) ) + { + DALI_LOG_INFO( gLogFilter, Debug::General, " Invalid font id. Number of items in the cache: %d\n",mFontCache.size()); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::IsCharacterSupportedByFont\n"); + return false; + } - // Traverse the list of fonts. - // Check for each default font if supports the character. + --fontId; - for( FontList::const_iterator it = fontList.begin(), endIt = fontList.end(); - it != endIt; - ++it ) + bool isSupported = false; + + FontFaceCacheItem& cacheItem = mFontCache[fontId]; + + if( NULL == cacheItem.mCharacterSet ) { - const FontDescription& description = *it; + // Create again the character set. + // It can be null if the ResetSystemDefaults() method has been called. + + FontDescription description; + description.path = cacheItem.mPath; + description.family = FontFamily( cacheItem.mFreeTypeFace->family_name ); + 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( cacheItem.mFreeTypeFace->style_flags & FT_STYLE_FLAG_ITALIC ) + { + description.slant = FontSlant::ITALIC; + } + if( cacheItem.mFreeTypeFace->style_flags & FT_STYLE_FLAG_BOLD ) + { + description.weight = FontWeight::BOLD; + } - FcPattern* pattern = CreateFontFamilyPattern( description ); + cacheItem.mCharacterSet = CreateCharacterSetFromDescription( description ); + } - FcResult result = FcResultMatch; - FcPattern* match = FcFontMatch( NULL /* use default configure */, pattern, &result ); + isSupported = FcCharSetHasChar( cacheItem.mCharacterSet, character ); - FcCharSet* charSet = NULL; - FcPatternGetCharSet( match, FC_CHARSET, 0u, &charSet ); + DALI_LOG_INFO( gLogFilter, Debug::General, " is supported : %s\n", (isSupported ? "true" : "false") ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::IsCharacterSupportedByFont\n"); + return isSupported; +} - if( FcCharSetHasChar( charSet, charcode ) ) - { - Vector< PointSize26Dot6 > fixedSizes; - GetFixedSizes( description, - fixedSizes ); +FontId FontClient::Plugin::FindFontForCharacter( const FontList& fontList, + const CharacterSetList& characterSetList, + Character character, + PointSize26Dot6 requestedPointSize, + bool preferColor ) +{ + DALI_ASSERT_DEBUG( ( fontList.size() == characterSetList.Count() ) && "FontClient::Plugin::FindFontForCharacter. Different number of fonts and character sets." ); - 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]; - for( unsigned int i=1; i size ) - { - size = fixedSizes[i]; - } - } - requestedSize = size; - } + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindFontForCharacter\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " character : %p\n", character ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + DALI_LOG_INFO( gLogFilter, Debug::General, " preferColor : %s\n", ( preferColor ? "true" : "false" ) ); + + FontId fontId = 0u; + bool foundColor = false; + + DALI_LOG_INFO( gLogFilter, Debug::General, " number of fonts : %d\n", fontList.size() ); + + // Traverse the list of fonts. + // Check for each font if supports the character. + for( unsigned int index = 0u, numberOfFonts = fontList.size(); index < numberOfFonts; ++index ) + { + const FontDescription& description = fontList[index]; + const FcCharSet* const characterSet = characterSetList[index]; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " description; family : [%s]\n", description.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", description.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[description.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[description.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[description.slant] ); + + bool foundInRanges = false; + if( NULL != characterSet ) + { + foundInRanges = FcCharSetHasChar( characterSet, character ); + } + + if( foundInRanges ) + { fontId = GetFontId( description, - requestedSize, + requestedPointSize, 0u ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " font id : %d\n", fontId ); + if( preferColor ) { - BufferImage bitmap = CreateBitmap( fontId, GetGlyphIndex(fontId,charcode) ); - if( bitmap && - Pixel::BGRA8888 == bitmap.GetPixelFormat() ) + if( ( fontId > 0 ) && + ( fontId - 1u < mFontCache.size() ) ) { - foundColor = true; + const FontFaceCacheItem& item = mFontCache[fontId - 1u]; + + foundColor = item.mHasColorTables; } + + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " foundColor : %s\n", ( foundColor ? "true" : "false" ) ); } - // Keep going unless we prefer a different (color) font + // Keep going unless we prefer a different (color) font. if( !preferColor || foundColor ) { - FcPatternDestroy( match ); - FcPatternDestroy( pattern ); break; } } - - FcPatternDestroy( match ); - FcPatternDestroy( pattern ); } + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFontForCharacter\n" ); return fontId; } 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") ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindDefaultFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " character : %p\n", charcode ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + DALI_LOG_INFO( gLogFilter, Debug::General, " preferColor : %s\n", ( preferColor ? "true" : "false" ) ); FontId fontId(0); @@ -495,77 +664,115 @@ 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 ); + + SetFontList( fontDescription, mDefaultFonts, mDefaultFontCharacterSets ); } + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " number of default fonts : %d\n", mDefaultFonts.size() ); + // Traverse the list of default fonts. // Check for each default font if supports the character. - fontId = FindFontForCharacter( mDefaultFonts, charcode, requestedSize, preferColor ); + fontId = FindFontForCharacter( mDefaultFonts, mDefaultFontCharacterSets, charcode, requestedPointSize, preferColor ); + + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindDefaultFont\n" ); 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 ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindFallbackFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " character : %p\n", charcode ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + DALI_LOG_INFO( gLogFilter, Debug::General, " preferColor : %s\n", ( preferColor ? "true" : "false" ) ); + // 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 ); + + DALI_LOG_INFO( gLogFilter, Debug::General, " preferredFontDescription --> fontDescription\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " [%s] --> [%s]\n", preferredFontDescription.family.c_str(), fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " [%s] --> [%s]\n", FontWeight::Name[preferredFontDescription.weight], FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " [%s] --> [%s]\n", FontWidth::Name[preferredFontDescription.width], FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " [%s] --> [%s]\n", FontSlant::Name[preferredFontDescription.slant], FontSlant::Name[fontDescription.slant] ); // Check first if the font's description has been queried before. - FontList* fontList( NULL ); + FontList* fontList = NULL; + CharacterSetList* characterSetList = NULL; - if( !FindFallbackFontList( fontDescription, fontList ) ) + if( !FindFallbackFontList( fontDescription, fontList, characterSetList ) ) { fontList = new FontList; - SetFontList( fontDescription, *fontList ); + characterSetList = new CharacterSetList; + + SetFontList( fontDescription, *fontList, *characterSetList ); // Add the font-list to the cache. - mFallbackCache.push_back( FallbackCacheItem(fontDescription, fontList) ); + mFallbackCache.push_back( FallbackCacheItem( fontDescription, fontList, characterSetList ) ); } - if( fontList ) + if( fontList && characterSetList ) { - fontId = FindFontForCharacter( *fontList, charcode, requestedSize, preferColor ); + fontId = FindFontForCharacter( *fontList, *characterSetList, charcode, requestedPointSize, preferColor ); } + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFallbackFont\n"); return fontId; } FontId FontClient::Plugin::GetFontId( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FaceIndex faceIndex, bool cacheDescription ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetFontId fontPatch:%s\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetFontId\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " path : [%s]\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); FontId id( 0 ); 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, faceIndex, cacheDescription ); } } + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", id ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetFontId\n" ); + return id; } FontId FontClient::Plugin::GetFontId( const FontDescription& fontDescription, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FaceIndex faceIndex ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetFontId font family(%s)\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetFontId\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); // This method uses three vectors which caches: // * Pairs of non validated font descriptions and an index to a vector with paths to font file names. @@ -591,54 +798,71 @@ FontId FontClient::Plugin::GetFontId( const FontDescription& fontDescription, if( !FindValidatedFont( fontDescription, validatedFontId ) ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::GetFontId Validating Font\n"); - // Use font config to validate the font's description. ValidateFont( 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, faceIndex, false ); - // Cache the pair 'validatedFontId, pointSize' to improve the following queries. + mFontCache[fontId-1u].mCharacterSet = mCharacterSetCache[validatedFontId]; + + // Cache the pair 'validatedFontId, requestedPointSize' to improve the following queries. mFontIdCache.push_back( FontIdCacheItem( validatedFontId, - pointSize, + requestedPointSize, fontId ) ); } + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetFontId\n" ); + return fontId; } void FontClient::Plugin::ValidateFont( const FontDescription& fontDescription, FontDescriptionId& validatedFontId ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::ValidateFont Validating Font family(%s) \n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::ValidateFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); // Create a font pattern. FcPattern* fontFamilyPattern = CreateFontFamilyPattern( fontDescription ); FontDescription description; - bool matched = MatchFontDescriptionToPattern( fontFamilyPattern, description ); + FcCharSet* characterSet = NULL; + bool matched = MatchFontDescriptionToPattern( fontFamilyPattern, description, &characterSet ); FcPatternDestroy( fontFamilyPattern ); - if( matched ) + if( matched && ( NULL != characterSet ) ) { // Set the index to the vector of paths to font file names. validatedFontId = mFontDescriptionCache.size(); + DALI_LOG_INFO( gLogFilter, Debug::General, " matched description; family : [%s]\n", description.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", description.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[description.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[description.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[description.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::General, " validatedFontId : %d\n", validatedFontId ); + // Add the path to the cache. mFontDescriptionCache.push_back( description ); + mCharacterSetCache.PushBack( characterSet ); // Cache the index and the matched font's description. FontDescriptionCacheItem item( description, @@ -660,55 +884,54 @@ void FontClient::Plugin::ValidateFont( const FontDescription& fontDescription, } else { - DALI_LOG_ERROR( "FontClient::Plugin::ValidateFont failed for font %s %d %d %d\n", - fontDescription.family.c_str(), - fontDescription.width, - fontDescription.weight, - fontDescription.slant ); + DALI_LOG_INFO( gLogFilter, Debug::General, " font validation failed for font [%s]\n", fontDescription.family.c_str() ); } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::ValidateFont validatedFontId(%u) font family(%s)\n", validatedFontId, fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::ValidateFont\n" ); } 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 { - DALI_LOG_ERROR( "Invalid font ID %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::GetFontMetrics. Invalid font id : %d\n", fontId ); } } GlyphIndex FontClient::Plugin::GetGlyphIndex( FontId fontId, Character charcode ) { - GlyphIndex index( 0 ); + GlyphIndex index = 0u; - if( fontId > 0 && - fontId-1 < mFontCache.size() ) + if( ( fontId > 0u ) && + ( fontId - 1u < mFontCache.size() ) ) { - FT_Face ftFace = mFontCache[fontId-1].mFreeTypeFace; + FT_Face ftFace = mFontCache[fontId-1u].mFreeTypeFace; index = FT_Get_Char_Index( ftFace, charcode ); } @@ -719,32 +942,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,53 +975,55 @@ 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 { - DALI_LOG_ERROR( "FreeType Bitmap Load_Glyph error %d\n", error ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::GetBitmapMetrics. FreeType Bitmap Load_Glyph error %d\n", error ); success = false; } } 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 +1043,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 +1055,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 +1065,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 +1084,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, int outlineWidth ) { - 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 ); } @@ -893,20 +1114,47 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, { if( glyph->format != FT_GLYPH_FORMAT_BITMAP ) { + // Check whether we should create a bitmap for the outline + if( glyph->format == FT_GLYPH_FORMAT_OUTLINE && outlineWidth > 0 ) + { + // Set up a stroker + FT_Stroker stroker; + error = FT_Stroker_New(mFreeTypeLibrary, &stroker ); + + if ( FT_Err_Ok == error ) + { + FT_Stroker_Set( stroker, outlineWidth * 64, FT_STROKER_LINECAP_ROUND, FT_STROKER_LINEJOIN_ROUND, 0 ); + error = FT_Glyph_StrokeBorder( &glyph, stroker, 0, 1 ); + + if ( FT_Err_Ok == error ) + { + FT_Stroker_Done( stroker ); + } + else + { + DALI_LOG_ERROR( "FT_Glyph_StrokeBorder Failed with error: %d\n", error ); + } + } + else + { + DALI_LOG_ERROR( "FT_Stroker_New Failed with error: %d\n", error ); + } + } + error = FT_Glyph_To_Bitmap( &glyph, FT_RENDER_MODE_NORMAL, 0, 1 ); if ( FT_Err_Ok == error ) { - FT_BitmapGlyph bitmapGlyph = (FT_BitmapGlyph)glyph; - ConvertBitmap( bitmap, bitmapGlyph->bitmap ); + FT_BitmapGlyph bitmapGlyph = reinterpret_cast< FT_BitmapGlyph >( glyph ); + ConvertBitmap( data, bitmapGlyph->bitmap ); } else { - DALI_LOG_ERROR( "FT_Get_Glyph Failed with error: %d\n", error ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::CreateBitmap. FT_Get_Glyph Failed with error: %d\n", error ); } } else { - ConvertBitmap( bitmap, ftFace->glyph->bitmap ); + ConvertBitmap( data, ftFace->glyph->bitmap ); } // Created FT_Glyph object must be released with FT_Done_Glyph @@ -915,11 +1163,23 @@ BufferImage FontClient::Plugin::CreateBitmap( FontId fontId, } else { - DALI_LOG_ERROR( "FT_Load_Glyph Failed with error: %d\n", error ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::CreateBitmap. FT_Load_Glyph Failed with error: %d\n", error ); } } +} + +PixelData FontClient::Plugin::CreateBitmap( FontId fontId, GlyphIndex glyphIndex, int outlineWidth ) +{ + TextAbstraction::FontClient::GlyphBufferData data; + + CreateBitmap( fontId, glyphIndex, data, outlineWidth ); - 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 +1191,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,8 +1203,11 @@ void FontClient::Plugin::CreateVectorBlob( FontId fontId, GlyphIndex glyphIndex, #endif } -const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 pointSize ) +const GlyphInfo& FontClient::Plugin::GetEllipsisGlyph( PointSize26Dot6 requestedPointSize ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::GetEllipsisGlyph\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize %d.\n", requestedPointSize ); + // First look into the cache if there is an ellipsis glyph for the requested point size. for( Vector::ConstIterator it = mEllipsisCache.Begin(), endIt = mEllipsisCache.End(); @@ -953,9 +1216,14 @@ 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. + + DALI_LOG_INFO( gLogFilter, Debug::General, " glyph id %d found in the cache.\n", item.glyph.index ); + DALI_LOG_INFO( gLogFilter, Debug::General, " font %d.\n", item.glyph.fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetEllipsisGlyph\n" ); + return item.glyph; } } @@ -964,30 +1232,58 @@ 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 ); + + DALI_LOG_INFO( gLogFilter, Debug::General, " glyph id %d found in the cache.\n", item.glyph.index ); + DALI_LOG_INFO( gLogFilter, Debug::General, " font %d.\n", item.glyph.fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::GetEllipsisGlyph\n" ); 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.mHasColorTables ) + { + 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"); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::InitSystemFonts\n" ); FcFontSet* fontSet = GetFcFontSet(); if( fontSet ) { + DALI_LOG_INFO( gLogFilter, Debug::General, " number of system fonts : %d\n", fontSet->nfont ); + // Reserve some space to avoid reallocations. mSystemFonts.reserve( fontSet->nfont ); @@ -1015,56 +1311,99 @@ void FontClient::Plugin::InitSystemFonts() fontDescription.width = IntToWidthType( width ); fontDescription.weight = IntToWeightType( weight ); fontDescription.slant = IntToSlantType( slant ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::InitSystemFonts font family(%s)\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); } } FcFontSetDestroy( fontSet ); } + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::InitSystemFonts\n" ); } -bool FontClient::Plugin::MatchFontDescriptionToPattern( FcPattern* pattern, Dali::TextAbstraction::FontDescription& fontDescription ) +bool FontClient::Plugin::MatchFontDescriptionToPattern( FcPattern* pattern, Dali::TextAbstraction::FontDescription& fontDescription, FcCharSet** characterSet ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::MatchFontDescriptionToPattern\n" ); + FcResult result = FcResultMatch; FcPattern* match = FcFontMatch( NULL /* use default configure */, pattern, &result ); - bool ret = false; + const bool matched = NULL != match; + DALI_LOG_INFO( gLogFilter, Debug::General, " pattern matched : %s\n", ( matched ? "true" : "false" ) ); - if( match ) + if( matched ) { int width = 0; int weight = 0; int slant = 0; GetFcString( match, FC_FILE, fontDescription.path ); GetFcString( match, FC_FAMILY, fontDescription.family ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::MatchFontDescriptionToPattern matched:%s \n", fontDescription.family.c_str()); GetFcInt( match, FC_WIDTH, width ); GetFcInt( match, FC_WEIGHT, weight ); GetFcInt( match, FC_SLANT, slant ); fontDescription.width = IntToWidthType( width ); fontDescription.weight = IntToWeightType( weight ); fontDescription.slant = IntToSlantType( slant ); + + // Cache the character ranges. + FcPatternGetCharSet( match, FC_CHARSET, 0u, characterSet ); + // destroyed the matched pattern FcPatternDestroy( match ); - ret = true; + + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); } - return ret; -} + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::MatchFontDescriptionToPattern\n" ); + return matched; +} -FcPattern* FontClient::Plugin::CreateFontFamilyPattern( const FontDescription& fontDescription ) +FcPattern* FontClient::Plugin::CreateFontFamilyPattern( const FontDescription& fontDescription ) const { // create the cached font family lookup pattern // a pattern holds a set of names, each name refers to a property of the font FcPattern* fontFamilyPattern = FcPatternCreate(); + if( !fontFamilyPattern ) + { + return NULL; + } + // 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,11 +1483,15 @@ bool FontClient::Plugin::GetFcInt( const _FcPattern* const pattern, const char* } FontId FontClient::Plugin::CreateFont( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FaceIndex faceIndex, bool cacheDescription ) { - FontId id( 0 ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::CreateFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " path : [%s]\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + + FontId id = 0u; // Create & cache new font face FT_Face ftFace; @@ -1159,62 +1502,68 @@ FontId FontClient::Plugin::CreateFont( const FontPath& path, if( FT_Err_Ok == error ) { + // Check if a font is scalable. + const bool isScalable = ( 0 != ( ftFace->face_flags & FT_FACE_FLAG_SCALABLE ) ); + const bool hasFixedSizedBitmaps = ( 0 != ( ftFace->face_flags & FT_FACE_FLAG_FIXED_SIZES ) ) && ( 0 != ftFace->num_fixed_sizes ); + const bool hasColorTables = ( 0 != ( ftFace->face_flags & FT_FACE_FLAG_COLOR ) ); + + DALI_LOG_INFO( gLogFilter, Debug::General, " isScalable : [%s]\n", ( isScalable ? "true" : "false" ) ); + DALI_LOG_INFO( gLogFilter, Debug::General, " hasFixedSizedBitmaps : [%s]\n", ( hasFixedSizedBitmaps ? "true" : "false" ) ); + DALI_LOG_INFO( gLogFilter, Debug::General, " hasColorTables : [%s]\n", ( hasColorTables ? "true" : "false" ) ); + // Check to see if the font contains fixed sizes? - if ( ftFace->num_fixed_sizes && ftFace->available_sizes ) + if( !isScalable && hasFixedSizedBitmaps ) { - // Ensure this size is available - for ( int i = 0; i < ftFace->num_fixed_sizes; ++i ) + PointSize26Dot6 actualPointSize = 0u; + int fixedSizeIndex = 0; + for( ; fixedSizeIndex < ftFace->num_fixed_sizes; ++fixedSizeIndex ) { - if ( static_cast(pointSize) == ftFace->available_sizes[ i ].size ) + const PointSize26Dot6 fixedSize = ftFace->available_sizes[fixedSizeIndex].size; + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " size index : %d, size : %d\n", fixedSizeIndex, fixedSize ); + + if( fixedSize >= requestedPointSize ) { - // Tell Freetype to use this size - error = FT_Select_Size( ftFace, i ); - if ( FT_Err_Ok != error ) - { - DALI_LOG_ERROR( "FreeType Select_Size error: %d\n", error ); - } - else - { - float fixedWidth = static_cast< float >( ftFace->available_sizes[ i ].width ); - float fixedHeight = static_cast< float >( ftFace->available_sizes[ i ].height ); + actualPointSize = fixedSize; + break; + } + } - // Indicate that the font is a fixed sized bitmap - FontMetrics metrics( fixedHeight, // The ascender in pixels. - 0.0f, - fixedHeight, // The height in pixels. - 0.0f, - 0.0f ); + if( 0u == actualPointSize ) + { + // The requested point size is bigger than the bigest fixed size. + fixedSizeIndex = ftFace->num_fixed_sizes - 1; + actualPointSize = ftFace->available_sizes[fixedSizeIndex].size; + } - mFontCache.push_back( CacheItem( ftFace, path, pointSize, faceIndex, metrics, fixedWidth, fixedHeight ) ); - id = mFontCache.size(); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " size index : %d, actual size : %d\n", fixedSizeIndex, actualPointSize ); - if( cacheDescription ) - { - CacheFontPath( ftFace, id, pointSize, path ); - } - return id; - } - } + // Tell Freetype to use this size + error = FT_Select_Size( ftFace, fixedSizeIndex ); + if ( FT_Err_Ok != error ) + { + DALI_LOG_INFO( gLogFilter, Debug::General, "FreeType Select_Size error: %d\n", error ); } - - // Can't find this size - std::stringstream sizes; - for ( int i = 0; i < ftFace->num_fixed_sizes; ++i ) + else { - if ( i ) - { - sizes << ", "; - } - sizes << ftFace->available_sizes[ i ].size; + float fixedWidth = static_cast< float >( ftFace->available_sizes[ fixedSizeIndex ].width ); + float fixedHeight = static_cast< float >( ftFace->available_sizes[ fixedSizeIndex ].height ); + + // Indicate that the font is a fixed sized bitmap + FontMetrics metrics( fixedHeight, // The ascender in pixels. + 0.0f, + fixedHeight, // The height in pixels. + 0.0f, + 0.0f ); + + mFontCache.push_back( FontFaceCacheItem( ftFace, path, requestedPointSize, faceIndex, metrics, fixedWidth, fixedHeight, hasColorTables ) ); + id = mFontCache.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() ); } else { error = FT_Set_Char_Size( ftFace, 0, - pointSize, + requestedPointSize, mDpiHorizontal, mDpiVertical ); @@ -1229,30 +1578,35 @@ 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 ); - } } else { - DALI_LOG_ERROR( "FreeType Set_Char_Size error: %d for pointSize %d\n", error, pointSize ); + DALI_LOG_INFO( gLogFilter, Debug::General, " FreeType Set_Char_Size error: %d for pointSize %d\n", error, requestedPointSize ); + } + } + + if( 0u != id ) + { + if( cacheDescription ) + { + CacheFontPath( ftFace, id, requestedPointSize, path ); } } } else { - DALI_LOG_ERROR( "FreeType New_Face error: %d for %s\n", error, path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, " FreeType New_Face error: %d for [%s]\n", error, path.c_str() ); } + DALI_LOG_INFO( gLogFilter, Debug::General, " font id : %d\n", id ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::CreateFont\n" ); + 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 +1614,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]; // @note The caller is responsible for deallocating the bitmap data using delete[]. + data.width = srcBitmap.width; + data.height = srcBitmap.rows; + data.format = Pixel::L8; + memcpy( data.buffer, srcBitmap.buffer, bufferSize ); } break; } @@ -1280,26 +1629,42 @@ 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 ); + // Set the input dimensions. + const ImageDimensions inputDimensions( srcBitmap.width, srcBitmap.rows ); + + // Set the output dimensions. + // If the output dimension is not given, the input dimension is set + // and won't be downscaling. + data.width = ( data.width == 0 ) ? srcBitmap.width : data.width; + data.height = ( data.height == 0 ) ? srcBitmap.rows : data.height; + const ImageDimensions desiredDimensions( data.width, data.height ); - PixelBuffer* destBuffer = destBitmap.GetBuffer(); - if( destBuffer ) + // Creates the output buffer + const unsigned int bufferSize = data.width * data.height * 4u; + data.buffer = new unsigned char[bufferSize]; // @note The caller is responsible for deallocating the bitmap data using delete[]. + + if( inputDimensions == desiredDimensions ) { - memcpy( destBuffer, srcBitmap.buffer, srcBitmap.width*srcBitmap.rows*4 ); + // There isn't downscaling. + memcpy( data.buffer, srcBitmap.buffer, bufferSize ); } else { - DALI_LOG_ERROR( "GetBuffer returns null\n" ); + Dali::Internal::Platform::LanczosSample4BPP( srcBitmap.buffer, + inputDimensions, + data.buffer, + desiredDimensions ); } + data.format = Pixel::BGRA8888; } break; } #endif default: { - DALI_LOG_ERROR( "FontClient Unable to create Bitmap of this PixelType\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::ConvertBitmap. FontClient Unable to create Bitmap of this PixelType\n" ); break; } } @@ -1307,34 +1672,52 @@ void FontClient::Plugin::ConvertBitmap( BufferImage& destBitmap, } bool FontClient::Plugin::FindFont( const FontPath& path, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FaceIndex faceIndex, FontId& fontId ) const { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " path : [%s]\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " number of fonts in the cache : %d\n", mFontCache.size() ); + 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 ) { ++fontId; + + DALI_LOG_INFO( gLogFilter, Debug::General, " font found, id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFont\n" ); + return true; } } + DALI_LOG_INFO( gLogFilter, Debug::General, " font not found\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFont\n" ); + return false; } bool FontClient::Plugin::FindValidatedFont( const FontDescription& fontDescription, FontDescriptionId& validatedFontId ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindValidatedFont fontDescription family(%s)\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindValidatedFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " number of validated fonts in the cache : %d\n", mValidatedFontCache.size() ); validatedFontId = 0u; @@ -1353,21 +1736,28 @@ bool FontClient::Plugin::FindValidatedFont( const FontDescription& fontDescripti { validatedFontId = item.index; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindValidatedFont validated font family(%s) font id (%u) \n", fontDescription.family.c_str(), validatedFontId ); - + DALI_LOG_INFO( gLogFilter, Debug::General, " validated font found, id : %d\n", validatedFontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindValidatedFont\n" ); return true; } } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindValidatedFont NOT VALIDATED return false\n" ); - + DALI_LOG_INFO( gLogFilter, Debug::General, " validated font not found\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindValidatedFont\n" ); return false; } bool FontClient::Plugin::FindFallbackFontList( const FontDescription& fontDescription, - FontList*& fontList ) + FontList*& fontList, + CharacterSetList*& characterSetList ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindFallbackFontList fontDescription family(%s)\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindFallbackFontList\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " description; family : [%s]\n", fontDescription.family.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " path : [%s]\n", fontDescription.path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " width : [%s]\n", FontWidth::Name[fontDescription.width] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " weight : [%s]\n", FontWeight::Name[fontDescription.weight] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " slant : [%s]\n\n", FontSlant::Name[fontDescription.slant] ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, " number of fallback font lists in the cache : %d\n", mFallbackCache.size() ); fontList = NULL; @@ -1384,22 +1774,27 @@ bool FontClient::Plugin::FindFallbackFontList( const FontDescription& fontDescri ( fontDescription.slant == item.fontDescription.slant ) ) { fontList = item.fallbackFonts; + characterSetList = item.characterSets; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindFallbackFontList font family(%s) font-list (%p) \n", fontDescription.family.c_str(), fontList ); - + DALI_LOG_INFO( gLogFilter, Debug::General, " fallback font list found.\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFallbackFontList\n" ); return true; } } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "FontClient::Plugin::FindFallbackFontList NOT FOUND return false\n" ); - + DALI_LOG_INFO( gLogFilter, Debug::General, " fallback font list not found.\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFallbackFontList\n" ); return false; } bool FontClient::Plugin::FindFont( FontDescriptionId validatedFontId, - PointSize26Dot6 pointSize, + PointSize26Dot6 requestedPointSize, FontId& fontId ) { + DALI_LOG_INFO( gLogFilter, Debug::General, "-->FontClient::Plugin::FindFont\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, " validatedFontId : %d\n", validatedFontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, " requestedPointSize : %d\n", requestedPointSize ); + fontId = 0u; for( std::vector::const_iterator it = mFontIdCache.begin(), @@ -1410,18 +1805,25 @@ bool FontClient::Plugin::FindFont( FontDescriptionId validatedFontId, const FontIdCacheItem& item = *it; if( ( validatedFontId == item.validatedFontId ) && - ( pointSize == item.pointSize ) ) + ( requestedPointSize == item.requestedPointSize ) ) { fontId = item.fontId; + + DALI_LOG_INFO( gLogFilter, Debug::General, " font found, id : %d\n", fontId ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFont\n" ); return true; } } + DALI_LOG_INFO( gLogFilter, Debug::General, " font not found.\n" ); + DALI_LOG_INFO( gLogFilter, Debug::General, "<--FontClient::Plugin::FindFont\n" ); return false; } bool FontClient::Plugin::IsScalable( const FontPath& path ) { + bool isScalable = false; + FT_Face ftFace; int error = FT_New_Face( mFreeTypeLibrary, path.c_str(), @@ -1429,9 +1831,14 @@ bool FontClient::Plugin::IsScalable( const FontPath& path ) &ftFace ); if( FT_Err_Ok != error ) { - DALI_LOG_ERROR( "FreeType Cannot check font: %s\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::IsScalable. FreeType Cannot check font: %s\n", path.c_str() ); + } + else + { + isScalable = ftFace->face_flags & FT_FACE_FLAG_SCALABLE; } - return ( ftFace->num_fixed_sizes == 0 ); + + return isScalable; } bool FontClient::Plugin::IsScalable( const FontDescription& fontDescription ) @@ -1443,7 +1850,7 @@ bool FontClient::Plugin::IsScalable( const FontDescription& fontDescription ) // match the pattern FcPattern* match = FcFontMatch( NULL /* use default configure */, fontFamilyPattern, &result ); - bool isScalable = true; + bool isScalable = false; if( match ) { @@ -1454,11 +1861,7 @@ bool FontClient::Plugin::IsScalable( const FontDescription& fontDescription ) } else { - DALI_LOG_ERROR( "FreeType Cannot check font: %s %d %d %d\n", - fontDescription.family.c_str(), - fontDescription.width, - fontDescription.weight, - fontDescription.slant ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::IsScalable. FreeType Cannot check font: [%s]\n", fontDescription.family.c_str() ); } FcPatternDestroy( fontFamilyPattern ); FcPatternDestroy( match ); @@ -1477,7 +1880,7 @@ void FontClient::Plugin::GetFixedSizes( const FontPath& path, Vector< PointSize2 &ftFace ); if( FT_Err_Ok != error ) { - DALI_LOG_ERROR( "FreeType Cannot check font: %s\n", path.c_str() ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::GetFixedSizes. FreeType Cannot check font path : [%s]\n", path.c_str() ); } // Fetch the number of fixed sizes available @@ -1510,24 +1913,20 @@ void FontClient::Plugin::GetFixedSizes( const FontDescription& fontDescription, } else { - DALI_LOG_ERROR( "FreeType Cannot check font: %s %d %d %d\n", - fontDescription.family.c_str(), - fontDescription.width, - fontDescription.weight, - fontDescription.slant ); + DALI_LOG_INFO( gLogFilter, Debug::General, "FontClient::Plugin::GetFixedSizes. FreeType Cannot check font: [%s]\n", fontDescription.family.c_str() ); } FcPatternDestroy( match ); 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 ) @@ -1546,8 +1945,22 @@ void FontClient::Plugin::CacheFontPath( FT_Face ftFace, FontId id, PointSize26Do // Set the index to the vector of paths to font file names. validatedFontId = mFontDescriptionCache.size(); + FcPattern* pattern = CreateFontFamilyPattern( description ); + + FcResult result = FcResultMatch; + FcPattern* match = FcFontMatch( NULL, pattern, &result ); + + FcCharSet* characterSet = NULL; + FcPatternGetCharSet( match, FC_CHARSET, 0u, &characterSet ); + + FcPatternDestroy( match ); + FcPatternDestroy( pattern ); + + mFontCache[id-1u].mCharacterSet = characterSet; + // Add the path to the cache. mFontDescriptionCache.push_back( description ); + mCharacterSetCache.PushBack( characterSet ); // Cache the index and the font's description. FontDescriptionCacheItem item( description, @@ -1555,13 +1968,33 @@ 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 ) ); } } +FcCharSet* FontClient::Plugin::CreateCharacterSetFromDescription( const FontDescription& description ) const +{ + FcCharSet* characterSet = NULL; + + FcPattern* pattern = CreateFontFamilyPattern( description ); + + if( NULL != pattern ) + { + FcResult result = FcResultMatch; + FcPattern* match = FcFontMatch( NULL, pattern, &result ); + + FcPatternGetCharSet( match, FC_CHARSET, 0u, &characterSet ); + + FcPatternDestroy( match ); + FcPatternDestroy( pattern ); + } + + return characterSet; +} + } // namespace Internal } // namespace TextAbstraction