[EGIT] [core/efl] efl-1.15 01/01: evas: Add defines for GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT
captainigloo pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=fbce77c7c9617ec9b34915e3046a6a4d0394378f commit fbce77c7c9617ec9b34915e3046a6a4d0394378f Author: Nicolas Aguirre Date: Thu Oct 1 08:54:47 2015 +0200 evas: Add defines for GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT --- src/modules/evas/engines/gl_common/evas_gl_define.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_define.h b/src/modules/evas/engines/gl_common/evas_gl_define.h index 2b5de74..822b9c9 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_define.h +++ b/src/modules/evas/engines/gl_common/evas_gl_define.h @@ -258,4 +258,10 @@ #define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x8000 #endif +#ifndef GL_EXT_discard_framebuffer +#define GL_COLOR_EXT 0x1800 +#define GL_DEPTH_EXT 0x1801 +#define GL_STENCIL_EXT 0x1802 +#endif + #endif --
[EGIT] [core/efl] master 01/01: evas: Add defines for GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT
captainigloo pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=cf2b9ea5caa1570d1f9aa09bf0e3ed381b84ddef commit cf2b9ea5caa1570d1f9aa09bf0e3ed381b84ddef Author: Nicolas Aguirre Date: Thu Oct 1 08:54:47 2015 +0200 evas: Add defines for GL_COLOR_EXT, GL_DEPTH_EXT, GL_STENCIL_EXT --- src/modules/evas/engines/gl_common/evas_gl_define.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_define.h b/src/modules/evas/engines/gl_common/evas_gl_define.h index 2b5de74..822b9c9 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_define.h +++ b/src/modules/evas/engines/gl_common/evas_gl_define.h @@ -258,4 +258,10 @@ #define GL_MULTISAMPLE_BUFFER_BIT7_QCOM 0x8000 #endif +#ifndef GL_EXT_discard_framebuffer +#define GL_COLOR_EXT 0x1800 +#define GL_DEPTH_EXT 0x1801 +#define GL_STENCIL_EXT 0x1802 +#endif + #endif --
[EGIT] [core/efl] master 01/01: edje_cc: Fix TEXT part validation for aliased parts
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7c8ca6b752b3f584b84aac78d8ee28bf6a6f562a
commit 7c8ca6b752b3f584b84aac78d8ee28bf6a6f562a
Author: Jean-Philippe Andre
Date: Thu Oct 1 17:34:20 2015 +0900
edje_cc: Fix TEXT part validation for aliased parts
Not 100% sure of this fix but it "works". This is just compile-time
safety checking code after all, so it won't impact any existing
application.
This fixes commit dbf7a0e368097bec555. Tested with empc.
Thanks @zmike for the report and test case.
---
src/bin/edje/edje_cc_out.c | 80 ++
1 file changed, 67 insertions(+), 13 deletions(-)
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index c0264e6..5c79ee8 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -382,32 +382,86 @@ check_image_part_desc(Edje_Part_Collection *pc, Edje_Part
*ep,
}
}
+static Edje_Part_Collection *
+_source_group_find(const char *source)
+{
+ Edje_Part_Collection *pc2;
+ Eina_List *l;
+ if (!source) return NULL;
+ EINA_LIST_FOREACH(edje_collections, l, pc2)
+ {
+if (!strcmp(pc2->part, source))
+ return pc2;
+ }
+ return NULL;
+}
+
+static Edje_Part *
+_aliased_text_part_find(Edje_Part_Collection *pc,
+int id_source, const char *id_source_part)
+{
+ Edje_Part_Collection *group;
+ unsigned int i;
+
+ if (!pc->parts[id_source]->source)
+ return NULL;
+
+ group = _source_group_find(pc->parts[id_source]->source);
+ if (!group) return NULL;
+
+ for (i = 0; i < group->parts_count; i++)
+ {
+if (!strcmp(group->parts[i]->name, id_source_part))
+ return group->parts[i];
+ }
+ return NULL;
+}
+
static void
check_text_part_desc(Edje_Part_Collection *pc, Edje_Part *ep,
- Edje_Part_Description_Text *epd, Eet_File *ef)
+ Edje_Part_Description_Text *epd, Eet_File *ef)
{
+ Edje_Part *ep2;
+
if (epd->text.id_source != -1)
{
-if ((pc->parts[epd->text.id_source]->type != EDJE_PART_TYPE_TEXT) &&
-(pc->parts[epd->text.id_source]->type != EDJE_PART_TYPE_TEXTBLOCK))
+if ((pc->parts[epd->text.id_source]->type == EDJE_PART_TYPE_TEXT) ||
+(pc->parts[epd->text.id_source]->type == EDJE_PART_TYPE_TEXTBLOCK))
+ return;
+
+if (epd->text.id_source_part)
{
- error_and_abort(ef, "Collection \"%s\" Part \"%s\" Description
\"%s\" [%.3f]: "
- "text.source point to a non TEXT part \"%s\"!",
- pc->part, ep->name,epd->common.state.name,
- epd->common.state.value,
pc->parts[epd->text.id_source]->name);
+ ep2 = _aliased_text_part_find(pc, epd->text.id_source,
epd->text.id_source_part);
+ if (ep2 && ((ep2->type == EDJE_PART_TYPE_TEXT) ||
+ (ep2->type == EDJE_PART_TYPE_TEXTBLOCK)))
+ return;
}
+
+error_and_abort(ef, "Collection \"%s\" Part \"%s\" Description \"%s\"
[%.3f]: "
+"text.source point to a non TEXT part \"%s\"!",
+pc->part, ep->name, epd->common.state.name,
+epd->common.state.value,
pc->parts[epd->text.id_source]->name);
}
if (epd->text.id_text_source != -1)
{
-if ((pc->parts[epd->text.id_text_source]->type != EDJE_PART_TYPE_TEXT)
&&
-(pc->parts[epd->text.id_text_source]->type !=
EDJE_PART_TYPE_TEXTBLOCK))
+
+if ((pc->parts[epd->text.id_text_source]->type == EDJE_PART_TYPE_TEXT)
||
+(pc->parts[epd->text.id_text_source]->type ==
EDJE_PART_TYPE_TEXTBLOCK))
+ return;
+
+if (epd->text.id_text_source_part)
{
- error_and_abort(ef, "Collection \"%s\" Part \"%s\" Description
\"%s\" [%.3f]: "
- "text.text_source point to a non TEXT part \"%s\"!",
- pc->part, ep->name,epd->common.state.name,
- epd->common.state.value,
pc->parts[epd->text.id_text_source]->name);
+ ep2 = _aliased_text_part_find(pc, epd->text.id_text_source,
epd->text.id_text_source_part);
+ if (ep2 && ((ep2->type == EDJE_PART_TYPE_TEXT) ||
+ (ep2->type == EDJE_PART_TYPE_TEXTBLOCK)))
+ return;
}
+
+error_and_abort(ef, "Collection \"%s\" Part \"%s\" Description \"%s\"
[%.3f]: "
+"text.text_source point to a non TEXT part
\"%s\"!",
+pc->part, ep->name,epd->common.state.name,
+epd->common.state.value,
pc->parts[epd->text.id_text_source]->name);
}
}
--
[EGIT] [core/elementary] master 01/01: elc_multibuttonentry: Memory leak fix.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9a4c6c63d38b88f12277c0665ee50b41b4b006e4
commit 9a4c6c63d38b88f12277c0665ee50b41b4b006e4
Author: Shilpa Singh
Date: Thu Oct 1 19:03:29 2015 +0900
elc_multibuttonentry: Memory leak fix.
Summary:
If item filters are appended and multibuttonentry is deleted, the
filter list is not freed causing leak
Signed-Off By: Kumar Navneet
Signed-Off By: Shilpa Singh
Test Plan:
append item filters and when multibuttonentry is deleted leak is
observed, run valgrind in this scenario.
Reviewers: Hermet, cedric, CHAN
Subscribers: navnbeet
Differential Revision: https://phab.enlightenment.org/D3118
---
src/lib/elc_multibuttonentry.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 52d8429..3078cf5 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1575,6 +1575,7 @@ EOLIAN static void
_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data
*sd)
{
Elm_Object_Item *eo_item;
+ Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
EINA_LIST_FREE(sd->items, eo_item)
eo_del(eo_item);
@@ -1591,6 +1592,9 @@ _elm_multibuttonentry_evas_object_smart_del(Eo *obj,
Elm_Multibuttonentry_Data *
evas_object_del(sd->end);
ecore_timer_del(sd->longpress_timer);
+ EINA_LIST_FREE(sd->filter_list, _item_filter)
+ _filter_free(_item_filter);
+
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}
--
[EGIT] [core/elementary] elementary-1.15 01/01: elc_multibuttonentry: Memory leak fix.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=de2ba979f7064ceccec4f65e6e99022594514e4c
commit de2ba979f7064ceccec4f65e6e99022594514e4c
Author: Shilpa Singh
Date: Thu Oct 1 19:03:29 2015 +0900
elc_multibuttonentry: Memory leak fix.
Summary:
If item filters are appended and multibuttonentry is deleted, the
filter list is not freed causing leak
Signed-Off By: Kumar Navneet
Signed-Off By: Shilpa Singh
Test Plan:
append item filters and when multibuttonentry is deleted leak is
observed, run valgrind in this scenario.
Reviewers: Hermet, cedric, CHAN
Subscribers: navnbeet
Differential Revision: https://phab.enlightenment.org/D3118
---
src/lib/elc_multibuttonentry.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index fd608b1..f27ee33 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1533,6 +1533,7 @@ EOLIAN static void
_elm_multibuttonentry_evas_object_smart_del(Eo *obj, Elm_Multibuttonentry_Data
*sd)
{
Elm_Object_Item *eo_item;
+ Elm_Multibuttonentry_Item_Filter *_item_filter = NULL;
EINA_LIST_FREE(sd->items, eo_item)
eo_del(eo_item);
@@ -1549,6 +1550,9 @@ _elm_multibuttonentry_evas_object_smart_del(Eo *obj,
Elm_Multibuttonentry_Data *
evas_object_del(sd->end);
ecore_timer_del(sd->longpress_timer);
+ EINA_LIST_FREE(sd->filter_list, _item_filter)
+ _filter_free(_item_filter);
+
eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
}
--
[EGIT] [core/efl] master 01/01: evas_canvas3d: Unification algorithm generation shadow
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=fe92fac05f0306bea83a6c113daea35acde80398 commit fe92fac05f0306bea83a6c113daea35acde80398 Author: Oleksandr Shcherbina Date: Thu Oct 1 19:08:14 2015 +0900 evas_canvas3d: Unification algorithm generation shadow Summary: Change type of texdepth from GL_R(doesn't support with GLES) to GL_RGBA. Don't use useless additional framebuffers for shadows. Use same shader code for generation shadow map texture. Turn always using software alpha-test. It reduce and simplify code in general. Reviewers: cedric, Hermet Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3115 --- src/modules/evas/engines/gl_common/evas_gl_3d.c| 38 +--- .../evas/engines/gl_common/evas_gl_3d_private.h| 6 -- .../evas/engines/gl_common/evas_gl_3d_shader.c | 6 -- .../gl_common/shader_3d/evas_gl_3d_shaders.x | 100 ++--- .../evas/engines/gl_common/shader_3d/include.shd | 21 + .../gl_common/shader_3d/shadow_map_frag.shd| 5 +- 6 files changed, 16 insertions(+), 160 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c b/src/modules/evas/engines/gl_common/evas_gl_3d.c index 69c9c54..68fc15f 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_3d.c +++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c @@ -276,9 +276,6 @@ e3d_drawable_new(int w, int h, int alpha, GLenum depth_format, GLenum stencil_fo GLuint depth_stencil_buf = 0; GLuint depth_buf = 0; GLuint stencil_buf = 0; -#ifdef GL_GLES - GLuint shadow_fbo, depth_render_buf; -#endif Eina_Bool depth_stencil = EINA_FALSE; glGenTextures(1, &tex); @@ -299,13 +296,7 @@ e3d_drawable_new(int w, int h, int alpha, GLenum depth_format, GLenum stencil_fo glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); -#ifndef GL_GLES - glTexImage2D(GL_TEXTURE_2D, 0, GL_R16, w, h, 0, GL_RED, GL_UNSIGNED_SHORT, 0); -#else - glGenFramebuffers(1, &shadow_fbo); - glGenFramebuffers(1, &depth_render_buf); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); -#endif glGenFramebuffers(1, &color_pick_fb_id); glGenTextures(1, &texcolorpick); @@ -401,10 +392,7 @@ e3d_drawable_new(int w, int h, int alpha, GLenum depth_format, GLenum stencil_fo drawable->depth_buf = depth_buf; drawable->stencil_buf = stencil_buf; drawable->texDepth = texDepth; -#ifdef GL_GLES - drawable->shadow_fbo = shadow_fbo; - drawable->depth_render_buf = depth_render_buf; -#endif + return drawable; error: @@ -437,12 +425,6 @@ error: if (stencil_buf) glDeleteRenderbuffers(1, &stencil_buf); -#ifdef GL_GLES - if (shadow_fbo) - glDeleteFramebuffers(1, &shadow_fbo); - if (depth_render_buf) - glDeleteFramebuffers(1, &depth_render_buf); -#endif return NULL; } @@ -1009,9 +991,7 @@ _mesh_draw_data_build(E3D_Draw_Data *data, data->flags |= E3D_SHADER_FLAG_SHADOWED; data->pcf_size = 1 / pdmesh->shadows_edges_size; data->pcf_step = (Evas_Real)pdmesh->shadows_edges_filtering_level; -#ifdef GL_GLES data->constant_bias = pdmesh->shadows_constant_bias; -#endif } if (pdmesh->color_pick_enabled) @@ -1186,18 +1166,10 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer, glEnable(GL_POLYGON_OFFSET_FILL); glPolygonOffset(data->depth_offset, data->depth_constant); -#ifdef GL_GLES - glBindFramebuffer(GL_FRAMEBUFFER, drawable->shadow_fbo); - glBindRenderbuffer(GL_RENDERBUFFER, drawable->depth_render_buf); -#endif + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, drawable->texDepth, 0); -#ifdef GL_GLES - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, drawable->w, - drawable->h); - glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, - drawable->depth_render_buf); -#endif + e3d_renderer_target_set(renderer, drawable); e3d_renderer_clear(renderer, &c); @@ -1231,9 +1203,7 @@ void _shadowmap_render(E3D_Drawable *drawable, E3D_Renderer *renderer, } glDisable(GL_POLYGON_OFFSET_FILL); -#ifdef GL_GLES - glBindFramebuffer(GL_FRAMEBUFFER, drawable->fbo); -#endif + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, drawable->tex, 0); } diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d_private.h b/src/modules/evas/engines/gl_common/evas_gl_3d_private.h index 6f44456..a05eba7 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_3d_private.h +++ b/src/modules/evas/engines/gl_common/evas_gl_3d_p
[EGIT] [core/elementary] master 01/01: test/entry: add editable set
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8fd5c708203ca59775b8aeffae59370176edaaf1
commit 8fd5c708203ca59775b8aeffae59370176edaaf1
Author: Thiep Ha
Date: Thu Oct 1 19:12:34 2015 +0900
test/entry: add editable set
Summary:
There is no good entry test for changing editable mode.
This patch adds a test for changing editable in entry.
Reviewers: Hermet, tasn, herdsman
Subscribers: seoz
Differential Revision: https://phab.enlightenment.org/D3112
---
src/bin/test_entry.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index faa2f5d..5da3f67 100644
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -75,6 +75,13 @@ my_entry_bt_6(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UN
elm_entry_line_wrap_set(en, wr);
}
+static void
+my_entry_bt_7(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *en = data;
+ elm_entry_editable_set(en, !elm_entry_editable_get(en));
+}
+
void
test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
@@ -194,6 +201,16 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
elm_object_focus_allow_set(bt, EINA_FALSE);
evas_object_show(bt);
+ bt = elm_button_add(win);
+ elm_object_text_set(bt, "Edit");
+ evas_object_smart_callback_add(bt, "clicked", my_entry_bt_7, en);
+ evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
+ elm_box_pack_end(bx2, bt);
+ evas_object_propagate_events_set(bt, EINA_FALSE);
+ elm_object_focus_allow_set(bt, EINA_FALSE);
+ evas_object_show(bt);
+
elm_box_pack_end(bx, bx2);
evas_object_show(bx2);
--
[EGIT] [core/efl] master 01/02: evas: include new header file in build to fix distcheck
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c130b9e307fa063884e630ebd86dce0cf24ba7a3 commit c130b9e307fa063884e630ebd86dce0cf24ba7a3 Author: Stefan Schmidt Date: Thu Oct 1 12:19:52 2015 +0200 evas: include new header file in build to fix distcheck Introduced in 72b13c3ebb0b5f117f3602871ec2842d4baac786 the new header was not deployed and thus not available in the tarball. --- src/Makefile_Evas.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 518c80a..71cd597 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -658,6 +658,7 @@ modules/evas/engines/gl_generic/ector_cairo_software_surface.eo.h GL_COMMON_SOURCES = \ modules/evas/engines/gl_common/evas_gl_private.h \ modules/evas/engines/gl_common/evas_gl_common.h \ +modules/evas/engines/gl_common/evas_gl_define.h \ modules/evas/engines/gl_common/evas_gl_context.c \ modules/evas/engines/gl_common/evas_gl_file_cache.c \ modules/evas/engines/gl_common/evas_gl_shader.c \ --
[EGIT] [core/efl] master 02/02: po: update po files
stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3daaf3a05bd70ac6b4e983291a3589bd621967aa commit 3daaf3a05bd70ac6b4e983291a3589bd621967aa Author: Stefan Schmidt Date: Thu Oct 1 12:21:33 2015 +0200 po: update po files --- po/ca.po| 2 +- po/cs.po| 2 +- po/de.po| 2 +- po/el.po| 2 +- po/eo.po| 2 +- po/es.po| 2 +- po/fi.po| 2 +- po/fr.po| 2 +- po/gl.po| 2 +- po/hu.po| 2 +- po/it.po| 2 +- po/ja.po| 2 +- po/ko.po| 2 +- po/lt.po| 2 +- po/nl.po| 2 +- po/pl.po| 2 +- po/pt.po| 2 +- po/ru.po| 2 +- po/sl.po| 2 +- po/sr.po| 2 +- po/tr.po| 2 +- po/vi.po| 2 +- po/zh_CN.po | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/po/ca.po b/po/ca.po index df769c5..2facee1 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-05-26 21:11+\n" "Last-Translator: joancoll \n" "Language-Team: Catalan\n" diff --git a/po/cs.po b/po/cs.po index 9660af6..3ccf50a 100644 --- a/po/cs.po +++ b/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-05-22 21:29+0200\n" "Last-Translator: Tomáš Čech \n" "Language-Team: Czech \n" diff --git a/po/de.po b/po/de.po index 16ed45a..35f8e56 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2012-06-24 17:10+0900\n" "Last-Translator: Jerome Pinot \n" "Language-Team: Enlightenment Team\n" diff --git a/po/el.po b/po/el.po index ab9ed4a..4a92a35 100644 --- a/po/el.po +++ b/po/el.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2012-12-01 18:26+0200\n" "Last-Translator: Efstathios Iosifidis \n" "Language-Team: Ελληνικά, Σύγχρονα \n" diff --git a/po/eo.po b/po/eo.po index d000601..7a74c97 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-02-13 06:52+\n" "Last-Translator: Eliovir \n" "Language-Team: Esperanto \n" diff --git a/po/es.po b/po/es.po index 9e6b1bb..c6f81f2 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: EFL\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2015-05-03 18:09+0100\n" "Last-Translator: Adrián Arévalo \n" "Language-Team: Enlightenment Team\n" diff --git a/po/fi.po b/po/fi.po index 133e022..13c2b52 100644 --- a/po/fi.po +++ b/po/fi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: enlightenment\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-08-31 14:20+\n" "Last-Translator: Kai Huuhko \n" "Language-Team: Finnish \n" diff --git a/po/fr.po b/po/fr.po index f7e0581..7722159 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-05-25 20:08+\n" "Last-Translator: Eliovir \n" "Language-Team: Enlightenment French Team \n" "Language-Team: http://trasno.net/ \n" diff --git a/po/hu.po b/po/hu.po index b0c01b4..2f76fcc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: efl 1.8.3\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Creation-Date: 2015-08-07 11:08+0200\n" +"POT-Creation-Date: 2015-10-01 11:42+0200\n" "PO-Revision-Date: 2014-01-29 15:08+0100\n" "Last-Translator: rezso \n" "Language-Team: Enlightenment Team\n" diff --git a/po/it.po b/po/it.po index 90bf145..e0035fb 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Efl\n" "Report-Msgid-Bugs-To: enlightenment-de...@lists.sourceforge.net\n" -"POT-Crea
[EGIT] [core/elementary] master 01/01: entry: remove evas_object_propagate_events_set() calls on buttons in test.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=9222d641788b2c4157ee0f12343d7a09bd10973a commit 9222d641788b2c4157ee0f12343d7a09bd10973a Author: ChunEon Park Date: Thu Oct 1 19:21:29 2015 +0900 entry: remove evas_object_propagate_events_set() calls on buttons in test. Seems unnecessary in test code. It just looks copied & pasted from wrong code. --- src/bin/test_entry.c | 107 --- 1 file changed, 107 deletions(-) diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c index 5da3f67..edc20ff 100644 --- a/src/bin/test_entry.c +++ b/src/bin/test_entry.c @@ -147,7 +147,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -157,7 +156,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -167,7 +165,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -177,7 +174,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -187,7 +183,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -197,7 +192,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -207,7 +201,6 @@ test_entry(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -573,7 +566,6 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -583,7 +575,6 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -593,7 +584,6 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE); evas_object_show(bt); @@ -603,7 +593,6 @@ test_entry_scrolled(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); elm_box_pack_end(bx2, bt); - evas_object_propagate_events_
[EGIT] [core/efl] master 01/01: doc/eldbus: fix parameter in document
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bb9fdad7c20d273d382ffe096aa3630534a54647 commit bb9fdad7c20d273d382ffe096aa3630534a54647 Author: Thiep Ha Date: Thu Oct 1 19:29:23 2015 +0900 doc/eldbus: fix parameter in document Summary: The allow_initial_call apprears two times in eldbus_name_owner_changed_callback_add api. @fix Reviewers: seoz, Hermet Reviewed By: Hermet Subscribers: cedric, seoz Differential Revision: https://phab.enlightenment.org/D3110 --- src/lib/eldbus/eldbus_freedesktop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eldbus/eldbus_freedesktop.h b/src/lib/eldbus/eldbus_freedesktop.h index 1b2901c..b629379 100644 --- a/src/lib/eldbus/eldbus_freedesktop.h +++ b/src/lib/eldbus/eldbus_freedesktop.h @@ -125,7 +125,7 @@ typedef void (*Eldbus_Name_Owner_Changed_Cb)(void *data, const char *bus, const * * This function implicitly calls eldbus_name_owner_get() in order to be able to * monitor the name. If the only interest is to receive notifications when the - * name in fact changes, pass EINA_FALSE to @param allow_initial_call so your + * name in fact changes, pass EINA_FALSE to \p allow_initial_call so your * callback will not be called on first retrieval of name owner. If the * initial state is important, pass EINA_TRUE to this parameter. * --
[EGIT] [core/efl] efl-1.15 01/01: doc/eldbus: fix parameter in document
hermet pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=b1eed95d381dd43a616d6d03e004626d8c98 commit b1eed95d381dd43a616d6d03e004626d8c98 Author: Thiep Ha Date: Thu Oct 1 19:29:23 2015 +0900 doc/eldbus: fix parameter in document Summary: The allow_initial_call apprears two times in eldbus_name_owner_changed_callback_add api. @fix Reviewers: seoz, Hermet Reviewed By: Hermet Subscribers: cedric, seoz Differential Revision: https://phab.enlightenment.org/D3110 --- src/lib/eldbus/eldbus_freedesktop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eldbus/eldbus_freedesktop.h b/src/lib/eldbus/eldbus_freedesktop.h index 1b2901c..b629379 100644 --- a/src/lib/eldbus/eldbus_freedesktop.h +++ b/src/lib/eldbus/eldbus_freedesktop.h @@ -125,7 +125,7 @@ typedef void (*Eldbus_Name_Owner_Changed_Cb)(void *data, const char *bus, const * * This function implicitly calls eldbus_name_owner_get() in order to be able to * monitor the name. If the only interest is to receive notifications when the - * name in fact changes, pass EINA_FALSE to @param allow_initial_call so your + * name in fact changes, pass EINA_FALSE to \p allow_initial_call so your * callback will not be called on first retrieval of name owner. If the * initial state is important, pass EINA_TRUE to this parameter. * --
[EGIT] [core/elementary] master 01/01: multibuttonentry: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f946768f6bc424557830d684f10db8f36247fda8
commit f946768f6bc424557830d684f10db8f36247fda8
Author: ChunEon Park
Date: Thu Oct 1 19:41:06 2015 +0900
multibuttonentry: code refactoring.
remove duplicated computations.
---
src/lib/elc_multibuttonentry.c | 20
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 0d3eb29..0e80c4d 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -94,6 +94,7 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj,
Elm_Multibuttonentry_Data
int hpad = 0, vpad = 0;
Eina_List *l;
Elm_Object_Item *eo_item;
+ double pad_scale;
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_theme_apply());
@@ -103,12 +104,9 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj,
Elm_Multibuttonentry_Data
if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str);
- elm_box_padding_set
- (sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
- / edje_object_base_scale_get(elm_layout_edje_get(obj)),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
- / edje_object_base_scale_get(elm_layout_edje_get(obj)));
+ pad_scale = elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj));
+ elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
EINA_LIST_FOREACH(sd->items, l, eo_item)
{
@@ -1405,6 +1403,7 @@ static void
_view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd)
{
const char *str;
+ double pad_scale;
int hpad = 0, vpad = 0;
sd->box = elm_box_add(obj);
@@ -1415,12 +1414,9 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data
*sd)
if (str) hpad = atoi(str);
str = elm_layout_data_get(obj, "vertical_pad");
if (str) vpad = atoi(str);
- elm_box_padding_set
- (sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
- / edje_object_base_scale_get(elm_layout_edje_get(obj)),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
- / edje_object_base_scale_get(elm_layout_edje_get(obj)));
+ pad_scale = elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj));
+ elm_box_padding_set(sd->box, (hpad * pad_scale), (vpad * pad_scale));
elm_box_layout_set(sd->box, _box_layout_cb, obj, NULL);
elm_box_homogeneous_set(sd->box, EINA_FALSE);
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: Fix padding to be affected by base_scale in edc.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=90aad6d593d24c1224d515756756fa0973098bd5
commit 90aad6d593d24c1224d515756756fa0973098bd5
Author: woochan lee
Date: Thu Oct 1 19:35:58 2015 +0900
multibuttonentry: Fix padding to be affected by base_scale in edc.
Summary:
MBE internal box get its padding size from edc.
Previously, it does not consider when calculating the padding size.
In this commit, the padding size from edc is divided by its base_scale
so that desirable size can be calculated.
@fix
Reviewers: Hermet, cedric
Differential Revision: https://phab.enlightenment.org/D3103
---
src/lib/elc_multibuttonentry.c | 12
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 3078cf5..0d3eb29 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -105,8 +105,10 @@ _elm_multibuttonentry_elm_widget_theme_apply(Eo *obj,
Elm_Multibuttonentry_Data
if (str) vpad = atoi(str);
elm_box_padding_set
(sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get(),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get());
+ hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)),
+ vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)));
EINA_LIST_FOREACH(sd->items, l, eo_item)
{
@@ -1415,8 +1417,10 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data
*sd)
if (str) vpad = atoi(str);
elm_box_padding_set
(sd->box,
- hpad * elm_widget_scale_get(obj) * elm_config_scale_get(),
- vpad * elm_widget_scale_get(obj) * elm_config_scale_get());
+ hpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)),
+ vpad * elm_widget_scale_get(obj) * elm_config_scale_get()
+ / edje_object_base_scale_get(elm_layout_edje_get(obj)));
elm_box_layout_set(sd->box, _box_layout_cb, obj, NULL);
elm_box_homogeneous_set(sd->box, EINA_FALSE);
--
[EGIT] [core/elementary] elementary-1.15 01/01: multibuttonentry: Fix MBE item box min size calc error.
hermet pushed a commit to branch elementary-1.15.
http://git.enlightenment.org/core/elementary.git/commit/?id=a20fe9cdedd0f06d9d6240c2a30a5390c22f9c32
commit a20fe9cdedd0f06d9d6240c2a30a5390c22f9c32
Author: woochan lee
Date: Thu Oct 1 19:50:23 2015 +0900
multibuttonentry: Fix MBE item box min size calc error.
Summary:
Before item packed again in mbe box. box calc own min height.
In this case, there is no need to increase line number when entry is box
item.
Actually the min height of box calculated wrong here.
@fix
Test Plan:
Give a color to internal box.
Then items add.
Check the internal box area got a wrong height value.
Reviewers: Hermet, cedric
Differential Revision: https://phab.enlightenment.org/D3102
---
src/lib/elc_multibuttonentry.c | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index f27ee33..8d485b9 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1242,7 +1242,7 @@ _box_min_size_calculate(Evas_Object *box,
{
Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0;
int line_num;
- Eina_List *l, *l_next;
+ Eina_List *l;
Evas_Object_Box_Option *opt;
evas_object_geometry_get(box, NULL, NULL, &w, NULL);
@@ -1262,15 +1262,6 @@ _box_min_size_calculate(Evas_Object *box,
{
linew = mnw;
line_num++;
-
- l_next = eina_list_next(l);
- opt = eina_list_data_get(l_next);
- if (l_next && opt && opt->obj &&
- eo_isa(opt->obj, ELM_ENTRY_CLASS))
- {
- linew = 0;
- line_num++;
- }
}
}
minh = lineh * line_num;
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: Fix MBE item box min size calc error.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=54fafb4049f67edbd9b28d3dc34f2271e4e3aebb
commit 54fafb4049f67edbd9b28d3dc34f2271e4e3aebb
Author: woochan lee
Date: Thu Oct 1 19:50:23 2015 +0900
multibuttonentry: Fix MBE item box min size calc error.
Summary:
Before item packed again in mbe box. box calc own min height.
In this case, there is no need to increase line number when entry is box
item.
Actually the min height of box calculated wrong here.
@fix
Test Plan:
Give a color to internal box.
Then items add.
Check the internal box area got a wrong height value.
Reviewers: Hermet, cedric
Differential Revision: https://phab.enlightenment.org/D3102
---
src/lib/elc_multibuttonentry.c | 11 +--
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 0e80c4d..56dc23f 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1256,7 +1256,7 @@ _box_min_size_calculate(Evas_Object *box,
{
Evas_Coord mnw, mnh, w, minw, minh = 0, linew = 0, lineh = 0;
int line_num;
- Eina_List *l, *l_next;
+ Eina_List *l;
Evas_Object_Box_Option *opt;
evas_object_geometry_get(box, NULL, NULL, &w, NULL);
@@ -1276,15 +1276,6 @@ _box_min_size_calculate(Evas_Object *box,
{
linew = mnw;
line_num++;
-
- l_next = eina_list_next(l);
- opt = eina_list_data_get(l_next);
- if (l_next && opt && opt->obj &&
- eo_isa(opt->obj, ELM_ENTRY_CLASS))
- {
- linew = 0;
- line_num++;
- }
}
if ((linew != 0) && (l != eina_list_last(priv->children)))
--
[EGIT] [core/elementary] master 01/01: elc_multibuttonentry: add item disable support
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d1dc7b2615a628c577da414bdbc42752c777bc37
commit d1dc7b2615a628c577da414bdbc42752c777bc37
Author: Shilpa Singh
Date: Thu Oct 1 19:55:02 2015 +0900
elc_multibuttonentry: add item disable support
Summary:
Add item disable support in multibuttonentry widget
@feature
Test Plan: elm_object_item_disabled_set on MBE item
Reviewers: CHAN, Hermet
Reviewed By: Hermet
Subscribers: CHAN, Hermet, navnbeet
Differential Revision: https://phab.enlightenment.org/D3084
---
src/lib/elc_multibuttonentry.c | 13 +
src/lib/elm_multibuttonentry_item.eo | 1 +
2 files changed, 14 insertions(+)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 56dc23f..e213234 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1874,6 +1874,19 @@ _elm_multibuttonentry_item_next_get(const Eo *eo_it,
return NULL;
}
+EOLIAN static void
+_elm_multibuttonentry_item_elm_widget_item_disable(Eo *eo_it,
Elm_Multibuttonentry_Item_Data *it)
+{
+ const char* emission;
+ Eina_Bool tmp;
+ if (eo_do_ret(eo_it, tmp, elm_wdg_item_disabled_get()))
+ emission = "elm,state,disabled";
+ else
+ emission = "elm,state,enabled";
+
+ elm_layout_signal_emit(VIEW(it), emission, "elm");
+}
+
EINA_DEPRECATED EAPI void *
elm_multibuttonentry_item_data_get(const Elm_Object_Item *it)
{
diff --git a/src/lib/elm_multibuttonentry_item.eo
b/src/lib/elm_multibuttonentry_item.eo
index 58368a2..366d018 100644
--- a/src/lib/elm_multibuttonentry_item.eo
+++ b/src/lib/elm_multibuttonentry_item.eo
@@ -27,5 +27,6 @@ class Elm.Multibuttonentry_Item(Elm.Widget_Item)
Elm.Widget_Item.signal_emit;
Elm.Widget_Item.part_text.get;
Elm.Widget_Item.part_text.set;
+Elm.Widget_Item.disable;
}
}
--
[EGIT] [core/efl] master 01/10: Edje: Move internal struct filter around (refactor)
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c0f887b42965121a0964d3b8a319cafb8b33d1fb
commit c0f887b42965121a0964d3b8a319cafb8b33d1fb
Author: Jean-Philippe Andre
Date: Tue Aug 18 21:05:51 2015 +0900
Edje: Move internal struct filter around (refactor)
---
src/bin/edje/edje_cc_handlers.c | 22 +++---
src/lib/edje/edje_calc.c| 12 ++--
src/lib/edje/edje_data.c| 12 ++--
src/lib/edje/edje_private.h | 5 +++--
4 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 7b22c6b..5a56fb2 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -7048,15 +7048,15 @@
st_collections_group_parts_part_description_inherit(void)
ted->text.font.str = STRDUP(ted->text.font.str);
/* Filters stuff */
- ted->text.filter.code = STRDUP(ted->text.filter.code);
- if (ted->text.filter.code)
+ ted->filter.code = STRDUP(ted->filter.code);
+ if (ted->filter.code)
{
Eina_List *list, *l;
const char *name;
- list = ted->text.filter.sources;
- ted->text.filter.sources = NULL;
+ list = ted->filter.sources;
+ ted->filter.sources = NULL;
EINA_LIST_FOREACH(list, l, name)
- ted->text.filter.sources =
eina_list_append(ted->text.filter.sources, STRDUP(name));
+ ted->filter.sources =
eina_list_append(ted->filter.sources, STRDUP(name));
}
data_queue_copied_part_nest_lookup(pc,
&(tparent->text.id_source), &(ted->text.id_source), &ted->text.id_source_part);
@@ -11896,9 +11896,9 @@
st_collections_group_parts_part_description_filter_code(void)
check_arg_count(1);
if (current_part->type == EDJE_PART_TYPE_TEXT)
- filter = &(((Edje_Part_Description_Text *)current_desc)->text.filter);
+ filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
- filter = &(((Edje_Part_Description_Image *)current_desc)->image.filter);
+ filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
else
{
ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
@@ -11937,9 +11937,9 @@
st_collections_group_parts_part_description_filter_source(void)
"abcdefghijklmnopqrstuvwxyzABCDEFGHJIKLMNOPQRSTUVWXYZ0123456789_";
if (current_part->type == EDJE_PART_TYPE_TEXT)
- filter = &(((Edje_Part_Description_Text *)current_desc)->text.filter);
+ filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
- filter = &(((Edje_Part_Description_Image *)current_desc)->image.filter);
+ filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
else
{
ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
@@ -12030,9 +12030,9 @@
st_collections_group_parts_part_description_filter_data(void)
unsigned k;
if (current_part->type == EDJE_PART_TYPE_TEXT)
- filter = &(((Edje_Part_Description_Text *)current_desc)->text.filter);
+ filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
- filter = &(((Edje_Part_Description_Image *)current_desc)->image.filter);
+ filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
else
{
ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index dcf868a..234c8a3 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2465,17 +2465,17 @@ _edje_part_recalc_single_filter(Edje *ed,
{
Edje_Part_Description_Text *chosen_edt = (Edje_Part_Description_Text
*) chosen_desc;
Edje_Part_Description_Text *edt = (Edje_Part_Description_Text *) desc;
-filter = &chosen_edt->text.filter;
-prev_sources = edt->text.filter.sources;
-filter_sources = chosen_edt->text.filter.sources;
+filter = &chosen_edt->filter;
+prev_sources = edt->filter.sources;
+filter_sources = chosen_edt->filter.sources;
}
else if (ep->part->type == EDJE_PART_TYPE_IMAGE)
{
Edje_Part_Description_Image *chosen_edi = (Edje_Part_Description_Image
*) chosen_desc;
Edje_Part_Description_Image *edi = (Edje_Part_Description_Image *)
desc;
-filter = &chosen_edi->image.filter;
-prev_sources = edi->image.filter.sources;
-filter_sources = chosen_edi->image.filter.sources;
+filter = &chosen_edi->filter;
+prev_sources = edi->filter.sources;
+filter_sources = chosen_edi->filter.so
[EGIT] [core/efl] master 09/10: Evas filters: Fix handling of FILL for image filters
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=52e4bbda7b90271f1bafceb4263d68f45fedda2c
commit 52e4bbda7b90271f1bafceb4263d68f45fedda2c
Author: Jean-Philippe Andre
Date: Thu Oct 1 19:59:22 2015 +0900
Evas filters: Fix handling of FILL for image filters
Note: Image filters still need a LOT of work to be usable.
---
src/lib/evas/canvas/evas_object_image.c | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index 3fd09fc..ee177c2 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -159,7 +159,7 @@ static void evas_object_image_render(Evas_Object *eo_obj,
Evas_Object_Protected_
int x, int y, Eina_Bool do_async);
static void _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
void *output, void *context, void *surface,
- int x, int y, Eina_Bool do_async);
+ int x, int y, int l, int t, int r, int b,
Eina_Bool do_async);
static void evas_object_image_free(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj);
static void evas_object_image_render_pre(Evas_Object *eo_obj,
@@ -3183,6 +3183,8 @@ _evas_image_evas_filter_input_render(Eo *eo_obj,
Evas_Image_Data *o,
{
l = 0;
t = 0;
+r = 0;
+b = 0;
}
if (!surface)
@@ -3198,7 +3200,8 @@ _evas_image_evas_filter_input_render(Eo *eo_obj,
Evas_Image_Data *o,
ENFN->context_render_op_set(output, context, EVAS_RENDER_BLEND);
_evas_image_render(eo_obj, obj, output, context, surface,
- l - obj->cur->geometry.x, t - obj->cur->geometry.y,
do_async);
+ l - obj->cur->geometry.x, t - obj->cur->geometry.y,
+ l, t, r, b, do_async);
if (!input_stolen)
{
@@ -3280,12 +3283,13 @@ evas_object_image_render(Evas_Object *eo_obj,
Evas_Object_Protected_Data *obj, v
return;
}
- _evas_image_render(eo_obj, obj, output, context, surface, x, y, do_async);
+ _evas_image_render(eo_obj, obj, output, context, surface, x, y, 0, 0, 0, 0,
do_async);
}
static void
_evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj,
- void *output, void *context, void *surface, int x, int y,
Eina_Bool do_async)
+ void *output, void *context, void *surface, int x, int y,
+ int l, int t, int r, int b, Eina_Bool do_async)
{
Evas_Image_Data *o = obj->private_data;
int imagew, imageh, uvw, uvh;
@@ -3358,7 +3362,6 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data
*obj,
if (pixels)
{
Evas_Coord idw, idh, idx, idy;
-int l = 0, r = 0, t = 0, b = 0;
int ix, iy, iw, ih;
if ((obj->map->cur.map) && (obj->map->cur.map->count > 3) &&
(obj->map->cur.usemap))
--
[EGIT] [core/efl] master 03/10: Edje: Add support for filters to PROXY parts
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=31edfbb817d24dc11224e6f68e6dcd12282ca5f8
commit 31edfbb817d24dc11224e6f68e6dcd12282ca5f8
Author: Jean-Philippe Andre
Date: Tue Aug 18 21:14:11 2015 +0900
Edje: Add support for filters to PROXY parts
Same syntax as for IMAGE and TEXT: description.filter
---
src/bin/edje/edje_cc_handlers.c | 8 +++-
src/lib/edje/edje_calc.c| 14 +-
src/lib/edje/edje_data.c| 3 +++
src/lib/edje/edje_private.h | 2 +-
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 18adacb..b4530c9 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -11911,9 +11911,11 @@
st_collections_group_parts_part_description_filter_code(void)
filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
+ else if (current_part->type == EDJE_PART_TYPE_PROXY)
+ filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter);
else
{
-ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
+ERR("parse error %s:%i. filter only supported for: TEXT, IMAGE,
PROXY.",
file_in, line - 1);
exit(-1);
}
@@ -11952,6 +11954,8 @@
st_collections_group_parts_part_description_filter_source(void)
filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
+ else if (current_part->type == EDJE_PART_TYPE_PROXY)
+ filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter);
else
{
ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
@@ -12045,6 +12049,8 @@
st_collections_group_parts_part_description_filter_data(void)
filter = &(((Edje_Part_Description_Text *)current_desc)->filter);
else if (current_part->type == EDJE_PART_TYPE_IMAGE)
filter = &(((Edje_Part_Description_Image *)current_desc)->filter);
+ else if (current_part->type == EDJE_PART_TYPE_PROXY)
+ filter = &(((Edje_Part_Description_Proxy *)current_desc)->filter);
else
{
ERR("parse error %s:%i. filter set for non-TEXT and non-IMAGE part.",
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 234c8a3..3312007 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2460,7 +2460,7 @@ _edje_part_recalc_single_filter(Edje *ed,
Evas_Object *obj = ep->object;
Eina_List *li1, *li2;
- /* handle TEXT and IMAGE part types here */
+ /* handle TEXT, IMAGE, PROXY part types here */
if (ep->part->type == EDJE_PART_TYPE_TEXT)
{
Edje_Part_Description_Text *chosen_edt = (Edje_Part_Description_Text
*) chosen_desc;
@@ -2477,6 +2477,14 @@ _edje_part_recalc_single_filter(Edje *ed,
prev_sources = edi->filter.sources;
filter_sources = chosen_edi->filter.sources;
}
+ else if (ep->part->type == EDJE_PART_TYPE_PROXY)
+ {
+Edje_Part_Description_Proxy *chosen_edp = (Edje_Part_Description_Proxy
*) chosen_desc;
+Edje_Part_Description_Proxy *edp = (Edje_Part_Description_Proxy *)
desc;
+filter = &chosen_edp->filter;
+prev_sources = edp->filter.sources;
+filter_sources = chosen_edp->filter.sources;
+ }
else
{
CRI("Invalid call to filter recalc");
@@ -2851,6 +2859,10 @@ _edje_part_recalc_single(Edje *ed,
_edje_part_recalc_single_filter(ed, ep, desc, chosen_desc, pos);
}
+ else if (ep->part->type == EDJE_PART_TYPE_PROXY)
+ {
+_edje_part_recalc_single_filter(ed, ep, desc, chosen_desc, pos);
+ }
/* remember what our size is BEFORE we go limit it */
params->req.x = TO_INT(params->eval.x);
diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c
index ef6ac47..acad419 100644
--- a/src/lib/edje/edje_data.c
+++ b/src/lib/edje/edje_data.c
@@ -1021,6 +1021,9 @@ _edje_edd_init(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy,
Edje_Part_Description_Proxy, "proxy.fill.type", proxy.fill.type, EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy,
Edje_Part_Description_Proxy, "proxy.source_visible", proxy.source_visible,
EET_T_CHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy,
Edje_Part_Description_Proxy, "proxy.source_clip", proxy.source_clip,
EET_T_CHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_proxy,
Edje_Part_Description_Proxy, "proxy.filter.code", filter.code, EET_T_STRING);
// @since 1.16
+ EET_DATA_DESCRIPTOR_ADD_LIST_STRING(_edje_edd_edje_part_description_proxy,
Edje_Part_Description_Proxy, "proxy.filter.sources", f
[EGIT] [core/efl] master 07/10: Edje: Add test case for SNAPSHOT
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=35fe059ec8091a7635117abfddb5ed3f83e2101e
commit 35fe059ec8091a7635117abfddb5ed3f83e2101e
Author: Jean-Philippe Andre
Date: Mon Sep 7 19:08:50 2015 +0900
Edje: Add test case for SNAPSHOT
This is mostly an edje_cc compilation test.
---
src/Makefile_Edje.am | 8 +++--
src/tests/edje/data/test_snapshot.edc | 61 +++
src/tests/edje/edje_test_edje.c | 25 ++
3 files changed, 92 insertions(+), 2 deletions(-)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6e99c85..1e5059f 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -254,6 +254,7 @@ tests/edje/data/test_layout.edc \
tests/edje/data/test_parens.edc \
tests/edje/data/test_masking.edc \
tests/edje/data/test_filters.edc \
+tests/edje/data/test_snapshot.edc \
tests/edje/data/filter.lua
@@ -295,6 +296,7 @@ EDJE_DATA_FILES = tests/edje/data/test_layout.edc \
tests/edje/data/test_parens.edc \
tests/edje/data/test_masking.edc \
tests/edje/data/test_filters.edc \
+ tests/edje/data/test_snapshot.edc \
tests/edje/data/filter.lua
edjedatafilesdir = $(datadir)/edje/data
@@ -302,13 +304,15 @@ edjedatafiles_DATA = tests/edje/data/test_layout.edj \
tests/edje/data/complex_layout.edj \
tests/edje/data/test_parens.edj \
tests/edje/data/test_masking.edj \
- tests/edje/data/test_filters.edj
+ tests/edje/data/test_filters.edj \
+ tests/edje/data/test_snapshot.edj
CLEANFILES += tests/edje/data/test_layout.edj \
tests/edje/data/complex_layout.edj \
tests/edje/data/test_parens.edj \
tests/edje/data/test_masking.edj \
- tests/edje/data/test_filters.edj
+ tests/edje/data/test_filters.edj \
+ tests/edje/data/test_snapshot.edj
endif
diff --git a/src/tests/edje/data/test_snapshot.edc
b/src/tests/edje/data/test_snapshot.edc
new file mode 100644
index 000..a68c649
--- /dev/null
+++ b/src/tests/edje/data/test_snapshot.edc
@@ -0,0 +1,61 @@
+collections {
+ filters {
+ filter {
+ name: "filter";
+ script {
+padding_set(0)
+blur { 10 }
+ }
+ }
+ }
+ images {
+ // found in tests/emotion/data
+ image: "e_logo.png" COMP;
+ }
+ group { name: "test_group";
+ filters {
+ filter.file: "filter.lua";
+ }
+ parts {
+ part { name: "background";
+type: RECT;
+description { state: "default" 0.0;
+ color: 33 32 32 255;
+ rel1.relative: 0 0;
+ rel2.relative: 1 1;
+ max: 250 250;
+}
+ }
+ image { "img";
+desc { "default";
+ image.normal: "e_logo.png";
+ fill.type: TILE;
+ rel.to: "background";
+}
+ }
+ part { name: "snap";
+type: SNAPSHOT;
+desc { "default";
+ rel.to: "background";
+ rel1.relative: 0.25 0.25;
+ rel2.relative: 0.75 0.75;
+ filter.code: "filter";
+}
+desc { "hid"; inherit: "default"; hid;
+}
+ }
+ }
+ programs.program {
+ source: "*";
+ signal: "mouse,in";
+ action: STATE_SET "hid" 0.0;
+ targets: "snap";
+ }
+ programs.program {
+ source: "*";
+ signal: "mouse,out";
+ action: STATE_SET "default" 0.0;
+ targets: "snap";
+ }
+ }
+}
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index bf32f6d..43eacdc 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -243,6 +243,30 @@ START_TEST(edje_test_filters)
}
END_TEST
+START_TEST(edje_test_snapshot)
+{
+ Evas *evas = EDJE_TEST_INIT_EVAS();
+ const Evas_Object *sub;
+ Evas_Object *obj, *src = NULL;
+ Eina_Bool b;
+
+ setenv("EVAS_DATA_DIR", EVAS_DATA_DIR, 1);
+
+ obj = edje_object_add(evas);
+ fail_unless(edje_object_file_set(obj, test_layout_get("test_snapshot.edj"),
"test_group"));
+
+ evas_object_resize(obj, 200, 200);
+
+ /* check value of no_render flag as seen from evas land */
+ sub = edje_object_part_object_get(obj, "snap");
+ fail_if(!eo_do_ret(sub, b, evas_obj_image_snapshot_get()));
+
+ // TODO: Verify that evas snapshot actually works (and has a filter)
+
+ EDJE_TEST_FREE_EVAS();
+}
+END_TEST
+
void edje_test_edje(TCase *tc)
{
tcase_add_test(tc, edje_test_edje_init);
@@ -253,4 +277,5 @@ void edje_test_edje(TCase *tc)
tcase_add_test(tc, edje_test_calculate_parens);
tcase_add_test(tc, edje_test_masking
[EGIT] [core/efl] master 02/10: Edje: Fix filters for IMAGE parts inherited states
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=99b1c7622ba3ee0358d491d048f115eed3031d34
commit 99b1c7622ba3ee0358d491d048f115eed3031d34
Author: Jean-Philippe Andre
Date: Tue Aug 18 21:07:53 2015 +0900
Edje: Fix filters for IMAGE parts inherited states
---
src/bin/edje/edje_cc_handlers.c | 12
1 file changed, 12 insertions(+)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 5a56fb2..18adacb 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -7089,6 +7089,18 @@ st_collections_group_parts_part_description_inherit(void)
ied->image.tweens[i] = iid_new;
}
+ /* Filters stuff */
+ ied->filter.code = STRDUP(ied->filter.code);
+ if (ied->filter.code)
+{
+ Eina_List *list, *l;
+ const char *name;
+ list = ied->filter.sources;
+ ied->filter.sources = NULL;
+ EINA_LIST_FOREACH(list, l, name)
+ ied->filter.sources =
eina_list_append(ied->filter.sources, STRDUP(name));
+}
+
break;
}
case EDJE_PART_TYPE_PROXY:
--
[EGIT] [core/efl] master 06/10: Edje: Add filter support to SNAPSHOT parts
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6ac4f7154b7750b7c9765f74428e2ebcc83290d9
commit 6ac4f7154b7750b7c9765f74428e2ebcc83290d9
Author: Jean-Philippe Andre
Date: Mon Sep 7 17:22:07 2015 +0900
Edje: Add filter support to SNAPSHOT parts
This makes SNAPSHOT a part type on it own, combining the
common and filter subtypes.
This means it is now possible to set an evas filter on
a SNAPSHOT object, just like for TEXT, IMAGE and PROXY.
@feature
---
src/bin/edje/edje_cc_handlers.c | 62 +++--
src/lib/edje/Edje_Common.h | 2 +-
src/lib/edje/edje_cache.c | 2 +-
src/lib/edje/edje_calc.c| 16 ++-
src/lib/edje/edje_data.c| 11 +---
src/lib/edje/edje_private.h | 7 +
6 files changed, 84 insertions(+), 16 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index b4530c9..2ccedb1 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -1423,7 +1423,6 @@ _edje_part_description_alloc(unsigned char type, const
char *collection, const c
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_GROUP:
- case EDJE_PART_TYPE_SNAPSHOT:
result = mem_alloc(SZ(Edje_Part_Description_Common));
break;
case EDJE_PART_TYPE_TEXT:
@@ -1457,7 +1456,16 @@ _edje_part_description_alloc(unsigned char type, const
char *collection, const c
result = &ed->common;
break;
- }
+}
+ case EDJE_PART_TYPE_SNAPSHOT:
+{
+ Edje_Part_Description_Snapshot *ed;
+
+ ed = mem_alloc(SZ(Edje_Part_Description_Snapshot));
+
+ result = &ed->common;
+ break;
+}
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *ed;
@@ -4921,12 +4929,12 @@ _part_desc_free(Edje_Part_Collection *pc,
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_GROUP:
- case EDJE_PART_TYPE_SNAPSHOT:
/* Nothing todo, this part only have a common description. */
break;
case EDJE_PART_TYPE_BOX:
case EDJE_PART_TYPE_TABLE:
case EDJE_PART_TYPE_IMAGE:
+ case EDJE_PART_TYPE_SNAPSHOT:
/* Nothing todo here */
break;
case EDJE_PART_TYPE_TEXT:
@@ -7031,7 +7039,6 @@ st_collections_group_parts_part_description_inherit(void)
case EDJE_PART_TYPE_RECTANGLE:
case EDJE_PART_TYPE_SWALLOW:
case EDJE_PART_TYPE_GROUP:
- case EDJE_PART_TYPE_SNAPSHOT:
/* Nothing todo, this part only have a common description. */
break;
case EDJE_PART_TYPE_TEXT:
@@ -7090,12 +7097,12 @@
st_collections_group_parts_part_description_inherit(void)
}
/* Filters stuff */
- ied->filter.code = STRDUP(ied->filter.code);
+ ied->filter.code = STRDUP(iparent->filter.code);
if (ied->filter.code)
{
Eina_List *list, *l;
const char *name;
- list = ied->filter.sources;
+ list = iparent->filter.sources;
ied->filter.sources = NULL;
EINA_LIST_FOREACH(list, l, name)
ied->filter.sources =
eina_list_append(ied->filter.sources, STRDUP(name));
@@ -7103,6 +7110,25 @@ st_collections_group_parts_part_description_inherit(void)
break;
}
+ case EDJE_PART_TYPE_SNAPSHOT:
+ {
+ Edje_Part_Description_Snapshot *sed =
(Edje_Part_Description_Snapshot*) ed;
+ Edje_Part_Description_Snapshot *sparent =
(Edje_Part_Description_Snapshot*) parent;
+
+ /* Filters stuff */
+ sed->filter.code = STRDUP(sparent->filter.code);
+ if (sed->filter.code)
+{
+ Eina_List *list, *l;
+ const char *name;
+ list = sparent->filter.sources;
+ sed->filter.sources = NULL;
+ EINA_LIST_FOREACH(list, l, name)
+ sed->filter.sources =
eina_list_append(sed->filter.sources, STRDUP(name));
+}
+
+ break;
+ }
case EDJE_PART_TYPE_PROXY:
{
Edje_Part_Description_Proxy *ped =
(Edje_Part_Description_Proxy*) ed;
@@ -7110,6 +7136,18 @@ st_collections_group_parts_part_description_inherit(void)
data_queue_copied_part_lookup(pc, &(pparent->proxy.id),
&(ped->proxy.id));
+ /* Filters stuff */
+ ped->filter.code = STRDUP(pparent->filter.code);
+ if (ped->filter.code)
+{
+ Eina_List *list, *l;
+ const char *name;
+ list = pparent->filter.
[EGIT] [core/efl] master 04/10: Edje: Fix IMAGE filters
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a181c32cbe03562c148cf31465317df365f9111d
commit a181c32cbe03562c148cf31465317df365f9111d
Author: Jean-Philippe Andre
Date: Tue Aug 18 21:35:55 2015 +0900
Edje: Fix IMAGE filters
Some invalid logic made filters work only in a rare situation.
@fix
---
src/lib/edje/edje_calc.c | 35 ++-
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 3312007..2da8cb8 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -2834,29 +2834,30 @@ _edje_part_recalc_single(Edje *ed,
if (lminh > minh) minh = lminh;
}
}
- else if ((ep->part->type == EDJE_PART_TYPE_IMAGE) &&
-(chosen_desc->min.limit || chosen_desc->max.limit))
+ else if (ep->part->type == EDJE_PART_TYPE_IMAGE)
{
-Evas_Coord w, h;
+if (chosen_desc->min.limit || chosen_desc->max.limit)
+ {
+ Evas_Coord w, h;
-/* We only need pos to find the right image that would be displayed */
-/* Yes, if someone set aspect preference to SOURCE and also max,min
+ /* We only need pos to find the right image that would be
displayed */
+ /* Yes, if someone set aspect preference to SOURCE and also
max,min
to SOURCE, it will be under efficient, but who cares at the
moment. */
-_edje_real_part_image_set(ed, ep, NULL, pos);
-evas_object_image_size_get(ep->object, &w, &h);
+ _edje_real_part_image_set(ed, ep, NULL, pos);
+ evas_object_image_size_get(ep->object, &w, &h);
-if (chosen_desc->min.limit)
- {
- if (w > minw) minw = w;
- if (h > minh) minh = h;
- }
-if (chosen_desc->max.limit)
- {
- if ((maxw <= 0) || (w < maxw)) maxw = w;
- if ((maxh <= 0) || (h < maxh)) maxh = h;
+ if (chosen_desc->min.limit)
+ {
+ if (w > minw) minw = w;
+ if (h > minh) minh = h;
+ }
+ if (chosen_desc->max.limit)
+ {
+ if ((maxw <= 0) || (w < maxw)) maxw = w;
+ if ((maxh <= 0) || (h < maxh)) maxh = h;
+ }
}
-
_edje_part_recalc_single_filter(ed, ep, desc, chosen_desc, pos);
}
else if (ep->part->type == EDJE_PART_TYPE_PROXY)
--
[EGIT] [core/efl] master 05/10: Edje tests: Add PROXY part to the filters test case
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6b7e4087d2eec005f9f5e1dc20b54d525700a7df
commit 6b7e4087d2eec005f9f5e1dc20b54d525700a7df
Author: Jean-Philippe Andre
Date: Tue Aug 18 21:37:42 2015 +0900
Edje tests: Add PROXY part to the filters test case
Only compilation is tested here.
Use edje_player to check the resulting edj if you wanna see what
happens.
---
src/tests/edje/data/test_filters.edc | 46
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/tests/edje/data/test_filters.edc
b/src/tests/edje/data/test_filters.edc
index 6b3b5e6..e1f8b57 100644
--- a/src/tests/edje/data/test_filters.edc
+++ b/src/tests/edje/data/test_filters.edc
@@ -29,7 +29,9 @@ collections {
filter {
name: "filter3";
script {
-blend {}
+if not a then a = 255 end
+fill { color = (color('lime') * a) }
+blend { color = (color('red') * a) }
}
}
}
@@ -53,7 +55,7 @@ collections {
}
part { name: "mask";
type: IMAGE;
-no_render: 1;
+no_render: 1;
description { state: "default" 0.0;
rel1.relative: 0 0;
rel2.relative: 1 1;
@@ -62,9 +64,43 @@ collections {
image.normal: "pnl.png";
}
}
- part { name: "text";
+ proxy { "prxy";
+desc { "default";
+ filter {
+ code: "filter3";
+ data: "a" "96";
+ }
+ max: 64 -1;
+ align: 1 0.5;
+ source: "mask";
+ fill {
+ type: TILE;
+ origin {
+ relative: 0 0;
+ offset: 0 0;
+ }
+ size {
+ relative: 1 1;
+ offset: -1 -1;
+ }
+ }
+}
+ }
+ image {
+"img";
+desc {
+ "default";
+ image.normal: "pnl.png";
+ max: 64 -1;
+ align: 0 0.5;
+ filter.code: "filter3";
+}
+ }
+ part {
+name: "text";
type: TEXT;
-description { state: "default" 0.0;
+description {
+ state: "default" 0.0;
rel1.relative: 0 0;
rel2.relative: 1 1;
rel1.to: "background";
@@ -78,7 +114,7 @@ collections {
filter {
code: "filterfile";
source: "mask";
- data: "mycolor" "#f0f8";
+ data: "mycolor" "#f0f8";
data: "cc" "color_class('cc1')";
}
color: 255 80 0 200;
--
[EGIT] [core/efl] master 08/10: Edje: Fix invalid loading of snapshot parts
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1bb294ba1c3e41f8e6bb4d3b8c23f0c58dee4cf9 commit 1bb294ba1c3e41f8e6bb4d3b8c23f0c58dee4cf9 Author: Jean-Philippe Andre Date: Tue Sep 15 18:10:51 2015 +0900 Edje: Fix invalid loading of snapshot parts --- src/lib/edje/edje_calc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c index ac444f0..e2a662f 100644 --- a/src/lib/edje/edje_calc.c +++ b/src/lib/edje/edje_calc.c @@ -328,9 +328,9 @@ case EDJE_PART_TYPE_##Short: \ case EDJE_PART_TYPE_SNAPSHOT: desc_rtl = eina_mempool_malloc(ce->mp_rtl.SNAPSHOT, - sizeof (Edje_Part_Description_Common)); + sizeof (Edje_Part_Description_Snapshot)); ce->count.SNAPSHOT++; -memsize = sizeof(Edje_Part_Description_Common); +memsize = sizeof(Edje_Part_Description_Snapshot); break; case EDJE_PART_TYPE_SWALLOW: @@ -4302,6 +4302,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int flags, Edje_Calc_Params *sta case EDJE_PART_TYPE_TEXTBLOCK: case EDJE_PART_TYPE_BOX: case EDJE_PART_TYPE_TABLE: + case EDJE_PART_TYPE_SNAPSHOT: evas_object_color_set(ep->object, (pf->color.r * pf->color.a) / 255, (pf->color.g * pf->color.a) / 255, --
[EGIT] [core/efl] master 10/10: Edje: Turn SNAPSHOT objects into filled images for now
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a449bfc555abe1d21c5e0afd97ef423e2821e585 commit a449bfc555abe1d21c5e0afd97ef423e2821e585 Author: Jean-Philippe Andre Date: Thu Oct 1 20:01:52 2015 +0900 Edje: Turn SNAPSHOT objects into filled images for now Without that, the image has no fill information. Fill properties may need to be added to SNAPHOT parts but the default behaviour should make sense. Before this patch you just get a black rectangle. Considering how image filters currently work, marking snapshots as filled by default is not the best solution (need padding_set(0) to render nicely). --- src/lib/edje/edje_load.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 2ab9862..e9fcfa3 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -711,7 +711,7 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch case EDJE_PART_TYPE_PROXY: case EDJE_PART_TYPE_IMAGE: case EDJE_PART_TYPE_SNAPSHOT: - rp->object = evas_object_image_add(ed->base->evas); + rp->object = evas_object_image_filled_add(ed->base->evas); if (ep->type == EDJE_PART_TYPE_SNAPSHOT) evas_object_image_snapshot_set(rp->object, EINA_TRUE); break; --
[EGIT] [core/efl] master 01/01: Edje: Fix big oopsie in previous commit
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4de199b7ac9dc3d90ee6cfc661f0e105f8d775bb commit 4de199b7ac9dc3d90ee6cfc661f0e105f8d775bb Author: Jean-Philippe Andre Date: Thu Oct 1 20:27:36 2015 +0900 Edje: Fix big oopsie in previous commit --- src/lib/edje/edje_load.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index e9fcfa3..13ad301 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -710,10 +710,12 @@ _edje_object_file_set_internal(Evas_Object *obj, const Eina_File *file, const ch case EDJE_PART_TYPE_PROXY: case EDJE_PART_TYPE_IMAGE: + rp->object = evas_object_image_add(ed->base->evas); + break; + case EDJE_PART_TYPE_SNAPSHOT: rp->object = evas_object_image_filled_add(ed->base->evas); - if (ep->type == EDJE_PART_TYPE_SNAPSHOT) - evas_object_image_snapshot_set(rp->object, EINA_TRUE); + evas_object_image_snapshot_set(rp->object, EINA_TRUE); break; case EDJE_PART_TYPE_TEXT: --
[EGIT] [core/elementary] elementary-1.15 01/01: build: remove colorclass generated files
discomfitor pushed a commit to branch elementary-1.15. http://git.enlightenment.org/core/elementary.git/commit/?id=7d8b08c6e810c2f772e5ec03634f88c36d364231 commit 7d8b08c6e810c2f772e5ec03634f88c36d364231 Author: Mike Blumenkrantz Date: Thu Oct 1 08:34:01 2015 -0400 build: remove colorclass generated files --- src/lib/Makefile.am | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 268b43a..4adeac8 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -376,11 +376,6 @@ elm_win_standard.eo.h \ elm_helper.h includesubdir = $(includedir)/elementary-@VMAJ@/ -COLORCLASS_GEN = \ -eldbus_elementary_colorclass.c \ -eldbus_elementary_colorclass.h \ -eldbus_utils.h - libelementary_la_SOURCES = \ elm_priv.h \ els_box.h \ @@ -497,8 +492,7 @@ elm_helper.c \ els_box.c \ els_cursor.c \ els_tooltip.c \ -elu_ews_wm.c \ -$(COLORCLASS_GEN) +elu_ews_wm.c libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@ libelementary_la_LIBADD = \ @@ -778,7 +772,3 @@ Elementary.hh: $(elm_eolian_hh) @for i in $(elm_eolian_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/Elementary.hh; done @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/Elementary.hh endif - - - -MAINTAINERCLEANFILES += $(COLORCLASS_GEN) --
[EGIT] [core/elementary] master 01/01: build: remove colorclass generated files
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=5471505d0f24a05c7d96a83540fcdd2b14785433 commit 5471505d0f24a05c7d96a83540fcdd2b14785433 Author: Mike Blumenkrantz Date: Thu Oct 1 08:34:01 2015 -0400 build: remove colorclass generated files --- src/lib/Makefile.am | 12 +--- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 12d304d..0922587 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -378,11 +378,6 @@ elm_win_standard.eo.h \ elm_helper.h includesubdir = $(includedir)/elementary-@VMAJ@/ -COLORCLASS_GEN = \ -eldbus_elementary_colorclass.c \ -eldbus_elementary_colorclass.h \ -eldbus_utils.h - libelementary_la_SOURCES = \ elm_priv.h \ els_box.h \ @@ -499,8 +494,7 @@ elm_helper.c \ els_box.c \ els_cursor.c \ els_tooltip.c \ -elu_ews_wm.c \ -$(COLORCLASS_GEN) +elu_ews_wm.c libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@ libelementary_la_LIBADD = \ @@ -661,7 +655,3 @@ nodist_includecxxbindings_HEADERS = Elementary.hh $(elm_eolian_hh) $(elm_eolian_ CLEANFILES += $(nodist_includecxxbindings_HEADERS) EXTRA_DIST += Elementary.hh.in endif - - - -MAINTAINERCLEANFILES += $(COLORCLASS_GEN) --
[EGIT] [core/enlightenment] master 01/01: wl_desktop_shell: return void
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=00a597213d0b9b37fce3dfddc2cb32bec5336043
commit 00a597213d0b9b37fce3dfddc2cb32bec5336043
Author: Boram Park
Date: Thu Oct 1 08:43:19 2015 -0400
wl_desktop_shell: return void
Summary:
_e_input_panel_cb_surface_get() returns void.
Signed-off-by: Boram Park
Reviewers: zmike, stefan_schmidt, gwanglim, raster, devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D3119
---
src/modules/wl_desktop_shell/e_mod_input_panel.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/modules/wl_desktop_shell/e_mod_input_panel.c
b/src/modules/wl_desktop_shell/e_mod_input_panel.c
index a8350ad..33e74fc 100644
--- a/src/modules/wl_desktop_shell/e_mod_input_panel.c
+++ b/src/modules/wl_desktop_shell/e_mod_input_panel.c
@@ -202,7 +202,7 @@ _e_input_panel_cb_surface_get(struct wl_client *client,
struct wl_resource *reso
if (!ips)
{
wl_client_post_no_memory(client);
-return NULL;
+return;
}
cd->shell.surface = wl_resource_create(client,
@@ -212,7 +212,7 @@ _e_input_panel_cb_surface_get(struct wl_client *client,
struct wl_resource *reso
{
wl_client_post_no_memory(client);
free(ips);
-return NULL;
+return;
}
ips->ec = ec;
--
[EGIT] [core/efl] master 01/01: edje_cc: Check default state as well
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ad268c1d94b0dd54ce31cb665f0be4c2ed8b4452 commit ad268c1d94b0dd54ce31cb665f0be4c2ed8b4452 Author: Jean-Philippe Andre Date: Thu Oct 1 21:28:32 2015 +0900 edje_cc: Check default state as well Strangely only the other states were checked for errors. Errors include: - no name for state, or "description with missing state" - invalid clip_to Also improve the error message a bit --- src/bin/edje/edje_cc_out.c | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index 5c79ee8..d8f6d55 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -554,8 +554,10 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo if (ed->clip_to_id != -1 && (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) - error_and_abort(ef, "Collection %i: description.clip_to point to a non RECT/IMAGE part '%s' !", - pc->id, pc->parts[ed->clip_to_id]->name); + error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to " + "a non RECT/IMAGE part '%s'!", + pc->id, ep->name, ed->state.name, ed->state.value, + pc->parts[ed->clip_to_id]->name); check_nameless_state(pc, ep, ed, ef); } @@ -570,6 +572,7 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) error_and_abort(ef, "Collection %i: default description missing " "for part \"%s\"", pc->id, ep->name); + check_state(pc, ep, ep->default_desc, ef); for (i = 0; i < ep->other.desc_count; ++i) check_state(pc, ep, ep->other.desc[i], ef); --
[EGIT] [core/efl] master 01/02: evas-wayland-egl: Add support for 'smart' merge mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bc9b4e536afc62d83d245724c94c2c91b312241d
commit bc9b4e536afc62d83d245724c94c2c91b312241d
Author: Chris Michael
Date: Thu Oct 1 08:59:00 2015 -0400
evas-wayland-egl: Add support for 'smart' merge mode
Summary: This just adds support for 'smart' merge mode in the wayland
egl engine to keep in line with the gl x11 engine
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_egl/evas_engine.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 750d443..70ed760 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -594,7 +594,7 @@ eng_setup(Evas *evas, void *info)
if (!(re = epd->engine.data.output))
{
-Render_Engine_Merge_Mode merge = MERGE_BOUNDING;
+Render_Engine_Merge_Mode merge = MERGE_SMART;
/* FIXME: Remove this line as soon as eglGetDisplay() autodetection
* gets fixed. Currently it is incorrectly detecting wl_display and
@@ -650,6 +650,8 @@ eng_setup(Evas *evas, void *info)
merge = MERGE_BOUNDING;
else if ((!strcmp(s, "full")) || (!strcmp(s, "f")))
merge = MERGE_FULL;
+ else if ((!strcmp(s, "smart")) || (!strcmp(s, "s")))
+ merge = MERGE_SMART;
}
evas_render_engine_software_generic_merge_mode_set(&re->generic.software,
merge);
--
[EGIT] [core/efl] master 02/02: evas-gl-drm: Add support for 'smart' merge mode
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ba5d3b048090e7a2a7dea648eb2dd3ea7ab2d3ae
commit ba5d3b048090e7a2a7dea648eb2dd3ea7ab2d3ae
Author: Chris Michael
Date: Thu Oct 1 09:00:44 2015 -0400
evas-gl-drm: Add support for 'smart' merge mode
Summary: This just adds support for 'smart' merge mode in the evas
gl_drm engine to keep in line with gl_x11 engine.
Signed-off-by: Chris Michael
---
src/modules/evas/engines/gl_drm/evas_engine.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index b424c70..1384bc9 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -802,7 +802,7 @@ eng_setup(Evas *evas, void *in)
if (!(re = epd->engine.data.output))
{
Outbuf *ob;
-Render_Engine_Merge_Mode merge_mode = MERGE_BOUNDING;
+Render_Engine_Merge_Mode merge_mode = MERGE_SMART;
if (!initted)
{
@@ -864,6 +864,8 @@ eng_setup(Evas *evas, void *in)
merge_mode = MERGE_BOUNDING;
else if ((!strcmp(s, "full")) || (!strcmp(s, "f")))
merge_mode = MERGE_FULL;
+ else if ((!strcmp(s, "smart")) || (!strcmp(s, "s")))
+ merge_mode = MERGE_SMART;
}
evas_render_engine_software_generic_merge_mode_set(&re->generic.software,
merge_mode);
--
[EGIT] [core/efl] master 01/01: edje_cc: Allow PROXY as clipper (clip_to and desc.clip_to)
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=8e004030470a89e34582ea4f20d9648547b0697f commit 8e004030470a89e34582ea4f20d9648547b0697f Author: Jean-Philippe Andre Date: Thu Oct 1 21:58:18 2015 +0900 edje_cc: Allow PROXY as clipper (clip_to and desc.clip_to) This arbitrary limitation can now be lifted since masking is well supported (ie. clip_to can point to an IMAGE rather than a RECT). @feature --- src/bin/edje/edje_cc_out.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c index d8f6d55..2a31b3f 100644 --- a/src/bin/edje/edje_cc_out.c +++ b/src/bin/edje/edje_cc_out.c @@ -553,7 +553,8 @@ check_state(Edje_Part_Collection *pc, Edje_Part *ep, Edje_Part_Description_Commo /* FIXME: When smart masks are supported, remove this check */ if (ed->clip_to_id != -1 && (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) + (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && + (pc->parts[ed->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) error_and_abort(ef, "Collection %i: part: '%s' state: '%s' %g clip_to points to " "a non RECT/IMAGE part '%s'!", pc->id, ep->name, ed->state.name, ed->state.value, @@ -600,7 +601,8 @@ check_part(Edje_Part_Collection *pc, Edje_Part *ep, Eet_File *ef) /* FIXME: When smart masks are supported, remove this check */ if (ep->clip_to_id != -1 && (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_RECTANGLE) && - (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE)) + (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_IMAGE) && + (pc->parts[ep->clip_to_id]->type != EDJE_PART_TYPE_PROXY)) error_and_abort(ef, "Collection %i: clip_to point to a non RECT/IMAGE part '%s' !", pc->id, pc->parts[ep->clip_to_id]->name); } --
[EGIT] [core/efl] master 01/01: edje_cc: Add "norender; " as lazEDC for "no_render: 1; "
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9c5e873c6834f3374946ff02546ec97b5b86f88f
commit 9c5e873c6834f3374946ff02546ec97b5b86f88f
Author: Jean-Philippe Andre
Date: Thu Oct 1 22:20:48 2015 +0900
edje_cc: Add "norender;" as lazEDC for "no_render: 1;"
---
src/bin/edje/edje_cc_handlers.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 2ccedb1..190c3e0 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -1078,6 +1078,7 @@ New_Statement_Handler statement_handlers_short_single[] =
{"collections.group.parts.part.noprecise",
st_collections_group_parts_part_noprecise},
{"collections.group.parts.part.scale",
st_collections_group_parts_part_scale},
{"collections.group.parts.part.noscale",
st_collections_group_parts_part_noscale},
+ {"collections.group.parts.part.norender",
st_collections_group_parts_part_no_render},
{"collections.group.parts.part.description.vis",
st_collections_group_parts_part_description_vis},
{"collections.group.parts.part.description.hid",
st_collections_group_parts_part_description_hid},
{"collections.group.mouse", st_collections_group_mouse},
@@ -5773,9 +5774,10 @@ st_collections_group_parts_part_clip_to_id(void)
static void
st_collections_group_parts_part_no_render(void)
{
- check_arg_count(1);
-
- current_part->no_render = parse_bool(0);
+ if (check_range_arg_count(0, 1) == 1)
+ current_part->no_render = parse_bool(0);
+ else /* lazEDC form */
+ current_part->no_render = EINA_TRUE;
}
/**
--
[EGIT] [core/elementary] master 01/01: Merge branch 'devs/stanluk/perf'
stanluk pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=b9d315996b917a2c04f5608ad3476140e1613ee0 commit b9d315996b917a2c04f5608ad3476140e1613ee0 Merge: 5471505 a109bf0 Author: Lukasz Stanislawski Date: Thu Oct 1 16:08:35 2015 +0200 Merge branch 'devs/stanluk/perf' Serie of patches reducing overall memory overhead of atspi mode. The main changes include: * use recently fixed eldbus_service_register_fallback function instead of regular ones. * use global accessibility events emitter and handler to avoid registering array of callbacks on every accessible object. * do not keep strings with object paths src/lib/Makefile.am | 1 + src/lib/elm_atspi_bridge.c| 917 +++--- src/lib/elm_entry.c | 10 +- src/lib/elm_genlist.c | 21 +- src/lib/elm_interface_atspi_accessible.c | 55 ++ src/lib/elm_interface_atspi_accessible.eo | 23 + src/lib/elm_interface_atspi_accessible.h | 46 +- src/lib/elm_interface_atspi_window.h | 56 ++ src/lib/elm_interfaces.h | 3 +- src/lib/elm_widget.c | 38 +- src/lib/elm_win.c | 36 +- src/tests/elm_test_genlist.c | 11 +- 12 files changed, 697 insertions(+), 520 deletions(-) --
[EGIT] [core/enlightenment] master 01/01: always apply all randr changes after a screen event
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=4b40ad10e5f31556d9ac233fb41c51141720ac6e
commit 4b40ad10e5f31556d9ac233fb41c51141720ac6e
Author: Mike Blumenkrantz
Date: Thu Oct 1 13:13:08 2015 -0400
always apply all randr changes after a screen event
fixes case where plugging an external monitor would cause the screen
to expand onto that display without the display being effectively usable
until after a restart
---
src/bin/e_randr2.c | 10 +++---
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/bin/e_randr2.c b/src/bin/e_randr2.c
index 789e388..9d1d604 100644
--- a/src/bin/e_randr2.c
+++ b/src/bin/e_randr2.c
@@ -598,13 +598,9 @@ _cb_screen_change_delay(void *data EINA_UNUSED)
}
// update screen info after the above apply or due to external changes
e_randr2_screeninfo_update();
- if ((e_comp->w != e_randr2->w) || (e_comp->h != e_randr2->h))
- e_comp_canvas_resize(e_randr2->w, e_randr2->h);
- else
- {
-e_randr2_screens_setup(e_comp->w, e_comp->h);
-e_comp_canvas_update();
- }
+ e_comp_canvas_resize(e_randr2->w, e_randr2->h);
+ e_randr2_screens_setup(e_comp->w, e_comp->h);
+ e_comp_canvas_update();
// tell the rest of e some screen reconfigure thing happened
ecore_event_add(E_EVENT_RANDR_CHANGE, NULL, NULL, NULL);
event_screen = EINA_FALSE;
--
[EGIT] [core/enlightenment] master 01/03: 20.0-alpha release
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=a43b49871d04c0097d67a47dea84245b43ccbc8c commit a43b49871d04c0097d67a47dea84245b43ccbc8c Author: Mike Blumenkrantz Date: Thu Oct 1 13:42:45 2015 -0400 20.0-alpha release --- configure.ac | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index be10d84..cb45c67 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) -m4_define([v_min], [19]) -m4_define([v_mic], [99]) +m4_define([v_min], [20]) +m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line -dnl m4_undefine([v_rev]) +m4_undefine([v_rev]) m4_define([relname], [0.20.0]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-autocannoli-0.20]) @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([enlightenment], [v_ver], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([enlightenment], [v_ver-alpha], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -54,7 +54,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) -##AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it]) +AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it]) version_info="lt_cur:lt_rev:lt_age" release_info="v_rel" AC_SUBST([version_info]) --
[EGIT] [core/enlightenment] master 02/03: 20.0-alpha NEWS updates
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=b848dbcb48a436eb7045b1a419821361be2ebdd5 commit b848dbcb48a436eb7045b1a419821361be2ebdd5 Author: Mike Blumenkrantz Date: Thu Oct 1 13:43:25 2015 -0400 20.0-alpha NEWS updates --- NEWS | 1796 ++ 1 file changed, 1796 insertions(+) diff --git a/NEWS b/NEWS index 919a57a..8baea79 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,1799 @@ +Release 0.20.0: +- +Highlights: + * Full Wayland support + - See README.wayland + * New screen management infrastructure and dialog + * New audio mixer infrastructure and gadget + * Many internal widgets replaced with Elementary + - Improved Elementary support + * Improved FreeBSD support + * Geolocation module + + +Bertrand Jacquin (1): + MEDIUM: modules/shot: switch to https:// + +Boram Park (5): + fix tty problem when enlightenment(drm-backend) is killed by SIGSEGV + e_comp_wl: fix segfault in case parent's surface is destroyed before subsurface is destroyed + e_comp_wl: fix not sending a mouse enter event to client. + Creating wl_shm global object before creating other global objects + wl_desktop_shell: return void + +Boris Faure (3): + synchronize mailmap + notification: don't segv if no zone found to place the popup + update mailmap + +Brian 'morlenxus' Miculcy (2): + mixer: Optionally select an external mixer application. + enlightenment/conf: fix missing icons in settings panel + +Bryce Harrington (14): + Code cleanup and check for OOM condition with wl_array_add + cosmetic: Whitespace cleanup of wayland client files + wayland: Refactor out common mouse handling code + wayland: Whitespace cleanup + wayland: Fix missing check on E_NEW return + wayland: Eliminate extraneous E_COMP_WL_PIXMAP_CHECK macro + wayland: Document the public API + wayland: Refactor output initialization code + wayland: Make sure we're initializing output scale sensibly + wayland: Check for potential OOM from wl_array_add() + wayland: Handle failure to init a display screen + uuid: Check error on ftruncate call + wayland: whitespace cleanup + wayland: Free temporary string on error exit + +Carsten Haitzler (105): + mixer: Optionally select an external mixer application. + e backlight - limit min to 0.05 to avoid totally off backlight + fix README to be more up to date + e_start - add ~/Applications/.bin to use for app bin searches + update po's + e_auth - null out compilert memset opts like lokker + windows - allow close button to work again in internal wins + Revert "windows - allow close button to work again in internal wins" + e - tiling module - silence warning (real possibility of an issue) + e - warning fix - fix SVID_SOURCE complaint warning + e - randr - stop saving config using XID - this is utterly WRONG + e randr - fix warning (signed vs unsigned cmp) + e randr - make it work on nvidia - lots of "wrong" things fixed + e randr - restore edp checks + Revert "randr: Don't track active outputs" + Revert "Randr: Fix null dereference." This reverts commit 4aef218d28ed66e80d882f052c704d92d11c3c81. + e - randr include - move to master includes (only if building for x) + Revert "all dialogs are now resizable" + e zone - add stow/unstow apis + e - force a config flush before sys actions that could kill e + revert all the ui breakes in e - going the wrong direction in the first place anyway. shoudl replace the entire dialgo one at a time by an elm version not try and stuff elm widgets into where e widgets used to be. this doesnt improve e's config dialogs, just makes them buggy as all hell in the name of a move to elm. + e dialogs - this one too + shot module - dont allow another instance and keep the current one + e - gadcon popup - handle delection of content object properly + clock - fix popup content.. use elm widgets now. + comp base - make base black. makes for better screenshots of blank areas + e - fix e widgets to use evas size hints - this unifies sizing elm vs e + e - rewrite randr code entirely. core and dialog. dialog is basic atm + e randr config - fid selecting of screen to populate correctly + update po + e - randr2 - handle lid close/open as screen unplug/plug + xinerama note for multiscreen handling + maximization bug affecting libreoffice and others - fix + adapt to new win center trap in 1.13 efl + e - client list update after adding to client list - fix netwm bug + e - fix build when wayland not enabled + elm accel pref config - fix to use correct api to set accel pref + e - randr - laptop lids - handle pl
[EGIT] [core/enlightenment] annotated tag v0.20.0-alpha created (now f69a8ff)
This is an automated email from the git hooks/post-receive script. discomfitor pushed a change to annotated tag v0.20.0-alpha in repository core/enlightenment. at f69a8ff (tag) tagging b848dbcb48a436eb7045b1a419821361be2ebdd5 (commit) replaces v0.19.0-rc3 tagged by Mike Blumenkrantz on Thu Oct 1 13:48:57 2015 -0400 - Log - 0.20.0-alpha release Bertrand Jacquin (1): MEDIUM: modules/shot: switch to https:// Boram Park (5): fix tty problem when enlightenment(drm-backend) is killed by SIGSEGV e_comp_wl: fix segfault in case parent's surface is destroyed before subsurface is destroyed e_comp_wl: fix not sending a mouse enter event to client. Creating wl_shm global object before creating other global objects wl_desktop_shell: return void Boris Faure (3): synchronize mailmap notification: don't segv if no zone found to place the popup update mailmap Brian 'morlenxus' Miculcy (3): mixer: Optionally select an external mixer application. mixer: Optionally select an external mixer application. enlightenment/conf: fix missing icons in settings panel Bryce Harrington (14): Code cleanup and check for OOM condition with wl_array_add cosmetic: Whitespace cleanup of wayland client files wayland: Refactor out common mouse handling code wayland: Whitespace cleanup wayland: Fix missing check on E_NEW return wayland: Eliminate extraneous E_COMP_WL_PIXMAP_CHECK macro wayland: Document the public API wayland: Refactor output initialization code wayland: Make sure we're initializing output scale sensibly wayland: Check for potential OOM from wl_array_add() wayland: Handle failure to init a display screen uuid: Check error on ftruncate call wayland: whitespace cleanup wayland: Free temporary string on error exit Carsten Haitzler (107): e input method config - fix ecore imf env vars to use xim Revert "redo pager modules to use more accurately named edje groups" mixer: Optionally select an external mixer application. e backlight - limit min to 0.05 to avoid totally off backlight fix README to be more up to date e_start - add ~/Applications/.bin to use for app bin searches update po's e_auth - null out compilert memset opts like lokker windows - allow close button to work again in internal wins Revert "windows - allow close button to work again in internal wins" e - tiling module - silence warning (real possibility of an issue) e - warning fix - fix SVID_SOURCE complaint warning e - randr - stop saving config using XID - this is utterly WRONG e randr - fix warning (signed vs unsigned cmp) e randr - make it work on nvidia - lots of "wrong" things fixed e randr - restore edp checks Revert "randr: Don't track active outputs" Revert "Randr: Fix null dereference." e - randr include - move to master includes (only if building for x) Revert "all dialogs are now resizable" e zone - add stow/unstow apis e - force a config flush before sys actions that could kill e revert all the ui breakes in e - going the wrong direction in the e dialogs - this one too shot module - dont allow another instance and keep the current one e - gadcon popup - handle delection of content object properly clock - fix popup content.. use elm widgets now. comp base - make base black. makes for better screenshots of blank areas e - fix e widgets to use evas size hints - this unifies sizing elm vs e e - rewrite randr code entirely. core and dialog. dialog is basic atm e randr config - fid selecting of screen to populate correctly update po e - randr2 - handle lid close/open as screen unplug/plug xinerama note for multiscreen handling maximization bug affecting libreoffice and others - fix adapt to new win center trap in 1.13 efl e - client list update after adding to client list - fix netwm bug e - fix build when wayland not enabled elm accel pref config - fix to use correct api to set accel pref e - randr - laptop lids - handle plug/unplug and well as lid open/close e - fix build. build break! shut up shadow warnings e - remove earns from randr2 e - randr - handle missing relative display and use priority for zone actions - add smart suspend + hibernate actions for laptop usage randr2 - handle missing clone src and walk back config only structs e - actions - smart suspend/hibernate - also dont do when on mains power efm - make dir listing far faster - no file magic content and dont sync e - menus - fix autoscroll on zones not at 0 y... e - menus - fix submenu popup direction when zones are not at 0 y e clients -
[EGIT] [core/enlightenment] master 03/03: unset release mode
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=982d4390f817e0c798e4d04247b7546fa61da742 commit 982d4390f817e0c798e4d04247b7546fa61da742 Author: Mike Blumenkrantz Date: Thu Oct 1 13:52:35 2015 -0400 unset release mode --- configure.ac | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index cb45c67..be10d84 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) -m4_define([v_min], [20]) -m4_define([v_mic], [0]) +m4_define([v_min], [19]) +m4_define([v_mic], [99]) m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line -m4_undefine([v_rev]) +dnl m4_undefine([v_rev]) m4_define([relname], [0.20.0]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-autocannoli-0.20]) @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([enlightenment], [v_ver-alpha], [enlightenment-de...@lists.sourceforge.net]) +AC_INIT([enlightenment], [v_ver], [enlightenment-de...@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -54,7 +54,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) -AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it]) +##AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it]) version_info="lt_cur:lt_rev:lt_age" release_info="v_rel" AC_SUBST([version_info]) --
[EGIT] [core/efl] efl-1.13 01/02: ecore_evas-x11: unset withdrawn state when window is mapped
cedric pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=478aaaf0d7fda19aa3746842545bb8ecaa604c27
commit 478aaaf0d7fda19aa3746842545bb8ecaa604c27
Author: Mike Blumenkrantz
Date: Fri Sep 25 21:19:12 2015 -0400
ecore_evas-x11: unset withdrawn state when window is mapped
according to ICCCM 4.1.4:
Newly created top-level windows are in the Withdrawn state.
Once the window has been provided with suitable properties,
the client is free to change its state...
...
Only the client can effect a transition into or out of the Withdrawn state
given that no external force can (according to spec) transition a
window out of the withdrawn state, this must be done at a reasonable
point. mapping the window seems like a reasonable point to me.
fix T2745
ref 5954289c6ce1cd55ff212428291604b981438439
@fix
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 31d5108..e4339d2 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1640,10 +1640,11 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.override)
+ if (ee->prop.withdrawn)
{
ee->prop.withdrawn = EINA_FALSE;
if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
}
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
--
[EGIT] [core/efl] efl-1.14 02/02: ecore_evas-x11: unset withdrawn flag when showing the ecore evas
cedric pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=676c334c2343dbe75403ecf975a54207afdd4866
commit 676c334c2343dbe75403ecf975a54207afdd4866
Author: Mike Blumenkrantz
Date: Fri Sep 25 22:21:25 2015 -0400
ecore_evas-x11: unset withdrawn flag when showing the ecore evas
while the window map event seemed like a reasonable place to unset
the withdrawn state at the time, studies and further tests have proven
that the direct show callback is even more reasonable and effective
ref T2745
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 8e7957f..c20dfd3 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1655,12 +1655,6 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.withdrawn)
- {
-ee->prop.withdrawn = EINA_FALSE;
-if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
-_ecore_evas_x_hints_update(ee);
- }
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
// printf("SHOW EVENT %p\n", ee);
@@ -2879,6 +2873,12 @@ _ecore_evas_x_show(Ecore_Evas *ee)
ecore_x_window_show(ee->prop.window);
if (ee->prop.fullscreen)
ecore_x_window_focus(ee->prop.window);
+ if (ee->prop.withdrawn)
+ {
+ee->prop.withdrawn = EINA_FALSE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
+ }
}
static void
--
[EGIT] [core/efl] efl-1.14 01/02: ecore_evas-x11: unset withdrawn state when window is mapped
cedric pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=da5ec0fe2f865a00bcad30e61e1daeb89159d228
commit da5ec0fe2f865a00bcad30e61e1daeb89159d228
Author: Mike Blumenkrantz
Date: Fri Sep 25 21:19:12 2015 -0400
ecore_evas-x11: unset withdrawn state when window is mapped
according to ICCCM 4.1.4:
Newly created top-level windows are in the Withdrawn state.
Once the window has been provided with suitable properties,
the client is free to change its state...
...
Only the client can effect a transition into or out of the Withdrawn state
given that no external force can (according to spec) transition a
window out of the withdrawn state, this must be done at a reasonable
point. mapping the window seems like a reasonable point to me.
fix T2745
ref 5954289c6ce1cd55ff212428291604b981438439
@fix
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 2d77b13..8e7957f 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1655,10 +1655,11 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.override)
+ if (ee->prop.withdrawn)
{
ee->prop.withdrawn = EINA_FALSE;
if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
}
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
--
[EGIT] [core/efl] efl-1.12 02/02: ecore_evas-x11: unset withdrawn flag when showing the ecore evas
cedric pushed a commit to branch efl-1.12.
http://git.enlightenment.org/core/efl.git/commit/?id=4ea10a788545de30c379945a262f4cbc2bc3f55c
commit 4ea10a788545de30c379945a262f4cbc2bc3f55c
Author: Mike Blumenkrantz
Date: Fri Sep 25 22:21:25 2015 -0400
ecore_evas-x11: unset withdrawn flag when showing the ecore evas
while the window map event seemed like a reasonable place to unset
the withdrawn state at the time, studies and further tests have proven
that the direct show callback is even more reasonable and effective
ref T2745
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 8d8e46b..6599057 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1642,12 +1642,6 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.withdrawn)
- {
-ee->prop.withdrawn = EINA_FALSE;
-if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
-_ecore_evas_x_hints_update(ee);
- }
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
// printf("SHOW EVENT %p\n", ee);
@@ -2864,6 +2858,12 @@ _ecore_evas_x_show(Ecore_Evas *ee)
ecore_x_window_show(ee->prop.window);
if (ee->prop.fullscreen)
ecore_x_window_focus(ee->prop.window);
+ if (ee->prop.withdrawn)
+ {
+ee->prop.withdrawn = EINA_FALSE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
+ }
}
static void
--
[EGIT] [core/efl] efl-1.13 02/02: ecore_evas-x11: unset withdrawn flag when showing the ecore evas
cedric pushed a commit to branch efl-1.13.
http://git.enlightenment.org/core/efl.git/commit/?id=739322e40a89e032d89f643041b4b2b19734fc29
commit 739322e40a89e032d89f643041b4b2b19734fc29
Author: Mike Blumenkrantz
Date: Fri Sep 25 22:21:25 2015 -0400
ecore_evas-x11: unset withdrawn flag when showing the ecore evas
while the window map event seemed like a reasonable place to unset
the withdrawn state at the time, studies and further tests have proven
that the direct show callback is even more reasonable and effective
ref T2745
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index e4339d2..afe0293 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1640,12 +1640,6 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.withdrawn)
- {
-ee->prop.withdrawn = EINA_FALSE;
-if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
-_ecore_evas_x_hints_update(ee);
- }
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
// printf("SHOW EVENT %p\n", ee);
@@ -2864,6 +2858,12 @@ _ecore_evas_x_show(Ecore_Evas *ee)
ecore_x_window_show(ee->prop.window);
if (ee->prop.fullscreen)
ecore_x_window_focus(ee->prop.window);
+ if (ee->prop.withdrawn)
+ {
+ee->prop.withdrawn = EINA_FALSE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
+ }
}
static void
--
[EGIT] [core/efl] efl-1.12 01/02: ecore_evas-x11: unset withdrawn state when window is mapped
cedric pushed a commit to branch efl-1.12.
http://git.enlightenment.org/core/efl.git/commit/?id=9b15832d28dcd05aa0c1d2f92f0e94ac3e3295ed
commit 9b15832d28dcd05aa0c1d2f92f0e94ac3e3295ed
Author: Mike Blumenkrantz
Date: Fri Sep 25 21:19:12 2015 -0400
ecore_evas-x11: unset withdrawn state when window is mapped
according to ICCCM 4.1.4:
Newly created top-level windows are in the Withdrawn state.
Once the window has been provided with suitable properties,
the client is free to change its state...
...
Only the client can effect a transition into or out of the Withdrawn state
given that no external force can (according to spec) transition a
window out of the withdrawn state, this must be done at a reasonable
point. mapping the window seems like a reasonable point to me.
fix T2745
ref 5954289c6ce1cd55ff212428291604b981438439
@fix
---
src/modules/ecore_evas/engines/x/ecore_evas_x.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index c5ad4f1..8d8e46b 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1642,10 +1642,11 @@ _ecore_evas_x_event_window_show(void *data EINA_UNUSED,
int type EINA_UNUSED, vo
}
if ((first_map_bug) && (!strcmp(ee->driver, "opengl_x11")))
evas_damage_rectangle_add(ee->evas, 0, 0, ee->w, ee->h);
- if (ee->prop.override)
+ if (ee->prop.withdrawn)
{
ee->prop.withdrawn = EINA_FALSE;
if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+_ecore_evas_x_hints_update(ee);
}
if (ee->visible) return ECORE_CALLBACK_PASS_ON;
// if (ee->visible) return ECORE_CALLBACK_DONE;
--
[EGIT] [core/elementary] master 01/01: test_genlist: remove check for array comparision against NULL
ami pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0bad0c98bc344eef90c4912c6a02b95a86e93d35
commit 0bad0c98bc344eef90c4912c6a02b95a86e93d35
Author: Amitesh Singh
Date: Fri Oct 2 00:26:16 2015 +0530
test_genlist: remove check for array comparision against NULL
CID: 1324955
---
src/bin/test_genlist.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 0ecd43b..3f686a1 100644
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -4888,7 +4888,7 @@ _entry_change_cb(void *data, Evas_Object *obj, void
*event EINA_UNUSED)
sprintf(buf, "%s", elm_object_text_get(obj));
api->filter_data = strdup(buf);
elm_genlist_filter_set(api->gl, (void *)(api->filter_data));
- if (buf == NULL || !strlen(buf))
+ if (!strlen(buf))
{
printf("Input data string empty; returning\n");
return;
--
[EGIT] [core/efl] master 01/01: ecore_imf: ibus - remove logically dead code
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=073d735d485c2088584850b89ff1211b7ddb941a commit 073d735d485c2088584850b89ff1211b7ddb941a Author: Amitesh Singh Date: Fri Oct 2 01:16:07 2015 +0530 ecore_imf: ibus - remove logically dead code fixes CID: 1261460 --- src/modules/ecore_imf/ibus/ibus_imcontext.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c index 2d776a0..0203b3e 100644 --- a/src/modules/ecore_imf/ibus/ibus_imcontext.c +++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c @@ -452,8 +452,6 @@ ecore_imf_context_ibus_filter_event(Ecore_IMF_Context *ctx, retval = EINA_TRUE; } } -else - retval = EINA_FALSE; if (retval) return EINA_TRUE; --
[EGIT] [core/efl] master 01/01: ecore_ipc: fix typo in ecore_ipc_server_send() API doc
ami pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bab9cb7bedb555ff93cbf1d0056be8773da05e22 commit bab9cb7bedb555ff93cbf1d0056be8773da05e22 Author: Amitesh Singh Date: Fri Oct 2 01:23:13 2015 +0530 ecore_ipc: fix typo in ecore_ipc_server_send() API doc --- src/lib/ecore_ipc/ecore_ipc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index 4588199..56de0ab 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c @@ -561,7 +561,7 @@ ecore_ipc_server_clients_get(Ecore_Ipc_Server *svr) /** * Sends a message to the given IPC server. * - * The content of the parameters, excluding the @p svr paramter, is up to + * The content of the parameters, excluding the @p svr parameter, is up to * the client. * * @param svr The given IPC server. --
[EGIT] [core/efl] master 01/01: evas-wayland-shm: Reduce size of resize pool during resize events
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=dedaf5550a316d8fca07c2f37ed759d353e39d21
commit dedaf5550a316d8fca07c2f37ed759d353e39d21
Author: Chris Michael
Date: Thu Oct 1 15:51:21 2015 -0400
evas-wayland-shm: Reduce size of resize pool during resize events
Summary: We really don't need to be allocating a shm pool this large
during resize, so reduce the size of the pool.
Signed-off-by: Chris Michael
---
src/modules/evas/engines/wayland_shm/evas_shm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/wayland_shm/evas_shm.c
b/src/modules/evas/engines/wayland_shm/evas_shm.c
index 1e730a4..593a8ae 100644
--- a/src/modules/evas/engines/wayland_shm/evas_shm.c
+++ b/src/modules/evas/engines/wayland_shm/evas_shm.c
@@ -395,7 +395,7 @@ _evas_shm_surface_reconfigure(Shm_Surface *surface, int dx,
int dy, int w, int h
if ((resize) && (!surface->leaf[i].resize_pool))
{
surface->leaf[i].resize_pool =
- _shm_pool_create(surface->shm, 10 * 1024 * 1024);
+ _shm_pool_create(surface->shm, 6 * 1024 * 1024);
}
if (!_shm_leaf_create(surface, &surface->leaf[i], w, h))
--
[EGIT] [core/enlightenment] master 01/01: md5: fix wrong sizeof argument (SIZEOF_MISMATCH)
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=c27ecb89fbbcb93ca23221e641084524398afa9f commit c27ecb89fbbcb93ca23221e641084524398afa9f Author: Amitesh Singh Date: Thu Oct 1 16:20:23 2015 -0400 md5: fix wrong sizeof argument (SIZEOF_MISMATCH) Summary: fixes CID: 222382 Reviewers: raster, zmike, cedric, devilhorns Reviewed By: devilhorns Subscribers: cedric, seoz, sachin.dev Differential Revision: https://phab.enlightenment.org/D3125 --- src/modules/everything/md5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/everything/md5.c b/src/modules/everything/md5.c index 3e5185c..fdc44cd 100644 --- a/src/modules/everything/md5.c +++ b/src/modules/everything/md5.c @@ -156,7 +156,7 @@ MD5Final(unsigned char digest[16], MD5_CTX *ctx) MD5Transform(ctx->buf, (uint32_t *)ctx->in); byteReverse((unsigned char *)ctx->buf, 4); memcpy(digest, ctx->buf, 16); - memset((char *)ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset((char *)ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */ --
[EGIT] [core/efl] master 02/02: eio: improve documentation.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1bd5a60c75a778cb81622cce3ed53db70d2e89aa
commit 1bd5a60c75a778cb81622cce3ed53db70d2e89aa
Author: Cedric BAIL
Date: Thu Oct 1 14:12:50 2015 -0700
eio: improve documentation.
This set of documentation update basically make it clearer that Eio
use Eina and do cross linking of function used by Eio to Eina. It
also copy some of the warning coming from Eina documentation into Eio.
---
src/lib/eio/Eio.h | 179 +-
1 file changed, 122 insertions(+), 57 deletions(-)
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index 7b4410f..7ee29fe 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -142,6 +142,8 @@ extern "C" {
* Recommended reading:
*
* @li @ref Eio_Helper for common functions and library initialization.
+ * @li @ref Eio_List for listing files asynchronous.
+ * @li @ref Eio_Management for anyone who want to do a file manager (copy, rm,
...).
* @li @ref Eio_Map to manipulate files asynchronously (mmap).
* @li @ref Eio_Xattr to access file extended attributes (xattr).
* @li @ref Eio_Monitor to monitor for file changes (inotify).
@@ -153,7 +155,6 @@ extern "C" {
*
* More examples can be found at @ref eio_examples.
*
- * @{
*/
/**
@@ -185,6 +186,18 @@ enum _Eio_File_Op
typedef enum _Eio_File_Op Eio_File_Op;
/**
+ * @defgroup Eio_List Eio file listing API
+ * @ingroup Eio
+ *
+ * @brief This functions helps list files asynchronously.
+ *
+ * This set of functions work on top of Eina_File and Ecore_Thread
+ * to list files under various condition.
+ *
+ * @{
+ */
+
+/**
* @typedef Eio_File
* Generic asynchronous I/O reference.
*/
@@ -252,14 +265,20 @@ struct _Eio_Progress
* It's equivalent to the "ls" shell command. Every file will be passed to the
* filter_cb, so it's your job to decide if you want to pass the file to the
* main_cb or not. Return EINA_TRUE to pass it to the main_cb or EINA_FALSE to
- * ignore it.
+ * ignore it. It runs eina_file_ls() in a separate thread using
+ * ecore_thread_feedback_run().
+ *
+ * @see eina_file_ls()
+ * @see ecore_thread_feedback_run()
+ * @see eio_file_direct_ls()
+ * @see eio_file_stat_ls()
*/
EAPI Eio_File *eio_file_ls(const char *dir,
- Eio_Filter_Cb filter_cb,
- Eio_Main_Cb main_cb,
- Eio_Done_Cb done_cb,
- Eio_Error_Cb error_cb,
- const void *data);
+ Eio_Filter_Cb filter_cb,
+ Eio_Main_Cb main_cb,
+ Eio_Done_Cb done_cb,
+ Eio_Error_Cb error_cb,
+ const void *data);
/**
* @brief List contents of a directory without locking your app.
@@ -271,18 +290,30 @@ EAPI Eio_File *eio_file_ls(const char *dir,
* @param data Unmodified user data passed to callbacks
* @return A reference to the I/O operation.
*
- * eio_file_direct_ls runs eina_file_direct_ls in a separate thread using
- * ecore_thread_feedback_run. This prevents any blocking in your apps.
+ * eio_file_direct_ls() runs eina_file_direct_ls() in a separate thread using
+ * ecore_thread_feedback_run(). This prevents any blocking in your apps.
* Every file will be passed to the filter_cb, so it's your job to decide if
you
* want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to
* the main_cb or EINA_FALSE to ignore it.
+ *
+ * @warning If readdir_r doesn't contain file type information, file type is
+ * EINA_FILE_UNKNOWN.
+ *
+ * @note The iterator walks over '.' and '..' without returning them.
+ * @note The difference between this function and eina_file_stat_ls() is that
+ * it may not get the file type information however it is likely to be
+ * faster.
+ *
+ * @see eio_file_stat_ls()
+ * @see eina_file_direct_ls()
+ * @see ecore_thread_feedback_run()
*/
EAPI Eio_File *eio_file_direct_ls(const char *dir,
- Eio_Filter_Direct_Cb filter_cb,
- Eio_Main_Direct_Cb main_cb,
- Eio_Done_Cb done_cb,
- Eio_Error_Cb error_cb,
- const void *data);
+ Eio_Filter_Direct_Cb filter_cb,
+ Eio_Main_Direct_Cb main_cb,
+ Eio_Done_Cb done_cb,
+ Eio_Error_Cb error_cb,
+ const void *data);
/**
* @brief List content of a directory without locking your app.
@@ -296,8 +327,17 @@ EAPI Eio_File *eio_file_direct_ls(const char *dir,
*
* Every file will be passed to the filter_cb, so it's your job to decide if
you
* want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to
[EGIT] [core/efl] efl-1.15 02/02: eio: improve documentation.
cedric pushed a commit to branch efl-1.15.
http://git.enlightenment.org/core/efl.git/commit/?id=66d38965fdf99f244b526040e7e1289ac42a2d14
commit 66d38965fdf99f244b526040e7e1289ac42a2d14
Author: Cedric BAIL
Date: Thu Oct 1 14:12:50 2015 -0700
eio: improve documentation.
This set of documentation update basically make it clearer that Eio
use Eina and do cross linking of function used by Eio to Eina. It
also copy some of the warning coming from Eina documentation into Eio.
---
src/lib/eio/Eio.h | 179 +-
1 file changed, 122 insertions(+), 57 deletions(-)
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index 3a9a281..9f139df 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -142,6 +142,8 @@ extern "C" {
* Recommended reading:
*
* @li @ref Eio_Helper for common functions and library initialization.
+ * @li @ref Eio_List for listing files asynchronous.
+ * @li @ref Eio_Management for anyone who want to do a file manager (copy, rm,
...).
* @li @ref Eio_Map to manipulate files asynchronously (mmap).
* @li @ref Eio_Xattr to access file extended attributes (xattr).
* @li @ref Eio_Monitor to monitor for file changes (inotify).
@@ -153,7 +155,6 @@ extern "C" {
*
* More examples can be found at @ref eio_examples.
*
- * @{
*/
/**
@@ -185,6 +186,18 @@ enum _Eio_File_Op
typedef enum _Eio_File_Op Eio_File_Op;
/**
+ * @defgroup Eio_List Eio file listing API
+ * @ingroup Eio
+ *
+ * @brief This functions helps list files asynchronously.
+ *
+ * This set of functions work on top of Eina_File and Ecore_Thread
+ * to list files under various condition.
+ *
+ * @{
+ */
+
+/**
* @typedef Eio_File
* Generic asynchronous I/O reference.
*/
@@ -252,14 +265,20 @@ struct _Eio_Progress
* It's equivalent to the "ls" shell command. Every file will be passed to the
* filter_cb, so it's your job to decide if you want to pass the file to the
* main_cb or not. Return EINA_TRUE to pass it to the main_cb or EINA_FALSE to
- * ignore it.
+ * ignore it. It runs eina_file_ls() in a separate thread using
+ * ecore_thread_feedback_run().
+ *
+ * @see eina_file_ls()
+ * @see ecore_thread_feedback_run()
+ * @see eio_file_direct_ls()
+ * @see eio_file_stat_ls()
*/
EAPI Eio_File *eio_file_ls(const char *dir,
- Eio_Filter_Cb filter_cb,
- Eio_Main_Cb main_cb,
- Eio_Done_Cb done_cb,
- Eio_Error_Cb error_cb,
- const void *data);
+ Eio_Filter_Cb filter_cb,
+ Eio_Main_Cb main_cb,
+ Eio_Done_Cb done_cb,
+ Eio_Error_Cb error_cb,
+ const void *data);
/**
* @brief List contents of a directory without locking your app.
@@ -271,18 +290,30 @@ EAPI Eio_File *eio_file_ls(const char *dir,
* @param data Unmodified user data passed to callbacks
* @return A reference to the I/O operation.
*
- * eio_file_direct_ls runs eina_file_direct_ls in a separate thread using
- * ecore_thread_feedback_run. This prevents any blocking in your apps.
+ * eio_file_direct_ls() runs eina_file_direct_ls() in a separate thread using
+ * ecore_thread_feedback_run(). This prevents any blocking in your apps.
* Every file will be passed to the filter_cb, so it's your job to decide if
you
* want to pass the file to the main_cb or not. Return EINA_TRUE to pass it to
* the main_cb or EINA_FALSE to ignore it.
+ *
+ * @warning If readdir_r doesn't contain file type information, file type is
+ * EINA_FILE_UNKNOWN.
+ *
+ * @note The iterator walks over '.' and '..' without returning them.
+ * @note The difference between this function and eina_file_stat_ls() is that
+ * it may not get the file type information however it is likely to be
+ * faster.
+ *
+ * @see eio_file_stat_ls()
+ * @see eina_file_direct_ls()
+ * @see ecore_thread_feedback_run()
*/
EAPI Eio_File *eio_file_direct_ls(const char *dir,
- Eio_Filter_Direct_Cb filter_cb,
- Eio_Main_Direct_Cb main_cb,
- Eio_Done_Cb done_cb,
- Eio_Error_Cb error_cb,
- const void *data);
+ Eio_Filter_Direct_Cb filter_cb,
+ Eio_Main_Direct_Cb main_cb,
+ Eio_Done_Cb done_cb,
+ Eio_Error_Cb error_cb,
+ const void *data);
/**
* @brief List content of a directory without locking your app.
@@ -296,8 +327,17 @@ EAPI Eio_File *eio_file_direct_ls(const char *dir,
*
* Every file will be passed to the filter_cb, so it's your job to decide if
you
* want to pass the file to the main_cb or not. Return EINA_TRUE to pass it
[EGIT] [core/efl] efl-1.15 01/02: eina: fix misleading documentation regarding enum values.
cedric pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=ffee0948c691d1630036a5be7ec4da89d50c4851 commit ffee0948c691d1630036a5be7ec4da89d50c4851 Author: Cedric BAIL Date: Thu Oct 1 14:11:02 2015 -0700 eina: fix misleading documentation regarding enum values. --- src/lib/eina/eina_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h index cf245e7..4589abd 100644 --- a/src/lib/eina/eina_file.h +++ b/src/lib/eina/eina_file.h @@ -384,7 +384,7 @@ EAPI Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path); * cost associated with creating the list and stopping halfway through it. * * @warning If readdir_r doesn't contain file type information, file type is - * DT_UNKNOWN. + * EINA_FILE_UNKNOWN. * @warning The #Eina_File_Direct_Info returned by the iterator must not * be modified in any way. * @warning When the iterator is advanced or deleted the #Eina_File_Direct_Info --
[EGIT] [core/efl] master 01/02: eina: fix misleading documentation regarding enum values.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6102f93304be6bc5e63fbeb800f6a363a855addc commit 6102f93304be6bc5e63fbeb800f6a363a855addc Author: Cedric BAIL Date: Thu Oct 1 14:11:02 2015 -0700 eina: fix misleading documentation regarding enum values. --- src/lib/eina/eina_file.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/eina/eina_file.h b/src/lib/eina/eina_file.h index 952e22c..4235f1c 100644 --- a/src/lib/eina/eina_file.h +++ b/src/lib/eina/eina_file.h @@ -408,7 +408,7 @@ EAPI Eina_Bool eina_file_mkdtemp(const char *templatename, Eina_Tmpstr **path); * cost associated with creating the list and stopping halfway through it. * * @warning If readdir_r doesn't contain file type information, file type is - * DT_UNKNOWN. + * EINA_FILE_UNKNOWN. * @warning The #Eina_File_Direct_Info returned by the iterator must not * be modified in any way. * @warning When the iterator is advanced or deleted the #Eina_File_Direct_Info --
[EGIT] [core/efl] master 01/01: ector: don't leak cairo context.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=cb65e6b1fe954db213aeb1ac8cd778a183b8f39d
commit cb65e6b1fe954db213aeb1ac8cd778a183b8f39d
Author: Cedric BAIL
Date: Thu Oct 1 17:18:54 2015 -0700
ector: don't leak cairo context.
---
src/lib/ector/cairo/ector_cairo_private.h | 2 --
src/lib/ector/cairo/ector_cairo_surface.c | 10 --
src/modules/evas/engines/software_generic/ector_surface.c | 9 -
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/lib/ector/cairo/ector_cairo_private.h
b/src/lib/ector/cairo/ector_cairo_private.h
index 5a27708..2b5735a 100644
--- a/src/lib/ector/cairo/ector_cairo_private.h
+++ b/src/lib/ector/cairo/ector_cairo_private.h
@@ -18,8 +18,6 @@ struct _Ector_Cairo_Surface_Data
struct {
double x, y;
} current;
-
- Eina_Bool internal : 1;
};
struct _Ector_Renderer_Cairo_Base_Data
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c
b/src/lib/ector/cairo/ector_cairo_surface.c
index 10fef65..bd44405 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -86,13 +86,9 @@ _ector_cairo_surface_context_set(Eo *obj,
Ector_Cairo_Surface_Data *pd,
cairo_t *ctx)
{
- if (pd->internal)
- {
-USE(obj, cairo_destroy, );
+ USE(obj, cairo_destroy, );
-if (pd->cairo) cairo_destroy(pd->cairo);
-pd->internal = EINA_FALSE;
- }
+ if (pd->cairo) cairo_destroy(pd->cairo);
if (!ctx)
{
USE(obj, cairo_image_surface_create, );
@@ -139,6 +135,8 @@ _ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
{
eo_do_super(obj, ECTOR_CAIRO_SURFACE_CLASS, eo_destructor());
+
+
if (--_cairo_count) return ;
if (_cairo_so) eina_module_free(_cairo_so);
_cairo_so = NULL;
diff --git a/src/modules/evas/engines/software_generic/ector_surface.c
b/src/modules/evas/engines/software_generic/ector_surface.c
index 34e957e..ffa3231 100644
--- a/src/modules/evas/engines/software_generic/ector_surface.c
+++ b/src/modules/evas/engines/software_generic/ector_surface.c
@@ -49,7 +49,6 @@ typedef struct _Ector_Cairo_Software_Surface_Data
Ector_Cairo_Software_Surface_D
struct _Ector_Cairo_Software_Surface_Data
{
cairo_surface_t *surface;
- cairo_t *ctx;
void *pixels;
@@ -60,13 +59,14 @@ struct _Ector_Cairo_Software_Surface_Data
void
_ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_Data *pd, void *pixels, unsigned int width,
unsigned int height)
{
+ cairo_t *ctx = NULL;
+
USE(obj, cairo_image_surface_create_for_data, );
USE(obj, cairo_surface_destroy, );
USE(obj, cairo_create, );
USE(obj, cairo_destroy, );
if (pd->surface) cairo_surface_destroy(pd->surface); pd->surface = NULL;
- if (pd->ctx) cairo_destroy(pd->ctx); pd->ctx = NULL;
pd->pixels = NULL;
pd->width = 0;
@@ -79,8 +79,7 @@ _ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_
width, height, width
* sizeof (int));
if (!pd->surface) goto end;
-pd->ctx = cairo_create(pd->surface);
-if (!pd->ctx) goto end;
+ctx = cairo_create(pd->surface);
}
pd->pixels = pixels;
@@ -91,7 +90,7 @@ _ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_
evas_common_cpu_end_opt();
eo_do(obj,
- ector_cairo_surface_context_set(pd->ctx),
+ ector_cairo_surface_context_set(ctx),
ector_surface_size_set(pd->width, pd->height));
}
--
[EGIT] [core/efl] master 02/03: edje_cc: Fix inheritance of "no_render" flag
jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=60d77cf853dac901f92c75a37e42413051df9394 commit 60d77cf853dac901f92c75a37e42413051df9394 Author: Jean-Philippe Andre Date: Fri Oct 2 12:17:34 2015 +0900 edje_cc: Fix inheritance of "no_render" flag @fix --- src/bin/edje/edje_cc_handlers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 7ae4007..156a15b 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -3488,6 +3488,7 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2) ep->cursor_mode = ep2->cursor_mode; ep->multiline = ep2->multiline; ep->access = ep2->access; + ep->no_render = ep2->no_render; ep->dragable.x = ep2->dragable.x; ep->dragable.step_x = ep2->dragable.step_x; ep->dragable.count_x = ep2->dragable.count_x; --
[EGIT] [core/efl] master 01/03: edje_cc: Add "render" keyword for lazEDC
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6882bb63286da1a50d112a95cbab2e3cdfc1a369
commit 6882bb63286da1a50d112a95cbab2e3cdfc1a369
Author: Jean-Philippe Andre
Date: Fri Oct 2 12:13:56 2015 +0900
edje_cc: Add "render" keyword for lazEDC
Since @zmike also thought this could be useful, let's add it.
---
src/bin/edje/edje_cc_handlers.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index 190c3e0..7ae4007 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -268,6 +268,7 @@ static void
st_collections_group_parts_part_pointer_mode(void);
static void st_collections_group_parts_part_precise_is_inside(void);
static void st_collections_group_parts_part_use_alternate_font_metrics(void);
static void st_collections_group_parts_part_clip_to_id(void);
+static void st_collections_group_parts_part_render(void);
static void st_collections_group_parts_part_no_render(void);
static void st_collections_group_parts_part_source(void);
static void st_collections_group_parts_part_source2(void);
@@ -1052,6 +1053,8 @@ New_Statement_Handler statement_handlers_short[] =
norepeat; -> repeat_events: 0;
precise; -> precise_is_inside: 1;
noprecise; -> precise_is_inside: 0;
+ render; -> no_render: 0;
+ norender; -> no_render: 1;
scale; -> scale: 1;
noscale; -> scale: 0;
desc {
@@ -1078,6 +1081,7 @@ New_Statement_Handler statement_handlers_short_single[] =
{"collections.group.parts.part.noprecise",
st_collections_group_parts_part_noprecise},
{"collections.group.parts.part.scale",
st_collections_group_parts_part_scale},
{"collections.group.parts.part.noscale",
st_collections_group_parts_part_noscale},
+ {"collections.group.parts.part.render",
st_collections_group_parts_part_render},
{"collections.group.parts.part.norender",
st_collections_group_parts_part_no_render},
{"collections.group.parts.part.description.vis",
st_collections_group_parts_part_description_vis},
{"collections.group.parts.part.description.hid",
st_collections_group_parts_part_description_hid},
@@ -5780,6 +5784,12 @@ st_collections_group_parts_part_no_render(void)
current_part->no_render = EINA_TRUE;
}
+static void
+st_collections_group_parts_part_render(void)
+{
+ current_part->no_render = EINA_FALSE;
+}
+
/**
@page edcref
@property
--
[EGIT] [core/efl] master 03/03: Edje tests: Test inheritance of flag no_render
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=73f9ca62970062b08efce3c09613f7a30657dd9e
commit 73f9ca62970062b08efce3c09613f7a30657dd9e
Author: Jean-Philippe Andre
Date: Fri Oct 2 12:21:56 2015 +0900
Edje tests: Test inheritance of flag no_render
---
src/tests/edje/data/test_filters.edc | 12
src/tests/edje/edje_test_edje.c | 6 ++
2 files changed, 18 insertions(+)
diff --git a/src/tests/edje/data/test_filters.edc
b/src/tests/edje/data/test_filters.edc
index e1f8b57..a526758 100644
--- a/src/tests/edje/data/test_filters.edc
+++ b/src/tests/edje/data/test_filters.edc
@@ -64,6 +64,18 @@ collections {
image.normal: "pnl.png";
}
}
+ part {
+"mask2";
+inherit: "mask";
+render;
+desc { "default";
+ rel1.relative: 0.0 0.8;
+}
+ }
+ part {
+"mask3";
+inherit: "mask";
+ }
proxy { "prxy";
desc { "default";
filter {
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 43eacdc..6cc6cb0 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -226,6 +226,12 @@ START_TEST(edje_test_filters)
sub = edje_object_part_object_get(obj, "mask");
fail_if(!eo_do_ret(sub, b, evas_obj_no_render_get()));
+ /* check no_render inheritance */
+ sub = edje_object_part_object_get(obj, "mask2");
+ fail_if(eo_do_ret(sub, b, evas_obj_no_render_get()));
+ sub = edje_object_part_object_get(obj, "mask3");
+ fail_if(!eo_do_ret(sub, b, evas_obj_no_render_get()));
+
/* text part: check filter status */
text = edje_object_part_object_get(obj, "text");
fail_if(!text);
--
[EGIT] [core/efl] efl-1.15 01/01: edje_cc: Fix inheritance of "no_render" flag
jpeg pushed a commit to branch efl-1.15. http://git.enlightenment.org/core/efl.git/commit/?id=3feae5456ed0cdea251ceb439deac9ef43342029 commit 3feae5456ed0cdea251ceb439deac9ef43342029 Author: Jean-Philippe Andre Date: Fri Oct 2 12:17:34 2015 +0900 edje_cc: Fix inheritance of "no_render" flag @fix --- src/bin/edje/edje_cc_handlers.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c index 9f2e21b..08615b4 100644 --- a/src/bin/edje/edje_cc_handlers.c +++ b/src/bin/edje/edje_cc_handlers.c @@ -3473,6 +3473,7 @@ _part_copy(Edje_Part *ep, Edje_Part *ep2) ep->cursor_mode = ep2->cursor_mode; ep->multiline = ep2->multiline; ep->access = ep2->access; + ep->no_render = ep2->no_render; ep->dragable.x = ep2->dragable.x; ep->dragable.step_x = ep2->dragable.step_x; ep->dragable.count_x = ep2->dragable.count_x; --
[EGIT] [core/efl] efl-1.15 01/01: ector: don't leak cairo context.
cedric pushed a commit to branch efl-1.15.
http://git.enlightenment.org/core/efl.git/commit/?id=a2c2b0fa0373d7add8d5e2b2b7362379797dca6c
commit a2c2b0fa0373d7add8d5e2b2b7362379797dca6c
Author: Cedric BAIL
Date: Thu Oct 1 17:18:54 2015 -0700
ector: don't leak cairo context.
---
src/lib/ector/cairo/ector_cairo_private.h | 2 --
src/lib/ector/cairo/ector_cairo_surface.c | 10 --
src/modules/evas/engines/software_generic/ector_surface.c | 9 -
3 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/lib/ector/cairo/ector_cairo_private.h
b/src/lib/ector/cairo/ector_cairo_private.h
index b5782ff..c41cbe3 100644
--- a/src/lib/ector/cairo/ector_cairo_private.h
+++ b/src/lib/ector/cairo/ector_cairo_private.h
@@ -18,8 +18,6 @@ struct _Ector_Cairo_Surface_Data
struct {
double x, y;
} current;
-
- Eina_Bool internal : 1;
};
struct _Ector_Renderer_Cairo_Base_Data
diff --git a/src/lib/ector/cairo/ector_cairo_surface.c
b/src/lib/ector/cairo/ector_cairo_surface.c
index 10fef65..bd44405 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.c
+++ b/src/lib/ector/cairo/ector_cairo_surface.c
@@ -86,13 +86,9 @@ _ector_cairo_surface_context_set(Eo *obj,
Ector_Cairo_Surface_Data *pd,
cairo_t *ctx)
{
- if (pd->internal)
- {
-USE(obj, cairo_destroy, );
+ USE(obj, cairo_destroy, );
-if (pd->cairo) cairo_destroy(pd->cairo);
-pd->internal = EINA_FALSE;
- }
+ if (pd->cairo) cairo_destroy(pd->cairo);
if (!ctx)
{
USE(obj, cairo_image_surface_create, );
@@ -139,6 +135,8 @@ _ector_cairo_surface_eo_base_destructor(Eo *obj EINA_UNUSED,
{
eo_do_super(obj, ECTOR_CAIRO_SURFACE_CLASS, eo_destructor());
+
+
if (--_cairo_count) return ;
if (_cairo_so) eina_module_free(_cairo_so);
_cairo_so = NULL;
diff --git a/src/modules/evas/engines/software_generic/ector_surface.c
b/src/modules/evas/engines/software_generic/ector_surface.c
index 78ad596..8590768 100644
--- a/src/modules/evas/engines/software_generic/ector_surface.c
+++ b/src/modules/evas/engines/software_generic/ector_surface.c
@@ -48,7 +48,6 @@ typedef struct _Ector_Cairo_Software_Surface_Data
Ector_Cairo_Software_Surface_D
struct _Ector_Cairo_Software_Surface_Data
{
cairo_surface_t *surface;
- cairo_t *ctx;
void *pixels;
@@ -59,13 +58,14 @@ struct _Ector_Cairo_Software_Surface_Data
void
_ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_Data *pd, void *pixels, unsigned int width,
unsigned int height)
{
+ cairo_t *ctx = NULL;
+
USE(obj, cairo_image_surface_create_for_data, );
USE(obj, cairo_surface_destroy, );
USE(obj, cairo_create, );
USE(obj, cairo_destroy, );
if (pd->surface) cairo_surface_destroy(pd->surface); pd->surface = NULL;
- if (pd->ctx) cairo_destroy(pd->ctx); pd->ctx = NULL;
pd->pixels = NULL;
pd->width = 0;
@@ -78,8 +78,7 @@ _ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_
width, height, width
* sizeof (int));
if (!pd->surface) goto end;
-pd->ctx = cairo_create(pd->surface);
-if (!pd->ctx) goto end;
+ctx = cairo_create(pd->surface);
}
pd->pixels = pixels;
@@ -90,7 +89,7 @@ _ector_cairo_software_surface_surface_set(Eo *obj,
Ector_Cairo_Software_Surface_
evas_common_cpu_end_opt();
eo_do(obj,
- ector_cairo_surface_context_set(pd->ctx),
+ ector_cairo_surface_context_set(ctx),
ector_surface_size_set(pd->width, pd->height));
}
--
