forked from enlightenment/efl
efl/font: Dispatch font load request once sent to server
Patch by: Paulo Alcantara <pcacjr@profusion.mobi> SVN revision: 82482
This commit is contained in:
parent
c6f907a9f4
commit
cf46337e17
|
@ -347,8 +347,12 @@ evas_common_font_int_memory_load(const char *source, const char *name, int size,
|
||||||
evas_common_font_int_load_complete(fi);
|
evas_common_font_int_load_complete(fi);
|
||||||
#ifdef EVAS_CSERVE2
|
#ifdef EVAS_CSERVE2
|
||||||
if (evas_cserve2_use_get())
|
if (evas_cserve2_use_get())
|
||||||
fi->cs2_handler = evas_cserve2_font_load(source, name, size, font_dpi,
|
{
|
||||||
wanted_rend);
|
fi->cs2_handler = evas_cserve2_font_load(source, name, size, font_dpi,
|
||||||
|
wanted_rend);
|
||||||
|
if (fi->cs2_handler)
|
||||||
|
evas_cserve2_font_load_wait((Font_Entry *)fi->cs2_handler);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
free(fake_name);
|
free(fake_name);
|
||||||
return fi;
|
return fi;
|
||||||
|
@ -379,8 +383,12 @@ evas_common_font_int_load(const char *name, int size,
|
||||||
fi = evas_common_font_int_load_init(fi);
|
fi = evas_common_font_int_load_init(fi);
|
||||||
#ifdef EVAS_CSERVE2
|
#ifdef EVAS_CSERVE2
|
||||||
if (evas_cserve2_use_get())
|
if (evas_cserve2_use_get())
|
||||||
fi->cs2_handler = evas_cserve2_font_load(NULL, name, size, font_dpi,
|
{
|
||||||
wanted_rend);
|
fi->cs2_handler = evas_cserve2_font_load(NULL, name, size, font_dpi,
|
||||||
|
wanted_rend);
|
||||||
|
if (fi->cs2_handler)
|
||||||
|
evas_cserve2_font_load_wait((Font_Entry *)fi->cs2_handler);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
// evas_common_font_int_load_complete(fi);
|
// evas_common_font_int_load_complete(fi);
|
||||||
return fi;
|
return fi;
|
||||||
|
|
|
@ -993,8 +993,8 @@ evas_cserve2_font_load(const char *source, const char *name, int size, int dpi,
|
||||||
return fe;
|
return fe;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
int
|
||||||
_font_load_wait(Font_Entry *fe)
|
evas_cserve2_font_load_wait(Font_Entry *fe)
|
||||||
{
|
{
|
||||||
_server_dispatch_until(fe->rid);
|
_server_dispatch_until(fe->rid);
|
||||||
|
|
||||||
|
@ -1010,7 +1010,7 @@ evas_cserve2_font_free(Font_Entry *fe)
|
||||||
|
|
||||||
if (!fe) return;
|
if (!fe) return;
|
||||||
|
|
||||||
ret = _font_load_wait(fe);
|
ret = evas_cserve2_font_load_wait(fe);
|
||||||
if (ret == CSERVE2_GENERIC)
|
if (ret == CSERVE2_GENERIC)
|
||||||
{
|
{
|
||||||
ERR("Failed to wait loading font '%s'.", fe->name);
|
ERR("Failed to wait loading font '%s'.", fe->name);
|
||||||
|
|
|
@ -35,6 +35,7 @@ void evas_cserve2_dispatch(void);
|
||||||
void *evas_cserve2_image_data_get(Image_Entry *ie);
|
void *evas_cserve2_image_data_get(Image_Entry *ie);
|
||||||
|
|
||||||
Font_Entry *evas_cserve2_font_load(const char *source, const char *name, int size, int dpi, Font_Rend_Flags wanted_rend);
|
Font_Entry *evas_cserve2_font_load(const char *source, const char *name, int size, int dpi, Font_Rend_Flags wanted_rend);
|
||||||
|
EAPI int evas_cserve2_font_load_wait(Font_Entry *fe);
|
||||||
void evas_cserve2_font_free(Font_Entry *fe);
|
void evas_cserve2_font_free(Font_Entry *fe);
|
||||||
Eina_Bool evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints);
|
Eina_Bool evas_cserve2_font_glyph_request(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints);
|
||||||
Eina_Bool evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints);
|
Eina_Bool evas_cserve2_font_glyph_used(Font_Entry *fe, unsigned int idx, Font_Hint_Flags hints);
|
||||||
|
|
Loading…
Reference in New Issue