Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-25 02:33:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add mutex for freetype2 font engine (MGRM_THREADS) and remove lock/unlock of __mg_gdi_lock in _font_get_glyph_advance

Browse Source
This commit is contained in:
Vincent Wei
2019-01-16 10:06:46 +08:00
parent 9af71438dd
commit 4bd7c0eef4
2 changed files with 93 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/font/freetype2.c
+93 -65
View File
@@ -64,15 +64,29 @@ static int bitmap_nohit = 0;
static int bitmap_hit = 0;
#endif
typedef struct _FT2_DATA{
typedef struct _FT2_DATA {
FTFACEINFO* ft_face_info;
FTINSTANCEINFO* ft_inst_info;
}FT2_DATA;
} FT2_DATA;
#define FT_FACE_INFO_P(devfont) ((FTFACEINFO*)(((FT2_DATA*)(devfont->data))->ft_face_info));
#define FT_INST_INFO_P(devfont) ((FTINSTANCEINFO*)(((FT2_DATA*)(devfont->data))->ft_inst_info));
static FT_Library ft_library = NULL;
#ifdef _MGRM_THREADS
static pthread_mutex_t ft_lock;
# define FT_INIT_LOCK(lock, attr) pthread_mutex_init(lock, attr)
# define FT_LOCK(lock) pthread_mutex_lock(lock)
# define FT_UNLOCK(lock) pthread_mutex_unlock(lock)
# define FT_DESTROY_LOCK(lock) pthread_mutex_destroy(lock)
#else
# define FT_INIT_LOCK(lock, attr)
# define FT_LOCK(lock)
# define FT_UNLOCK(lock)
# define FT_DESTROY_LOCK(lock)
#endif
#ifdef _MGFONT_TTF_CACHE
static FTC_Manager ft_cache_manager = NULL;
static FTC_CMapCache ft_cmap_cache = NULL;
@@ -265,6 +279,8 @@ static int
load_or_search_glyph (FTINSTANCEINFO* ft_inst_info, FT_Face* face,
FT_ULong uni_char, int glyph_type)
{
/* no need to lock/unlock in this function */
#ifndef _MGFONT_TTF_CACHE
FTFACEINFO* ft_face_info = ft_inst_info->ft_face_info;
int ft_load_flags = FT_LOAD_NO_BITMAP | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
@@ -347,11 +363,13 @@ get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,
bbox.xMin = bbox.yMin = 32000;
bbox.xMax = bbox.yMax = -32000;
if(devfont->charset_ops->conv_to_uc32)
if (devfont->charset_ops->conv_to_uc32)
uni_char = (*devfont->charset_ops->conv_to_uc32) (glyph_value);
else
uni_char = glyph_value;
FT_LOCK(&ft_lock);
/* Search cache by unicode !*/
#ifdef _MGFONT_TTF_CACHE
if (ft_inst_info->cache && (ft_inst_info->rotation == 0)) {
@@ -373,6 +391,7 @@ get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,
if (px)
*px += (cache_info->delta.x >> 6);
FT_UNLOCK(&ft_lock);
return (int)(cache_info->bbox.xMax - cache_info->bbox.xMin);
}
DP(("\nBBOX Non - Hit! %d, %d\n", bbox_nohit++, uni_char));
@@ -381,8 +400,8 @@ get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,
if (load_or_search_glyph (ft_inst_info, &face, uni_char,
get_glyph_type(logfont, devfont))) {
_MG_PRINTF ("FONT>FT2: load_or_search_glyph error in freetype2\n");
return 0;
_ERR_PRINTF ("FONT>FT2: load_or_search_glyph error in freetype2\n");
goto error;
}
if (ft_inst_info->use_kerning) {
@@ -420,7 +439,7 @@ get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,
FT_Done_Glyph (ft_inst_info->glyph);
if (bbox.xMin > bbox.xMax) {
return 0;
goto error;
}
#ifdef _MGFONT_TTF_CACHE
@@ -457,7 +476,12 @@ get_glyph_bbox (LOGFONT* logfont, DEVFONT* devfont,
if (px) *px += bbox.xMin;
if (py) *py -= bbox.yMax;
FT_UNLOCK(&ft_lock);
return (int)(bbox.xMax - bbox.xMin);
error:
FT_UNLOCK(&ft_lock);
return 0;
}
#if 0 // VincentWei: Bad implementation
@@ -496,11 +520,12 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
BYTE* buffer = NULL;
FTINSTANCEINFO* ft_inst_info = FT_INST_INFO_P (devfont);
/*because: lock in draw_one_glyph*/
FT_LOCK(&ft_lock);
if (IS_SUBPIXEL(logfont))
FT_Library_SetLcdFilter(ft_library, ft_inst_info->ft_lcdfilter);
if(devfont->charset_ops->conv_to_uc32)
if (devfont->charset_ops->conv_to_uc32)
uni_char = (*devfont->charset_ops->conv_to_uc32) (glyph_value);
else
uni_char = glyph_value;
@@ -518,16 +543,18 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
if (pitch)
*pitch = cacheinfo->pitch;
FT_UNLOCK(&ft_lock);
return cacheinfo->bitmap;
}
DP(("Bitmap Non hit %d, %d\n", bitmap_nohit++, uni_char));
}
#endif
if (load_or_search_glyph (ft_inst_info, &face, uni_char,
get_glyph_type(logfont, devfont))) {
_MG_PRINTF ("FONT>FT2: load_or_search_glyph failed in freetype2\n");
return NULL;
_ERR_PRINTF ("FONT>FT2: load_or_search_glyph failed in freetype2\n");
goto error;
}
/*convert to a bitmap (default render mode + destroy old or not)*/
@@ -536,16 +563,16 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
IS_SUBPIXEL(logfont) && is_grey) {
if (FT_Glyph_To_Bitmap (&(ft_inst_info->glyph),
FT_RENDER_MODE_LCD, NULL, 1)) {
_MG_PRINTF ("FONT>FT2: FT_Glyph_To_Bitmap failed\n");
return NULL;
_ERR_PRINTF ("FONT>FT2: FT_Glyph_To_Bitmap failed\n");
goto error;
}
}
else {
if (FT_Glyph_To_Bitmap (&(ft_inst_info->glyph),
is_grey? FT_RENDER_MODE_NORMAL : FT_RENDER_MODE_MONO,
NULL, 1)) {
_MG_PRINTF ("FONT>FT2: FT_Glyph_To_Bitmap failed\n");
return NULL;
_ERR_PRINTF ("FONT>FT2: FT_Glyph_To_Bitmap failed\n");
goto error;
}
}
}
@@ -557,16 +584,6 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
if (pitch)
*pitch = source->pitch;
#if 0 // VincentWei: Bad implementation
if (!is_grey) {
press_bitmap(source->buffer,
source->width, source->rows, source->pitch);
*pitch = (source->width + 7) >> 3;
}
#else
*pitch = source->pitch;
#endif
#ifdef _MGFONT_TTF_CACHE
if (ft_inst_info->cache && (ft_inst_info->rotation == 0)) {
TTFCACHEINFO * pcache;
@@ -600,7 +617,9 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
memcpy(pcache->bitmap, source->buffer, size);
pcache->flag = TRUE;
}
FT_Done_Glyph (ft_inst_info->glyph);
FT_UNLOCK(&ft_lock);
return pcache->bitmap;
}
}
@@ -610,8 +629,12 @@ char_bitmap_pixmap (LOGFONT* logfont, DEVFONT* devfont,
memcpy(buffer, source->buffer, source->rows * source->pitch);
FT_Done_Glyph (ft_inst_info->glyph);
FT_UNLOCK(&ft_lock);
return buffer;
error:
FT_UNLOCK(&ft_lock);
return NULL;
}
static const void*
@@ -724,21 +747,22 @@ new_instance (LOGFONT* logfont, DEVFONT* devfont, BOOL need_sbc_font)
ft_inst_info->ft_lcdfilter = FT_LCD_FILTER_NONE;
}
FT_LOCK(&ft_lock);
#ifdef _MGFONT_TTF_CACHE
if (FTC_Manager_LookupFace (ft_cache_manager,
(FTC_FaceID)ft_face_info, &face)) {
/* can't access the font file. do not render anything */
_MG_PRINTF ("FONT>FT2: can't access font file %p\n", ft_face_info);
return 0;
goto out_lock;
}
#else
face = ft_face_info->face;
#endif
/* Create instance */
if (FT_New_Size (face, &size))
goto out;
goto out_lock;
if (FT_Activate_Size (size))
goto out_size;
@@ -797,38 +821,17 @@ new_instance (LOGFONT* logfont, DEVFONT* devfont, BOOL need_sbc_font)
if (hCache == 0) {
int nblk, col, blksize, rows = ft_inst_info->height;
#if 0 // VincentWei: use FS_RENDER_MASK instead (3.4.0)
int pitch = 0;
if (((logfont->style & 0x0000000F) == FS_WEIGHT_BOOK)
|| ((logfont->style & 0x0000000F) == FS_WEIGHT_DEMIBOLD)
|| ((logfont->style & 0x0000000FF) == FS_WEIGHT_SUBPIXEL)) {
pitch = 1;
}
if (!pitch) {
col = (ft_inst_info->max_width + 7) >> 3;
} else {
col = (ft_inst_info->max_width + 3) & -4;
}
#else
if ((logfont->style & FS_RENDER_MASK) == FS_RENDER_MONO) {
col = (ft_inst_info->max_width + 7) >> 3;
}
else {
col = (ft_inst_info->max_width + 3) & -4;
}
#endif
blksize = col * rows;
#if 0 // VincentWei: use FS_RENDER_MASK instead (3.4.0)
if ((logfont->style & 0x0000000FF) == FS_WEIGHT_SUBPIXEL)
blksize *= 3;
#else
if ((logfont->style & FS_RENDER_MASK) == FS_RENDER_SUBPIXEL)
blksize *= 3;
#endif
blksize += sizeof(TTFCACHEINFO);
@@ -883,12 +886,17 @@ new_instance (LOGFONT* logfont, DEVFONT* devfont, BOOL need_sbc_font)
}
#endif
FT_UNLOCK(&ft_lock);
return new_devfont;
out_size:
FT_Done_Size (size);
out_lock:
FT_UNLOCK(&ft_lock);
out:
free (ft_data);
free (ft_inst_info);
free (new_devfont);
return NULL;
@@ -900,9 +908,13 @@ delete_instance (DEVFONT* devfont)
FTINSTANCEINFO* ft_inst_info = FT_INST_INFO_P (devfont);
#ifdef _MGFONT_TTF_CACHE
FT_LOCK(&ft_lock);
if (ft_inst_info->cache) {
__mg_ttc_release(ft_inst_info->cache);
}
FT_UNLOCK(&ft_lock);
#endif
free (ft_inst_info);
@@ -916,31 +928,38 @@ static BOOL is_glyph_existed (LOGFONT* logfont, DEVFONT* devfont, Glyph32 glyph_
FT_UInt uni_char;
FTINSTANCEINFO* ft_inst_info = FT_INST_INFO_P (devfont);
if(devfont->charset_ops->conv_to_uc32)
if (devfont->charset_ops->conv_to_uc32)
uni_char = (*devfont->charset_ops->conv_to_uc32) (glyph_value);
else
uni_char = glyph_value;
FT_LOCK(&ft_lock);
#ifndef _MGFONT_TTF_CACHE
face = ft_inst_info->ft_face_info->face;
if(0 == FT_Get_Char_Index (face, uni_char))
return FALSE;
else
if (0 == FT_Get_Char_Index (face, uni_char))
goto error;
else {
FT_UNLOCK(&ft_lock);
return TRUE;
}
#else
if (get_cached_face (ft_inst_info, &face)) {
_MG_PRINTF ("FONT>FT2: can't access cached face %p\n", ft_inst_info->ft_face_info);
return FALSE;
goto error;
}
if(0 == FTC_CMapCache_Lookup (ft_cmap_cache,
(FTC_FaceID) (ft_inst_info->image_type.face_id),
ft_inst_info->ft_face_info->cmap_index,
uni_char))
return FALSE;
else
return TRUE;
if (0 == FTC_CMapCache_Lookup (ft_cmap_cache,
(FTC_FaceID) (ft_inst_info->image_type.face_id),
ft_inst_info->ft_face_info->cmap_index, uni_char)) {
goto error;
}
#endif
error:
FT_UNLOCK(&ft_lock);
return FALSE;
}
static int is_rotatable (LOGFONT* logfont, DEVFONT* devfont, int rot_desired)
@@ -958,6 +977,8 @@ static void* load_font_data (const char* font_name, const char *file_name)
FTFACEINFO* ft_face_info = (FTFACEINFO*) calloc (1, sizeof(FTFACEINFO));
FT2_DATA* ft_data = (FT2_DATA*) calloc(1, sizeof(FTFACEINFO));
FT_LOCK(&ft_lock);
#ifdef _MGFONT_TTF_CACHE
strcpy (ft_face_info->filepathname, file_name);
ft_face_info->face_index = 0;
@@ -1008,9 +1029,11 @@ static void* load_font_data (const char* font_name, const char *file_name)
ft_data->ft_face_info = ft_face_info;
FT_UNLOCK(&ft_lock);
return ft_data;
error:
FT_UNLOCK(&ft_lock);
free (ft_data);
free (ft_face_info);
return NULL;
@@ -1027,10 +1050,9 @@ static void unload_font_data (void* data)
free (ft_data);
}
static void
ShowErr (const char* message , int error)
static void ShowErr (const char* message , int error)
{
_MG_PRINTF ("FONT>FT2: %s\n error = 0x%04x\n", message, error );
_ERR_PRINTF ("FONT>FT2: %s\n error = 0x%04x\n", message, error );
}
@@ -1054,6 +1076,8 @@ BOOL font_InitFreetypeLibrary (void)
goto error_library;
}
FT_INIT_LOCK(&ft_lock, NULL);
/* Init freetype2 cache manager */
#ifdef _MGFONT_TTF_CACHE
error = FTC_Manager_New (ft_library, 0, 0, 0,
@@ -1092,12 +1116,14 @@ BOOL font_InitFreetypeLibrary (void)
error_ftc_manager:
FTC_Manager_Done (ft_cache_manager);
#endif
return TRUE;
error_library:
_ERR_PRINTF ("FONT>FT2: Could not initialise FreeType 2 library\n");
FT_Done_FreeType (ft_library);
FT_DESTROY_LOCK(&ft_lock);
FT_Done_FreeType (ft_library);
return FALSE;
}
@@ -1113,6 +1139,8 @@ void font_TermFreetypeLibrary (void)
if (ft_library)
FT_Done_FreeType (ft_library);
FT_DESTROY_LOCK(&ft_lock);
}
src/newgdi/glyph.c
-29
View File
@@ -2325,21 +2325,6 @@ void _gdi_get_baseline_point (PDC pdc, int* x, int* y)
}
}
#ifdef _MGRM_THREADS
static inline BOOL _gdi_glyph_if_need_lock(DEVFONT* devfont)
{
BOOL lock = FALSE;
#ifdef _MGFONT_FT2
lock |= ft2IsFreeTypeDevfont(devfont);
#endif
#ifdef _MGFONT_TTF
lock |= ftIsFreeTypeDevfont(devfont);
#endif
return lock;
}
#endif
int _font_get_glyph_advance (LOGFONT* logfont, DEVFONT* devfont,
Glyph32 glyph_value, BOOL direction, int ch_extra,
int x, int y, int* adv_x, int* adv_y, BBOX* bbox)
@@ -2354,22 +2339,12 @@ int _font_get_glyph_advance (LOGFONT* logfont, DEVFONT* devfont,
int advance = 0;
int glyph_bmptype;
#ifdef _MGRM_THREADS
BOOL lock = _gdi_glyph_if_need_lock(devfont);
#endif
glyph_bmptype = devfont->font_ops->get_glyph_type (logfont, devfont)
& DEVFONTGLYPHTYPE_MASK_BMPTYPE;
bbox_x = x;
bbox_y = y;
/* houhh 20091225, noneed to lock for MiniGUI-Process, All App MainWindow
* is run only in one thread and no desktop thread).*/
#ifdef _MGRM_THREADS
if (lock) LOCK (&__mg_gdilock);
#endif
/* in freetype get_glyph_bbox loads glyph, so we must get_glyph_bbox
* before get_glyph_advance, get_glyph_monobitmap....
*/
@@ -2395,10 +2370,6 @@ int _font_get_glyph_advance (LOGFONT* logfont, DEVFONT* devfont,
adv_len = devfont->font_ops->get_glyph_advance (logfont, devfont,
REAL_GLYPH(glyph_value), &tmp_x, &tmp_y);
#ifdef _MGRM_THREADS
if (lock) UNLOCK (&__mg_gdilock);
#endif
if (!direction) {
if (bbox) bbox->x -= (bold + ch_extra + adv_len);
}