summaryrefslogtreecommitdiff
path: root/src/lib/evas/include/evas_private.h
diff options
context:
space:
mode:
authorsubhransu mohanty <sub.mohanty@samsung.com>2017-11-07 11:22:09 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-07 11:34:53 +0900
commitb038d7df25f9cecaa4f0d8c1c7355e4852e5348a (patch)
tree595da7d0114056e147d4a40fedc72d5b71b3927a /src/lib/evas/include/evas_private.h
parenta75b3dcdfbe0760972c8b4d55a90dc6250bd1e45 (diff)
Remove evas internal dependency from the evas_font module
Summary: dev branch : devs/subhransu/font The Final goal is to move the evas_font module to ector so that both ector and evas can reuse the code. make the api simple so that sam eapi can be used by evas_textblock and ector text. This is the 1st stage to achive that gola, first remove the evas internal dependancy as much as possible before moving to ector library. Reviewers: jpeg, raster, herdsman, cedric, id213sin Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D5419
Diffstat (limited to '')
-rw-r--r--src/lib/evas/include/evas_private.h129
1 files changed, 2 insertions, 127 deletions
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index ebc14a44c9..7ec4095692 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -14,12 +14,10 @@
14 14
15#include "../file/evas_module.h" 15#include "../file/evas_module.h"
16#include "../file/evas_path.h" 16#include "../file/evas_path.h"
17#include "../common/evas_text_utils.h"
18#include "../common/language/evas_bidi_utils.h"
19#include "../common/language/evas_language_utils.h"
20 17
21#include "evas_3d_utils.h" 18#include "evas_3d_utils.h"
22 19
20
23#ifdef EAPI 21#ifdef EAPI
24# undef EAPI 22# undef EAPI
25#endif 23#endif
@@ -66,10 +64,6 @@ typedef struct _Evas_Aspect Evas_Aspect;
66typedef struct _Evas_Border Evas_Border; 64typedef struct _Evas_Border Evas_Border;
67typedef struct _Evas_Double_Pair Evas_Double_Pair; 65typedef struct _Evas_Double_Pair Evas_Double_Pair;
68typedef struct _Evas_Size_Hints Evas_Size_Hints; 66typedef struct _Evas_Size_Hints Evas_Size_Hints;
69typedef struct _Evas_Font_Dir Evas_Font_Dir;
70typedef struct _Evas_Font Evas_Font;
71typedef struct _Evas_Font_Alias Evas_Font_Alias;
72typedef struct _Evas_Font_Description Evas_Font_Description;
73typedef struct _Evas_Data_Node Evas_Data_Node; 67typedef struct _Evas_Data_Node Evas_Data_Node;
74typedef struct _Evas_Func Evas_Func; 68typedef struct _Evas_Func Evas_Func;
75typedef struct _Evas_Image_Save_Func Evas_Image_Save_Func; 69typedef struct _Evas_Image_Save_Func Evas_Image_Save_Func;
@@ -505,64 +499,6 @@ struct _Evas_Canvas3D_Pick_Data
505 Evas_Real s, t; 499 Evas_Real s, t;
506}; 500};
507 501
508enum _Evas_Font_Style
509{
510 EVAS_FONT_STYLE_SLANT,
511 EVAS_FONT_STYLE_WEIGHT,
512 EVAS_FONT_STYLE_WIDTH
513};
514
515enum _Evas_Font_Slant
516{
517 EVAS_FONT_SLANT_NORMAL,
518 EVAS_FONT_SLANT_OBLIQUE,
519 EVAS_FONT_SLANT_ITALIC
520};
521
522enum _Evas_Font_Weight
523{
524 EVAS_FONT_WEIGHT_NORMAL,
525 EVAS_FONT_WEIGHT_THIN,
526 EVAS_FONT_WEIGHT_ULTRALIGHT,
527 EVAS_FONT_WEIGHT_EXTRALIGHT,
528 EVAS_FONT_WEIGHT_LIGHT,
529 EVAS_FONT_WEIGHT_BOOK,
530 EVAS_FONT_WEIGHT_MEDIUM,
531 EVAS_FONT_WEIGHT_SEMIBOLD,
532 EVAS_FONT_WEIGHT_BOLD,
533 EVAS_FONT_WEIGHT_ULTRABOLD,
534 EVAS_FONT_WEIGHT_EXTRABOLD,
535 EVAS_FONT_WEIGHT_BLACK,
536 EVAS_FONT_WEIGHT_EXTRABLACK
537};
538
539enum _Evas_Font_Width
540{
541 EVAS_FONT_WIDTH_NORMAL,
542 EVAS_FONT_WIDTH_ULTRACONDENSED,
543 EVAS_FONT_WIDTH_EXTRACONDENSED,
544 EVAS_FONT_WIDTH_CONDENSED,
545 EVAS_FONT_WIDTH_SEMICONDENSED,
546 EVAS_FONT_WIDTH_SEMIEXPANDED,
547 EVAS_FONT_WIDTH_EXPANDED,
548 EVAS_FONT_WIDTH_EXTRAEXPANDED,
549 EVAS_FONT_WIDTH_ULTRAEXPANDED
550};
551
552enum _Evas_Font_Spacing
553{
554 EVAS_FONT_SPACING_PROPORTIONAL,
555 EVAS_FONT_SPACING_DUAL,
556 EVAS_FONT_SPACING_MONO,
557 EVAS_FONT_SPACING_CHARCELL
558};
559
560typedef enum _Evas_Font_Style Evas_Font_Style;
561typedef enum _Evas_Font_Slant Evas_Font_Slant;
562typedef enum _Evas_Font_Weight Evas_Font_Weight;
563typedef enum _Evas_Font_Width Evas_Font_Width;
564typedef enum _Evas_Font_Spacing Evas_Font_Spacing;
565
566/* General types - used for script type chceking */ 502/* General types - used for script type chceking */
567#define OPAQUE_TYPE(type) struct __##type { int a; }; \ 503#define OPAQUE_TYPE(type) struct __##type { int a; }; \
568 typedef struct __##type type 504 typedef struct __##type type
@@ -1281,50 +1217,6 @@ struct _Evas_Data_Node
1281 void *data; 1217 void *data;
1282}; 1218};
1283 1219
1284struct _Evas_Font_Dir
1285{
1286 Eina_Hash *lookup;
1287 Eina_List *fonts;
1288 Eina_List *aliases;
1289 DATA64 dir_mod_time;
1290 DATA64 fonts_dir_mod_time;
1291 DATA64 fonts_alias_mod_time;
1292};
1293
1294struct _Evas_Font
1295{
1296 struct {
1297 const char *prop[14];
1298 } x;
1299 struct {
1300 const char *name;
1301 } simple;
1302 const char *path;
1303 char type;
1304};
1305
1306struct _Evas_Font_Alias
1307{
1308 const char *alias;
1309 Evas_Font *fn;
1310};
1311
1312struct _Evas_Font_Description
1313{
1314 int ref;
1315 Eina_Stringshare *name;
1316 Eina_Stringshare *fallbacks;
1317 Eina_Stringshare *lang;
1318 Eina_Stringshare *style;
1319
1320 Evas_Font_Slant slant;
1321 Evas_Font_Weight weight;
1322 Evas_Font_Width width;
1323 Evas_Font_Spacing spacing;
1324
1325 Eina_Bool is_new : 1;
1326};
1327
1328struct _Efl_Canvas_Output 1220struct _Efl_Canvas_Output
1329{ 1221{
1330 Eo *canvas; 1222 Eo *canvas;
@@ -1703,7 +1595,7 @@ void evas_debug_generic(const char *str);
1703const char *evas_debug_magic_string_get(DATA32 magic); 1595const char *evas_debug_magic_string_get(DATA32 magic);
1704void evas_render_update_del(Evas_Public_Data *e, int x, int y, int w, int h); 1596void evas_render_update_del(Evas_Public_Data *e, int x, int y, int w, int h);
1705void evas_render_object_render_cache_free(Evas_Object *eo_obj, void *data); 1597void evas_render_object_render_cache_free(Evas_Object *eo_obj, void *data);
1706 1598
1707void evas_object_smart_use(Evas_Smart *s); 1599void evas_object_smart_use(Evas_Smart *s);
1708void evas_object_smart_unuse(Evas_Smart *s); 1600void evas_object_smart_unuse(Evas_Smart *s);
1709void evas_smart_cb_descriptions_fix(Evas_Smart_Cb_Description_Array *a) EINA_ARG_NONNULL(1); 1601void evas_smart_cb_descriptions_fix(Evas_Smart_Cb_Description_Array *a) EINA_ARG_NONNULL(1);
@@ -1764,23 +1656,6 @@ void evas_object_inform_call_image_resize(Evas_Object *obj);
1764void evas_object_intercept_cleanup(Evas_Object *obj); 1656void evas_object_intercept_cleanup(Evas_Object *obj);
1765void evas_object_grabs_cleanup(Evas_Object *obj, Evas_Object_Protected_Data *pd); 1657void evas_object_grabs_cleanup(Evas_Object *obj, Evas_Object_Protected_Data *pd);
1766void evas_key_grab_free(Evas_Object *obj, Evas_Object_Protected_Data *pd, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers); 1658void evas_key_grab_free(Evas_Object *obj, Evas_Object_Protected_Data *pd, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers);
1767void evas_font_dir_cache_free(void);
1768const char *evas_font_dir_cache_find(char *dir, char *font);
1769Eina_List *evas_font_dir_available_list(const Evas* evas);
1770void evas_font_dir_available_list_free(Eina_List *available);
1771void evas_font_free(Evas *evas, void *font);
1772void evas_fonts_zero_free(Evas *evas);
1773void evas_fonts_zero_pressure(Evas *evas);
1774void evas_font_name_parse(Evas_Font_Description *fdesc, const char *name);
1775int evas_font_style_find(const char *start, const char *end, Evas_Font_Style style);
1776Evas_Font_Description *evas_font_desc_new(void);
1777Evas_Font_Description *evas_font_desc_dup(const Evas_Font_Description *fdesc);
1778void evas_font_desc_unref(Evas_Font_Description *fdesc);
1779int evas_font_desc_cmp(const Evas_Font_Description *a, const Evas_Font_Description *b);
1780Evas_Font_Description *evas_font_desc_ref(Evas_Font_Description *fdesc);
1781const char *evas_font_lang_normalize(const char *lang);
1782void * evas_font_load(Evas *evas, Evas_Font_Description *fdesc, const char *source, Evas_Font_Size size, Efl_Text_Font_Bitmap_Scalable bitmap_scalable);
1783void evas_font_load_hinting_set(Evas *evas, void *font, int hinting);
1784void evas_object_smart_member_cache_invalidate(Evas_Object *obj, Eina_Bool pass_events, Eina_Bool freeze_events, Eina_Bool sourve_invisible); 1659void evas_object_smart_member_cache_invalidate(Evas_Object *obj, Eina_Bool pass_events, Eina_Bool freeze_events, Eina_Bool sourve_invisible);
1785void evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int *b); 1660void evas_text_style_pad_get(Evas_Text_Style_Type style, int *l, int *r, int *t, int *b);
1786void _evas_object_text_rehint(Evas_Object *obj); 1661void _evas_object_text_rehint(Evas_Object *obj);