[EGIT] [website/www-content] master 01/01: Wiki page allnewsdata changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=cce6e78ae24267f45d9f2f2c2b529f6e63af1690 commit cce6e78ae24267f45d9f2f2c2b529f6e63af1690 Author: RasterDate: Tue Feb 16 01:07:49 2016 -0800 Wiki page allnewsdata changed with summary [] by Raster --- pages/news/allnewsdata.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pages/news/allnewsdata.txt b/pages/news/allnewsdata.txt index df3ce40..5f4ff5d 100644 --- a/pages/news/allnewsdata.txt +++ b/pages/news/allnewsdata.txt @@ -1,4 +1,7 @@ ~~Title: News~~ + +{{page>start-shortcuts}} + News ~~NOCACHE~~ {{anss>allnews}} --
[EGIT] [website/www-content] master 01/01: Wiki page allnewsdata changed with summary [] by Raster
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=b947eed79f73647866d94f323db5a7997fcbd7a8 commit b947eed79f73647866d94f323db5a7997fcbd7a8 Author: RasterDate: Tue Feb 16 01:08:12 2016 -0800 Wiki page allnewsdata changed with summary [] by Raster --- pages/news/allnewsdata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/news/allnewsdata.txt b/pages/news/allnewsdata.txt index 5f4ff5d..dfa4b6a 100644 --- a/pages/news/allnewsdata.txt +++ b/pages/news/allnewsdata.txt @@ -1,6 +1,6 @@ ~~Title: News~~ -{{page>start-shortcuts}} +{{page>:start-shortcuts}} News ~~NOCACHE~~ --
[EGIT] [core/efl] master 05/06: Ecore con base: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=de2d28230918e6a3bd3172cb31f62a9210094da8 commit de2d28230918e6a3bd3172cb31f62a9210094da8 Author: Tom HacohenDate: Tue Feb 16 10:02:10 2016 + Ecore con base: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/ecore_con/Ecore_Con.h | 52 - src/lib/ecore_con/ecore_con_base.eo | 29 ++ src/lib/ecore_con/efl_network_server.eo | 2 +- 3 files changed, 30 insertions(+), 53 deletions(-) diff --git a/src/lib/ecore_con/Ecore_Con.h b/src/lib/ecore_con/Ecore_Con.h index 09363f7..8eea8f9 100644 --- a/src/lib/ecore_con/Ecore_Con.h +++ b/src/lib/ecore_con/Ecore_Con.h @@ -263,58 +263,6 @@ typedef void (*Ecore_Con_Dns_Cb)(const char *canonname, int addrlen, void *data); -/** - * @typedef Ecore_Con_Type - * @enum _Ecore_Con_Type - * Types for an ecore_con client/server object. A correct way to set this type is - * with an ECORE_CON_$TYPE, optionally OR'ed with an ECORE_CON_$USE if encryption is desired, - * and LOAD_CERT if the previously loaded certificate should be used. - * @code - * ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT - * @endcode - * @ingroup Ecore_Con_Server_Group - */ -typedef enum _Ecore_Con_Type -{ - /** Socket in ~/.ecore */ - ECORE_CON_LOCAL_USER = 0, - /** Socket in /tmp */ - ECORE_CON_LOCAL_SYSTEM = 1, - /** Abstract socket */ - ECORE_CON_LOCAL_ABSTRACT = 2, - /** Remote server using TCP */ - ECORE_CON_REMOTE_TCP = 3, - /** Remote multicast server */ - ECORE_CON_REMOTE_MCAST = 4, - /** Remote server using UDP */ - ECORE_CON_REMOTE_UDP = 5, - /** Remote broadcast using UDP */ - ECORE_CON_REMOTE_BROADCAST = 6, - /** Remote connection sending packets immediately */ - ECORE_CON_REMOTE_NODELAY = 7, - /** Remote connection sending data in large chunks -* @note Only available on Linux -* @since 1.2 -*/ - ECORE_CON_REMOTE_CORK = 8, - /** Use SSL2: UNSUPPORTED. **/ - ECORE_CON_USE_SSL2 = (1 << 4), - /** Use SSL3: UNSUPPORTED. **/ - ECORE_CON_USE_SSL3 = (1 << 5), - /** Use TLS */ - ECORE_CON_USE_TLS = (1 << 6), - /** Use both TLS and SSL3 */ - ECORE_CON_USE_MIXED = ECORE_CON_USE_SSL3 | ECORE_CON_USE_TLS, - /** Attempt to use the loaded certificate */ - ECORE_CON_LOAD_CERT = (1 << 7), - /** Disable all types of proxy on the server -* @note Only functional for clients -* @since 1.2 -*/ - ECORE_CON_NO_PROXY = (1 << 8), - ECORE_CON_SOCKET_ACTIVATE = (1 << 9) -} Ecore_Con_Type; - /** @} */ #ifndef EFL_NOLEGACY_API_SUPPORT diff --git a/src/lib/ecore_con/ecore_con_base.eo b/src/lib/ecore_con/ecore_con_base.eo index ab8049b..bec25ee 100644 --- a/src/lib/ecore_con/ecore_con_base.eo +++ b/src/lib/ecore_con/ecore_con_base.eo @@ -1,5 +1,34 @@ type Ecore_Con_Dns_Cb: __undefined_type; +enum Ecore.Con.Type +{ + [[Types for an ecore_con client/server object. A correct way to set this type is + with an ECORE_CON_$TYPE, optionally OR'ed with an ECORE_CON_$USE if encryption is desired, + and LOAD_CERT if the previously loaded certificate should be used.]] + legacy: ecore_con; + + local_user = 0, [[Socket in "~/.ecore"]] + local_system = 1, [[Socket in /tmp]] + local_abstract = 2, [[Abstract socket]] + remote_tcp = 3, [[Remote server using TCP]] + remote_mcast = 4, [[Remote multicast server]] + remote_udp = 5, [[Remote server using UDP]] + remote_broadcasT = 6, [[Remote broadcast using UDP]] + remote_nodelay = 7, [[Remote connection sending packets immediately]] + remote_cork = 8, [[Remote connection sending data in large chunks + Note: Only available on Linux + @since 1.2]] + use_ssl2 = (1 << 4), [[Use SSL2: UNSUPPORTED.]] + use_ssl3 = (1 << 5), [[Use SSL3: UNSUPPORTED.]] + use_tls = (1 << 6), [[Use TLS]] + use_mixed = Ecore.Con.Type.use_tls | Ecore.Con.Type.use_ssl3, [[Use both TLS and SSL3]] + load_cert = (1 << 7), [[Attempt to use the loaded certificate]] + no_proxy = (1 << 8), [[Disable all types of proxy on the server + Note: Only functional for clients + @since 1.2]] + socket_activate = (1 << 9) +} + abstract Ecore.Con.Base (Eo.Base) { legacy_prefix: ecore_con; eo_prefix: ecore_con_obj; diff --git a/src/lib/ecore_con/efl_network_server.eo b/src/lib/ecore_con/efl_network_server.eo index 38794c3..910ca6b 100644 --- a/src/lib/ecore_con/efl_network_server.eo +++ b/src/lib/ecore_con/efl_network_server.eo @@ -69,7 +69,7 @@ class Efl.Network.Server (Ecore.Con.Base) { legacy: null; } values { -conn_type: Ecore_Con_Type; +conn_type: Ecore.Con.Type; } } } --
[EGIT] [core/efl] master 04/06: Evas ector buffer: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9c44e1c2dd419ba70ebd4acbbb52b6558925c588 commit 9c44e1c2dd419ba70ebd4acbbb52b6558925c588 Author: Tom HacohenDate: Tue Feb 16 09:48:22 2016 + Evas ector buffer: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/evas/include/evas_ector_buffer.eo | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/include/evas_ector_buffer.eo b/src/lib/evas/include/evas_ector_buffer.eo index cb94215..cbf8c8b 100644 --- a/src/lib/evas/include/evas_ector_buffer.eo +++ b/src/lib/evas/include/evas_ector_buffer.eo @@ -1,5 +1,7 @@ /* Note: only for internal C API */ +import evas_canvas; + interface Evas.Ector.Buffer { legacy_prefix: null; @@ -8,7 +10,7 @@ interface Evas.Ector.Buffer get {} set { [[This Buffer will hold a reference to the evas image struct.]] } values { -evas: Evas *; [[The current Evas.]] +evas: Evas.Canvas *; [[The current Evas.]] image: void *; [[The engine-specific image struct.]] } } --
[EGIT] [core/efl] master 01/06: Efl vg: Use correct types in eolian file.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7293d234e55e518fcc9162f5c7720e73e2b79238 commit 7293d234e55e518fcc9162f5c7720e73e2b79238 Author: Tom HacohenDate: Tue Feb 16 09:35:22 2016 + Efl vg: Use correct types in eolian file. --- src/lib/evas/canvas/efl_vg_base.eo | 2 +- src/lib/evas/canvas/efl_vg_shape.eo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/canvas/efl_vg_base.eo b/src/lib/evas/canvas/efl_vg_base.eo index f97e9ab..66ca5e4 100644 --- a/src/lib/evas/canvas/efl_vg_base.eo +++ b/src/lib/evas/canvas/efl_vg_base.eo @@ -68,7 +68,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack) get { } values { -m: Efl_VG *; +m: Efl.VG.Base *; } } /* quality { diff --git a/src/lib/evas/canvas/efl_vg_shape.eo b/src/lib/evas/canvas/efl_vg_shape.eo index 337c807..10abbff 100644 --- a/src/lib/evas/canvas/efl_vg_shape.eo +++ b/src/lib/evas/canvas/efl_vg_shape.eo @@ -8,7 +8,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape) get { } values { - f: Efl_VG *; + f: Efl.VG.Base *; } } @property stroke_fill { @@ -17,7 +17,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape) get { } values { - f: Efl_VG *; + f: Efl.VG.Base *; } } @property stroke_marker { @@ -26,7 +26,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape) get { } values { - m: Efl_VG *; + m: Efl.VG.Base *; } } } --
[EGIT] [core/efl] master 03/06: Evas vg: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d9d3acc45a70da555761c8ba3d5598302c9f11c4 commit d9d3acc45a70da555761c8ba3d5598302c9f11c4 Author: Tom HacohenDate: Tue Feb 16 09:45:47 2016 + Evas vg: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/evas/canvas/evas_vg.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo index 6438fe3..fb9f7b9 100644 --- a/src/lib/evas/canvas/evas_vg.eo +++ b/src/lib/evas/canvas/evas_vg.eo @@ -14,7 +14,7 @@ class Evas.VG (Evas.Object, Efl.Gfx.Fill, Efl.Gfx.View) @since 1.14]] } values { -container: Efl_VG *; [[Root node of the VG canvas.]] +container: Eo.Base *; [[Root node of the VG canvas.]] /* FIXME: Should be Efl.VG.Base */ } } } --
[EGIT] [core/efl] master 06/06: Evas out: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0fa24ee17501c632225cfe7c979f9f005b194d20 commit 0fa24ee17501c632225cfe7c979f9f005b194d20 Author: Tom HacohenDate: Tue Feb 16 10:06:46 2016 + Evas out: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/evas/canvas/evas_out.eo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo index 18a7b7a..731da8a 100644 --- a/src/lib/evas/canvas/evas_out.eo +++ b/src/lib/evas/canvas/evas_out.eo @@ -32,7 +32,7 @@ class Evas.Out (Eo.Base) [[Gets the engine specific output parameters for a given output.]] } values { -info: Evas_Engine_Info *; [[The engine parameters.]] +info: Evas.Engine_Info *; [[The engine parameters.]] } } } --
[EGIT] [core/efl] master 02/06: Edje cc: Fix shadow warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d9b5ce01921c07bcf71731427b2ea683e27f867a commit d9b5ce01921c07bcf71731427b2ea683e27f867a Author: Tom HacohenDate: Tue Feb 16 09:38:36 2016 + Edje cc: Fix shadow warnings. --- src/bin/edje/edje_cc_out.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 45eeb93..40b9ef6 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -4159,7 +4159,7 @@ color_tree_root_free(void) } char * -color_tree_token_next(char *dst, char *src, int *line) +color_tree_token_next(char *dst, char *src, int *ln) { Eina_Bool begin = EINA_FALSE, next = EINA_FALSE; @@ -4179,7 +4179,7 @@ color_tree_token_next(char *dst, char *src, int *line) } else if ((!begin) && (*src == '\n')) { - (*line)++; + (*ln)++; } else if (begin) { @@ -4208,7 +4208,7 @@ color_tree_parent_node_get(const char *color_class) } void -process_color_tree(char *s, const char *file_in, int line) +process_color_tree(char *s, const char *f_in, int ln) { char token[2][1024]; int id = 0; @@ -4223,13 +4223,13 @@ process_color_tree(char *s, const char *file_in, int line) do { -s = color_tree_token_next(token[id], s, ); +s = color_tree_token_next(token[id], s, ); if (!strcmp(token[id], "{")) { if (!token[!id][0]) error_and_abort(NULL, "parse error %s:%i. color class is not set to newly opened node block.", - file_in, line - 1); + f_in, ln - 1); ctn = mem_alloc(SZ(Edje_Color_Tree_Node)); ctn->name = strdup(token[!id]); @@ -4258,12 +4258,12 @@ process_color_tree(char *s, const char *file_in, int line) if (!strcmp(name, token[id])) { error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the root node.", - file_in, line -1, token[id]); + f_in, ln -1, token[id]); } if ((ctn = color_tree_parent_node_get(token[id]))) error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the \"%s\" node.", -file_in, line -1, token[id], ctn->name); +f_in, ln -1, token[id], ctn->name); ctn = eina_array_data_get(array, eina_array_count(array) - 1); ctn->color_classes = eina_list_append(ctn->color_classes, strdup(token[id])); @@ -4272,7 +4272,7 @@ process_color_tree(char *s, const char *file_in, int line) { if ((ctn = color_tree_parent_node_get(token[id]))) error_and_abort(NULL, "parse error %s:%i. The color class \"%s\" already belongs to the \"%s\" node.", -file_in, line -1, token[id], ctn->name); +f_in, ln -1, token[id], ctn->name); color_tree_root = eina_list_append(color_tree_root, strdup(token[id])); } @@ -4283,7 +4283,7 @@ process_color_tree(char *s, const char *file_in, int line) } while (*s); if (eina_array_count(array)) - error_and_abort(NULL, "parse error %s:%i. check pair of parens.", file_in, line - 1); + error_and_abort(NULL, "parse error %s:%i. check pair of parens.", f_in, ln - 1); eina_array_clean(array); eina_array_free(array); --
[EGIT] [tools/enventor] master 01/01: text_setting: remove redundant code.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d84e1b11b60fb55730a4e76a5521d5c0bdeeb45c commit d84e1b11b60fb55730a4e76a5521d5c0bdeeb45c Author: Hermet ParkDate: Tue Feb 16 21:46:51 2016 +0900 text_setting: remove redundant code. That code is totally useless at the moment. I belive color palette will be introduced in enventor soon. --- src/bin/text_setting.c | 118 + 1 file changed, 2 insertions(+), 116 deletions(-) diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index e4fb384..886a37b 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -190,42 +190,6 @@ text_setting_syntax_color_update(Evas_Object *ctxpopup, } static void -color_btn_up_cb(void *data, Evas_Object *obj EINA_UNUSED, -void *event_info EINA_UNUSED) -{ - Evas_Object *layout = data; - Evas_Object *slider = elm_object_part_content_get(layout, - "elm.swallow.slider"); - Evas_Object *entry = elm_object_part_content_get(layout, -"elm.swallow.entry"); - double value = elm_slider_value_get(slider); - char buf[128]; - - value += 1; - - snprintf(buf, sizeof(buf), "%1.0f", value); - elm_object_text_set(entry, buf); -} - -static void -color_btn_down_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) -{ - Evas_Object *layout = data; - Evas_Object *slider = elm_object_part_content_get(layout, - "elm.swallow.slider"); - Evas_Object *entry = elm_object_part_content_get(layout, -"elm.swallow.entry"); - double value = elm_slider_value_get(slider); - char buf[128]; - - value -= 1; - - snprintf(buf, sizeof(buf), "%1.0f", value); - elm_object_text_set(entry, buf); -} - -static void color_ctxpopup_dismiss_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { @@ -252,16 +216,9 @@ color_ctxpopup_del_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, } static void -color_slider_changed_cb(void *data, Evas_Object *obj, +color_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { - Evas_Object *entry = data; - double val = elm_slider_value_get(obj); - char buf[128]; - - snprintf(buf, sizeof(buf), "%1.0f", val); - elm_object_text_set(entry, buf); - Evas_Object *ctxpopup = evas_object_data_get(obj, "ctxpopup"); color_keyword *selected_color_keyword; selected_color_keyword = evas_object_data_get(ctxpopup, "color_keyword"); @@ -270,30 +227,6 @@ color_slider_changed_cb(void *data, Evas_Object *obj, syntax_template_apply(); } -static void -color_entry_changed_cb(void *data, Evas_Object *obj, - void *event_info EINA_UNUSED) -{ - Evas_Object *slider = data; - double text_val, val, min_val, max_val; - char buf[128]; - - text_val = atof(elm_object_text_get(obj)); - elm_slider_min_max_get(slider, _val, _val); - - if (text_val < min_val) val = min_val; - else if (text_val > max_val) val = max_val; - else val = text_val; - - if (val != text_val) - { -snprintf(buf, sizeof(buf), "%1.0f", val); -elm_object_text_set(obj, buf); - } - else - elm_slider_value_set(slider, val); -} - static Evas_Object * color_slider_layout_create(Evas_Object *parent, Evas_Object *ctxpopup, const char *type, double slider_val) @@ -322,55 +255,8 @@ color_slider_layout_create(Evas_Object *parent, Evas_Object *ctxpopup, elm_object_part_text_set(layout, "elm.text.slider_min", slider_min); elm_object_part_text_set(layout, "elm.text.slider_max", slider_max); elm_object_part_content_set(layout, "elm.swallow.slider", slider); - - //Entry - char buf[128]; - Evas_Object *entry = elm_entry_add(layout); - elm_entry_context_menu_disabled_set(entry, EINA_TRUE); - elm_entry_single_line_set(entry, EINA_TRUE); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - snprintf(buf, sizeof(buf), "%1.0f", slider_val); - elm_object_text_set(entry, buf); - elm_object_part_content_set(layout, "elm.swallow.entry", entry); - - Elm_Entry_Filter_Accept_Set digits_filter_data; - Elm_Entry_Filter_Limit_Size limit_filter_data; - digits_filter_data.accepted = "0123456789"; - digits_filter_data.rejected = NULL; - limit_filter_data.max_char_count = 4; - elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set, - _filter_data); - elm_entry_markup_filter_append(entry, elm_entry_filter_limit_size, - _filter_data); - evas_object_smart_callback_add(slider, "changed",
[EGIT] [tools/enventor] master 01/01: setting: fix broken view scale entries.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d388f581e55aab7c385b401d6c384fbf4c63e681 commit d388f581e55aab7c385b401d6c384fbf4c63e681 Author: Hermet ParkDate: Tue Feb 16 21:58:58 2016 +0900 setting: fix broken view scale entries. this seems caused by elementary change, 92d905ffa0e9c5b2f5b01885856349a010b49ee4 --- src/bin/setting.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/setting.c b/src/bin/setting.c index 10fa9ac..416d4d1 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -354,8 +354,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent) //Entry (View Width) Evas_Object *entry_view_size_w = entry_create(box2); - evas_object_size_hint_weight_set(entry_view_size_w, 0.15, 0); - evas_object_size_hint_align_set(entry_view_size_w, 1.0, 0); + evas_object_size_hint_weight_set(entry_view_size_w, 0.15, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(entry_view_size_w, EVAS_HINT_FILL, EVAS_HINT_FILL); digits_filter_data.accepted = "0123456789"; digits_filter_data.rejected = NULL; @@ -377,8 +377,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent) //Entry (View Height) Evas_Object *entry_view_size_h = entry_create(box2); - evas_object_size_hint_weight_set(entry_view_size_h, 0.15, 0); - evas_object_size_hint_align_set(entry_view_size_h, 1.0, 0); + evas_object_size_hint_weight_set(entry_view_size_h, 0.15, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(entry_view_size_h, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_markup_filter_append(entry_view_size_h, elm_entry_filter_accept_set, --
[EGIT] [core/efl] master 01/01: Efl tests: Major test rework
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=475b43f4a96e2a6ff9f44e8d2812c7ce9a374e83 commit 475b43f4a96e2a6ff9f44e8d2812c7ce9a374e83 Merge: 0fa24ee 936801e Author: Tom HacohenDate: Tue Feb 16 13:09:10 2016 + Efl tests: Major test rework This is a merge commit of a branch by vtorri to rework all the test infrastructure. Closes D3654 src/Makefile_Ecore_Cxx.am |3 +- src/Makefile_Eet.am| 11 +- src/Makefile_Eet_Cxx.am|3 +- src/Makefile_Eeze.am |8 +- src/Makefile_Eina.am |1 + src/Makefile_Eina_Cxx.am |3 +- src/Makefile_Eldbus_Cxx.am |3 +- src/Makefile_Emile.am |5 +- src/Makefile_Eolian_Cxx.am |3 +- src/tests/ecore/ecore_suite.c | 92 +- src/tests/ecore/ecore_test_animator.c |3 +- src/tests/ecore/ecore_test_ecore_audio.c |6 +- src/tests/ecore/ecore_test_ecore_file.c|4 +- .../ecore_test_ecore_thread_eina_thread_queue.c|7 +- src/tests/ecore/ecore_test_ecore_x.c |4 +- src/tests/ecore_con/ecore_con_suite.c | 92 +- src/tests/ecore_con/ecore_con_test_ecore_con.c |5 +- src/tests/ecore_con/ecore_con_test_ecore_con_eet.c |4 +- src/tests/ecore_con/ecore_con_test_ecore_con_url.c |9 +- src/tests/ecore_cxx/ecore_cxx_suite.cc | 103 +- src/tests/ecore_cxx/ecore_cxx_suite.h | 11 + src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc| 11 +- src/tests/ector/ector_suite.c | 84 +- src/tests/ector/ector_test_init.c |4 +- src/tests/edje/edje_suite.c| 94 +- src/tests/edje/edje_test_edje.c|2 +- src/tests/eet/eet_data_suite.c | 73 - src/tests/eet/eet_suite.c | 2907 +--- src/tests/eet/eet_suite.h | 12 +- src/tests/eet/eet_test_cache.c | 105 + src/tests/eet/eet_test_cipher.c| 72 + src/tests/eet/eet_test_common.c| 649 + src/tests/eet/eet_test_common.h| 139 + src/tests/eet/eet_test_connection.c| 150 + src/tests/eet/eet_test_data.c | 764 + src/tests/eet/eet_test_file.c | 427 +++ src/tests/eet/eet_test_identity.c | 248 ++ src/tests/eet/eet_test_image.c | 502 src/tests/eet/eet_test_init.c | 24 + src/tests/eet_cxx/eet_cxx_suite.cc | 102 +- src/tests/eet_cxx/eet_cxx_suite.h | 11 + src/tests/eet_cxx/eet_cxx_test_descriptors.cc | 16 +- src/tests/eeze/eeze_suite.c| 685 + src/tests/eeze/eeze_suite.h| 11 + src/tests/eeze/eeze_test_init.c| 24 + src/tests/eeze/eeze_test_net.c | 116 + src/tests/eeze/eeze_test_sensor.c | 280 ++ src/tests/eeze/eeze_test_udev.c| 254 ++ src/tests/efl_check.h | 117 + src/tests/efreet/ef_cache.c|5 +- src/tests/efreet/ef_data_dirs.c| 10 +- src/tests/efreet/ef_desktop.c |9 +- src/tests/efreet/ef_icon_theme.c |7 +- src/tests/efreet/ef_ini.c |9 +- src/tests/efreet/ef_locale.c |9 +- src/tests/efreet/ef_menu.c |7 +- src/tests/efreet/ef_mime.c |9 +- src/tests/efreet/ef_test.h |2 - src/tests/efreet/ef_utils.c|7 +- src/tests/efreet/efreet_async_test.c |5 +- src/tests/efreet/efreet_icon_cache_dump.c |7 +- src/tests/efreet/efreet_spec_test.c|5 +- src/tests/efreet/efreet_suite.c| 97 +- src/tests/efreet/efreet_test_efreet.c |2 - src/tests/efreet/efreet_test_efreet_cache.c|2 - src/tests/efreet/efreet_user_dir.c |2 - src/tests/efreet/main.c| 18 +- src/tests/eina/eina_suite.c| 96 +- src/tests/eina/eina_test_accessor.c|3 +- src/tests/eina/eina_test_array.c |3 +- src/tests/eina/eina_test_barrier.c |3 +- src/tests/eina/eina_test_bezier.c |5 +- src/tests/eina/eina_test_binbuf.c |3 +-
[EGIT] [core/efl] master 01/02: Ecore eolian: Ignore callback prototypes for now.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d114926b6661dc10c2e9b2d35ccdcaad62e6df04 commit d114926b6661dc10c2e9b2d35ccdcaad62e6df04 Author: Tom HacohenDate: Tue Feb 16 13:55:20 2016 + Ecore eolian: Ignore callback prototypes for now. We don't plan on handling function pointers in Eolian. Fixing these is work for the future, in the meanwhile, we should just work around these. --- src/lib/ecore/ecore_animator.eo | 3 +++ src/lib/ecore/ecore_idle_enterer.eo | 2 ++ src/lib/ecore/ecore_idle_exiter.eo | 2 ++ src/lib/ecore/ecore_idler.eo| 2 ++ src/lib/ecore/ecore_job.eo | 2 ++ src/lib/ecore/ecore_mainloop.eo | 2 ++ src/lib/ecore/ecore_poller.eo | 2 ++ src/lib/ecore/ecore_timer.eo| 2 ++ 8 files changed, 17 insertions(+) diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo index eb0e183..35edede 100644 --- a/src/lib/ecore/ecore_animator.eo +++ b/src/lib/ecore/ecore_animator.eo @@ -1,3 +1,6 @@ +type @extern Ecore_Timeline_Cb: __undefined_type; +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Animator (Eo.Base) { eo_prefix: ecore_animator; diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo index 4f975ed..aef93a4 100644 --- a/src/lib/ecore/ecore_idle_enterer.eo +++ b/src/lib/ecore/ecore_idle_enterer.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Idle.Enterer (Eo.Base) { eo_prefix: ecore_idle_enterer; diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo index 8e79177..33982ac 100644 --- a/src/lib/ecore/ecore_idle_exiter.eo +++ b/src/lib/ecore/ecore_idle_exiter.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Idle.Exiter (Eo.Base) { eo_prefix: ecore_idle_exiter; diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo index 56ae811..948189b 100644 --- a/src/lib/ecore/ecore_idler.eo +++ b/src/lib/ecore/ecore_idler.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Idler (Eo.Base) { eo_prefix: ecore_idler; diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo index e9c4cd8..0c232f6 100644 --- a/src/lib/ecore/ecore_job.eo +++ b/src/lib/ecore/ecore_job.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Cb: __undefined_type; + class Ecore.Job (Eo.Base) { eo_prefix: ecore_job; diff --git a/src/lib/ecore/ecore_mainloop.eo b/src/lib/ecore/ecore_mainloop.eo index 5568f7c..37eeaee 100644 --- a/src/lib/ecore/ecore_mainloop.eo +++ b/src/lib/ecore/ecore_mainloop.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Select_Function: __undefined_type; + class Ecore_Mainloop (Eo.Base) { legacy_prefix: null; diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo index 92fb30f..4dad584 100644 --- a/src/lib/ecore/ecore_poller.eo +++ b/src/lib/ecore/ecore_poller.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Poller (Eo.Base) { methods { diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo index b1cfee1..da89b86 100644 --- a/src/lib/ecore/ecore_timer.eo +++ b/src/lib/ecore/ecore_timer.eo @@ -1,3 +1,5 @@ +type @extern Ecore_Task_Cb: __undefined_type; + class Ecore.Timer (Eo.Base) { [[Timers are objects that will call a given callback at some point --
[EGIT] [core/efl] master 02/02: Ecore poller: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2bddf709c7433a69a9d861545780c75ffe4b4e21 commit 2bddf709c7433a69a9d861545780c75ffe4b4e21 Author: Tom HacohenDate: Tue Feb 16 14:00:46 2016 + Ecore poller: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/ecore/Ecore_Common.h | 37 - src/lib/ecore/Ecore_Legacy.h | 4 ++-- src/lib/ecore/ecore_poller.eo | 9 - 3 files changed, 10 insertions(+), 40 deletions(-) diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h index 8e704ca..fe2c5c9 100644 --- a/src/lib/ecore/Ecore_Common.h +++ b/src/lib/ecore/Ecore_Common.h @@ -2588,43 +2588,6 @@ EAPI double ecore_throttle_get(void); */ /** - * @enum _Ecore_Poller_Type - * Defines the frequency of ticks for the poller. - */ -enum _Ecore_Poller_Type/* Poller types */ -{ - ECORE_POLLER_CORE = 0 /**< The core poller interval */ -}; -typedef enum _Ecore_Poller_Type Ecore_Poller_Type; - -/* - * @since 1.8 - */ - -typedef EoEcore_Poller; /**< A handle for pollers */ - -#define _ECORE_POLLER_EO_CLASS_TYPE - -/** - * @brief Sets the time(in seconds) between ticks for the given poller type. - * @param type The poller type to adjust. - * @param poll_time The time(in seconds) between ticks of the timer. - * - * This will adjust the time between ticks of the given timer type defined by - * @p type to the time period defined by @p poll_time. - */ -EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time); - -/** - * @brief Gets the time(in seconds) between ticks for the given poller type. - * @param type The poller type to query. - * @return The time in seconds between ticks of the poller timer. - * - * This will get the time between ticks of the specified poller timer. - */ -EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type); - -/** * @} */ diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h index b457b97..90d5248 100644 --- a/src/lib/ecore/Ecore_Legacy.h +++ b/src/lib/ecore/Ecore_Legacy.h @@ -8,6 +8,8 @@ extern "C" { * @{ */ +#include "ecore_poller.eo.legacy.h" + /** * @brief Creates a poller to call the given function at a particular tick interval. * @param type The ticker type to attach the poller to. Must be ECORE_POLLER_CORE. @@ -46,8 +48,6 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_ */ EAPI void *ecore_poller_del(Ecore_Poller *poller); -#include "ecore_poller.eo.legacy.h" - /** * @} */ diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo index 4dad584..0c647bb 100644 --- a/src/lib/ecore/ecore_poller.eo +++ b/src/lib/ecore/ecore_poller.eo @@ -1,5 +1,12 @@ type @extern Ecore_Task_Cb: __undefined_type; +enum Ecore.Poller_Type +{ + [[Defines the frequency of ticks for the poller.]] + legacy: ecore_poller; + core = 0 [[The core poller interval]] +} + class Ecore.Poller (Eo.Base) { methods { @@ -7,7 +14,7 @@ class Ecore.Poller (Eo.Base) [[Constructor with parameters for Ecore Poller.]] legacy: null; params { -@in type: Ecore_Poller_Type; +@in type: Ecore.Poller_Type; @in interval: int; @in func: Ecore_Task_Cb; @in data: const(void)*; --
[EGIT] [core/efl] master 01/01: Eio model: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4e285d6a323f0c894feb3965f7781fa6c48a90a4 commit 4e285d6a323f0c894feb3965f7781fa6c48a90a4 Author: Tom HacohenDate: Tue Feb 16 14:05:50 2016 + Eio model: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/eio/eio_model.eo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/eio/eio_model.eo b/src/lib/eio/eio_model.eo index 47323a1..6332a8a 100644 --- a/src/lib/eio/eio_model.eo +++ b/src/lib/eio/eio_model.eo @@ -1,3 +1,5 @@ +type @extern Eio_Filter_Direct_Cb: __undefined_type; + class Eio.Model (Eo.Base, Efl.Model.Base) { legacy_prefix: null; --
[EGIT] [core/efl] master 01/03: Efl gfx spread: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2e7cab107df11e1d0a0299251f232c9fc41748aa commit 2e7cab107df11e1d0a0299251f232c9fc41748aa Author: Tom HacohenDate: Tue Feb 16 14:15:41 2016 + Efl gfx spread: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/efl/interfaces/efl_gfx_fill.eo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo b/src/lib/efl/interfaces/efl_gfx_fill.eo index 51078bb..0ea3be9 100644 --- a/src/lib/efl/interfaces/efl_gfx_fill.eo +++ b/src/lib/efl/interfaces/efl_gfx_fill.eo @@ -1,4 +1,4 @@ -enum Efl.Gfx.Fill.Spread { +enum Efl.Gfx.Fill_Spread { [[Type defining how an image content gets filled. @since 1.14 ]] @@ -24,7 +24,7 @@ interface Efl.Gfx.Fill { fill.]] } values { -spread: Efl_Gfx_Fill_Spread; [[The current spread mode of the image object. +spread: Efl.Gfx.Fill_Spread; [[The current spread mode of the image object. One of $EFL_GFX_FILL_REFLECT, $EFL_GFX_FILL_REPEAT]] } } --
[EGIT] [core/efl] master 02/03: Efl gfx gradient: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c0ba02e0abde641ad07be032f9a0733ff03d51a0 commit c0ba02e0abde641ad07be032f9a0733ff03d51a0 Author: Tom HacohenDate: Tue Feb 16 14:20:15 2016 + Efl gfx gradient: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/efl/interfaces/efl_gfx_gradient_base.eo | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo index a530397..36df101 100644 --- a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo +++ b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo @@ -1,3 +1,5 @@ +import efl_gfx_types; + interface Efl.Gfx.Gradient.Base { eo_prefix: efl_gfx_gradient; @@ -11,7 +13,7 @@ interface Efl.Gfx.Gradient.Base [[Get the list of color stops.]] } values { -colors: const(Efl_Gfx_Gradient_Stop) *; [[color stops list]] +colors: const(Efl.Gfx.Gradient.Stop) *; [[color stops list]] length: uint; [[length of the list]] } } @@ -25,7 +27,7 @@ interface Efl.Gfx.Gradient.Base ]] } values { -s: Efl_Gfx_Gradient_Spread; [[spread type to be used]] +s: Efl.Gfx.Gradient.Spread; [[spread type to be used]] } } } --
[EGIT] [core/efl] master 03/03: Efl gfx shape: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fab9bd38c86618be9b9c3bd9cfe271bb41c06880 commit fab9bd38c86618be9b9c3bd9cfe271bb41c06880 Author: Tom HacohenDate: Tue Feb 16 14:25:15 2016 + Efl gfx shape: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/efl/interfaces/efl_gfx_shape.eo | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo b/src/lib/efl/interfaces/efl_gfx_shape.eo index f70571e..cd5ea68 100644 --- a/src/lib/efl/interfaces/efl_gfx_shape.eo +++ b/src/lib/efl/interfaces/efl_gfx_shape.eo @@ -1,4 +1,5 @@ import eina_types; +import efl_gfx_types; mixin Efl.Gfx.Shape { @@ -78,7 +79,7 @@ mixin Efl.Gfx.Shape [[Not Implemented]] } values { -dash: const(Efl_Gfx_Dash) *; +dash: const(Efl.Gfx.Dash) *; length: uint; } } @@ -100,7 +101,7 @@ mixin Efl.Gfx.Shape ]] } values { -c: Efl_Gfx_Cap; [[cap style to use, default is EFL_GFX_CAP_BUTT]] +c: Efl.Gfx.Cap; [[cap style to use, default is EFL_GFX_CAP_BUTT]] } } @property stroke_join { @@ -122,7 +123,7 @@ mixin Efl.Gfx.Shape ]] } values { -j: Efl_Gfx_Join; [[join style to use, default is EFL_GFX_JOIN_MITER]] +j: Efl.Gfx.Join; [[join style to use, default is EFL_GFX_JOIN_MITER]] } } @property fill_rule { @@ -140,7 +141,7 @@ mixin Efl.Gfx.Shape ]] } values { -fill_rule: Efl_Gfx_Fill_Rule; [[The current fill rule of the shape object. +fill_rule: Efl.Gfx.Fill.Rule; [[The current fill rule of the shape object. One of $EFL_GFX_FILL_RULE_WINDING, $EFL_GFX_FILL_RULE_ODD_EVEN]] } } @@ -161,7 +162,7 @@ mixin Efl.Gfx.Shape ]] } values { -op: const(Efl_Gfx_Path_Command) *; [[command list]] +op: const(Efl.Gfx.Path.Command_Type) *; [[command list]] points: const(double) *; [[point list]] } } --
[EGIT] [core/efl] master 02/02: Ector renderer generic: Fix Eolian warnings.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cbca4e3c12bc439440052f1aadb8c01e5431c940 commit cbca4e3c12bc439440052f1aadb8c01e5431c940 Author: Tom HacohenDate: Tue Feb 16 14:39:30 2016 + Ector renderer generic: Fix Eolian warnings. This includes either migrating types to eolian, fixing namespace or importing extra types. --- src/lib/ector/Ector.h | 11 --- src/lib/ector/ector_renderer_generic_base.eo | 13 +++-- src/lib/ector/ector_renderer_generic_shape.eo | 8 +--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/ector/Ector.h b/src/lib/ector/Ector.h index 82d22bf..66ebc85 100644 --- a/src/lib/ector/Ector.h +++ b/src/lib/ector/Ector.h @@ -114,17 +114,6 @@ typedef Eo Ector_Renderer; /* typedef Evas_Colorspace Ector_Colorspace; */ /** - * Quality values - */ -typedef enum _Ector_Quality -{ - ECTOR_QUALITY_BEST, /**< Best quality */ - ECTOR_QUALITY_GOOD, /**< Good quality */ - ECTOR_QUALITY_FAST, /**< Lower quality, fastest */ - ECTOR_QUALITY_LAST -} Ector_Quality; - -/** * Priorities */ typedef enum _Ector_Priority diff --git a/src/lib/ector/ector_renderer_generic_base.eo b/src/lib/ector/ector_renderer_generic_base.eo index a9b91cb..28659a1 100644 --- a/src/lib/ector/ector_renderer_generic_base.eo +++ b/src/lib/ector/ector_renderer_generic_base.eo @@ -1,5 +1,14 @@ import eina_types; +enum Ector.Quality +{ + [[Quality values]] + best, [[Best quality]] + good, [[Good quality]] + fast, [[Lower quality]] + last, [[Sentinel]] +} + abstract Ector.Renderer.Generic.Base (Eo.Base) { eo_prefix: ector_renderer; @@ -80,7 +89,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base) get { } values { - r: Ector_Renderer *; + r: Ector.Renderer.Generic.Base *; } } @property quality { @@ -89,7 +98,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base) get { } values { - q: Ector_Quality; + q: Ector.Quality; } } @property crc { diff --git a/src/lib/ector/ector_renderer_generic_shape.eo b/src/lib/ector/ector_renderer_generic_shape.eo index 37d27b7..4362a88 100644 --- a/src/lib/ector/ector_renderer_generic_shape.eo +++ b/src/lib/ector/ector_renderer_generic_shape.eo @@ -1,3 +1,5 @@ +import ector_renderer_generic_base; + mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape) { eo_prefix: ector_renderer_shape; @@ -9,7 +11,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape) get { } values { - r: const(Ector_Renderer) *; + r: const(Ector.Renderer.Generic.Base) *; } } @property stroke_fill { @@ -18,7 +20,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape) get { } values { - r: const(Ector_Renderer) *; + r: const(Ector.Renderer.Generic.Base) *; } } @property stroke_marker { @@ -27,7 +29,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape) get { } values { - r: const(Ector_Renderer) *; + r: const(Ector.Renderer.Generic.Base) *; } } } --
[EGIT] [core/efl] master 01/01: Ecore poller: Fix tests.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=0ef330a363eaefd2545d5ecbae1309655d2f1869 commit 0ef330a363eaefd2545d5ecbae1309655d2f1869 Author: Tom HacohenDate: Tue Feb 16 15:43:46 2016 + Ecore poller: Fix tests. Very confusing, we have: poller_poller_interval_set and poller_poll_interval_set. Thanks to herdsman for reporting. --- src/lib/ecore/Ecore_Legacy.h | 19 +++ 1 file changed, 19 insertions(+) diff --git a/src/lib/ecore/Ecore_Legacy.h b/src/lib/ecore/Ecore_Legacy.h index 90d5248..ab9df2d 100644 --- a/src/lib/ecore/Ecore_Legacy.h +++ b/src/lib/ecore/Ecore_Legacy.h @@ -49,6 +49,25 @@ EAPI Ecore_Poller *ecore_poller_add(Ecore_Poller_Type type, int interval, Ecore_ EAPI void *ecore_poller_del(Ecore_Poller *poller); /** + * @brief Sets the time(in seconds) between ticks for the given poller type. + * @param type The poller type to adjust. + * @param poll_time The time(in seconds) between ticks of the timer. + * + * This will adjust the time between ticks of the given timer type defined by + * @p type to the time period defined by @p poll_time. + */ +EAPI void ecore_poller_poll_interval_set(Ecore_Poller_Type type, double poll_time); + +/** + * @brief Gets the time(in seconds) between ticks for the given poller type. + * @param type The poller type to query. + * @return The time in seconds between ticks of the poller timer. + * + * This will get the time between ticks of the specified poller timer. + */ +EAPI double ecore_poller_poll_interval_get(Ecore_Poller_Type type); + +/** * @} */ --
[EGIT] [core/efl] master 01/01: Evas Text: Update text layout when ellipsis is changed without resize
herdsman pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=471c7635eed67509a24fc6dcc04de65622568f4c commit 471c7635eed67509a24fc6dcc04de65622568f4c Author: Youngbok ShinDate: Tue Feb 16 17:14:38 2016 +0200 Evas Text: Update text layout when ellipsis is changed without resize Summary: When only ellipsis is changed from 0.0~1.0 to -1.0 without resize, the text is never updated. Because, previous state for ellipsis is never kept and used properly to check when Evas Text needs to be updated. It does not have any effect when ellipsis is changed from -1.0 to 0.0~1.0. Because, Evas text always resize itself according to its text size. So, necessarily, Evas text object has to be resized to the smaller size. Commonly, Edje will handle its size if Evas text needs to be ellipsized. @fix Test Plan: Test case is included. Reviewers: tasn, woohyun, herdsman Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3448 --- src/lib/evas/canvas/evas_object_text.c | 7 --- src/tests/evas/evas_test_text.c| 30 ++ 2 files changed, 34 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c index 91fcfa1..d6d3ee5 100644 --- a/src/lib/evas/canvas/evas_object_text.c +++ b/src/lib/evas/canvas/evas_object_text.c @@ -995,6 +995,7 @@ _evas_text_ellipsis_set(Eo *eo_obj, Evas_Text_Data *o, double ellipsis) if (o->cur.ellipsis == ellipsis) return; evas_object_async_block(obj); + o->prev.ellipsis = o->cur.ellipsis; o->cur.ellipsis = ellipsis; o->changed = 1; if (o->has_filter) @@ -1596,7 +1597,7 @@ evas_object_text_init(Evas_Object *eo_obj) Evas_Text_Data *o = obj->private_data; /* alloc obj private data */ - o->cur.ellipsis = -1.0; + o->prev.ellipsis = o->cur.ellipsis = -1.0; o->prev = o->cur; #ifdef BIDI_SUPPORT o->bidi_par_props = evas_bidi_paragraph_props_new(); @@ -2019,10 +2020,10 @@ evas_object_text_render_pre(Evas_Object *eo_obj, #endif /* If object size changed and ellipsis is set */ - if (((o->cur.ellipsis >= 0.0 || - o->cur.ellipsis != o->prev.ellipsis) && + if (((o->cur.ellipsis >= 0.0) && ((obj->cur->geometry.w != o->last_computed.w) || (obj->cur->geometry.h != o->last_computed.h))) || + (o->cur.ellipsis != o->prev.ellipsis) || (obj->cur->scale != obj->prev->scale) || (o->changed_paragraph_direction)) { diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c index 746fbee..a7c3242 100644 --- a/src/tests/evas/evas_test_text.c +++ b/src/tests/evas/evas_test_text.c @@ -6,6 +6,7 @@ #include #include +#include #include "evas_suite.h" #include "evas_tests_helpers.h" @@ -624,6 +625,34 @@ START_TEST(evas_text_bidi) END_TEST #endif +START_TEST(evas_text_render) +{ + Ecore_Evas *ee = ecore_evas_buffer_new(500, 500); + Evas *evas = ecore_evas_get(ee); + Evas_Object *to; + const char *font = TEST_FONT_NAME; + Evas_Font_Size size = 14; + int w; + + evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); + to = evas_object_text_add(evas); + evas_object_text_font_source_set(to, TEST_FONT_SOURCE); + evas_object_show(to); + + /* Check the changing ellipsis is updated properly. */ + evas_object_text_font_set(to, font, size); + evas_object_text_text_set(to, "Dynamically changing ellipsis!"); + evas_object_text_ellipsis_set(to, 0.0); + evas_object_resize(to, 50, 100); + w = evas_object_text_horiz_advance_get(to); + evas_object_text_ellipsis_set(to, -1.0); + evas_render(evas); + ck_assert_int_gt(evas_object_text_horiz_advance_get(to), w); + + ecore_evas_free(ee); +} +END_TEST + void evas_test_text(TCase *tc) { tcase_add_test(tc, evas_text_simple); @@ -637,4 +666,5 @@ void evas_test_text(TCase *tc) #endif tcase_add_test(tc, evas_text_unrelated); + tcase_add_test(tc, evas_text_render); } --
[EGIT] [core/enlightenment] master 01/01: e/quickaccess: Make "Skip window list" a quickaccess behavior option too.
glima pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=92eb0572e2eb94c95369ee81a0a98195e15afbb2 commit 92eb0572e2eb94c95369ee81a0a98195e15afbb2 Author: Gustavo Lima ChavesDate: Thu Feb 4 00:35:42 2016 -0200 e/quickaccess: Make "Skip window list" a quickaccess behavior option too. --- src/modules/quickaccess/e_mod_config.c | 9 + src/modules/quickaccess/e_mod_main.h| 1 + src/modules/quickaccess/e_mod_quickaccess.c | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/modules/quickaccess/e_mod_config.c b/src/modules/quickaccess/e_mod_config.c index 3898bbb..57d5e30 100644 --- a/src/modules/quickaccess/e_mod_config.c +++ b/src/modules/quickaccess/e_mod_config.c @@ -19,6 +19,7 @@ struct _E_Config_Dialog_Data int autohide; int hide_when_behind; + int skip_window_list; int skip_taskbar; int skip_pager; @@ -77,6 +78,7 @@ _fill_data(E_Config_Dialog_Data *cfdata) cfdata->autohide = qa_config->autohide; cfdata->hide_when_behind = qa_config->hide_when_behind; + cfdata->skip_window_list = qa_config->skip_window_list; cfdata->skip_taskbar = qa_config->skip_taskbar; cfdata->skip_pager = qa_config->skip_pager; @@ -142,6 +144,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd CHECK(autohide); CHECK(skip_pager); CHECK(skip_taskbar); + CHECK(skip_window_list); CHECK(hide_when_behind); #undef CHECK @@ -335,6 +338,9 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia ob = e_widget_check_add(evas, _("Hide If Focus Lost"), >autohide); e_widget_list_object_append(ol, ob, 1, 0, 0.5); + ob = e_widget_check_add(evas, _("Skip Window List"), >skip_window_list); + e_widget_list_object_append(ol, ob, 1, 0, 0.5); + ob = e_widget_check_add(evas, _("Skip Taskbar"), >skip_taskbar); e_widget_list_object_append(ol, ob, 1, 0, 0.5); @@ -395,6 +401,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdat #define SET(X) qa_config->X = cfdata->X SET(autohide); SET(hide_when_behind); + SET(skip_window_list); SET(skip_taskbar); SET(skip_pager); e_qa_entries_update(); @@ -466,6 +473,7 @@ e_qa_config_dd_new(void) E_CONFIG_LIST(D, T, transient_entries, entry_edd); E_CONFIG_VAL(D, T, autohide, UCHAR); E_CONFIG_VAL(D, T, hide_when_behind, UCHAR); + E_CONFIG_VAL(D, T, skip_window_list, UCHAR); E_CONFIG_VAL(D, T, skip_taskbar, UCHAR); E_CONFIG_VAL(D, T, skip_pager, UCHAR); E_CONFIG_VAL(D, T, dont_bug_me, UCHAR); @@ -496,6 +504,7 @@ e_qa_config_new(void) Config *conf; conf = E_NEW(Config, 1); + conf->skip_window_list = 1; conf->skip_taskbar = 1; conf->skip_pager = 1; return conf; diff --git a/src/modules/quickaccess/e_mod_main.h b/src/modules/quickaccess/e_mod_main.h index a35a499..c4ffcce 100644 --- a/src/modules/quickaccess/e_mod_main.h +++ b/src/modules/quickaccess/e_mod_main.h @@ -46,6 +46,7 @@ typedef struct Config Eina_Bool autohide; Eina_Bool hide_when_behind; + Eina_Bool skip_window_list; Eina_Bool skip_taskbar; Eina_Bool skip_pager; Eina_Bool dont_bug_me; diff --git a/src/modules/quickaccess/e_mod_quickaccess.c b/src/modules/quickaccess/e_mod_quickaccess.c index 0004aaa..ba5b1f1 100644 --- a/src/modules/quickaccess/e_mod_quickaccess.c +++ b/src/modules/quickaccess/e_mod_quickaccess.c @@ -245,7 +245,8 @@ _e_qa_entry_border_props_apply(E_Quick_Access_Entry *entry) SET(lock_client_iconify); SET(lock_user_sticky); SET(lock_client_sticky); - SET(user_skip_winlist); + if (qa_config->skip_window_list) + SET(user_skip_winlist); EC_CHANGED(entry->client); #undef SET } --
[EGIT] [core/enlightenment] master 01/01: do not clamp comp object input regions to 0, 0
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a9b47547763b0302d32c29c1778d60c202709aea commit a9b47547763b0302d32c29c1778d60c202709aea Author: Mike BlumenkrantzDate: Tue Feb 16 15:36:04 2016 -0500 do not clamp comp object input regions to 0,0 this breaks input for clients using csd which are aligned at x|y axis --- src/bin/e_comp_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index 561ecbe..916fa48 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -3062,8 +3062,8 @@ e_comp_object_input_area_set(Evas_Object *obj, int x, int y, int w, int h) evas_object_smart_member_add(cw->input_obj, obj); } evas_object_geometry_set(cw->input_obj, - MAX(cw->ec->client.x + (!!cw->frame_object * cw->client_inset.l), 0) + x, - MAX(cw->ec->client.y + (!!cw->frame_object * cw->client_inset.t), 0) + y, w, h); + cw->ec->client.x + (!!cw->frame_object * cw->client_inset.l) + x, + cw->ec->client.y + (!!cw->frame_object * cw->client_inset.t) + y, w, h); evas_object_pass_events_set(cw->obj, 1); if (cw->visible) evas_object_show(cw->input_obj); } --
[EGIT] [core/efl] master 01/01: ecore-x: Add safety checks for NULL _ecore_x_disp in dnd functions
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5b2580b62e3fed580bb29580333e3276b7346c9e commit 5b2580b62e3fed580bb29580333e3276b7346c9e Author: Chris MichaelDate: Tue Feb 16 15:51:58 2016 -0500 ecore-x: Add safety checks for NULL _ecore_x_disp in dnd functions xlib immediately crashes upon being passed a NULL display object, so every function in ecore-x should likely have safety checks such as these. @fix Signed-off-by: Chris Michael --- src/lib/ecore_x/xlib/ecore_x_dnd.c | 4 1 file changed, 4 insertions(+) diff --git a/src/lib/ecore_x/xlib/ecore_x_dnd.c b/src/lib/ecore_x/xlib/ecore_x_dnd.c index 601c8ce..d673094 100644 --- a/src/lib/ecore_x/xlib/ecore_x_dnd.c +++ b/src/lib/ecore_x/xlib/ecore_x_dnd.c @@ -541,6 +541,8 @@ ecore_x_dnd_send_status(Eina_Bool will_accept, { XEvent xev; + EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); + if (_target->state == ECORE_X_DND_TARGET_IDLE) return; @@ -591,6 +593,8 @@ ecore_x_dnd_send_finished(void) { XEvent xev; + EINA_SAFETY_ON_NULL_RETURN(_ecore_x_disp); + if (_target->state == ECORE_X_DND_TARGET_IDLE) return; --
[EGIT] [core/enlightenment] master 01/01: Ensure wayland clients haven't been deleted when processing callbacks
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=3e9029ea08c14135f68693a872c1d23fecdec3d8 commit 3e9029ea08c14135f68693a872c1d23fecdec3d8 Author: Derek ForemanDate: Tue Feb 16 16:41:03 2016 -0500 Ensure wayland clients haven't been deleted when processing callbacks Summary: It's apparently possible to trigger at least some of these by interacting with a client as it's closing, so add a bunch of checks. Reviewers: zmike Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3699 --- src/bin/e_comp_wl.c | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 075cfa4..8c450a8 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -107,7 +107,7 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EIN Eina_List *l; if (!(ec = data)) return; - if (e_object_is_del(data)) return; + if (e_object_is_del(E_OBJECT(ec))) return; if (!ec->override) e_hints_window_visible_set(ec); @@ -181,6 +181,7 @@ _e_comp_wl_evas_cb_mouse_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob uint32_t serial; if (!(ec = data)) return; + if (e_object_is_del(E_OBJECT(ec))) return; if (ec->cur_mouse_action) return; /* FIXME? this is a hack to just reset the cursor whenever we mouse out. not sure if accurate */ { @@ -314,6 +315,7 @@ _e_comp_wl_evas_cb_multi_down(void *data, Evas *evas EINA_UNUSED, Evas_Object *o Evas_Event_Multi_Down *ev = event; wl_fixed_t x, y; + if (e_object_is_del(E_OBJECT(ec))) return; if (!ec->comp_data->surface) return; wc = wl_resource_get_client(ec->comp_data->surface); @@ -341,6 +343,7 @@ _e_comp_wl_evas_cb_multi_up(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj E_Client *ec = data; Evas_Event_Multi_Up *ev = event; + if (e_object_is_del(E_OBJECT(ec))) return; if (!ec->comp_data->surface) return; wc = wl_resource_get_client(ec->comp_data->surface); @@ -364,6 +367,7 @@ _e_comp_wl_evas_cb_multi_move(void *data, Evas *evas EINA_UNUSED, Evas_Object *o Evas_Event_Multi_Move *ev = event; wl_fixed_t x, y; + if (e_object_is_del(E_OBJECT(ec))) return; if (!ec->comp_data->surface) return; wc = wl_resource_get_client(ec->comp_data->surface); @@ -503,8 +507,7 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas EINA_UNUSED, Evas_Object *ob double t; if (!(ec = data)) return; - - if (!ec->comp_data) return; + if (e_object_is_del(E_OBJECT(ec))) return; E_FREE_FUNC(ec->comp_data->on_focus_timer, ecore_timer_del); @@ -536,6 +539,7 @@ _e_comp_wl_evas_cb_restack(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EIN E_Client *sec, *ec = data; Eina_List *l, *ll; + if (e_object_is_del(E_OBJECT(ec))) return; if (!ec->comp_data->sub.list) return; EINA_LIST_FOREACH(ec->comp_data->sub.list, l, sec) evas_object_layer_set(sec->frame, evas_object_layer_get(ec->frame)); @@ -556,6 +560,7 @@ _e_comp_wl_evas_cb_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_U E_Client *sec, *ec = data; Eina_List *l; + if (e_object_is_del(E_OBJECT(ec))) return; EINA_LIST_FOREACH(ec->comp_data->sub.list, l, sec) { if (!sec->comp_data->sub.data->position.set) @@ -570,6 +575,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj EINA_UNUSED, void *event E_Client *ec; if (!(ec = data)) return; + if (e_object_is_del(E_OBJECT(ec))) return; if ((ec->shading) || (ec->shaded)) return; if (!ec->comp_data->shell.configure_send) return; @@ -688,6 +694,7 @@ _e_comp_wl_evas_cb_ping(void *data, Evas_Object *obj EINA_UNUSED, void *event EI E_Client *ec; if (!(ec = data)) return; + if (e_object_is_del(E_OBJECT(ec))) return; if (!(ec->comp_data->shell.ping)) return; if (!(ec->comp_data->shell.surface)) return; --
[EGIT] [website/www-content] master 01/01: Wiki page contribute changed with summary [] by Shuhrat Dehkanov
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=f17c27a4ab5e1c59b82718dcac68179bd9f0fb18 commit f17c27a4ab5e1c59b82718dcac68179bd9f0fb18 Author: Shuhrat DehkanovDate: Tue Feb 16 20:25:22 2016 -0800 Wiki page contribute changed with summary [] by Shuhrat Dehkanov --- pages/contribute.txt | 23 +++ 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pages/contribute.txt b/pages/contribute.txt index bb9338c..1bd2cdb 100644 --- a/pages/contribute.txt +++ b/pages/contribute.txt @@ -6,29 +6,20 @@ If you have free time, help is welcome in different areas: - * Developers: See the [[docs|documentation]], subscribe to the -[[contact|mailing lists]], create a [[http://phab.enlightenment.org|phab -account]], have a look at the opened tasks, join [[contact|IRC channel]] to get -help on how to start coding + * Developers: See the [[docs|documentation]], subscribe to the [[contact|mailing lists]], create a [[http://phab.enlightenment.org|phab +account]], have a look at the opened tasks, join [[contact|IRC channel]] to get help on how to start coding * Writers: to help improve the documentation * Translators: to translate Enlightenment, Terminology, Edi, ... * Designers: to help to get edje themes of all applications better === Donate money === -Enlightenment project needs money for different reasons : +Enlightenment project needs money for different reasons: - * Maintain servers, on which are running all the sevices : git, phab, mailing lists, ... + * Maintain servers, on which are running all the services: git, phab, mailing lists, ... * Promote the project by organising or participating in events (FOSDEM, ELC, LinuxTag, ...) - * Buy hardware for developping and testing purpose. + * Buy hardware for developing and testing purposes -Enlightenment Association is a non-profit organisation, under French -law. Enlightenment association has its own bank account and is responsible for running and -maintaining the Enlightenment servers. - -Donate to Enlightenment via PayPal or Flattr you can donnate money to the -project through Enlightenment's PayPal account. There is no minimal amount for -your donation. If you click on one of the buttons below, you will be taken to -the secure PayPal Web site. You don't need to have a paypal account in order to -make a donation. +Enlightenment Association is a non-profit organisation, under French law. Enlightenment association has its own bank account and is responsible for running and maintaining the Enlightenment servers. +Donate to Enlightenment via PayPal or Flattr. You can donate money to the project through Enlightenment's PayPal account. There is no minimal amount for your donation. If you click on one of the buttons below, you will be taken to the secure PayPal Web site. You don't need to have a PayPal account in order to make a donation. \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page contribute changed with summary [Add Flattr and Paypal links] by Shuhrat Dehkanov
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=837e6914bd0ca4ffab16576f14a261d36ad5d050 commit 837e6914bd0ca4ffab16576f14a261d36ad5d050 Author: Shuhrat DehkanovDate: Tue Feb 16 20:28:52 2016 -0800 Wiki page contribute changed with summary [Add Flattr and Paypal links] by Shuhrat Dehkanov --- pages/contribute.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/contribute.txt b/pages/contribute.txt index 1bd2cdb..7e03992 100644 --- a/pages/contribute.txt +++ b/pages/contribute.txt @@ -22,4 +22,8 @@ Enlightenment project needs money for different reasons: Enlightenment Association is a non-profit organisation, under French law. Enlightenment association has its own bank account and is responsible for running and maintaining the Enlightenment servers. -Donate to Enlightenment via PayPal or Flattr. You can donate money to the project through Enlightenment's PayPal account. There is no minimal amount for your donation. If you click on one of the buttons below, you will be taken to the secure PayPal Web site. You don't need to have a PayPal account in order to make a donation. \ No newline at end of file +Donate to Enlightenment via PayPal or Flattr. You can donate money to the project through Enlightenment's PayPal account. There is no minimal amount for your donation. If you click on one of the buttons below, you will be taken to the secure PayPal Web site. You don't need to have a PayPal account in order to make a donation. + +[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]] +{{:scut-pad-sml.svg?nolink}} +[[https://www.paypal.com/webscr?cmd=_s-xclick_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]] \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page contribute changed with summary [Use donation-buttons page] by Shuhrat Dehkanov
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3e2e2a27dc1fd7ed6a34559be6d51b3287916ff7 commit 3e2e2a27dc1fd7ed6a34559be6d51b3287916ff7 Author: Shuhrat DehkanovDate: Tue Feb 16 20:32:19 2016 -0800 Wiki page contribute changed with summary [Use donation-buttons page] by Shuhrat Dehkanov --- pages/contribute.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pages/contribute.txt b/pages/contribute.txt index 7e03992..08fa816 100644 --- a/pages/contribute.txt +++ b/pages/contribute.txt @@ -24,6 +24,4 @@ Enlightenment Association is a non-profit organisation, under French law. Enligh Donate to Enlightenment via PayPal or Flattr. You can donate money to the project through Enlightenment's PayPal account. There is no minimal amount for your donation. If you click on one of the buttons below, you will be taken to the secure PayPal Web site. You don't need to have a PayPal account in order to make a donation. -[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]] -{{:scut-pad-sml.svg?nolink}} -[[https://www.paypal.com/webscr?cmd=_s-xclick_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]] \ No newline at end of file +{{page>donation-buttons}} \ No newline at end of file --
[EGIT] [website/www-content] master 01/01: Wiki page donation-buttons changed with summary [Created donation buttons page for shortcut linking] by Shuhrat Dehkanov
WWW-www.enlightenment.org pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=22a673f5fd7433f55a005d615d20cf60e7544b63 commit 22a673f5fd7433f55a005d615d20cf60e7544b63 Author: Shuhrat DehkanovDate: Tue Feb 16 20:30:45 2016 -0800 Wiki page donation-buttons changed with summary [Created donation buttons page for shortcut linking] by Shuhrat Dehkanov --- pages/donation-buttons.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pages/donation-buttons.txt b/pages/donation-buttons.txt new file mode 100644 index 000..0f75cc6 --- /dev/null +++ b/pages/donation-buttons.txt @@ -0,0 +1,3 @@ +[[http://flattr.com/thing/418692/Enlightenment|{{:scut-flattr.svg|Flattr}}]] +{{:scut-pad-sml.svg?nolink}} +[[https://www.paypal.com/webscr?cmd=_s-xclick_button_id=A5U75JR3FFWFC|{{:scut-paypal.svg|PayPal}}]] \ No newline at end of file --
[EGIT] [core/efl] master 06/06: eina log: print formatted string when log domain is invalid
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a4270b25a3f0866b4011e58d9857e7c4ce2bdd57 commit a4270b25a3f0866b4011e58d9857e7c4ce2bdd57 Author: Jean-Philippe AndreDate: Wed Feb 17 15:40:43 2016 +0900 eina log: print formatted string when log domain is invalid Before this patch, eina_log would simply record a non-formatted entry like: unknown domain -1, original message format 'proxy=%p, obj=%p' This was not very useful as even if the log domain is invalid, the message itself might be relevant (often those are ERR logs). Now the message format is roughly the same as the default format, except that the line info comes from the original message (and doesn't refer to eina_log.c). Backtrace printing will happen at the same level as the original log level, in order to avoid log pollution in case DBG logs are printed with an invalid domain (and CRI would trigger bt). I actually wonder if the logs shouldn't actually be forwarded to the standard log callback instead of just stderr. This may be useful for logging with dlog or journald (atm we will simply lose all logs without a valid domain). This would mean eina_log itself requires a log domain. --- src/lib/eina/eina_log.c | 78 +++-- 1 file changed, 49 insertions(+), 29 deletions(-) diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index b544468..9d518c9 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -1191,6 +1191,16 @@ eina_log_domain_unregister_unlocked(int domain) d->deleted = 1; } +#ifdef EINA_LOG_BACKTRACE +# define DISPLAY_BACKTRACE(File, Level) \ + if (EINA_UNLIKELY(Level <= _backtrace_level)) { \ + fprintf(File, "*** Backtrace ***\n"); \ + EINA_BT(File); \ + } +#else +# define DISPLAY_BACKTRACE(File, Level) +#endif + static inline void eina_log_print_unlocked(int domain, Eina_Log_Level level, @@ -1206,28 +1216,35 @@ eina_log_print_unlocked(int domain, if (EINA_UNLIKELY((unsigned int)domain >= _log_domains_count) || EINA_UNLIKELY(domain < 0)) { -if (file && fnc && fmt) +DECLARE_LEVEL_NAME(level); +if (level > _log_level) { - fprintf( - stderr, - "CRI: %s:%d %s() eina_log_print() unknown domain %d, original message format '%s'\n", - file, - line, - fnc, - domain, - fmt); + fprintf(stderr, "CRI<%u>:eina_log %s:%d %s() unknown log domain %d, " + "original message level was: %s\n", eina_log_pid_get(), + file, line, fnc, domain, name); } else { - fprintf( - stderr, - "CRI: eina_log_print() unknown domain %d, original message format '%s'\n", - domain, - fmt ? fmt : ""); + if (file && fnc && fmt) + { + fprintf(stderr, "CRI<%u>:eina_log %s:%d %s() unknown log domain %d, " + "original message was: %s: '", eina_log_pid_get(), + file, line, fnc, domain, name); + vfprintf(stderr, fmt, args); + } + else + { + fprintf(stderr, "CRI<%u>:eina_log unknown log domain %d, original " + "message was: %s: '", eina_log_pid_get(), domain, name); + if (fmt) +vfprintf(stderr, fmt, args); + } + fputs("'\n", stderr); } -if (_abort_on_critical) - abort(); +DISPLAY_BACKTRACE(stderr, level); +if (EINA_UNLIKELY(_abort_on_critical)) + abort(); return; } @@ -1237,9 +1254,22 @@ eina_log_print_unlocked(int domain, #ifdef EINA_SAFETY_CHECKS if (EINA_UNLIKELY(d->deleted)) { - fprintf(stderr, -"ERR: eina_log_print() domain %d is deleted\n", -domain); +if (level > d->level) + fprintf(stderr, "ERR<%u>:eina_log %s:%d %s() log domain %d was deleted\n", + eina_log_pid_get(), file, line, fnc, domain); +else + { + DECLARE_LEVEL_NAME(level); + fprintf(stderr, "ERR<%u>:eina_log %s:%d %s() log domain %d was " + "deleted, original message was: %s: '", + eina_log_pid_get(), file, line, fnc, domain, name); + vfprintf(stderr, fmt, args); + fputs("'\n", stderr); + } +DISPLAY_BACKTRACE(stderr, level); +if (EINA_UNLIKELY(_abort_on_critical) && +EINA_UNLIKELY(level <= _abort_level_on_critical)) + abort(); return; } @@
[EGIT] [core/efl] master 03/06: evas: Update eina_vector, add new function.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a1584c8a5db0bdacd8f14669f77d2c4f4de4d1c3 commit a1584c8a5db0bdacd8f14669f77d2c4f4de4d1c3 Author: se.osadchyDate: Wed Feb 17 14:14:24 2016 +0900 evas: Update eina_vector, add new function. Summary: Add direction transform for eina_vector3. Reviewers: cedric, Hermet, jpeg Reviewed By: jpeg Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D3692 --- src/lib/eina/eina_inline_vector.x | 14 ++ src/lib/eina/eina_vector.h| 12 src/tests/eina/eina_test_vector.c | 3 +++ 3 files changed, 29 insertions(+) diff --git a/src/lib/eina/eina_inline_vector.x b/src/lib/eina/eina_inline_vector.x index 1332a90..d7dd8d8 100644 --- a/src/lib/eina/eina_inline_vector.x +++ b/src/lib/eina/eina_inline_vector.x @@ -283,6 +283,20 @@ eina_vector3_transform(Eina_Vector3 *out, const Eina_Matrix3 *m, const Eina_Vec } static inline void +eina_vector3_homogeneous_direction_transform(Eina_Vector3 *out, const Eina_Matrix4 *m, const Eina_Vector3 *v) +{ + if (eina_matrix4_type_get(m) == EINA_MATRIX_TYPE_IDENTITY) + { +eina_vector3_copy(out, v); +return; + } + + out->x = (m->xx * v->x) + (m->yx * v->y) + (m->zx * v->z); + out->y = (m->xy * v->x) + (m->yy * v->y) + (m->zy * v->z); + out->z = (m->xz * v->x) + (m->yz * v->y) + (m->zz * v->z); +} + +static inline void eina_vector3_homogeneous_position_transform(Eina_Vector3 *out, const Eina_Matrix4 *m, const Eina_Vector3 *v) { diff --git a/src/lib/eina/eina_vector.h b/src/lib/eina/eina_vector.h index 1c95c3d..5653e0a 100644 --- a/src/lib/eina/eina_vector.h +++ b/src/lib/eina/eina_vector.h @@ -424,6 +424,18 @@ static inline void eina_vector3_transform(Eina_Vector3 *out, const Eina_Matrix3 const Eina_Vector3 *v); /** + * @brief Homogeneous direction transform vector. + * + * @param out The resulting vector. + * @param m The matrix for transform. + * @param v The vector for transform. + * + * @since 1.18 + */ +static inline void eina_vector3_homogeneous_direction_transform(Eina_Vector3 *out, const Eina_Matrix4 *m, + const Eina_Vector3 *v); + +/** * @brief Homogeneous position transform vector. * * @param out The resulting vector. diff --git a/src/tests/eina/eina_test_vector.c b/src/tests/eina/eina_test_vector.c index 8657685..a155ef8 100644 --- a/src/tests/eina/eina_test_vector.c +++ b/src/tests/eina/eina_test_vector.c @@ -217,6 +217,9 @@ START_TEST(eina_test_vector3_operations) , , ); fail_if(res2 != EINA_TRUE); + eina_vector3_homogeneous_direction_transform(, , ); + fail_if((v3.x != 12) || (v3.y != 12) || (v3.z != 12)); + eina_shutdown(); } END_TEST --
[EGIT] [core/efl] master 02/06: ector gl: Use proper PRIx64 to print a uint64_t
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7940a6d9a59a44be1d19c7df31628ec500e5c01b commit 7940a6d9a59a44be1d19c7df31628ec500e5c01b Author: Jean-Philippe AndreDate: Wed Feb 17 13:34:01 2016 +0900 ector gl: Use proper PRIx64 to print a uint64_t Thanks @vtorri for the report. Closes D3698 --- src/lib/ector/gl/ector_gl_surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c index e4756ae..14302e3 100644 --- a/src/lib/ector/gl/ector_gl_surface.c +++ b/src/lib/ector/gl/ector_gl_surface.c @@ -180,7 +180,7 @@ _ector_gl_shader_textures_bind(Ector_Shader *p) loc = GL.glGetUniformLocation(p->prg, textures[i].name); if (loc < 0) { - ERR("Couldn't find uniform '%s' (shader: %16lx)", + ERR("Couldn't find uniform '%s' (shader: %16" PRIx64 ")", textures[i].name, p->flags); } GL.glUniform1i(loc, tex_count++); @@ -203,7 +203,7 @@ _ector_gl_shader_load(uint64_t flags) buf = eina_strbuf_new(); if (!buf) return NULL; - eina_strbuf_append_printf(buf, "ector/shader/%16lx", flags); + eina_strbuf_append_printf(buf, "ector/shader/%16" PRIx64, flags); data = (void*) eet_read_direct(shader_file, eina_strbuf_string_get(buf), ); if (!data) @@ -312,7 +312,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA if (GL.glGetProgramBinary) { buf = eina_strbuf_new(); -eina_strbuf_append_printf(buf, "ector/shader/%16lx", flags); +eina_strbuf_append_printf(buf, "ector/shader/%16" PRIx64, flags); eet_write(shader_file, eina_strbuf_string_get(buf), data, length, 1); --
[EGIT] [core/efl] master 04/06: evas: Update evas_3d_utils, replace Evas_Vec.
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=780ec5d0297c3645033b64f4e0723c579e12e491 commit 780ec5d0297c3645033b64f4e0723c579e12e491 Author: se.osadchyDate: Wed Feb 17 14:26:40 2016 +0900 evas: Update evas_3d_utils, replace Evas_Vec. Summary: Change Evas_Vec2(3) to Eina_Vector2(3). Reviewers: cedric, Hermet, jpeg Subscribers: jpeg Differential Revision: https://phab.enlightenment.org/D3686 --- src/lib/evas/canvas/evas_canvas3d_camera.c | 2 +- src/lib/evas/canvas/evas_canvas3d_mesh.c | 2 +- src/lib/evas/canvas/evas_canvas3d_node.c | 76 +- src/lib/evas/canvas/evas_canvas3d_scene.c | 20 +- .../evas/common3d/primitives/primitive_common.c| 16 +- .../evas/common3d/primitives/primitive_common.h| 20 +- .../primitives/solids_of_revolution/cone.c | 6 +- .../primitives/solids_of_revolution/cylinder.c | 6 +- .../primitives/solids_of_revolution/sphere.c | 10 +- .../primitives/solids_of_revolution/torus.c| 2 +- .../evas/common3d/primitives/surfaces/surface.c| 10 +- .../evas/common3d/primitives/surfaces/terrain.c| 2 +- src/lib/evas/include/evas_3d_utils.h | 870 ++--- src/lib/evas/include/evas_private.h| 24 +- src/modules/evas/engines/gl_common/evas_gl_3d.c| 20 +- .../evas/engines/gl_common/evas_gl_3d_private.h| 4 +- 16 files changed, 346 insertions(+), 744 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas3d_camera.c b/src/lib/evas/canvas/evas_canvas3d_camera.c index 9f874e2..c8ed312 100644 --- a/src/lib/evas/canvas/evas_canvas3d_camera.c +++ b/src/lib/evas/canvas/evas_canvas3d_camera.c @@ -163,7 +163,7 @@ _evas_canvas3d_camera_node_visible_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Camera Eina_Quaternion planes[6]; Evas_Canvas3D_Node_Data *pd_node = eo_data_scope_get(node, EVAS_CANVAS3D_NODE_CLASS); Evas_Canvas3D_Node_Data *pd_camera = eo_data_scope_get(camera_node, EVAS_CANVAS3D_NODE_CLASS); - Evas_Vec3 central_point; + Eina_Vector3 central_point; if (!node || pd_node->type != EVAS_CANVAS3D_NODE_TYPE_MESH) { diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index ead3da0..84403c3 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -924,7 +924,7 @@ _evas_canvas3d_mesh_from_primitive_set(Eo *obj, } void -evas_canvas3d_mesh_interpolate_position_get(Evas_Vec3 *out, const Evas_Canvas3D_Vertex_Buffer *pos0, const Evas_Canvas3D_Vertex_Buffer *pos1, +evas_canvas3d_mesh_interpolate_position_get(Eina_Vector3 *out, const Evas_Canvas3D_Vertex_Buffer *pos0, const Evas_Canvas3D_Vertex_Buffer *pos1, Evas_Real weight, int index) { if (pos1->data == NULL) diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index 6cf880d..bf295cb 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -8,7 +8,7 @@ Evas_Canvas3D_Mesh_Frame *evas_canvas3d_mesh_frame_find(Evas_Canvas3D_Mesh_Data *pd, int frame); static void -_look_at_set(Evas_Canvas3D_Node_Data *pd, Evas_Vec3 *target, Evas_Vec3 *up); +_look_at_set(Evas_Canvas3D_Node_Data *pd, Eina_Vector3 *target, Eina_Vector3 *up); static Eina_Stringshare * _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_Node *node, Evas_Canvas3D_Mesh *mesh, @@ -240,7 +240,7 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) if (pd->parent) { Evas_Canvas3D_Node_Data *pdparent = eo_data_scope_get(pd->parent, MY_CLASS); - const Evas_Vec3 *scale_parent = >scale_world; + const Eina_Vector3 *scale_parent = >scale_world; const Eina_Quaternion *orientation_parent = >orientation_world; /* Orienatation */ @@ -256,17 +256,17 @@ _node_transform_update(Evas_Canvas3D_Node *node, void *data EINA_UNUSED) /* Scale */ if (pd->scale_inherit) - evas_vec3_multiply(>scale_world, scale_parent, >scale); + eina_vector3_multiply(>scale_world, scale_parent, >scale); else pd->scale_world = pd->scale; /* Position */ if (pd->position_inherit) { - evas_vec3_multiply(>position_world, >position, scale_parent); - evas_vec3_quaternion_rotate(>position_world, >position_world, + eina_vector3_multiply(>position_world, >position, scale_parent); + eina_vector3_quaternion_rotate(>position_world, >position_world, orientation_parent); - evas_vec3_add(>position_world, >position_world, +
[EGIT] [core/efl] master 01/06: eina: eina_array_free() now silently ignores NULL
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=32fedb1e6d00a2a1ad9136cc30dac19f731abfcc commit 32fedb1e6d00a2a1ad9136cc30dac19f731abfcc Author: Jean-Philippe AndreDate: Mon Feb 15 18:19:58 2016 +0900 eina: eina_array_free() now silently ignores NULL This is a follow-up patch after 56a4535ada71af1d22611e861ada. Also, remove now invalid documentation. --- src/lib/eina/eina_array.c | 1 - src/lib/eina/eina_array.h | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lib/eina/eina_array.c b/src/lib/eina/eina_array.c index f500273..99891ad 100644 --- a/src/lib/eina/eina_array.c +++ b/src/lib/eina/eina_array.c @@ -296,7 +296,6 @@ eina_array_free(Eina_Array *array) if (!array) return; eina_array_flush(array); - EINA_SAFETY_ON_NULL_RETURN(array); EINA_MAGIC_CHECK_ARRAY(array); MAGIC_FREE(array); } diff --git a/src/lib/eina/eina_array.h b/src/lib/eina/eina_array.h index 07234cd..f4e363a 100644 --- a/src/lib/eina/eina_array.h +++ b/src/lib/eina/eina_array.h @@ -264,10 +264,9 @@ EAPI Eina_Array *eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_ * This function frees @p array. It calls first eina_array_flush() then * free the memory of the pointer. It does not free the memory * allocated for the elements of @p array. To free them, walk the array with - * #EINA_ARRAY_ITER_NEXT. For performance reasons, there is no check - * of @p array. + * #EINA_ARRAY_ITER_NEXT. */ -EAPI voideina_array_free(Eina_Array *array) EINA_ARG_NONNULL(1); +EAPI voideina_array_free(Eina_Array *array); /** * @brief Set the step of an array. --
[EGIT] [core/efl] master 05/06: tests: Fix evas 3d tests after previous commit
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f649dac12ffc88d7c0b78cdeb4aff9f6338e1239 commit f649dac12ffc88d7c0b78cdeb4aff9f6338e1239 Author: Jean-Philippe AndreDate: Wed Feb 17 14:49:23 2016 +0900 tests: Fix evas 3d tests after previous commit --- src/tests/evas/evas_test_matrix.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/evas/evas_test_matrix.c b/src/tests/evas/evas_test_matrix.c index b6df8f2..95e320f 100644 --- a/src/tests/evas/evas_test_matrix.c +++ b/src/tests/evas/evas_test_matrix.c @@ -16,14 +16,14 @@ START_TEST(evas_matrix) { - Evas_Vec3 position; + Eina_Vector3 position; Eina_Quaternion orientation; - Evas_Vec3 scale; + Eina_Vector3 scale; Eina_Matrix4 mat; - evas_vec3_set(, 5.0, 3.0, 2.0); + eina_vector3_set(, 5.0, 3.0, 2.0); eina_quaternion_set(, 30.0, 1.0, 0.0, 0.0); - evas_vec3_set(, 1.0, 2.0, 1.0); + eina_vector3_set(, 1.0, 2.0, 1.0); evas_mat4_build(, , , ); fail_if((mat.xx != -1) || (mat.xy != 60) || --