[EGIT] [tools/enventor] master 01/01: template: select the random name after inserting live view part

[taehyub]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=ad35ab32aa49214fc891065a2b1485da3f18b855

commit ad35ab32aa49214fc891065a2b1485da3f18b855
Author: taehyub 
Date:   Fri Mar 4 16:21:14 2016 +0900

template: select the random name after inserting live view part

Summary:
select the random name after inserting live view part or template part.

Test Plan:
1. insert a part using Live View
2. see the selection region of random name of Live View
3. insert a templte using Ctrl + t
4. see the selection region of random name of template

@T3014

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3743
---
 src/lib/template.c | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/src/lib/template.c b/src/lib/template.c
index 4d81fd5..6afec5c 100644
--- a/src/lib/template.c
+++ b/src/lib/template.c
@@ -145,6 +145,23 @@ template_part_insert_cursor_pos_set(edit_data *ed,
return cursor_pos;
 }
 
+static void
+select_random_name(Evas_Object *entry, const char* first_line,
+   const char* random_name, int space)
+{
+   char *matched = strstr(first_line, random_name);
+   if (matched)
+ {
+int random_name_pos = matched - first_line;
+random_name_pos += space;
+elm_entry_cursor_line_begin_set(entry);
+int line_start = elm_entry_cursor_pos_get(entry);
+int start = line_start + random_name_pos;
+int end = start + strlen(random_name);
+elm_entry_select_region_set(entry, start, end);
+ }
+}
+
 /*/
 /* Externally accessible calls   */
 /*/
@@ -289,6 +306,9 @@ template_part_insert(edit_data *ed, Edje_Part_Type 
part_type,
else if (part_type == EDJE_PART_TYPE_TEXTBLOCK)
  textblock_style_add(ed, random_name);
 
+   //select random name
+   select_random_name(edit_entry, first_line, random_name, space);
+
edit_syntax_color_partial_apply(ed, 0);
edit_changed_set(ed, EINA_TRUE);
 
@@ -400,6 +420,9 @@ template_insert(edit_data *ed, 
Enventor_Template_Insert_Type insert_type,
 
elm_entry_cursor_pos_set(entry, cursor_pos);
 
+   //select random name
+   select_random_name(entry, first_line, random_name, space);
+
edit_syntax_color_partial_apply(ed, 0);
edit_changed_set(ed, EINA_TRUE);
 

-- 

[EGIT] [tools/enventor] master 01/01: template: Fix undo error by correcting cursor position

[taehyub]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=26570d64c08d4e7d1906d7f6b22bddf146e374ea

commit 26570d64c08d4e7d1906d7f6b22bddf146e374ea
Author: taehyub 
Date:   Fri Mar 4 16:17:48 2016 +0900

template: Fix undo error by correcting cursor position

Summary:
There is a memorizing cursor in wrong position, it cause undo error.
If insert the description template, undo operation is not working correctly.

@fix

Test Plan:
1. press ctrl + t in the part, then insert description part
2. press ctrl + z, undo the code
3. see the normal operation

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3760
---
 src/lib/template.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/template.c b/src/lib/template.c
index 5e519c7..4d81fd5 100644
--- a/src/lib/template.c
+++ b/src/lib/template.c
@@ -369,15 +369,15 @@ template_insert(edit_data *ed, 
Enventor_Template_Insert_Type insert_type,
 
if (!t) goto end;
 
+   int cursor_pos = elm_entry_cursor_pos_get(entry);
+   int cursor_pos1 = elm_entry_cursor_pos_get(entry);
+
if (strcmp(paragh, "images"))
  {
 elm_entry_entry_insert(entry, p);
 elm_entry_entry_insert(entry, first_line);
  }
 
-   int cursor_pos = elm_entry_cursor_pos_get(entry);
-   int cursor_pos1 = elm_entry_cursor_pos_get(entry);
-
int i;
for (i = 0; i < (line_cnt - 1); i++)
  {

-- 

[EGIT] [tools/enventor] master 01/01: ctxpopup.c: change sprintf function to snprintf function

[taehyub]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=3cb3dfdda78f0bc56a3f70d584ddfcd2c4081186

commit 3cb3dfdda78f0bc56a3f70d584ddfcd2c4081186
Author: taehyub 
Date:   Fri Mar 4 16:09:40 2016 +0900

ctxpopup.c: change sprintf function to snprintf function

Summary:
change sprintf to snprintf for code safety

@fix

Reviewers: Hermet, Jaehyun_Cho, NikaWhite

Differential Revision: https://phab.enlightenment.org/D3757
---
 src/lib/ctxpopup.c | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index 09bb3f8..eee963e 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -394,7 +394,8 @@ colorselector_changed_cb(void *data, Evas_Object *obj,
evas_object_color_set(ctxdata->color_view, (r * a) / 255 , (g * a) / 255, 
(b * a) / 255, a);
 
ecore_animator_del(ctxdata->animator);
-   sprintf(ctxdata->candidate, ": %d %d %d %d;", r, g, b, a);
+   snprintf(ctxdata->candidate, sizeof(ctxdata->candidate), ": %d %d %d %d;",
+r, g, b, a);
ctxdata->animator = ecore_animator_add(changed_animator_cb, ctxdata);
 
preset_cur_color.r = r;
@@ -421,7 +422,8 @@ colorselector_inputs_changed_cb(void *data, Evas_Object 
*obj,
elm_colorselector_color_set(ctxdata->colorselector, r, g, b, a);
 
ecore_animator_del(ctxdata->animator);
-   sprintf(ctxdata->candidate, ": %d %d %d %d;", r, g, b, a);
+   snprintf(ctxdata->candidate, sizeof(ctxdata->candidate), ": %d %d %d %d;",
+r, g, b, a);
ctxdata->animator = ecore_animator_add(changed_animator_cb, ctxdata);
 
preset_cur_color.r = r;
@@ -455,7 +457,8 @@ colorselector_preset_clicked_cb(void *data,  Evas *e 
EINA_UNUSED, Evas_Object *o
elm_spinner_value_set(ctxdata->input_colors[3], a);
 
ecore_animator_del(ctxdata->animator);
-   sprintf(ctxdata->candidate, ": %d %d %d %d;", r, g, b, a);
+   snprintf(ctxdata->candidate, sizeof(ctxdata->candidate), ": %d %d %d %d;",
+r, g, b, a);
ctxdata->animator = ecore_animator_add(changed_animator_cb, ctxdata);
 
preset_cur_color.r = r;

-- 

[EGIT] [tools/enventor] master 01/01: ctxpopup.c: change strcat function to strncat function

[taehyub]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=d86d1f38ee67b1e402f6db57437a9fd339fbaddf

commit d86d1f38ee67b1e402f6db57437a9fd339fbaddf
Author: taehyub 
Date:   Fri Mar 4 16:05:16 2016 +0900

ctxpopup.c: change strcat function to strncat function

Summary:
change strcat to strncat for code safe

@fix

Reviewers: Hermet, Jaehyun_Cho

Differential Revision: https://phab.enlightenment.org/D3755
---
 src/lib/ctxpopup.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index 8f0928b..09bb3f8 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -167,9 +167,10 @@ slider_changed_cb(void *data, Evas_Object *obj, void 
*event_info EINA_UNUSED)
  else
snprintf(buf, sizeof(buf), " %0.2f", val);
   }
-strcat(ctxdata->candidate, buf);
+strncat(ctxdata->candidate, buf, strlen(buf));
  }
-   strcat(ctxdata->candidate, ctxdata->attr->append_str);
+   strncat(ctxdata->candidate, ctxdata->attr->append_str,
+   strlen(ctxdata->attr->append_str));
ecore_animator_del(ctxdata->animator);
ctxdata->animator = ecore_animator_add(changed_animator_cb, ctxdata);
 }
@@ -219,9 +220,10 @@ toggle_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
EINA_LIST_FOREACH(ctxdata->toggles, l, toggle)
  {
 snprintf(buf, sizeof(buf), " %d", (int) elm_check_state_get(toggle));
-strcat(ctxdata->candidate, buf);
+strncat(ctxdata->candidate, buf, strlen(buf));
  }
-   strcat(ctxdata->candidate, ctxdata->attr->append_str);
+   strncat(ctxdata->candidate, ctxdata->attr->append_str,
+   strlen(ctxdata->attr->append_str));
ctxdata->changed_cb(ctxdata->data, ctxdata->ctxpopup, ctxdata->candidate);
 }
 

-- 

[EGIT] [core/elementary] master 01/01: elm_access: remove duplicated line, ELM_SAFE_FREE handles NULL assign

[Shinwoo Kim]

kimcinoo pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=a63077ab1a884935639863d536d729c4f1f524f3

commit a63077ab1a884935639863d536d729c4f1f524f3
Author: Shinwoo Kim 
Date:   Fri Mar 4 16:02:13 2016 +0900

elm_access: remove duplicated line, ELM_SAFE_FREE handles NULL assign
---
 src/lib/elm_access.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index 9e31ba7..6e9a829 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -189,7 +189,6 @@ _access_shutdown(void)
 
/* _elm_module_unload(); could access m->api and try to free(); */
ELM_SAFE_FREE(m->api, free);
-   m->api = NULL;
mapi = NULL;
 }
 

-- 

[EGIT] [core/elementary] master 01/01: elm_access: mapi have to be set NULL after free(m->api)

[Jonghee Choi]

kimcinoo pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=c289109903dfdca9e9ed787a98daf48d2a314ac1

commit c289109903dfdca9e9ed787a98daf48d2a314ac1
Author: Jonghee Choi 
Date:   Fri Mar 4 15:33:49 2016 +0900

elm_access: mapi have to be set NULL after free(m->api)

Summary: mapi have to be set NULL after free(m->api)

Reviewers: kimcinoo

Reviewed By: kimcinoo

Differential Revision: https://phab.enlightenment.org/D3756
---
 src/lib/elm_access.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index b238537..9e31ba7 100644
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -189,6 +189,8 @@ _access_shutdown(void)
 
/* _elm_module_unload(); could access m->api and try to free(); */
ELM_SAFE_FREE(m->api, free);
+   m->api = NULL;
+   mapi = NULL;
 }
 
 static Elm_Access_Item *

-- 

[EGIT] [core/elementary] master 01/01: hoversel: remove EINA_UNUSED since data is getting used

[Amitesh Singh]

ami pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=fb5228b4d2ba01cb2683298069744b7940c70a47

commit fb5228b4d2ba01cb2683298069744b7940c70a47
Author: Amitesh Singh 
Date:   Fri Mar 4 11:14:20 2016 +0530

hoversel: remove EINA_UNUSED since data is getting used
---
 src/lib/elc_hoversel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c
index 7d9817f..e14e0e6 100644
--- a/src/lib/elc_hoversel.c
+++ b/src/lib/elc_hoversel.c
@@ -440,7 +440,7 @@ _activate(Evas_Object *obj)
 }
 
 static Eina_Bool
-_on_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
+_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
 {
_activate(data);
 

-- 

[EGIT] [core/efl] master 01/01: eina: rely on GNU make to find file at their correct location.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=e26fcbb1dc588c5130e477bf832c59386b1c1951

commit e26fcbb1dc588c5130e477bf832c59386b1c1951
Author: Cedric Bail 
Date:   Thu Mar 3 21:09:29 2016 -0800

eina: rely on GNU make to find file at their correct location.
---
 src/Makefile_Eina.am  |   2 +
 src/lib/eina/Makefile.am  |   5 +-
 src/lib/eina/Makefile_File.am | 323 +-
 3 files changed, 166 insertions(+), 164 deletions(-)

diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 31162e5..11e22c4 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -9,6 +9,8 @@ dist_installed_einamainheaders_DATA = \
 lib/eina/Eina.h \
 lib/eina/eina_config.h
 
+installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
+dist_installed_einaheaders_DATA = $(EINA_H)
 lib_eina_libeina_la_SOURCES = $(EINA_S)
 
 EINA_MODULE_COMMON_CFLAGS = \
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index ee789b1..01e06ec 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -6,7 +6,10 @@ include Makefile_File.am
 
 lib_LTLIBRARIES = libeina.la
 
-libeina_la_SOURCES = $(EINA_S)
+installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
+dist_installed_einaheaders_DATA = $(notdir $(EINA_H))
+
+libeina_la_SOURCES = $(notdir $(EINA_S))
 libeina_la_CPPFLAGS = $(EINA_FLAGS)
 libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
 libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@
diff --git a/src/lib/eina/Makefile_File.am b/src/lib/eina/Makefile_File.am
index b47bcbd..c89daeb 100644
--- a/src/lib/eina/Makefile_File.am
+++ b/src/lib/eina/Makefile_File.am
@@ -7,181 +7,178 @@ EINA_FLAGS = -I$(top_builddir)/src/lib/efl \
 @VALGRIND_CFLAGS@
 
 EINA_H = \
-$(top_srcdir)/src/lib/eina/eina_safety_checks.h \
-$(top_srcdir)/src/lib/eina/eina_error.h \
-$(top_srcdir)/src/lib/eina/eina_log.h \
-$(top_srcdir)/src/lib/eina/eina_inline_log.x \
-$(top_srcdir)/src/lib/eina/eina_fp.h \
-$(top_srcdir)/src/lib/eina/eina_inline_f32p32.x \
-$(top_srcdir)/src/lib/eina/eina_inline_f16p16.x \
-$(top_srcdir)/src/lib/eina/eina_inline_f8p24.x \
-$(top_srcdir)/src/lib/eina/eina_inline_fp.x \
-$(top_srcdir)/src/lib/eina/eina_hash.h \
-$(top_srcdir)/src/lib/eina/eina_inline_hash.x \
-$(top_srcdir)/src/lib/eina/eina_lalloc.h \
-$(top_srcdir)/src/lib/eina/eina_clist.h \
-$(top_srcdir)/src/lib/eina/eina_inline_clist.x \
-$(top_srcdir)/src/lib/eina/eina_inarray.h \
-$(top_srcdir)/src/lib/eina/eina_inlist.h \
-$(top_srcdir)/src/lib/eina/eina_inline_inlist.x \
-$(top_srcdir)/src/lib/eina/eina_list.h \
-$(top_srcdir)/src/lib/eina/eina_file.h \
-$(top_srcdir)/src/lib/eina/eina_inline_file.x \
-$(top_srcdir)/src/lib/eina/eina_mempool.h \
-$(top_srcdir)/src/lib/eina/eina_module.h \
-$(top_srcdir)/src/lib/eina/eina_rectangle.h \
-$(top_srcdir)/src/lib/eina/eina_types.h \
-$(top_srcdir)/src/lib/eina/eina_array.h \
-$(top_srcdir)/src/lib/eina/eina_counter.h \
-$(top_srcdir)/src/lib/eina/eina_inline_array.x \
-$(top_srcdir)/src/lib/eina/eina_magic.h \
-$(top_srcdir)/src/lib/eina/eina_stringshare.h \
-$(top_srcdir)/src/lib/eina/eina_binshare.h \
-$(top_srcdir)/src/lib/eina/eina_binbuf.h \
-$(top_srcdir)/src/lib/eina/eina_ustringshare.h \
-$(top_srcdir)/src/lib/eina/eina_inline_stringshare.x \
-$(top_srcdir)/src/lib/eina/eina_inline_ustringshare.x \
-$(top_srcdir)/src/lib/eina/eina_inline_list.x \
-$(top_srcdir)/src/lib/eina/eina_accessor.h \
-$(top_srcdir)/src/lib/eina/eina_convert.h \
-$(top_srcdir)/src/lib/eina/eina_rbtree.h \
-$(top_srcdir)/src/lib/eina/eina_benchmark.h \
-$(top_srcdir)/src/lib/eina/eina_inline_rbtree.x \
-$(top_srcdir)/src/lib/eina/eina_inline_mempool.x \
-$(top_srcdir)/src/lib/eina/eina_inline_rectangle.x \
-$(top_srcdir)/src/lib/eina/eina_inline_trash.x \
-$(top_srcdir)/src/lib/eina/eina_thread.h \
-$(top_srcdir)/src/lib/eina/eina_trash.h \
-$(top_srcdir)/src/lib/eina/eina_iterator.h \
-$(top_srcdir)/src/lib/eina/eina_main.h \
-$(top_srcdir)/src/lib/eina/eina_cpu.h \
-$(top_srcdir)/src/lib/eina/eina_inline_cpu.x \
-$(top_srcdir)/src/lib/eina/eina_sched.h \
-$(top_srcdir)/src/lib/eina/eina_tiler.h \
-$(top_srcdir)/src/lib/eina/eina_hamster.h \
-$(top_srcdir)/src/lib/eina/eina_matrixsparse.h \
-$(top_srcdir)/src/lib/eina/eina_inline_tiler.x \
-$(top_srcdir)/src/lib/eina/eina_str.h \
-$(top_srcdir)/src/lib/eina/eina_inline_str.x \
-$(top_srcdir)/src/lib/eina/eina_strbuf.h \
-$(top_srcdir)/src/lib/eina/eina_ustrbuf.h \
-$(top_srcdir)/src/lib/eina/eina_unicode.h \
-$(top_srcdir)/src/lib/eina/eina_quadtree.h \
-$(top_srcdir)/src/lib/eina/eina_simple_xml_parser.h \
-$(top_srcdir)/src/lib/eina/eina_lock.h \
-$(top_srcdir)/src/lib/eina/eina_prefix.h \
-$(top_srcdir)/src/lib/eina/eina_refcount.h \
-$(top_srcdir)/src/lib/eina/eina_mmap.h \
-$(top_srcdir)/src/lib/eina/eina_xattr.h \
-$(top_srcdir)/src/lib/eina/eina_value.h \
-$(top_srcdir)/src/lib/eina/eina_inline_value.x \

[EGIT] [core/efl] master 01/01: Eo: Fix typo of SUPER_TAG_SHIFT.

[Jaehyun Cho]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3398db2dcd975e056fe5543c7ba7403d689086ae

commit 3398db2dcd975e056fe5543c7ba7403d689086ae
Author: Jaehyun Cho 
Date:   Fri Mar 4 13:49:38 2016 +0900

Eo: Fix typo of SUPER_TAG_SHIFT.

This commit fixes commit fc88037977dcc39dfd6d817c522cce01f5bfa024
---
 src/lib/eo/eo_ptr_indirection.x | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/eo/eo_ptr_indirection.x b/src/lib/eo/eo_ptr_indirection.x
index 0e6ef34..d89b1ec 100644
--- a/src/lib/eo/eo_ptr_indirection.x
+++ b/src/lib/eo/eo_ptr_indirection.x
@@ -64,7 +64,7 @@
 # define BITS_ENTRY_ID   12
 # define BITS_GENERATION_COUNTER  8
 # define REF_TAG_SHIFT   30
-# define SUPER_TAG_SHIF  31
+# define SUPER_TAG_SHIFT 31
 # define DROPPED_TABLES   0
 # define DROPPED_ENTRIES  4
 typedef int16_t Table_Index;

-- 

[EGIT] [tools/enventor] master 02/02: edc_editor: Support auto save to update preview.

[Jaehyun Cho]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=509b9bd6283bebc56beb11e2e485b19cd6c3f09f

commit 509b9bd6283bebc56beb11e2e485b19cd6c3f09f
Author: Jaehyun Cho 
Date:   Mon Feb 29 20:02:39 2016 +0900

edc_editor: Support auto save to update preview.

auto save function saves edc file and updates preview by using timer.
auto save timer is applied when entry is changed or redo/undo is done.
auto save timer is cancelled when candidate list or auto complete list
appears.
---
 src/lib/auto_comp.c|  4 
 src/lib/edc_editor.c   | 37 +
 src/lib/enventor_private.h |  2 ++
 3 files changed, 43 insertions(+)

diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 664db9e..9754e62 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -506,6 +506,8 @@ list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
 {
autocomp_data *ad = data;
ad->list = NULL;
+
+   edit_auto_save_timer_apply(ad->ed);
 }
 
 
@@ -579,6 +581,8 @@ entry_tooltip_content_cb(void *data, Evas_Object *obj 
EINA_UNUSED,
elm_list_go(ad->list);
evas_object_show(ad->list);
 
+   edit_auto_save_timer_cancel(ad->ed);
+
return ad->list;
 }
 
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 931b190..65809aa 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -13,6 +13,7 @@ const int MAX_LINE_DIGIT_CNT = 10;
 const int SYNTAX_COLOR_SPARE_LINES = 42;
 const double SYNTAX_COLOR_DEFAULT_TIME = 0.25;
 const double SYNTAX_COLOR_SHORT_TIME = 0.025;
+const double AUTO_SAVE_TIME = 2.0;
 
 typedef struct syntax_color_thread_data_s
 {
@@ -48,6 +49,7 @@ struct editor_s
   int right;
} bracket;
 
+   Ecore_Timer *auto_save_timer;
Ecore_Timer *syntax_color_timer;
Ecore_Thread *syntax_color_thread;
 
@@ -457,6 +459,8 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, 
void *event_info)
syntax_color_partial_update(ed, SYNTAX_COLOR_DEFAULT_TIME);
 
parser_bracket_cancel(ed->pd);
+
+   edit_auto_save_timer_apply(ed);
 }
 
 static void
@@ -547,6 +551,8 @@ ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj EINA_UNUSED,
 {
edit_data *ed = data;
ed->ctxpopup = NULL;
+
+   edit_auto_save_timer_apply(ed);
 }
 
 //This function is called when user press up/down key or mouse wheel up/down
@@ -708,6 +714,8 @@ candidate_list_show(edit_data *ed, char *text, char *cur, 
char *selected)
evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL, 
ctxpopup_del_cb, ed);
ed->ctxpopup = ctxpopup;
elm_object_tree_focus_allow_set(ed->layout, EINA_FALSE);
+
+   edit_auto_save_timer_cancel(ed);
 }
 
 static void
@@ -1106,6 +1114,16 @@ edit_focused_cb(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_smart_callback_call(ed->enventor, SIG_FOCUSED, NULL);
 }
 
+static Eina_Bool
+auto_save_timer_cb(void *data)
+{
+   edit_data *ed = data;
+   edit_save(ed, build_edc_path_get());
+   build_edc();
+   ed->auto_save_timer = NULL;
+   return ECORE_CALLBACK_CANCEL;
+}
+
 /*/
 /* Externally accessible calls   */
 /*/
@@ -1858,5 +1876,24 @@ edit_redoundo(edit_data *ed, Eina_Bool undo)
edit_changed_set(ed, EINA_TRUE);
syntax_color_full_update(ed, EINA_TRUE);
 
+   edit_auto_save_timer_apply(ed);
+
return EINA_TRUE;
 }
+
+void
+edit_auto_save_timer_apply(edit_data *ed)
+{
+   if (ed->auto_save_timer)
+ ecore_timer_del(ed->auto_save_timer);
+   ed->auto_save_timer = ecore_timer_add(AUTO_SAVE_TIME, auto_save_timer_cb,
+ ed);
+}
+
+void
+edit_auto_save_timer_cancel(edit_data *ed)
+{
+   if (ed->auto_save_timer)
+ ecore_timer_del(ed->auto_save_timer);
+   ed->auto_save_timer = NULL;
+}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index c16e5e9..e1df42f 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -296,5 +296,7 @@ void edit_disabled_set(edit_data *ed, Eina_Bool disabled);
 void edit_error_set(edit_data *ed, int line, const char *target);
 void edit_text_insert(edit_data *ed, const char *text);
 void edit_part_cursor_set(edit_data *ed, const char *group_name, const char 
*part_name);
+void edit_auto_save_timer_apply(edit_data *ed);
+void edit_auto_save_timer_cancel(edit_data *ed);
 
 #endif

-- 

[EGIT] [tools/enventor] master 01/02: edc_editor: Fix to call "edc, modified" callback when edc is modified.

[Jaehyun Cho]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=b488c57a9cecc1a0fb6ca14084c3da3b3bca41de

commit b488c57a9cecc1a0fb6ca14084c3da3b3bca41de
Author: Jaehyun Cho 
Date:   Wed Mar 2 21:25:59 2016 +0900

edc_editor: Fix to call "edc,modified" callback when edc is modified.

Previously, "edc,modified" callback is called only if
enventor_object_save() is called.
To call "edc,modified" callback when edc is modified, "edc,modified"
callback is called in edit_save().
---
 src/lib/edc_editor.c |  4 
 src/lib/enventor_smart.c | 17 +
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 059d350..931b190 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1270,6 +1270,10 @@ edit_save(edit_data *ed, const char *file)
edit_changed_set(ed, EINA_FALSE);
edit_saved_set(ed, EINA_TRUE);
 
+   Enventor_EDC_Modified modified;
+   modified.self_changed = EINA_TRUE;
+   evas_object_smart_callback_call(ed->enventor, SIG_EDC_MODIFIED, );
+
return EINA_TRUE;
 }
 
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 584c53c..48109c4 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -678,26 +678,11 @@ EOLIAN static Eina_Bool
 _enventor_object_save(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd,
   const char *file)
 {
-   Eina_Bool edc_modified = EINA_FALSE;
-
//Update edc file and try to save if the edc path is different.
if (build_edc_path_get() != file) edit_changed_set(pd->ed, EINA_TRUE);
 
-   //Build edc file and call modified smart callback if edc file is modified.
-   if (edit_changed_get(pd->ed)) edc_modified = EINA_TRUE;
-
Eina_Bool saved = edit_save(pd->ed, file);
-   //EDC file is newly generated, we need to reload as the input.
-   if (saved && edc_modified)
- {
-Enventor_EDC_Modified modified;
-
-build_edc();
-edit_saved_set(pd->ed, EINA_FALSE);
-
-modified.self_changed = EINA_TRUE;
-evas_object_smart_callback_call(pd->obj, SIG_EDC_MODIFIED, );
- }
+   if (saved) build_edc();
return saved;
 }
 

-- 

[EGIT] [apps/ephoto] master 01/01: Ephoto: Move the single browser zoom icons from the toolbar into the edit move so that the toolbar isn't so cramped.

[Stephen Houston]

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=b3dc934c49ee23c55dcdbfcb585c8af3d80fc76b

commit b3dc934c49ee23c55dcdbfcb585c8af3d80fc76b
Author: Stephen Houston 
Date:   Thu Mar 3 19:30:31 2016 -0600

Ephoto: Move the single browser zoom icons from the toolbar into the edit 
move so that the toolbar isn't so cramped.
---
 src/bin/ephoto_single_browser.c | 57 ++---
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 9dd7044..e62d6ff 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -2255,6 +2255,18 @@ _edit_menu(Ephoto_Single_Browser *sb)
elm_menu_item_separator_add(menu, NULL);
 
menu_it =
+   elm_menu_item_add(menu, NULL, "zoom-in", _("Zoom"), NULL, NULL);
+   elm_menu_item_add(menu, menu_it, "zoom-in", _("Zoom In"), _zoom_in_cb,
+   sb);
+   elm_menu_item_add(menu, menu_it, "zoom-out", _("Zoom Out"), _zoom_out_cb,
+   sb);
+   elm_menu_item_add(menu, menu_it, "zoom-fit-best", _("Zoom Fit"),
+   _zoom_fit_cb, sb);
+   elm_menu_item_add(menu, menu_it, "zoom-original", _("Zoom 1:1"),
+   _zoom_1_cb, sb);
+   elm_menu_item_separator_add(menu, NULL);
+
+   menu_it =
elm_menu_item_add(menu, NULL, "document-properties", _("Color"), NULL,
NULL);
elm_menu_item_add(menu, menu_it, "insert-image", _("Auto Equalize"),
@@ -2582,7 +2594,7 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object 
*parent)
evas_object_size_hint_weight_set(sb->bar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(sb->bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
-   icon = elm_toolbar_item_append(sb->bar, "go-home", _("Back"), _back, sb);
+   elm_toolbar_item_append(sb->bar, "go-home", _("Back"), _back, sb);
icon =
elm_toolbar_item_append(sb->bar, "image-x-generic", _("Edit"), NULL,
NULL);
@@ -2616,6 +2628,18 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object 
*parent)
elm_menu_item_separator_add(menu, NULL);
 
menu_it =
+   elm_menu_item_add(menu, NULL, "zoom-in", _("Zoom"), NULL, NULL);  
+   elm_menu_item_add(menu, menu_it, "zoom-in", _("Zoom In"), _zoom_in_cb,
+   sb);
+   elm_menu_item_add(menu, menu_it, "zoom-out", _("Zoom Out"), _zoom_out_cb,
+   sb);
+   elm_menu_item_add(menu, menu_it, "zoom-fit-best", _("Zoom Fit"),
+   _zoom_fit_cb, sb);
+   elm_menu_item_add(menu, menu_it, "zoom-original", _("Zoom 1:1"),
+   _zoom_1_cb, sb);
+   elm_menu_item_separator_add(menu, NULL);
+
+   menu_it =
elm_menu_item_add(menu, NULL, "document-properties", _("Color"), NULL,
NULL);
elm_menu_item_add(menu, menu_it, "insert-image", _("Auto Equalize"),
@@ -2640,32 +2664,13 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object 
*parent)
elm_menu_item_add(menu, menu_it, "insert-image", _("Old Photo"),
_go_old_photo, sb);
 
-   icon =
-   elm_toolbar_item_append(sb->bar, "go-first", _("First"), _go_first, sb);
-   icon =
-   elm_toolbar_item_append(sb->bar, "go-previous", _("Previous"), _go_prev,
-   sb);
-   icon = elm_toolbar_item_append(sb->bar, "go-next", _("Next"), _go_next, sb);
-   icon = elm_toolbar_item_append(sb->bar, "go-last", _("Last"), _go_last, sb);
-
-   icon =
-   elm_toolbar_item_append(sb->bar, "zoom-in", _("Zoom In"), _zoom_in_cb,
-   sb);
-   icon =
-   elm_toolbar_item_append(sb->bar, "zoom-out", _("Zoom Out"), 
_zoom_out_cb,
-   sb);
-   icon =
-   elm_toolbar_item_append(sb->bar, "zoom-fit-best", _("Zoom Fit"),
-   _zoom_fit_cb, sb);
-   icon =
-   elm_toolbar_item_append(sb->bar, "zoom-original", _("Zoom 1:1"),
-   _zoom_1_cb, sb);
-
-   icon =
-   elm_toolbar_item_append(sb->bar, "media-playback-start", _("Slideshow"),
+   elm_toolbar_item_append(sb->bar, "go-first", _("First"), _go_first, sb);
+   elm_toolbar_item_append(sb->bar, "go-previous", _("Previous"), _go_prev, 
sb);
+   elm_toolbar_item_append(sb->bar, "go-next", _("Next"), _go_next, sb);
+   elm_toolbar_item_append(sb->bar, "go-last", _("Last"), _go_last, sb);
+   elm_toolbar_item_append(sb->bar, "media-playback-start", _("Slideshow"),
_slideshow, sb);
-   icon =
-   elm_toolbar_item_append(sb->bar, "preferences-system", _("Settings"),
+   elm_toolbar_item_append(sb->bar, "preferences-system", _("Settings"),
_settings, sb);
 
elm_box_pack_end(sb->tbox, sb->bar);

-- 

[EGIT] [apps/ephoto] master 01/01: Ephoto: Move sort functionality to a hoversel in the bottom bar. Add a progressbar for directory loading that is helpful with large directories of images to the bott

[Stephen Houston]

okra pushed a commit to branch master.

http://git.enlightenment.org/apps/ephoto.git/commit/?id=cfa19d3fa3f4b84c346be3cc19b6b3eb5a561d94

commit cfa19d3fa3f4b84c346be3cc19b6b3eb5a561d94
Author: Stephen Houston 
Date:   Thu Mar 3 19:20:50 2016 -0600

Ephoto: Move sort functionality to a hoversel in the bottom bar.  Add a 
progressbar for directory loading that is helpful with large directories of 
images to the bottom bar.
---
 src/bin/ephoto_thumb_browser.c | 62 +++---
 1 file changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index 97ee42c..14305d9 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -35,6 +35,8 @@ struct _Ephoto_Thumb_Browser
Evas_Object *direntry;
Evas_Object *ficon;
Evas_Object *search;
+   Evas_Object *hover;
+   Evas_Object *progress;
Elm_Object_Item *dir_current;
Elm_Object_Item *last_sel;
Ephoto_Sort sort;
@@ -426,6 +428,7 @@ _sort_alpha_asc(void *data, Evas_Object *obj EINA_UNUSED,
tb->sort = EPHOTO_SORT_ALPHABETICAL_ASCENDING;
tb->thumbs_only = 1;
tb->dirs_only = 0;
+   elm_object_text_set(tb->hover, _("Alphabetical Ascending"));
ephoto_directory_set(tb->ephoto, tb->ephoto->config->directory,
NULL, tb->dirs_only, tb->thumbs_only);
 }
@@ -439,6 +442,7 @@ _sort_alpha_desc(void *data, Evas_Object *obj EINA_UNUSED,
tb->sort = EPHOTO_SORT_ALPHABETICAL_DESCENDING;
tb->thumbs_only = 1;
tb->dirs_only = 0;
+   elm_object_text_set(tb->hover, _("Alphabetical Descending"));
ephoto_directory_set(tb->ephoto, tb->ephoto->config->directory,
NULL, tb->dirs_only, tb->thumbs_only);
 }
@@ -452,6 +456,7 @@ _sort_mod_asc(void *data, Evas_Object *obj EINA_UNUSED,
tb->sort = EPHOTO_SORT_MODTIME_ASCENDING;
tb->thumbs_only = 1;
tb->dirs_only = 0;
+   elm_object_text_set(tb->hover, _("Modification Time Ascending"));
ephoto_directory_set(tb->ephoto, tb->ephoto->config->directory,
NULL, tb->dirs_only, tb->thumbs_only);
 }
@@ -465,6 +470,7 @@ _sort_mod_desc(void *data, Evas_Object *obj EINA_UNUSED,
tb->sort = EPHOTO_SORT_MODTIME_DESCENDING;
tb->thumbs_only = 1;
tb->dirs_only = 0;
+   elm_object_text_set(tb->hover, _("Modification Time Descending"));
ephoto_directory_set(tb->ephoto, tb->ephoto->config->directory,
NULL, tb->dirs_only, tb->thumbs_only);
 }
@@ -622,6 +628,8 @@ _todo_items_process(void *data)
   return EINA_TRUE;
 tb->animator.todo_items = NULL;
 tb->processing = 0;
+elm_progressbar_pulse(tb->progress, EINA_FALSE);
+evas_object_hide(tb->progress);
return EINA_FALSE;
  }
if ((tb->ls) && (eina_list_count(tb->todo_items) < TODO_ITEM_MIN_BATCH))
@@ -3504,6 +3512,8 @@ _ephoto_thumb_populate_start(void *data, int type 
EINA_UNUSED,
 
evas_object_smart_callback_call(tb->main, "changed,directory", NULL);
 
+   evas_object_show(tb->progress);
+   elm_progressbar_pulse(tb->progress, EINA_TRUE);
tb->animator.processed = 0;
tb->animator.count = 0;
if (tb->ephoto->selentries)
@@ -3539,6 +3549,11 @@ _ephoto_thumb_populate_end(void *data, int type 
EINA_UNUSED,
 tb->totimages = 0;
 tb->totsize = 0;
  }
+   if (tb->animator.processed == tb->animator.count)
+ {
+elm_progressbar_pulse(tb->progress, EINA_FALSE);
+evas_object_hide(tb->progress);
+ }
_update_info_label(tb);
tb->dirs_only = 0;
tb->thumbs_only = 0;
@@ -3784,7 +3799,7 @@ Evas_Object *
 ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
 {
Evas_Object *box = elm_box_add(parent);
-   Evas_Object *icon, *hbox, *but, *ic, *menu;
+   Evas_Object *icon, *hbox, *but, *ic, *tab;
Ephoto_Thumb_Browser *tb;
 
EINA_SAFETY_ON_NULL_RETURN_VAL(box, NULL);
@@ -3843,20 +3858,6 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object 
*parent)
  tb->ficon = elm_toolbar_item_prepend(tb->bar, "system-file-manager",
  _("Folders"), _ephoto_dir_show_folders, tb);
icon =
-   elm_toolbar_item_append(tb->bar, "view-sort-descending",
-   _("Sort"), NULL, NULL);
-   elm_toolbar_item_menu_set(icon, EINA_TRUE);
-   elm_toolbar_menu_parent_set(tb->bar, tb->ephoto->win);
-   menu = elm_toolbar_item_menu_get(icon);
-   elm_menu_item_add(menu, NULL, "view-sort-ascending",
-   _("Alphabetical Ascending"), _sort_alpha_asc, tb);
-   elm_menu_item_add(menu, NULL, "view-sort-descending",
-   _("Alphabetical Descending"), _sort_alpha_desc, tb);
-   elm_menu_item_add(menu, NULL, "view-sort-ascending",
-   _("Modification Time Ascending"), _sort_mod_asc, tb);
-   elm_menu_item_add(menu, NULL, "view-sort-descending",
-   _("Modification Time Descending"), _sort_mod_desc, tb);
-   icon =
elm_toolbar_item_append(tb->bar, "zoom-in", _("Zoom In"), _zoom_in, tb);
tb->max = elm_object_item_widget_get(icon);
icon =

[EGIT] [tools/enventor] master 01/01: Fix to apply Eo4.

[Jaehyun Cho]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/tools/enventor.git/commit/?id=b656f774d959a7dfac807f2756869bef3d24a102

commit b656f774d959a7dfac807f2756869bef3d24a102
Author: Jaehyun Cho 
Date:   Fri Mar 4 09:21:56 2016 +0900

Fix to apply Eo4.

In Eo4, eo_do, eo_do_ret, eo_do_super, eo_do_super_ret are not used.
---
 src/lib/edj_viewer.c |  3 +--
 src/lib/enventor_smart.c | 12 +---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 3d78de5..1969985 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -159,8 +159,7 @@ view_obj_create_post_job(view_data *vd)
 
if (vd->part_name) view_part_highlight_set(vd, vd->part_name);
 
-   Eina_Bool ret;
-   if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get()))
+   if (enventor_obj_dummy_parts_get(vd->enventor))
  dummy_obj_new(vd->layout);
 
if (vd->changed_part.part)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 759f97a..584c53c 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -196,7 +196,7 @@ _enventor_object_evas_object_smart_add(Eo *obj, 
Enventor_Object_Data *pd)
pd->obj = obj;
 
elm_widget_sub_object_parent_add(obj);
-   eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+   evas_obj_smart_add(eo_super(obj, MY_CLASS));
 
build_init();
autocomp_init();
@@ -288,10 +288,9 @@ EOLIAN static Eo *
 _enventor_object_eo_base_constructor(Eo *obj,
  Enventor_Object_Data *pd EINA_UNUSED)
 {
-   obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
-   eo_do(obj,
- evas_obj_type_set(MY_CLASS_NAME_LEGACY),
- evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
+   obj = eo_constructor(eo_super(obj, MY_CLASS));
+   evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+   evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
return obj;
 }
@@ -774,8 +773,7 @@ enventor_object_add(Evas_Object *parent)
 EAPI Eina_Bool
 enventor_object_file_set(Evas_Object *obj, const char *file)
 {
-   Eina_Bool ret;
-   return eo_do_ret(obj, ret, efl_file_set(file, NULL));
+   return efl_file_set(obj, file, NULL);
 }
 
 #include "enventor_object.eo.c"

-- 

[EGIT] [core/efl] master 02/02: eina: reintroduce additional support for eina sub directory compilation.

[Cedric BAIL]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=1affc60d00e1fa2b702d6b170514b86e1438ed9a

commit 1affc60d00e1fa2b702d6b170514b86e1438ed9a
Author: Cedric Bail 
Date:   Thu Mar 3 15:09:54 2016 -0800

eina: reintroduce additional support for eina sub directory compilation.

This is still experimental and quite hacky. Let me know if you face issue.
It should just work with make -C src/lib/eina normally...
---
 configure.ac |  1 +
 src/lib/eina/Makefile.am | 16 
 2 files changed, 17 insertions(+)

diff --git a/configure.ac b/configure.ac
index f60bdb2..33cd584 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5074,6 +5074,7 @@ src/examples/elua/Makefile
 src/examples/eolian_cxx/Makefile
 src/examples/elocation/Makefile
 src/lib/eina/eina_config.h
+src/lib/eina/Makefile
 src/lib/ecore_x/ecore_x_version.h
 src/lib/efl/Efl_Config.h
 spec/efl.spec
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
new file mode 100644
index 000..ee789b1
--- /dev/null
+++ b/src/lib/eina/Makefile.am
@@ -0,0 +1,16 @@
+MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES =
+BUILT_SOURCES =
+
+include Makefile_File.am
+
+lib_LTLIBRARIES = libeina.la
+
+libeina_la_SOURCES = $(EINA_S)
+libeina_la_CPPFLAGS = $(EINA_FLAGS)
+libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
+libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@
+libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+libeina_la-%.Plo: lib_eina_libeina_la-%.Plo
+   ln -fs $(subst $(top_srcdir)/src/lib/eina/,,$<) $(subst 
$(top_srcdir)/src/lib/eina/,,$@)

-- 

[EGIT] [core/efl] master 01/02: eolian-cxx: Partial fix for generation without eo_do

[Felipe Magno de Almeida]

vitorsousa pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5c7d78d1040b5bdfe6430e84c90d36ab8bf27064

commit 5c7d78d1040b5bdfe6430e84c90d36ab8bf27064
Author: Felipe Magno de Almeida 
Date:   Wed Mar 2 11:32:16 2016 -0300

eolian-cxx: Partial fix for generation without eo_do
---
 src/bindings/eo_cxx/eo_event.hh|  2 +-
 src/bindings/eo_cxx/eo_inherit_bindings.hh |  4 +-
 src/bindings/eo_cxx/eo_ops.hh  | 56 +++---
 .../grammar/eo_class_constructors_generator.hh |  5 +-
 .../grammar/eo_class_events_generator.hh   | 11 ++---
 .../grammar/eo_class_functions_generator.hh| 29 +--
 .../grammar/inheritance_base_generator.hh  |  5 +-
 src/lib/eolian_cxx/grammar/parameters_generator.hh |  7 +--
 src/tests/eolian_cxx/callback.c|  4 +-
 9 files changed, 71 insertions(+), 52 deletions(-)

diff --git a/src/bindings/eo_cxx/eo_event.hh b/src/bindings/eo_cxx/eo_event.hh
index d0b335e..5fa6404 100644
--- a/src/bindings/eo_cxx/eo_event.hh
+++ b/src/bindings/eo_cxx/eo_event.hh
@@ -95,7 +95,7 @@ struct _event_deleter
 
   void operator()() const
   {
-eo_do(_eo, ::eo_event_callback_del(_description, _cb, _data));
+::eo_event_callback_del(_eo, _description, _cb, _data);
 ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data);
   }
 
diff --git a/src/bindings/eo_cxx/eo_inherit_bindings.hh 
b/src/bindings/eo_cxx/eo_inherit_bindings.hh
index cbd2bc8..458036d 100644
--- a/src/bindings/eo_cxx/eo_inherit_bindings.hh
+++ b/src/bindings/eo_cxx/eo_inherit_bindings.hh
@@ -61,7 +61,9 @@ void inherit_constructor_impl(Eo*, Inherit_Private_Data* 
self, void* this_)
 /// @param this_ The user data to be passed to the resolved function.
 /// @param args An heterogeneous sequence of arguments.
 ///
-inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), 
void* this_);
+// inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), 
void* this_);
+inline
+void inherit_constructor(void* this_);
 
 template 
 int initialize_operation_description(detail::tag, void*);
diff --git a/src/bindings/eo_cxx/eo_ops.hh b/src/bindings/eo_cxx/eo_ops.hh
index 47d920d..46a33c7 100644
--- a/src/bindings/eo_cxx/eo_ops.hh
+++ b/src/bindings/eo_cxx/eo_ops.hh
@@ -22,112 +22,112 @@ shutdown()
 }
 
 inline Eo*
-ref(const Eo *obj)
+ref(Eo *obj)
 {
return ::eo_ref(obj);
 }
 
 inline void
-unref(const Eo *obj)
+unref(Eo *obj)
 {
::eo_unref(obj);
 }
 
 inline int
-ref_get(const Eo *obj)
+ref_get(Eo *obj)
 {
return ::eo_ref_get(obj);
 }
 
 inline void
-del(const Eo *obj)
+del(Eo *obj)
 {
::eo_del(obj);
 }
 
 inline Eina_Bool
-isa(const Eo *obj, const Eo_Class *klass)
+isa(Eo *obj, Eo_Class *klass)
 {
return eo_isa(obj, klass);
 }
 
 inline Eo*
-add(const Eo_Class *klass, Eo *parent = NULL)
+add(Eo_Class *klass, Eo *parent = NULL)
 {
Eo *eo = eo_add_ref(klass, parent);
return eo;
 }
 
 inline void
-dbg_info_get(const Eo *obj, Eo_Dbg_Info *info)
+dbg_info_get(Eo *obj, Eo_Dbg_Info *info)
 {
-   eo_do(obj, eo_dbg_info_get(info));
+   eo_dbg_info_get(obj, info);
 }
 
 inline void
-base_data_set(const Eo *obj, const char *key, const void *data)
+base_data_set(Eo *obj, const char *key, const void *data)
 {
-   eo_do(obj, eo_key_data_set(key, data));
+   eo_key_data_set(obj, key, data);
 }
 
 inline void*
-base_data_get(const Eo *obj, const char *key)
+base_data_get(Eo *obj, const char *key)
 {
void *data;
-   eo_do(obj, data = eo_key_data_get(key));
+   data = eo_key_data_get(obj, key);
return data;
 }
 
 inline void
-base_data_del(const Eo *obj, const char *key)
+base_data_del(Eo *obj, const char *key)
 {
-   eo_do(obj, eo_key_data_del(key));
+   eo_key_data_del(obj, key);
 }
 
 inline void
-parent_set(const Eo *obj, Eo *parent)
+parent_set(Eo *obj, Eo *parent)
 {
-   eo_do(obj, eo_parent_set(parent));
+   eo_parent_set(obj, parent);
 }
 
 inline Eo*
-parent_get(const Eo *obj)
+parent_get(Eo *obj)
 {
Eo *parent;
-   eo_do(obj, parent = eo_parent_get());
+   parent = eo_parent_get(obj);
return parent;
 }
 
 inline void
-event_freeze(const Eo *obj)
+event_freeze(Eo *obj)
 {
-   eo_do(obj, eo_event_freeze());
+   eo_event_freeze(obj);
 }
 
 inline void
-event_thaw(const Eo *obj)
+event_thaw(Eo *obj)
 {
-   eo_do(obj, eo_event_thaw());
+   eo_event_thaw(obj);
 }
 
 inline int
-event_freeze_get(const Eo *obj)
+event_freeze_get(Eo *obj)
 {
int count = -1;
-   eo_do(obj, count = eo_event_freeze_count_get());
+   count = eo_event_freeze_count_get(obj);
return count;
 }
 
 inline void
-wref_add(const Eo *obj, Eo **wref)
+wref_add(Eo *obj, Eo **wref)
 {
-   eo_do(obj, eo_wref_add(wref));
+   eo_wref_add(obj, wref);
 }
 
 inline void
-wref_del(const Eo *obj, Eo **wref)
+wref_del(Eo *obj, Eo **wref)
 {
-   eo_do(obj, eo_wref_del(wref));
+   eo_wref_del(obj, wref);
 }
 
 } } }
diff --git 

[EGIT] [core/efl] master 02/02: eolian-cxx: Fix Eolian C++ constructing methods with new eo_add

[Vitor Sousa]

vitorsousa pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=9cbda57bf03bfdaa5c0379023a05868b2f0986aa

commit 9cbda57bf03bfdaa5c0379023a05868b2f0986aa
Author: Vitor Sousa 
Date:   Thu Mar 3 15:10:13 2016 -0300

eolian-cxx: Fix Eolian C++ constructing methods with new eo_add

Also fix Eolian C++ examples using the new "eo_super".
---
 src/bindings/eo_cxx/eo_cxx_interop.hh   |  4 ++--
 src/bindings/eo_cxx/eo_inherit.hh   | 13 ++---
 src/bindings/eo_cxx/eo_inherit_bindings.hh  | 12 
 src/examples/eolian_cxx/colourable_cxx.cc   |  6 +++---
 src/examples/eolian_cxx/colourablesquare_cxx.cc |  2 +-
 src/examples/eolian_cxx/eolian_cxx_inherit_01.cc|  4 ++--
 .../eolian_cxx/grammar/eo_class_constructors_generator.hh   |  9 +
 7 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/bindings/eo_cxx/eo_cxx_interop.hh 
b/src/bindings/eo_cxx/eo_cxx_interop.hh
index 7cd7b35..b1978a8 100644
--- a/src/bindings/eo_cxx/eo_cxx_interop.hh
+++ b/src/bindings/eo_cxx/eo_cxx_interop.hh
@@ -472,9 +472,9 @@ F* alloc_static_callback(F&& f)
 
 template 
 inline
-void call_ctors(Fs&&... fs)
+void call_ctors(Eo* _obj_eoid, Fs&&... fs)
 {
-   std::initializer_list const v {(fs(), 0)...};
+   std::initializer_list const v {(fs(_obj_eoid), 0)...};
(void) v;
 }
 
diff --git a/src/bindings/eo_cxx/eo_inherit.hh 
b/src/bindings/eo_cxx/eo_inherit.hh
index 3138d1e..9639e33 100644
--- a/src/bindings/eo_cxx/eo_inherit.hh
+++ b/src/bindings/eo_cxx/eo_inherit.hh
@@ -22,8 +22,15 @@ namespace detail {
 template 
 Eo_Class const* create_class(eina::index_sequence);
 
-inline
-void inherit_constructor(void* this_);
+/// @internal
+///
+/// @brief Find the correct function for the "constructor"
+/// operation and invoke it.
+///
+/// @param this_ The user data to be passed to the resolved function.
+/// @param args An heterogeneous sequence of arguments.
+///
+inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), 
void* this_);
 
 }
 
@@ -78,7 +85,7 @@ struct inherit
inherit(efl::eo::parent_type _p, Args&& ... args)
{
   _eo_cls = detail::create_class 
(eina::make_index_sequence());
-  _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, 
detail::inherit_constructor(this), ::efl::eolian::call_ctors(args...));
+  _eo_raw = eo_add_ref(_eo_cls, _p._eo_raw, 
detail::inherit_constructor(eoid, this), ::efl::eolian::call_ctors(eoid, 
args...));
   ::efl::eolian::register_ev_del_free_callback(_eo_raw, args...);
   }
 
diff --git a/src/bindings/eo_cxx/eo_inherit_bindings.hh 
b/src/bindings/eo_cxx/eo_inherit_bindings.hh
index 458036d..bb29b9e 100644
--- a/src/bindings/eo_cxx/eo_inherit_bindings.hh
+++ b/src/bindings/eo_cxx/eo_inherit_bindings.hh
@@ -53,18 +53,6 @@ void inherit_constructor_impl(Eo*, Inherit_Private_Data* 
self, void* this_)
self->this_ = this_;
 }
 
-/// @internal
-///
-/// @brief Find the correct function for the "constructor"
-/// operation and invoke it.
-///
-/// @param this_ The user data to be passed to the resolved function.
-/// @param args An heterogeneous sequence of arguments.
-///
-// inline EOAPI EO_VOID_FUNC_BODYV(inherit_constructor, EO_FUNC_CALL(this_), 
void* this_);
-inline
-void inherit_constructor(void* this_);
-
 template 
 int initialize_operation_description(detail::tag, void*);
 
diff --git a/src/examples/eolian_cxx/colourable_cxx.cc 
b/src/examples/eolian_cxx/colourable_cxx.cc
index 934a5d0..f1f6bec 100644
--- a/src/examples/eolian_cxx/colourable_cxx.cc
+++ b/src/examples/eolian_cxx/colourable_cxx.cc
@@ -24,14 +24,14 @@ _colourable_eo_base_constructor(Eo *obj, Colourable_Data 
*self)
 {
EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
self->r = self->g = self->b = 0;
-   return eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+   return eo_constructor(eo_super(obj, MY_CLASS));
 }
 
 void
 _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
 {
EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
-   eo_do_super(obj, MY_CLASS, eo_destructor());
+   eo_destructor(eo_super(obj, MY_CLASS));
 }
 
 void
@@ -42,7 +42,7 @@ _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data 
*self, int rgb)
self->r = (rgb & 0x00ff) >> 16;
self->g = (rgb & 0xff00) >> 8;
self->b = rgb & 0x00ff;
-   eo_do_super(obj, MY_CLASS, eo_constructor());
+   eo_constructor(eo_super(obj, MY_CLASS));
 }
 
 void
diff --git a/src/examples/eolian_cxx/colourablesquare_cxx.cc 
b/src/examples/eolian_cxx/colourablesquare_cxx.cc
index 906183a2..6908f73 100644
--- a/src/examples/eolian_cxx/colourablesquare_cxx.cc
+++ b/src/examples/eolian_cxx/colourablesquare_cxx.cc
@@ -25,7 +25,7 @@ _colourablesquare_size_constructor(Eo *obj, 
ColourableSquare_Data *self, int siz
 {
self->size = size;

[EGIT] [core/efl] master 01/01: ecore-input: Fix spelling errors in comments

[Derek Foreman]

devilhorns pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=54f954c2ee6f75bb3fcbc71e78b7e8526df93918

commit 54f954c2ee6f75bb3fcbc71e78b7e8526df93918
Author: Derek Foreman 
Date:   Thu Mar 3 11:24:37 2016 -0500

ecore-input: Fix spelling errors in comments

This small patch just fixes up some spelling errors in comments. No
functional changes.

Reviewers: zmike, devilhorns

Reviewed By: devilhorns

Subscribers: cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D3753
---
 src/lib/ecore_input/Ecore_Input.h | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/ecore_input/Ecore_Input.h 
b/src/lib/ecore_input/Ecore_Input.h
index 1e7e836..c7a74a9 100644
--- a/src/lib/ecore_input/Ecore_Input.h
+++ b/src/lib/ecore_input/Ecore_Input.h
@@ -147,7 +147,7 @@ extern "C" {
 Ecore_Window event_window; /**< The child window where event 
happened */
 
 unsigned int timestamp; /**< Time when the event occurred */
-unsigned int modifiers; /**< The combination of modifiers key 
(SHIT,CTRL,ALT,..)*/
+unsigned int modifiers; /**< The combination of modifiers key 
(SHIFT,CTRL,ALT,..)*/
 
 int  same_screen; /**< same screen flag */
 
@@ -167,7 +167,7 @@ extern "C" {
 Ecore_Window event_window; /**< The child window where event 
happened */
 
 unsigned int timestamp; /**< Time when the event occurred */
-unsigned int modifiers; /**< The combination of modifiers key 
(SHIT,CTRL,ALT,..)*/
+unsigned int modifiers; /**< The combination of modifiers key 
(SHIFT,CTRL,ALT,..)*/
 unsigned int buttons; /**< The button that was used */
 unsigned int double_click; /**< Double click event */
 unsigned int triple_click; /**< Triple click event */
@@ -203,7 +203,7 @@ extern "C" {
 Ecore_Window event_window; /**< The child window where event 
happened */
 
 unsigned int timestamp; /**< Time when the event occurred */
-unsigned int modifiers; /**< The combination of modifiers key 
(SHIT,CTRL,ALT,..)*/
+unsigned int modifiers; /**< The combination of modifiers key 
(SHIFT,CTRL,ALT,..)*/
 
 int  same_screen; /**< Same screen flag */
 int  direction; /**< Orientation of the wheel 
(horizontal/vertical) */
@@ -228,7 +228,7 @@ extern "C" {
 Ecore_Window event_window; /**< The child window where event 
happened */
 
 unsigned int timestamp; /**< Time when the event occurred */
-unsigned int modifiers; /**< The combination of modifiers key 
(SHIT,CTRL,ALT,..)*/
+unsigned int modifiers; /**< The combination of modifiers key 
(SHIFT,CTRL,ALT,..)*/
 
 int  same_screen; /**< Same screen flag */
 
@@ -297,7 +297,7 @@ extern "C" {
 Ecore_Window event_window; /**< The child window where event 
happened */
 
 unsigned int timestamp; /**< Time when the event occurred */
-unsigned int modifiers; /**< The combination of modifiers key 
(SHIT,CTRL,ALT,..)*/
+unsigned int modifiers; /**< The combination of modifiers key 
(SHIFT,CTRL,ALT,..)*/
 
 int  x; /**< x coordinate relative to window where event 
happened */
 int  y; /**< y coordinate relative to window where event 
happened */

-- 

[EGIT] [core/elementary] master 01/01: Genlist test: Adjust according to the recent eo event changes.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=c63ee44cfc888016691c72d7fc1c934fffe860f3

commit c63ee44cfc888016691c72d7fc1c934fffe860f3
Author: Tom Hacohen 
Date:   Thu Mar 3 13:44:07 2016 +

Genlist test: Adjust according to the recent eo event changes.

Thanks to zmike for letting me know.
---
 src/tests/elm_test_genlist.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/tests/elm_test_genlist.c b/src/tests/elm_test_genlist.c
index 5d23930..614fda9 100644
--- a/src/tests/elm_test_genlist.c
+++ b/src/tests/elm_test_genlist.c
@@ -81,14 +81,13 @@ START_TEST(elm_atspi_children_get2)
 END_TEST
 
 static Eina_Bool
-_children_changed_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED,
- const Eo_Event_Description *desc, void *event_info 
EINA_UNUSED)
+_children_changed_cb(void *data EINA_UNUSED, const Eo_Event *event)
 {
-   if (desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
+   if (event->desc != ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
  return EINA_TRUE;
 
-   ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event_info;
-   current = obj;
+   ev_data = *(Elm_Atspi_Event_Children_Changed_Data*)event->event_info;
+   current = event->obj;
counter++;
 
return EINA_TRUE;

-- 

[EGIT] [core/efl] master 01/01: Fix more wrong migration to Eo4.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b60db90ddc45001db2128f96aa0f5196f844b8c5

commit b60db90ddc45001db2128f96aa0f5196f844b8c5
Author: Tom Hacohen 
Date:   Thu Mar 3 12:58:24 2016 +

Fix more wrong migration to Eo4.

The if wasn't using {} so one of the statements was out of the scope
of the condition.
There was some misindented code.
---
 src/modules/evas/model_loaders/md2/evas_model_load_md2.c |  9 ++---
 src/modules/evas/model_loaders/obj/evas_model_load_obj.c | 16 ++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c 
b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
index 40a2aa6..02842ad 100644
--- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
+++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
@@ -347,15 +347,18 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh, 
Eina_File *file)
 int  f = i * MD2_FRAME_SCALE;
 
 /* Add a mesh frame. */
-  evas_canvas3d_mesh_frame_add(mesh, f);
+evas_canvas3d_mesh_frame_add(mesh, f);
+
 /* Allocate vertex buffer for the frame. */
-  evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
+evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
 evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
+
 /* Map vertex buffer. */
-  pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
+pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
 nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
 tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+
 stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
 stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
 stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c 
b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
index 718b8c9..4f1c8f6 100644
--- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
+++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
@@ -380,14 +380,18 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh, 
Eina_File *file)
stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
 
if (counts.existence_of_normal)
- evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+ {
+evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
+nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+ }
 
if (counts.existence_of_tex_point)
- evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+ {
+evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
+tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0, 
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+ }
 
if (stride_pos == 0) stride_pos = sizeof(float) * 3;
if ((counts.existence_of_normal) && (stride_nor == 0))

-- 

[EGIT] [apps/terminology] master 02/02: Revert "wip"

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=f05a9187b079a6977a2ba592030c3ed02bc32dc3

commit f05a9187b079a6977a2ba592030c3ed02bc32dc3
Author: Boris Faure 
Date:   Thu Mar 3 13:30:14 2016 +0100

Revert "wip"

This reverts commit 487c54b4e11804f70b84cde802c7a4a886b81093.
---
 data/themes/default.edc |  1 -
 src/bin/win.c   | 10 ++
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index fcd7302..7b5cc26 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1087,7 +1087,6 @@ collections {
  }
 
  part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
-/* TODO: boris */
 scale: 1;
 effect: SOFT_SHADOW BOTTOM;
 mouse_events: 0;
diff --git a/src/bin/win.c b/src/bin/win.c
index e555d51..d31af83 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1659,9 +1659,6 @@ _tabbar_clear(Term *tm)
 edje_object_message_signal_process(tm->bg);
 edje_object_part_unswallow(tm->bg, tm->tab_spacer);
 evas_object_del(tm->tab_spacer);
-Evas_Object *o;
-o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
-evas_object_del(o);
 tm->tab_spacer = NULL;
  }
 }
@@ -2555,9 +2552,8 @@ _tabs_set_title(Term_Container *tc, Term_Container *child,
 
 if (!term->config->notabs)
   {
- Evas_Object *o;
- o = edje_object_part_swallow_get(term->bg, 
"terminology.tab.title");
- evas_object_text_text_set(o, title);
+ edje_object_part_text_set(term->bg, "terminology.tab.title",
+   title);
   }
  }
else
@@ -2632,7 +2628,6 @@ _tabs_refresh(Tabs *tabs)
 v2 = (double)i / (double)n;
 if (!term->tab_spacer)
   {
- Evas_Object *o;
  term->tab_spacer = evas_object_rectangle_add(
 evas_object_evas_get(term->bg));
  evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2641,7 +2636,6 @@ _tabs_refresh(Tabs *tabs)
  edje_object_part_swallow(term->bg, "terminology.tab", 
term->tab_spacer);
  edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 
0.0);
  edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 
0.0);
- /* TODO: boris */
  edje_object_part_text_set(term->bg, "terminology.tab.title",
solo->tc.title);
  edje_object_signal_emit(term->bg, "tabbar,on", "terminology");

-- 

[EGIT] [apps/terminology] master 01/02: Revert "wip"

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=2c5568c933bf62c9b5f71d47a040f09044babaeb

commit 2c5568c933bf62c9b5f71d47a040f09044babaeb
Author: Boris Faure 
Date:   Thu Mar 3 13:30:00 2016 +0100

Revert "wip"

This reverts commit 02db084b276346160fcea4775dcc156f6036f3ce.
---
 data/themes/default.edc | 29 +++--
 src/bin/win.c   | 16 
 2 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 69cb4d7..fcd7302 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1016,8 +1016,7 @@ collections {
 target: "tab_bevel_shad1";
 target: "tab_bevel_shad3";
 target: "tab_bevel_shad4";
-//target: "tabtitle";
-target: "terminology.tab.title";
+target: "tabtitle";
 target: "tabclose";
  }
  program {
@@ -1043,8 +1042,7 @@ collections {
 target: "tab_bevel_shad1";
 target: "tab_bevel_shad3";
 target: "tab_bevel_shad4";
-//target: "tabtitle";
-target: "terminology.tab.title";
+target: "tabtitle";
 target: "tabclose";
  }
 
@@ -1088,28 +1086,8 @@ collections {
 }
  }
 
-/* TODO: boris */
- part { name: "terminology.tab.title";
-type: SWALLOW;
-mouse_events: 0;
-scale: 1;
-description { state: "default" 0.0;
-   align: 0.5 0.5;
-   rel1.to_x: "tab_bevel_top2";
-   rel1.offset: 0 2;
-   rel2.to_x: "tab_bevel_top2";
-   rel2.offset: -1 2;
-   rel2.relative: 1.0 0.0;
-   visible: 0;
-   fixed: 1 1;
-}
-description { state: "tab" 0.0;
-   inherit: "default" 0.0;
-   visible: 1;
-}
- }
- /*
  part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
+/* TODO: boris */
 scale: 1;
 effect: SOFT_SHADOW BOTTOM;
 mouse_events: 0;
@@ -1155,7 +1133,6 @@ collections {
visible: 1;
 }
  }
-*/
  part { name: "tablimit0"; type: SPACER;
 description { state: "default" 0.0;
rel1.to_y: "terminology.tab";
diff --git a/src/bin/win.c b/src/bin/win.c
index b8c891c..e555d51 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1659,7 +1659,8 @@ _tabbar_clear(Term *tm)
 edje_object_message_signal_process(tm->bg);
 edje_object_part_unswallow(tm->bg, tm->tab_spacer);
 evas_object_del(tm->tab_spacer);
-o = edje_object_part_swallow_get(tm->bg, "terminology.tab.title");
+Evas_Object *o;
+o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
 evas_object_del(o);
 tm->tab_spacer = NULL;
  }
@@ -2632,7 +2633,6 @@ _tabs_refresh(Tabs *tabs)
 if (!term->tab_spacer)
   {
  Evas_Object *o;
- Evas_Coord ow, oh;
  term->tab_spacer = evas_object_rectangle_add(
 evas_object_evas_get(term->bg));
  evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2642,16 +2642,8 @@ _tabs_refresh(Tabs *tabs)
  edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 
0.0);
  edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 
0.0);
  /* TODO: boris */
- //edje_object_part_text_set(term->bg, "terminology.tab.title",
- //  solo->tc.title);
- o = evas_object_text_add(evas_object_evas_get(term->bg));
- /* TODO boris: style */
- evas_object_text_text_set(o, solo->tc.title);
- evas_object_scale_set(o, elm_config_scale_get());
- evas_object_geometry_get(o, NULL, NULL, , );
- evas_object_size_hint_min_set(o, ow, oh);
- edje_object_part_swallow(term->bg, "terminology.tab.title", o);
-
+ edje_object_part_text_set(term->bg, "terminology.tab.title",
+   solo->tc.title);
  edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
  edje_object_message_signal_process(term->bg);
   }

-- 

[EGIT] [core/efl] master 01/01: Edje calc: Fix wrong migration to Eo4.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=12d8654f147ba2e93411840dbb17a3285435f4c5

commit 12d8654f147ba2e93411840dbb17a3285435f4c5
Author: Tom Hacohen 
Date:   Thu Mar 3 12:23:04 2016 +

Edje calc: Fix wrong migration to Eo4.

The if wasn't using {} so one of the statements was executed
unconditionally.
---
 src/lib/edje/edje_calc.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 8fa3cb9..c30efb2 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -4777,8 +4777,10 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int 
flags, Edje_Calc_Params *sta
 
  frame_exist = evas_canvas3d_mesh_frame_exist(mesh, 
pf->type.node.frame);
  if (!frame_exist)
-   evas_canvas3d_mesh_frame_add(mesh, pf->type.node.frame);
-   evas_canvas3d_mesh_frame_material_set(mesh, 
pf->type.node.frame, material);
+   {
+  evas_canvas3d_mesh_frame_add(mesh, 
pf->type.node.frame);
+  evas_canvas3d_mesh_frame_material_set(mesh, 
pf->type.node.frame, material);
+   }
  evas_canvas3d_mesh_shade_mode_set(mesh, 
pd_mesh_node->mesh_node.properties.shade);
  evas_canvas3d_mesh_vertex_assembly_set(mesh, 
pd_mesh_node->mesh_node.mesh.assembly);
  evas_canvas3d_node_mesh_frame_set(ep->node, mesh, 
pf->type.node.frame);

-- 

[EGIT] [apps/terminology] master 03/04: wip

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=02db084b276346160fcea4775dcc156f6036f3ce

commit 02db084b276346160fcea4775dcc156f6036f3ce
Author: Boris Faure 
Date:   Wed Feb 10 23:56:59 2016 +0100

wip
---
 data/themes/default.edc | 29 ++---
 src/bin/win.c   | 16 
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index fcd7302..69cb4d7 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1016,7 +1016,8 @@ collections {
 target: "tab_bevel_shad1";
 target: "tab_bevel_shad3";
 target: "tab_bevel_shad4";
-target: "tabtitle";
+//target: "tabtitle";
+target: "terminology.tab.title";
 target: "tabclose";
  }
  program {
@@ -1042,7 +1043,8 @@ collections {
 target: "tab_bevel_shad1";
 target: "tab_bevel_shad3";
 target: "tab_bevel_shad4";
-target: "tabtitle";
+//target: "tabtitle";
+target: "terminology.tab.title";
 target: "tabclose";
  }
 
@@ -1086,8 +1088,28 @@ collections {
 }
  }
 
- part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
 /* TODO: boris */
+ part { name: "terminology.tab.title";
+type: SWALLOW;
+mouse_events: 0;
+scale: 1;
+description { state: "default" 0.0;
+   align: 0.5 0.5;
+   rel1.to_x: "tab_bevel_top2";
+   rel1.offset: 0 2;
+   rel2.to_x: "tab_bevel_top2";
+   rel2.offset: -1 2;
+   rel2.relative: 1.0 0.0;
+   visible: 0;
+   fixed: 1 1;
+}
+description { state: "tab" 0.0;
+   inherit: "default" 0.0;
+   visible: 1;
+}
+ }
+ /*
+ part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
 scale: 1;
 effect: SOFT_SHADOW BOTTOM;
 mouse_events: 0;
@@ -1133,6 +1155,7 @@ collections {
visible: 1;
 }
  }
+*/
  part { name: "tablimit0"; type: SPACER;
 description { state: "default" 0.0;
rel1.to_y: "terminology.tab";
diff --git a/src/bin/win.c b/src/bin/win.c
index 315dd4c..88aa885 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1649,8 +1649,7 @@ _tabbar_clear(Term *tm)
 edje_object_message_signal_process(tm->bg);
 edje_object_part_unswallow(tm->bg, tm->tab_spacer);
 evas_object_del(tm->tab_spacer);
-Evas_Object *o;
-o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
+o = edje_object_part_swallow_get(tm->bg, "terminology.tab.title");
 evas_object_del(o);
 tm->tab_spacer = NULL;
  }
@@ -2623,6 +2622,7 @@ _tabs_refresh(Tabs *tabs)
 if (!term->tab_spacer)
   {
  Evas_Object *o;
+ Evas_Coord ow, oh;
  term->tab_spacer = evas_object_rectangle_add(
 evas_object_evas_get(term->bg));
  evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2632,8 +2632,16 @@ _tabs_refresh(Tabs *tabs)
  edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 
0.0);
  edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 
0.0);
  /* TODO: boris */
- edje_object_part_text_set(term->bg, "terminology.tab.title",
-   solo->tc.title);
+ //edje_object_part_text_set(term->bg, "terminology.tab.title",
+ //  solo->tc.title);
+ o = evas_object_text_add(evas_object_evas_get(term->bg));
+ /* TODO boris: style */
+ evas_object_text_text_set(o, solo->tc.title);
+ evas_object_scale_set(o, elm_config_scale_get());
+ evas_object_geometry_get(o, NULL, NULL, , );
+ evas_object_size_hint_min_set(o, ow, oh);
+ edje_object_part_swallow(term->bg, "terminology.tab.title", o);
+
  edje_object_signal_emit(term->bg, "tabbar,on", "terminology");
  edje_object_message_signal_process(term->bg);
   }

-- 

[EGIT] [apps/terminology] master 04/04: refocus other split when closing one. Closes T3239

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=815880b7ec943581ee75ec6f19e16358b3c0

commit 815880b7ec943581ee75ec6f19e16358b3c0
Author: Boris Faure 
Date:   Thu Mar 3 13:01:19 2016 +0100

refocus other split when closing one. Closes T3239
---
 src/bin/win.c | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/src/bin/win.c b/src/bin/win.c
index 88aa885..b8c891c 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -247,6 +247,7 @@ _solo_size_eval(Term_Container *container, Sizeinfo *info)
 static void
 _solo_close(Term_Container *tc, Term_Container *child EINA_UNUSED)
 {
+   DBG("close");
tc->parent->close(tc->parent, tc);
 
eina_stringshare_del(tc->title);
@@ -821,6 +822,8 @@ _win_swallow(Term_Container *tc, Term_Container *orig,
wn = (Win*) tc;
base = win_base_get(wn);
 
+   DBG("orig:%p", orig);
+
if (orig)
  {
 o = orig->get_evas_object(orig);
@@ -1325,6 +1328,8 @@ _split_close(Term_Container *tc, Term_Container *child)
assert (tc->type == TERM_CONTAINER_TYPE_SPLIT);
split = (Split*) tc;
 
+   DBG("close");
+
top = elm_object_part_content_unset(split->panes, PANES_TOP);
bottom = elm_object_part_content_unset(split->panes, PANES_BOTTOM);
evas_object_hide(top);
@@ -1334,6 +1339,11 @@ _split_close(Term_Container *tc, Term_Container *child)
other_child = (child == split->tc1) ? split->tc2 : split->tc1;
parent->swallow(parent, tc, other_child);
 
+   if (tc->is_focused)
+ {
+other_child->focus(other_child, parent);
+ }
+
evas_object_del(split->panes);
 
eina_stringshare_del(tc->title);

-- 

[EGIT] [apps/terminology] master 01/04: tiny cleanup

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=e1be15fa89748ea50ccbae29aaa3c46603407cca

commit e1be15fa89748ea50ccbae29aaa3c46603407cca
Author: Boris Faure 
Date:   Tue Feb 9 20:59:32 2016 +0100

tiny cleanup
---
 src/bin/win.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/win.c b/src/bin/win.c
index 143984e..3472efc 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -705,7 +705,8 @@ terms_from_win_object(Evas_Object *win)
 
 
 static Evas_Object *
-tg_win_add(const char *name, const char *role, const char *title, const char 
*icon_name)
+win_add(const char *name, const char *role,
+const char *title, const char *icon_name)
 {
Evas_Object *win, *o;
char buf[4096];
@@ -1013,7 +1014,7 @@ win_new(const char *name, const char *role, const char 
*title,
wn = calloc(1, sizeof(Win));
if (!wn) return NULL;
 
-   wn->win = tg_win_add(name, role, title, icon_name);
+   wn->win = win_add(name, role, title, icon_name);
if (!wn->win)
  {
 free(wn);

-- 

[EGIT] [apps/terminology] master 02/04: wip

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=487c54b4e11804f70b84cde802c7a4a886b81093

commit 487c54b4e11804f70b84cde802c7a4a886b81093
Author: Boris Faure 
Date:   Tue Feb 9 21:03:04 2016 +0100

wip
---
 data/themes/default.edc |  1 +
 src/bin/win.c   | 10 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 7b5cc26..fcd7302 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1087,6 +1087,7 @@ collections {
  }
 
  part { name: "terminology.tab.title"; type: TEXT; mouse_events: 0;
+/* TODO: boris */
 scale: 1;
 effect: SOFT_SHADOW BOTTOM;
 mouse_events: 0;
diff --git a/src/bin/win.c b/src/bin/win.c
index 3472efc..315dd4c 100644
--- a/src/bin/win.c
+++ b/src/bin/win.c
@@ -1649,6 +1649,9 @@ _tabbar_clear(Term *tm)
 edje_object_message_signal_process(tm->bg);
 edje_object_part_unswallow(tm->bg, tm->tab_spacer);
 evas_object_del(tm->tab_spacer);
+Evas_Object *o;
+o = edje_object_part_swallow_get(term->bg, "terminology.tab.title");
+evas_object_del(o);
 tm->tab_spacer = NULL;
  }
 }
@@ -2542,8 +2545,9 @@ _tabs_set_title(Term_Container *tc, Term_Container *child,
 
 if (!term->config->notabs)
   {
- edje_object_part_text_set(term->bg, "terminology.tab.title",
-   title);
+ Evas_Object *o;
+ o = edje_object_part_swallow_get(term->bg, 
"terminology.tab.title");
+ evas_object_text_text_set(o, title);
   }
  }
else
@@ -2618,6 +2622,7 @@ _tabs_refresh(Tabs *tabs)
 v2 = (double)i / (double)n;
 if (!term->tab_spacer)
   {
+ Evas_Object *o;
  term->tab_spacer = evas_object_rectangle_add(
 evas_object_evas_get(term->bg));
  evas_object_color_set(term->tab_spacer, 0, 0, 0, 0);
@@ -2626,6 +2631,7 @@ _tabs_refresh(Tabs *tabs)
  edje_object_part_swallow(term->bg, "terminology.tab", 
term->tab_spacer);
  edje_object_part_drag_value_set(term->bg, "terminology.tabl", v1, 
0.0);
  edje_object_part_drag_value_set(term->bg, "terminology.tabr", v2, 
0.0);
+ /* TODO: boris */
  edje_object_part_text_set(term->bg, "terminology.tab.title",
solo->tc.title);
  edje_object_signal_emit(term->bg, "tabbar,on", "terminology");

-- 

[EGIT] [core/efl] master 01/01: Eo examples: remove another reference to the eo examples.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=800e760b7e8e26a6676f7ca06a83e375b3e2c344

commit 800e760b7e8e26a6676f7ca06a83e375b3e2c344
Author: Tom Hacohen 
Date:   Thu Mar 3 11:50:25 2016 +

Eo examples: remove another reference to the eo examples.

Thanks to _ami_ for reporting.
---
 configure.ac | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 4b25b55..f60bdb2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5060,7 +5060,6 @@ src/benchmarks/evas/Makefile
 src/examples/eina/Makefile
 src/examples/eina_cxx/Makefile
 src/examples/eet/Makefile
-src/examples/eo/Makefile
 src/examples/evas/Makefile
 src/examples/ecore/Makefile
 src/examples/ecore_avahi/Makefile

-- 

[EGIT] [core/efl] master 01/01: Doc: Fix compilation after massive eo_do patch

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=021c74d7704741041333901c4b37d2a5408ea015

commit 021c74d7704741041333901c4b37d2a5408ea015
Author: Jean-Philippe Andre 
Date:   Thu Mar 3 20:21:17 2016 +0900

Doc: Fix compilation after massive eo_do patch
---
 doc/previews/preview_text_filter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/previews/preview_text_filter.c 
b/doc/previews/preview_text_filter.c
index fa3b26e..1c6e0e3 100644
--- a/doc/previews/preview_text_filter.c
+++ b/doc/previews/preview_text_filter.c
@@ -108,7 +108,7 @@ main(int argc, char **argv)
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_show(o);
 
-   eo_do(o, efl_gfx_filter_program_set(filter, wpd.file));
+   efl_gfx_filter_program_set(o, filter, wpd.file);
 
ecore_evas_manual_render(wpd.ee);
evas_object_geometry_get(o, NULL, NULL, , );

-- 

[EGIT] [core/efl] master 12/14: Examples: Remove eo examples.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=dbdb5b8a33cecfb8c8f6cade9bfd21c2eecec081

commit dbdb5b8a33cecfb8c8f6cade9bfd21c2eecec081
Author: Tom Hacohen 
Date:   Wed Mar 2 16:11:35 2016 +

Examples: Remove eo examples.

Those were always bad, inaccurate and outdated, and are not really needed
because you should be using Eolian, and not Eo directly.
---
 src/Makefile.am |   1 -
 src/examples/eo/.gitignore  |   2 -
 src/examples/eo/Makefile.am | 103 
 src/examples/eo/Makefile.examples   |  42 
 src/examples/eo/evas/evas_elw_box.c |  74 --
 src/examples/eo/evas/evas_elw_box.h |  25 -
 src/examples/eo/evas/evas_elw_boxedbutton.c |  57 ---
 src/examples/eo/evas/evas_elw_boxedbutton.h |   9 --
 src/examples/eo/evas/evas_elw_button.c  | 115 --
 src/examples/eo/evas/evas_elw_button.h  |  29 --
 src/examples/eo/evas/evas_elw_win.c |  74 --
 src/examples/eo/evas/evas_elw_win.h |   9 --
 src/examples/eo/evas/evas_evas_obj.c| 146 
 src/examples/eo/evas/evas_evas_obj.h|  90 -
 src/examples/eo/evas/evas_test.c|  67 -
 src/examples/eo/isa/eo_isa_complex.c|  21 
 src/examples/eo/isa/eo_isa_complex.h|  10 --
 src/examples/eo/isa/eo_isa_interface.c  |  28 --
 src/examples/eo/isa/eo_isa_interface.h  |  16 ---
 src/examples/eo/isa/eo_isa_main.c   |  36 ---
 src/examples/eo/isa/eo_isa_mixin.c  |  39 
 src/examples/eo/isa/eo_isa_mixin.h  |  16 ---
 src/examples/eo/isa/eo_isa_simple.c |  59 ---
 src/examples/eo/isa/eo_isa_simple.h |  25 -
 src/examples/eo/simple/simple_interface.c   |  28 --
 src/examples/eo/simple/simple_interface.h   |  16 ---
 src/examples/eo/simple/simple_main.c|  31 --
 src/examples/eo/simple/simple_mixin.c   |  39 
 src/examples/eo/simple/simple_mixin.h   |  16 ---
 src/examples/eo/simple/simple_simple.c  |  59 ---
 src/examples/eo/simple/simple_simple.h  |  25 -
 31 files changed, 1307 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index dacb79c..c03ffa5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,7 +108,6 @@ benchmark: all
 
 EXAMPLES_SUBDIRS = \
 examples/eina \
-examples/eo \
 examples/eet \
 examples/evas \
 examples/ecore \
diff --git a/src/examples/eo/.gitignore b/src/examples/eo/.gitignore
deleted file mode 100644
index c299c4b..000
--- a/src/examples/eo/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/eo_isa
-/eo_simple
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
deleted file mode 100644
index 9bd1a92..000
--- a/src/examples/eo/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I$(top_builddir)/src/lib/efl \
--I. \
--I$(top_srcdir)/src/lib/eina \
--I$(top_srcdir)/src/lib/eo \
--I$(top_builddir)/src/lib/eina \
--I$(top_builddir)/src/lib/eo \
-@EO_CFLAGS@
-
-EXTRA_PROGRAMS = eo_isa eo_simple
-
-if EO_BUILD_EXAMPLE_EVAS
-
-EXTRA_PROGRAMS += eo_evas
-
-endif
-
-eo_isa_SOURCES = \
-isa/eo_isa_complex.c \
-isa/eo_isa_complex.h \
-isa/eo_isa_interface.c \
-isa/eo_isa_interface.h \
-isa/eo_isa_main.c \
-isa/eo_isa_mixin.c \
-isa/eo_isa_mixin.h \
-isa/eo_isa_simple.c \
-isa/eo_isa_simple.h
-
-eo_isa_LDADD = $(top_builddir)/src/lib/eo/libeo.la 
$(top_builddir)/src/lib/eina/libeina.la @EO_LDFLAGS@ @EFL_PTHREAD_LIBS@
-
-if EO_BUILD_EXAMPLE_EVAS
-
-AM_CPPFLAGS += @ELM_CFLAGS@
-
-eo_evas_SOURCES = \
-evas/evas_elw_box.c \
-evas/evas_elw_box.h \
-evas/evas_elw_boxedbutton.c \
-evas/evas_elw_boxedbutton.h  \
-evas/evas_elw_button.c \
-evas/evas_elw_button.h \
-evas/evas_elw_win.h \
-evas/evas_elw_win.c \
-evas/evas_evas_obj.c \
-evas/evas_evas_obj.h \
-evas/evas_test.c
-
-eo_evas_LDADD = $(top_builddir)/src/lib/eo/libeo.la @ELM_LIBS@ @EO_LDFLAGS@ 
@EFL_PTHREAD_LIBS@
-
-endif
-
-eo_simple_SOURCES = \
-simple/simple_interface.c \
-simple/simple_interface.h \
-simple/simple_main.c \
-simple/simple_mixin.c \
-simple/simple_mixin.h \
-simple/simple_simple.c \
-simple/simple_simple.h
-
-eo_simple_LDADD = $(top_builddir)/src/lib/eo/libeo.la 
$(top_builddir)/src/lib/eina/libeina.la @EO_LDFLAGS@ @EFL_PTHREAD_LIBS@
-
-DATA_FILES = Makefile.examples
-
-EXTRA_DIST = $(DATA_FILES)
-
-examples: $(EXTRA_PROGRAMS)
-
-clean-local:
-   rm -f $(EXTRA_PROGRAMS)
-
-install-examples:
-   $(MKDIR_P) $(datadir)/eo/examples
-   $(MKDIR_P) $(datadir)/eo/examples/isa
-   $(MKDIR_P) $(datadir)/eo/examples/simple
-   cd $(srcdir); \
-   $(install_sh_DATA) -c $(DATA_FILES) $(datadir)/eo/examples; \
-   $(install_sh_DATA) -c $(eo_isa_SOURCES) $(datadir)/eo/examples/isa; \
-   $(install_sh_DATA) -c 

[EGIT] [core/elementary] master 05/07: Map: Correct broken migration.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=7bd1d488408ae36d346ef274e6b93039dfa6de8b

commit 7bd1d488408ae36d346ef274e6b93039dfa6de8b
Author: Tom Hacohen 
Date:   Wed Mar 2 15:17:43 2016 +

Map: Correct broken migration.

The script failed migrating some code, so I needed to fix it manually.
---
 src/lib/elm_map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 120b9d1..b88edac 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1209,7 +1209,7 @@ _zoom_animator_set(Elm_Map_Data *sd,
sd->zoom_animator = !!callback;
r = eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, 
_zoom_anim_cb, sd->obj);
r |= eo_event_callback_del(sd->obj, EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, 
_zoom_bring_anim_cb, sd->obj);
-   if (sd->obj, callback);
+   if (callback) eo_event_callback_add(sd->obj, 
EFL_CORE_ANIMATOR_EVENT_ANIMATOR_TICK, callback, sd->obj);
 
return r;
 }

-- 

[EGIT] [core/elementary] master 02/07: Manually migrate some eo_do for the migration script

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=306f50bf5c53d4f09a8c72b15921cd666adef923

commit 306f50bf5c53d4f09a8c72b15921cd666adef923
Author: Tom Hacohen 
Date:   Wed Mar 2 11:50:51 2016 +

Manually migrate some eo_do for the migration script

The script doesn't handle a few corner cases well. Update the code
manually so it doesn't have to deal with those.
---
 src/examples/performance/graphical.c | 2 --
 src/lib/elm_win.c| 6 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/examples/performance/graphical.c 
b/src/examples/performance/graphical.c
index 9bc60e8..1390ac7 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -452,8 +452,6 @@ _init_scene(Evas_Object *img)
  evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
  evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
  evas_canvas3d_light_projection_perspective_set(globalGraphical.angle 
/ 5, 1.0, 1.0, 1000.0),
- /*evas_canvas3d_light_projection_perspective_set(value, ...) =>
-  evas_canvas3d_light_spot_cutoff_set(~(value / 3))*/
  evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15));
 
globalGraphical.light_node =
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 03b3006..f3806af 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -67,8 +67,7 @@ static const Elm_Win_Trap *trap = NULL;
  {  \
 edje_object_signal_emit(cursd->edje, \
 "elm,action,hide_blocker", "elm");  \
-eo_do(cursd->main_menu, eo_event_callback_call  \
-  (ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL));  \
+eo_event_callback_call(cursd->main_menu, 
ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
  }  \
 }
 
@@ -84,8 +83,7 @@ static const Elm_Win_Trap *trap = NULL;
  {  \
 edje_object_signal_emit(cursd->edje, \
  "elm,action,show_blocker", "elm"); \
-eo_do(cursd->main_menu, eo_event_callback_call  \
-  (ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL)); \
+eo_event_callback_call(cursd->main_menu, 
ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
  }  \
 }
 

-- 

[EGIT] [core/efl] master 02/14: eolian generator: use new call syntax

[Daniel Kolesa]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=737a297a79a5046fd4ff79679da395fb79dd3a1f

commit 737a297a79a5046fd4ff79679da395fb79dd3a1f
Author: Daniel Kolesa 
Date:   Tue Mar 1 14:13:16 2016 +

eolian generator: use new call syntax
---
 src/bin/eolian/impl_generator.c   |  6 --
 src/bin/eolian/legacy_generator.c | 12 
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/bin/eolian/impl_generator.c b/src/bin/eolian/impl_generator.c
index 4103a21..00f8edf 100644
--- a/src/bin/eolian/impl_generator.c
+++ b/src/bin/eolian/impl_generator.c
@@ -160,6 +160,8 @@ _prototype_generate(const Eolian_Function *foo, 
Eolian_Function_Type ftype, Eina
_params_generate(foo, ftype, var_as_ret, params, short_params);
if (eina_strbuf_length_get(params))
   eina_strbuf_prepend_printf(params, ", ");
+   if (eina_strbuf_length_get(short_params))
+  eina_strbuf_prepend_printf(short_params, ", ");
 
fname = eolian_function_name_get(foo);
if (fname)
@@ -172,9 +174,9 @@ _prototype_generate(const Eolian_Function *foo, 
Eolian_Function_Type ftype, Eina
{
   eina_strbuf_append_printf
   (super_invok,
-   "   eo_do_super(obj, %s_%s, %s_%s(%s));\n",
-   class_env.upper_eo_prefix, class_env.upper_classtype,
+   "   %s_%s(eo_super(obj, %s_%s)%s);\n",
impl_env.lower_eo_prefix, eolian_function_name_get(foo),
+   class_env.upper_eo_prefix, class_env.upper_classtype,
eina_strbuf_string_get(short_params));
}
   }
diff --git a/src/bin/eolian/legacy_generator.c 
b/src/bin/eolian/legacy_generator.c
index 660464f..ebda81e 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -23,9 +23,7 @@ tmpl_eapi_body[] ="\
 EAPI @#ret_type\n\
 @#eapi_func(@#full_params)\n\
 {\n\
-   @#ret_type ret;\n\
-   eo_do(@#eo_obj, ret = @#eo_func(@#eo_params));\n\
-   return ret;\n\
+   return @#eo_func(@#eo_obj@#eo_params);\n\
 }\n\
 ";
 static const char
@@ -34,7 +32,7 @@ tmpl_eapi_body_void[] ="\
 EAPI void\n\
 @#eapi_func(@#full_params)\n\
 {\n\
-   eo_do(@#eo_obj, @#eo_func(@#eo_params));\n\
+   @#eo_func(@#eo_obj@#eo_params);\n\
 }\n\
 ";
 
@@ -266,8 +264,7 @@ _eapi_func_generate(const Eolian_Class *class, const 
Eolian_Function *funcid, Eo
 if (eina_strbuf_length_get(fparam)) eina_strbuf_append(fparam, ", ");
 eina_strbuf_append_printf(fparam, "%s %s", ptype, pname);
 eina_stringshare_del(ptype);
-if (eina_strbuf_length_get(eoparam)) eina_strbuf_append(eoparam, ", ");
-eina_strbuf_append_printf(eoparam, "%s", pname);
+eina_strbuf_append_printf(eoparam, ", %s", pname);
  }
eina_iterator_free(itr);
if (!var_as_ret)
@@ -286,8 +283,7 @@ _eapi_func_generate(const Eolian_Class *class, const 
Eolian_Function *funcid, Eo
 eina_strbuf_append_printf(fparam, "%s%s%s%s",
   ptype, had_star?"":" ", add_star?"*":"", pname);
 eina_stringshare_del(ptype);
-if (eina_strbuf_length_get(eoparam)) eina_strbuf_append(eoparam, 
", ");
-eina_strbuf_append_printf(eoparam, "%s", pname);
+eina_strbuf_append_printf(eoparam, ", %s", pname);
 }
   eina_iterator_free(itr);
}

-- 

[EGIT] [core/elementary] master 01/07: Remove redundant defines.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=9274efb94c47833aa4dc89832c7f2efcccea19b4

commit 9274efb94c47833aa4dc89832c7f2efcccea19b4
Author: Tom Hacohen 
Date:   Wed Mar 2 11:53:04 2016 +

Remove redundant defines.
---
 src/lib/elm_main.c | 17 -
 1 file changed, 17 deletions(-)

diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c
index 4469873..1229444 100644
--- a/src/lib/elm_main.c
+++ b/src/lib/elm_main.c
@@ -1713,23 +1713,6 @@ elm_coords_finger_size_adjust(int times_w,
  *h = elm_config_finger_size_get() * times_h;
 }
 
-
-// Object item Eo migration defines, will be removed later
-#define IF_EO_DO(obj, func)\
-   if (eo_isa(obj, ELM_WIDGET_ITEM_CLASS))   \
- { \
-eo_do (obj, func);   \
-return;\
- }
-
-#define IF_EO_RETURN(obj, type, func)  \
-   if (eo_isa(obj, ELM_WIDGET_ITEM_CLASS))   \
- { \
-type ret;  \
-eo_do (obj, ret = func); \
-return ret;\
- }
-
 EAPI void
 elm_object_access_info_set(Evas_Object *obj, const char *txt)
 {

-- 

[EGIT] [core/elementary] master 07/07: Migrate elementary to the new Eo4 syntax

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=7b3fa8abc46ca049f2ddb335ba33d2d8f32cf963

commit 7b3fa8abc46ca049f2ddb335ba33d2d8f32cf963
Merge: 36669f1 02e87e8
Author: Tom Hacohen 
Date:   Thu Mar 3 10:10:20 2016 +

Migrate elementary to the new Eo4 syntax

Eo's syntax has changed (see efl.git for more info), this adjusts
elementary accordingly.

This is a merge commit that merges my branch will all of the fixes

 src/bin/test_anim.c|   2 +-
 src/bin/test_application_server.c  |  55 +--
 src/bin/test_entry.c   |  14 +-
 src/bin/test_systray.c |  14 +-
 src/bin/test_task_switcher.c   |  54 +--
 src/bin/test_win_plug.c|   2 +-
 src/examples/evas3d_map_example.c  | 244 --
 src/examples/evas3d_object_on_button_example.c | 131 ++---
 src/examples/evas3d_scene_on_button_example.c  | 126 ++---
 src/examples/filemvc.c |  46 +-
 src/examples/fileviewlist.c|  13 +-
 src/examples/performance/camera_light.c|  18 +-
 src/examples/performance/graphical.c   | 270 ---
 src/examples/performance/performance.c |  33 +-
 src/examples/sphere_hunter/evas_3d_sphere_hunter.c | 270 +--
 src/lib/elc_combobox.c |  71 ++-
 src/lib/elc_ctxpopup.c |  52 +-
 src/lib/elc_fileselector.c | 199 
 src/lib/elc_fileselector_button.c  |  49 +-
 src/lib/elc_fileselector_entry.c   |  62 ++-
 src/lib/elc_hoversel.c |  69 ++-
 src/lib/elc_multibuttonentry.c |  97 ++--
 src/lib/elc_naviframe.c|  89 ++--
 src/lib/elc_player.c   |  57 +--
 src/lib/elc_popup.c| 115 +++--
 src/lib/elm_access.c   |   7 +-
 src/lib/elm_actionslider.c |  83 ++--
 src/lib/elm_app_client.c   |  30 +-
 src/lib/elm_app_client_view.c  |  39 +-
 src/lib/elm_app_server.c   |  43 +-
 src/lib/elm_app_server_view.c  |  32 +-
 src/lib/elm_atspi_app_object.c |   4 +-
 src/lib/elm_atspi_bridge.c | 237 +-
 src/lib/elm_bg.c   |  18 +-
 src/lib/elm_box.c  |  45 +-
 src/lib/elm_bubble.c   |  17 +-
 src/lib/elm_button.c   |  41 +-
 src/lib/elm_calendar.c |  21 +-
 src/lib/elm_check.c|  31 +-
 src/lib/elm_clock.c|  19 +-
 src/lib/elm_cnp.c  |  32 +-
 src/lib/elm_color_class.c  |  12 +-
 src/lib/elm_colorselector.c|  84 ++--
 src/lib/elm_conform.c  |  49 +-
 src/lib/elm_datetime.c |  29 +-
 src/lib/elm_dayselector.c  |  34 +-
 src/lib/elm_dbus_menu.c|   4 +-
 src/lib/elm_diskselector.c | 124 +++--
 src/lib/elm_entry.c| 291 ++--
 src/lib/elm_flip.c |  29 +-
 src/lib/elm_flipselector.c |  35 +-
 src/lib/elm_frame.c|  26 +-
 src/lib/elm_gengrid.c  | 382 +++
 src/lib/elm_genlist.c  | 525 ++---
 src/lib/elm_gesture_layer.c|  10 +-
 src/lib/elm_glview.c   |  23 +-
 src/lib/elm_grid.c |  15 +-
 src/lib/elm_helper.h   |   4 +-
 src/lib/elm_hover.c|  69 ++-
 src/lib/elm_icon.c |  35 +-
 src/lib/elm_image.c| 103 ++--
 src/lib/elm_index.c|  75 ++-
 src/lib/elm_interface_atspi_accessible.c   |  30 +-
 src/lib/elm_interface_atspi_accessible.h   |  24 +-
 src/lib/elm_interface_atspi_action.c   |   2 +-
 src/lib/elm_interface_atspi_component.c|  18 +-
 src/lib/elm_interface_atspi_image.c|  10 +-
 src/lib/elm_interface_atspi_widget_action.c|   8 +-
 src/lib/elm_interface_atspi_window.h   |  14 +-
 src/lib/elm_interface_scrollable.c | 331 +++--
 src/lib/elm_inwin.c|  17 +-
 src/lib/elm_label.c   

[EGIT] [core/elementary] master 03/07: App client/server and entry: Mix of automatic migration and manual adjustments.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=b805c84bbc72d07bbaff487c35bd0ea7420cdda2

commit b805c84bbc72d07bbaff487c35bd0ea7420cdda2
Author: Tom Hacohen 
Date:   Wed Mar 2 11:57:19 2016 +

App client/server and entry: Mix of automatic migration and manual 
adjustments.

The script couldn't handle everything correctly on its own.
---
 src/lib/elm_app_client_view.c |  39 +++---
 src/lib/elm_app_server_view.c |  32 ++---
 src/lib/elm_entry.c   | 291 +-
 3 files changed, 176 insertions(+), 186 deletions(-)

diff --git a/src/lib/elm_app_client_view.c b/src/lib/elm_app_client_view.c
index 62fa1fd..7ea6d8a 100644
--- a/src/lib/elm_app_client_view.c
+++ b/src/lib/elm_app_client_view.c
@@ -58,34 +58,26 @@ _prop_changed(void *user_data, Eldbus_Proxy *proxy 
EINA_UNUSED, void *event_info
Elm_App_Client_View_Data *cdata = eo_data_scope_get(eo, MY_CLASS);
 
if (!strcmp(prop_event->name, "Title"))
- eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED,
-  (void *) _string_prop_get(v)));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_TITLE_CHANGED, (void 
*) _string_prop_get(v));
else if (!strcmp(prop_event->name, "IconName"))
- eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED,
-  (void *) _string_prop_get(v)));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_CHANGED, (void 
*) _string_prop_get(v));
else if (!strcmp(prop_event->name, "IconPixels"))
- eo_do(eo, 
eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED,
-  NULL));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_ICON_PIXELS_CHANGED, 
NULL);
else if (!strcmp(prop_event->name, "NewEvents"))
- eo_do(eo, 
eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED,
-  (void *)(uintptr_t)_int_prop_get(v)));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_NEW_EVENTS_CHANGED, 
(void *)(uintptr_t)_int_prop_get(v));
else if (!strcmp(prop_event->name, "Progress"))
- eo_do(eo, 
eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED,
-  (void *)(uintptr_t)_short_prop_get(v)));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROGRESS_CHANGED, 
(void *)(uintptr_t)_short_prop_get(v));
else if (!strcmp(prop_event->name, "State"))
  {
 cdata->state = _string_state_to_id(_string_prop_get(v));
-eo_do(eo, 
eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED,
- (void *)(uintptr_t)cdata->state));
+eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, 
(void *)(uintptr_t)cdata->state);
  }
else if (!strcmp(prop_event->name, "WindowId"))
- eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED,
-  (void *)(uintptr_t)_int_prop_get(v)));
+ eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_WINDOW_CHANGED, 
(void *)(uintptr_t)_int_prop_get(v));
else
   return;
 
-   eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED,
-(void *) prop_event->name));
+   eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_PROPERTY_CHANGED, 
(void *) prop_event->name);
 }
 
 static void
@@ -123,8 +115,7 @@ elm_app_client_view_internal_state_set(Eo *eo, 
Elm_App_View_State state)
cdata->state = state;
if (!changed)
  return;
-   eo_do(eo, eo_event_callback_call(ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED,
-(void *)(uintptr_t)cdata->state));
+   eo_event_callback_call(eo, ELM_APP_CLIENT_VIEW_EVENT_STATE_CHANGED, (void 
*)(uintptr_t)cdata->state);
 }
 
 EOLIAN static Eo *
@@ -135,13 +126,13 @@ _elm_app_client_view_eo_base_finalize(Eo *eo, 
Elm_App_Client_View_Data *data)
Eldbus_Connection *conn;
Eldbus_Object *obj;
 
-   eo_do(eo, parent = eo_parent_get());
+   parent = eo_parent_get(eo);
EINA_SAFETY_ON_TRUE_RETURN_VAL((!parent) ||
 (!eo_isa(parent, ELM_APP_CLIENT_CLASS)), NULL);
 
EINA_SAFETY_ON_NULL_RETURN_VAL(data->path, NULL);
 
-   eo_do(parent, package = elm_app_client_package_get());
+   package = elm_app_client_package_get(parent);
 
eldbus_init();
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
@@ -156,7 +147,7 @@ _elm_app_client_view_eo_base_finalize(Eo *eo, 
Elm_App_Client_View_Data *data)
ELDBUS_PROXY_EVENT_PROPERTY_LOADED,
_props_loaded, eo);
 
-   return eo_do_super_ret(eo, MY_CLASS, eo, eo_finalize());
+   return eo_finalize(eo_super(eo, MY_CLASS));
 }
 
 static void
@@ -272,9 +263,9 @@ 

[EGIT] [core/efl] master 14/14: Eo: Migrate to the new syntax (Eo4) and adjust the EFL

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f46afbcbdf1380e93c4e1e092b8f06b4c743e6db

commit f46afbcbdf1380e93c4e1e092b8f06b4c743e6db
Merge: 0ceca70 f1b1c53
Author: Tom Hacohen 
Date:   Thu Mar 3 10:05:38 2016 +

Eo: Migrate to the new syntax (Eo4) and adjust the EFL

This is a merge commit for all of the relevant changes.

The syntax is described in: https://phab.enlightenment.org/w/eo/

Summary:
eo_do(obj, a_set(1)) -> a_set(obj, 1)
eo_do_super(obj, CLASS, a_set(1)) -> a_set(eo_super(obj, CLASS), 1)

eo_do_*_ret() set of functions are no longer needed.

This is the first step, the next step would be to also fix up eo_add()
which currently still uses the old syntax and is not 100% portable.

 src/Makefile.am|   1 -
 src/benchmarks/eo/class_simple.c   |   2 +-
 src/benchmarks/eo/eo_bench_callbacks.c |   6 +-
 src/benchmarks/eo/eo_bench_eo_do.c |  12 +-
 src/bin/eolian/eo_generator.c  |  24 +-
 src/bin/eolian/impl_generator.c|   6 +-
 src/bin/eolian/legacy_generator.c  |  12 +-
 src/examples/ecore/ecore_audio_custom.c|  14 +-
 src/examples/ecore/ecore_audio_playback.c  |  82 ++--
 src/examples/ecore/ecore_audio_to_ogg.c|  14 +-
 src/examples/ecore/ecore_idler_example.c   |   2 +-
 src/examples/ecore/ecore_poller_example.c  |  11 +-
 src/examples/edje/edje-text.c  |   6 +-
 src/examples/eldbus/dbusmodel.c|  26 +-
 src/examples/emotion/emotion_basic_example.c   |   4 +-
 src/examples/emotion/emotion_border_example.c  |   5 +-
 src/examples/emotion/emotion_generic_example.c |  10 +-
 .../emotion/emotion_generic_subtitle_example.c |   4 +-
 src/examples/emotion/emotion_signals_example.c |  10 +-
 src/examples/eo/.gitignore |   2 -
 src/examples/eo/Makefile.am| 103 
 src/examples/eo/Makefile.examples  |  42 --
 src/examples/eo/evas/evas_elw_box.c|  74 ---
 src/examples/eo/evas/evas_elw_box.h|  25 -
 src/examples/eo/evas/evas_elw_boxedbutton.c|  57 ---
 src/examples/eo/evas/evas_elw_boxedbutton.h|   9 -
 src/examples/eo/evas/evas_elw_button.c | 115 -
 src/examples/eo/evas/evas_elw_button.h |  29 --
 src/examples/eo/evas/evas_elw_win.c|  74 ---
 src/examples/eo/evas/evas_elw_win.h|   9 -
 src/examples/eo/evas/evas_evas_obj.c   | 146 --
 src/examples/eo/evas/evas_evas_obj.h   |  90 
 src/examples/eo/evas/evas_test.c   |  66 ---
 src/examples/eo/isa/eo_isa_complex.c   |  21 -
 src/examples/eo/isa/eo_isa_complex.h   |  10 -
 src/examples/eo/isa/eo_isa_interface.c |  28 --
 src/examples/eo/isa/eo_isa_interface.h |  16 -
 src/examples/eo/isa/eo_isa_main.c  |  36 --
 src/examples/eo/isa/eo_isa_mixin.c |  39 --
 src/examples/eo/isa/eo_isa_mixin.h |  16 -
 src/examples/eo/isa/eo_isa_simple.c|  59 ---
 src/examples/eo/isa/eo_isa_simple.h|  25 -
 src/examples/eo/simple/simple_interface.c  |  28 --
 src/examples/eo/simple/simple_interface.h  |  16 -
 src/examples/eo/simple/simple_main.c   |  31 --
 src/examples/eo/simple/simple_mixin.c  |  39 --
 src/examples/eo/simple/simple_mixin.h  |  16 -
 src/examples/eo/simple/simple_simple.c |  59 ---
 src/examples/eo/simple/simple_simple.h |  25 -
 src/examples/eolian_cxx/colourable.c   |   6 +-
 src/examples/eolian_cxx/colourablesquare.c |   2 +-
 src/examples/evas/evas-3d-aabb.c   | 157 +++---
 src/examples/evas/evas-3d-blending.c   | 128 ++---
 src/examples/evas/evas-3d-colorpick.c  | 156 +++---
 src/examples/evas/evas-3d-cube-rotate.c|  91 ++--
 src/examples/evas/evas-3d-cube.c   | 123 ++---
 src/examples/evas/evas-3d-cube2.c  | 150 +++---
 src/examples/evas/evas-3d-eet.c| 136 +++---
 src/examples/evas/evas-3d-fog.c| 127 +++--
 src/examples/evas/evas-3d-frustum.c| 229 -
 src/examples/evas/evas-3d-hull.c   | 242 -
 src/examples/evas/evas-3d-md2.c| 120 ++---
 src/examples/evas/evas-3d-mmap-set.c   | 137 +++---
 src/examples/evas/evas-3d-obj.c| 129 ++---
 src/examples/evas/evas-3d-parallax-occlusion.c | 186 +++
 src/examples/evas/evas-3d-pick.c   |  97 ++--
 src/examples/evas/evas-3d-ply.c| 132 ++---
 

[EGIT] [core/efl] master 06/14: Eo: Migrate to the new syntax (Eo 4).

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=fc88037977dcc39dfd6d817c522cce01f5bfa024

commit fc88037977dcc39dfd6d817c522cce01f5bfa024
Author: Tom Hacohen 
Date:   Mon Nov 9 11:45:04 2015 +

Eo: Migrate to the new syntax (Eo 4).

The syntax is described in: https://phab.enlightenment.org/w/eo/

Summary:
eo_do(obj, a_set(1)) -> a_set(obj, 1)
eo_do_super(obj, CLASS, a_set(1)) -> a_set(eo_super(obj, CLASS), 1)

eo_do_*_ret() set of functions are no longer needed.

This is the first step, the next step would be to also fix up eo_add()
which currently still uses the old syntax and is not 100% portable.

@feature
---
 src/lib/eo/Eo.h | 136 +
 src/lib/eo/eo.c | 422 
 src/lib/eo/eo_private.h |   7 +-
 src/lib/eo/eo_ptr_indirection.x |  21 +-
 4 files changed, 154 insertions(+), 432 deletions(-)

diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h
index cfabd74..a0b817c 100644
--- a/src/lib/eo/Eo.h
+++ b/src/lib/eo/Eo.h
@@ -99,6 +99,8 @@ extern "C" {
  * @{
  */
 
+typedef struct _Eo_Object _Eo_Object;
+
 /**
  * @typedef Eo
  * The basic Object type.
@@ -452,7 +454,8 @@ EAPI Eina_Bool eo_shutdown(void);
 // to fetch internal function and object data at once
 typedef struct _Eo_Op_Call_Data
 {
-   Eo   *obj;
+   Eo *eo_id;
+   _Eo_Object *obj;
void *func;
void *data;
 } Eo_Op_Call_Data;
@@ -497,7 +500,7 @@ typedef struct _Eo_Call_Cache
 #endif
 
 // cache OP id, get real fct and object data then do the call
-#define EO_FUNC_COMMON_OP(Name, DefRet) \
+#define EO_FUNC_COMMON_OP(Obj, Name, DefRet) \
  static Eo_Call_Cache ___cache; /* static 0 by default */   \
  Eo_Op_Call_Data ___call;   \
  if (EINA_UNLIKELY(___cache.op == EO_NOOP)) \
@@ -505,51 +508,65 @@ typedef struct _Eo_Call_Cache
   ___cache.op = _eo_api_op_id_get(EO_FUNC_COMMON_OP_FUNC(Name)); \
   if (___cache.op == EO_NOOP) return DefRet;\
}\
- if (!_eo_call_resolve(#Name, &___call, &___cache,  \
+ if (!_eo_call_resolve((Eo *) Obj, #Name, &___call, &___cache, 
 \
__FILE__, __LINE__)) return DefRet;  \
  _Eo_##Name##_func _func_ = (_Eo_##Name##_func) ___call.func;   \
 
 // to define an EAPI function
-#define EO_FUNC_BODY(Name, Ret, DefRet) \
+#define _EO_FUNC_BODY(Name, ObjType, Ret, DefRet)  
   \
   Ret   \
-  Name(void)\
+  Name(ObjType obj)
\
   { \
  typedef Ret (*_Eo_##Name##_func)(Eo *, void *obj_data);\
  Ret _r;\
- EO_FUNC_COMMON_OP(Name, DefRet);   \
- _r = _func_(___call.obj, ___call.data);\
+ EO_FUNC_COMMON_OP(obj, Name, DefRet);   \
+ _r = _func_(___call.eo_id, ___call.data);\
+ _eo_call_end(&___call); \
  return _r; \
   }
 
-#define EO_VOID_FUNC_BODY(Name)\
+#define _EO_VOID_FUNC_BODY(Name, ObjType)  
\
   void \
-  Name(void)\
+  Name(ObjType obj)
\
   { \
  typedef void (*_Eo_##Name##_func)(Eo *, void *obj_data);   \
- EO_FUNC_COMMON_OP(Name, ); \
- _func_(___call.obj, ___call.data); \
+ EO_FUNC_COMMON_OP(obj, Name, ); \
+ _func_(___call.eo_id, ___call.data); \
+ _eo_call_end(&___call); \
   }
 
-#define EO_FUNC_BODYV(Name, Ret, DefRet, Arguments, ...)\
+#define _EO_FUNC_BODYV(Name, ObjType, Ret, DefRet, Arguments, ...) 
   \
   Ret   \
-  Name(__VA_ARGS__) \
+  Name(ObjType obj, __VA_ARGS__)   
  \
   { 

[EGIT] [core/efl] master 08/14: Some automatic migration and some manual adjustments to calc and text.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=3faf3f3fc68a839f06b311c35ba020cb25e7c9c4

commit 3faf3f3fc68a839f06b311c35ba020cb25e7c9c4
Author: Tom Hacohen 
Date:   Tue Mar 1 18:02:49 2016 +

Some automatic migration and some manual adjustments to calc and text.

These file needed some manual adjustments in addition to the automatic
migration, that's why these are separate from the previous and next
commits, so I can easily know there are additional changes to these, and
it wasn't just the script.
---
 src/lib/edje/edje_calc.c | 321 ++-
 src/lib/edje/edje_text.c | 113 +++--
 2 files changed, 166 insertions(+), 268 deletions(-)

diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 28a346b..8fa3cb9 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -57,40 +57,35 @@ static void  
_edje_part_recalc_single(Edje *ed, Edje_Rea
  \
eina_quaternion_scale(, , 1/norm);  \
  \
-   eo_do(ep->node,   \
- evas_canvas3d_node_orientation_set(quaternion.x, quaternion.y,
\
-  quaternion.z, quaternion.w));
+   evas_canvas3d_node_orientation_set(ep->node, quaternion.x, quaternion.y, \
+  quaternion.z, quaternion.w);
 
 #define SET_LOOK_AT(type) \
-   eo_do(ep->node,\
- evas_canvas3d_node_look_at_set(pd_##type->type.position.space,
 \
-  pd_##type->type.orientation.data[0],\
-  pd_##type->type.orientation.data[1],\
-  pd_##type->type.orientation.data[2],\
-  pd_##type->type.position.space, \
-  pd_##type->type.orientation.data[3],\
-  pd_##type->type.orientation.data[4],\
-  pd_##type->type.orientation.data[5]));
+   evas_canvas3d_node_look_at_set(ep->node, pd_##type->type.position.space, \
+  pd_##type->type.orientation.data[0], \
+  pd_##type->type.orientation.data[1], \
+  pd_##type->type.orientation.data[2], \
+  pd_##type->type.position.space, \
+  pd_##type->type.orientation.data[3], \
+  pd_##type->type.orientation.data[4], \
+  pd_##type->type.orientation.data[5]);
 
 #define SET_LOOK_TO(type)  
  \
Edje_Real_Part *look_to;
  \
Evas_Real x, y ,z;  
  \
look_to = ed->table_parts[pd_##type->type.orientation.look_to % 
ed->table_parts_size];\
-   eo_do(look_to->node,
  \
- evas_canvas3d_node_position_get(pd_##type->type.position.space, , 
, )); \
-   eo_do(ep->node, 
  \
- evas_canvas3d_node_look_at_set(pd_##type->type.position.space, x, y, 
z,   \
-  pd_##type->type.position.space,  
  \
-  pd_##type->type.orientation.data[3], 
  \
-  pd_##type->type.orientation.data[4], 
  \
-  pd_##type->type.orientation.data[5]));
+   evas_canvas3d_node_position_get(look_to->node, 
pd_##type->type.position.space, , , ); \
+   evas_canvas3d_node_look_at_set(ep->node, pd_##type->type.position.space, x, 
y, z, \
+  pd_##type->type.position.space, \
+  pd_##type->type.orientation.data[3], \
+  pd_##type->type.orientation.data[4], \
+  pd_##type->type.orientation.data[5]);
 
 #define SET_ANGLE_AXIS(type)   
  \
-   eo_do(ep->node, 
  \
- 
evas_canvas3d_node_orientation_angle_axis_set(pd_##type->type.orientation.data[0],
\
- 

[EGIT] [core/efl] master 13/14: Manually fix extra eo_do calls that were added after I migrated

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f1b1c5354b7d36edd5b8a6cfca0c082cab01b965

commit f1b1c5354b7d36edd5b8a6cfca0c082cab01b965
Author: Tom Hacohen 
Date:   Thu Mar 3 10:00:26 2016 +

Manually fix extra eo_do calls that were added after I migrated
---
 src/lib/evas/canvas/evas_filter_mixin.c | 2 +-
 src/lib/evas/canvas/evas_object_text.c  | 4 ++--
 src/tests/evas/evas_test_filters.c  | 8 
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lib/evas/canvas/evas_filter_mixin.c 
b/src/lib/evas/canvas/evas_filter_mixin.c
index 0933665..4d4b7ca 100644
--- a/src/lib/evas/canvas/evas_filter_mixin.c
+++ b/src/lib/evas/canvas/evas_filter_mixin.c
@@ -702,7 +702,7 @@ _evas_filter_efl_gfx_filter_filter_data_set(Eo *eo_obj, 
Evas_Filter_Data *pd,
FCOW_END(fcow, pd);
 
// update object
-   eo_do(eo_obj, evas_filter_dirty());
+   evas_filter_dirty(eo_obj);
evas_object_change(eo_obj, obj);
evas_object_clip_dirty(eo_obj, obj);
evas_object_coords_recalc(eo_obj, obj);
diff --git a/src/lib/evas/canvas/evas_object_text.c 
b/src/lib/evas/canvas/evas_object_text.c
index 7efb37f..a492ebd 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -2340,13 +2340,13 @@ _evas_text_efl_gfx_filter_filter_program_set(Eo *obj, 
Evas_Text_Data *pd EINA_UN
 EAPI void
 evas_object_text_filter_program_set(Evas_Object *obj, const char *code, const 
char *name)
 {
-   eo_do(obj, efl_gfx_filter_program_set(code, name));
+   efl_gfx_filter_program_set(obj, code, name);
 }
 
 EAPI void
 evas_object_text_filter_source_set(Evas_Object *obj, const char *name, 
Evas_Object *source)
 {
-   eo_do(obj, efl_gfx_filter_source_set(name, source));
+   efl_gfx_filter_source_set(obj, name, source);
 }
 
 EOLIAN static void
diff --git a/src/tests/evas/evas_test_filters.c 
b/src/tests/evas/evas_test_filters.c
index 5841fa2..65028a7 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -438,8 +438,8 @@ START_TEST(evas_filter_state_test)
ecore_evas_transparent_set(ee, EINA_TRUE);
 
evas_object_color_set(to, 255, 0, 0, 255);
-   eo_do(to, efl_gfx_filter_program_set(code, "merf"));
-   eo_do(to, efl_gfx_filter_state_set("state1", 0.0, "state2", 1.0, 0.5));
+   efl_gfx_filter_program_set(to, code, "merf");
+   efl_gfx_filter_state_set(to, "state1", 0.0, "state2", 1.0, 0.5);
 
/* check pixels */
ecore_evas_manual_render(ee);
@@ -447,12 +447,12 @@ START_TEST(evas_filter_state_test)
fail_if(!pixels || (*pixels != 0x),
"state render test failed: %p (%#x)", pixels, pixels ? *pixels : 0);
 
-   eo_do(to, efl_gfx_filter_state_get(, , , , ));
+   efl_gfx_filter_state_get(to, , , , , );
fail_unless(strequal(s1, "state1") && strequal(s2, "state2") && (v1 == 0.0) 
&& (v2 == 1.0) && (p == 0.5),
"got: %s %f %s %f %f", s1, v1, s2, v2, p);
 
/* data test */
-   eo_do(to, efl_gfx_filter_data_set("data", "{r=0, g=255, b=0, a=255}", 1));
+   efl_gfx_filter_data_set(to, "data", "{r=0, g=255, b=0, a=255}", 1);
ecore_evas_manual_render(ee);
pixels = ecore_evas_buffer_pixels_get(ee);
fail_if(!pixels || (*pixels != 0xFF00FF00),

-- 

[EGIT] [core/efl] master 11/14: Fix migration script mistakes and compilation warnings.

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=23a6b12183aa1365a6da33ab4f06bdf04b42e1e1

commit 23a6b12183aa1365a6da33ab4f06bdf04b42e1e1
Author: Tom Hacohen 
Date:   Wed Mar 2 14:42:46 2016 +

Fix migration script mistakes and compilation warnings.

Mostly unused vars following the removal of eo_do_ret().
However, there are some cases where the migration script got some things
wrong, and I had to manually fix them.
---
 src/examples/evas/evas-3d-parallax-occlusion.c |  2 +-
 src/examples/evas/shooter/evas-3d-shooter.c| 26 +++---
 src/lib/ecore_con/ecore_con.c  | 15 -
 src/lib/ecore_con/ecore_con_eet.c  |  2 --
 src/lib/edje/edje_smart.c  |  2 --
 src/lib/emotion/emotion_smart.c| 10 -
 src/lib/eo/eo_base_class.c |  1 -
 src/lib/evas/canvas/evas_canvas3d_node.c   |  7 +++---
 src/lib/evas/canvas/evas_canvas3d_scene.c  |  5 ++---
 src/lib/evas/canvas/evas_layer.c   |  2 --
 src/lib/evas/canvas/evas_object_image.c|  5 -
 src/lib/evas/canvas/evas_object_main.c |  2 --
 src/lib/evas/canvas/evas_object_text.c |  1 -
 src/lib/evas/canvas/evas_stack.c   |  4 
 src/lib/evas/canvas/evas_vg_gradient.c |  2 --
 src/lib/evas/canvas/evas_vg_gradient_radial.c  |  2 --
 src/lib/evas/canvas/evas_vg_node.c |  2 --
 src/lib/evas/canvas/evas_vg_shape.c| 14 
 .../gl_generic/evas_ector_gl_rgbaimage_buffer.c|  1 -
 .../software_generic/evas_ector_software_buffer.c  |  1 -
 src/tests/edje/edje_test_edje.c|  3 ---
 .../eo/composite_objects/composite_objects_comp.c  |  1 -
 .../eo/composite_objects/composite_objects_main.c  |  1 -
 .../function_overrides/function_overrides_simple.c |  4 ++--
 .../function_overrides/function_overrides_simple.h |  4 ++--
 src/tests/eo/signals/signals_simple.c  |  4 ++--
 src/tests/eo/suite/eo_test_class_simple.c  |  2 +-
 src/tests/eo/suite/eo_test_class_simple.h  |  2 +-
 src/tests/eo/suite/eo_test_general.c   |  3 +--
 29 files changed, 33 insertions(+), 97 deletions(-)

diff --git a/src/examples/evas/evas-3d-parallax-occlusion.c 
b/src/examples/evas/evas-3d-parallax-occlusion.c
index ff20dfe..67be665 100644
--- a/src/examples/evas/evas-3d-parallax-occlusion.c
+++ b/src/examples/evas/evas-3d-parallax-occlusion.c
@@ -246,7 +246,7 @@ main(void)
image = evas_object_image_filled_add(evas);
efl_gfx_size_set(image, WIDTH, HEIGHT);
efl_gfx_visible_set(image, EINA_TRUE);
-   evas_object_focus_set(image, image, EINA_TRUE);
+   evas_object_focus_set(image, EINA_TRUE);
 
/* Set the image object as render target for 3D scene. */
evas_obj_image_scene_set(image, data.scene);
diff --git a/src/examples/evas/shooter/evas-3d-shooter.c 
b/src/examples/evas/shooter/evas-3d-shooter.c
index 9ea9ceb..2e83fd8 100644
--- a/src/examples/evas/shooter/evas-3d-shooter.c
+++ b/src/examples/evas/shooter/evas-3d-shooter.c
@@ -250,13 +250,19 @@ _key_down(void *data,
   }
  }
else if (!strcmp(ev->key, "F1"))
- evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0);
- evas_canvas3d_node_look_at_set(scene->camera_node, 
EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 
1.0, 0.0);
+ {
+evas_canvas3d_node_position_set(scene->camera_node, 0.0, 80.0, 30.0);
+evas_canvas3d_node_look_at_set(scene->camera_node, 
EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, 0.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 
1.0, 0.0);
+ }
else if (!strcmp(ev->key, "F2"))
- evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0);
+ {
+evas_canvas3d_node_position_set(scene->camera_node, -2.0, 0.0, 4.0);
  evas_canvas3d_node_look_at_set(scene->camera_node, 
EVAS_CANVAS3D_SPACE_PARENT, 0.0, 0.0, -100.0, EVAS_CANVAS3D_SPACE_PARENT, 0.0, 
1.0, 0.0);
+ }
else if (!strcmp(ev->key, "A"))
- aabb_index++;
+ {
+aabb_index++;
+ }
 }
 
 static void
@@ -831,8 +837,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
 
/* placing of wall carpet on the floor grid */
if (index == 0)
- evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 
20.0, 2.0);
- evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 18.6 
* 3, 0.0, -60.3);
+ {
+evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 6.7 * 19.5, 
20.0, 2.0);
+evas_canvas3d_node_position_set(data->mesh_node_wall[index], -39.7 + 
18.6 * 3, 0.0, -60.3);
+ }
else if (index == 1)
  {
 evas_canvas3d_node_scale_set(data->mesh_node_wall[index], 5 * 19.5, 
20.0, 2.0);
@@ -840,8 +848,10 @@ _mesh_setup_wall(Scene_Data *data, int index)
 

[EGIT] [core/efl] master 03/14: eolian: generate correct const first param on methods where applicable

[Daniel Kolesa]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8299be03f42d2c81499e3a4097984639fe29e7bd

commit 8299be03f42d2c81499e3a4097984639fe29e7bd
Author: Daniel Kolesa 
Date:   Wed Mar 2 13:11:14 2016 +

eolian: generate correct const first param on methods where applicable
---
 src/bin/eolian/eo_generator.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 1128e41..ea54b9a 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -97,7 +97,8 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
 eina_strbuf_append_char(str_func, '\n');
 eina_strbuf_free(dbuf);
  }
-   eina_strbuf_append_printf(str_func, "EOAPI @#rettype@#retspace%s(Eo 
*obj@#full_params);\n", func_env.lower_eo_func);
+   eina_strbuf_append_printf(str_func, "EOAPI @#rettype@#retspace%s(%sEo 
*obj@#full_params);\n",
+ func_env.lower_eo_func, (ftype == EOLIAN_PROP_GET 
|| eolian_function_object_is_const(func))?"const ":"");
 
if (scope == EOLIAN_SCOPE_PROTECTED)
   eina_strbuf_append_printf(str_func, "#endif\n");
@@ -507,9 +508,9 @@ eo_bind_func_generate(const Eolian_Class *class, const 
Eolian_Function *funcid,
 Eina_Bool ret_is_void = (!rettype || !strcmp(rettype, "void"));
 _class_func_env_create(class, eolian_function_name_get(funcid), ftype, 
_env);
 eina_strbuf_append_printf(eo_func_decl,
-  "EOAPI EO_%sFUNC_BODY%s(%s",
+  "EOAPI EO_%sFUNC_BODY%s%s(%s",
   ret_is_void?"VOID_":"", has_params?"V":"",
-  func_env.lower_eo_func);
+  (ftype == EOLIAN_PROP_GET || 
eolian_function_object_is_const(funcid))?"_CONST":"", func_env.lower_eo_func);
 if (!ret_is_void)
   {
  const char *val_str = NULL;

-- 

[EGIT] [core/efl] master 04/14: eolian: fix generation tests

[Daniel Kolesa]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=b8c820db17065bc0e3c5f60b8b941bdbb2d96372

commit b8c820db17065bc0e3c5f60b8b941bdbb2d96372
Author: Daniel Kolesa 
Date:   Wed Mar 2 13:50:19 2016 +

eolian: fix generation tests
---
 src/tests/eolian/data/class_simple_ref.c|  2 +-
 src/tests/eolian/data/class_simple_ref_eo.h | 10 +-
 src/tests/eolian/data/docs_ref.h|  6 +++---
 src/tests/eolian/data/override_ref.c|  8 
 src/tests/eolian/data/struct_ref.c  |  4 ++--
 src/tests/eolian/data/typedef_ref.c |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/tests/eolian/data/class_simple_ref.c 
b/src/tests/eolian/data/class_simple_ref.c
index 0c6a86f..b97639d 100644
--- a/src/tests/eolian/data/class_simple_ref.c
+++ b/src/tests/eolian/data/class_simple_ref.c
@@ -5,7 +5,7 @@ EOAPI EO_FUNC_BODYV(evas_obj_simple_a_set, Eina_Bool, 
EINA_TRUE, EO_FUNC_CALL(va
 
 int _class_simple_a_get(Eo *obj, Evas_Simple_Data *pd);
 
-EOAPI EO_FUNC_BODY(evas_obj_simple_a_get, int, 100);
+EOAPI EO_FUNC_BODY_CONST(evas_obj_simple_a_get, int, 100);
 
 void _class_simple_b_set(Eo *obj, Evas_Simple_Data *pd);
 
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h 
b/src/tests/eolian/data/class_simple_ref_eo.h
index 52d8a58..f5b4f78 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -33,7 +33,7 @@ EAPI const Eo_Class *class_simple_class_get(void);
  *
  * @ingroup Class_Simple
  */
-EOAPI Eina_Bool evas_obj_simple_a_set(int value);
+EOAPI Eina_Bool evas_obj_simple_a_set(Eo *obj, int value);
 #endif
 
 #ifdef CLASS_SIMPLE_BETA
@@ -44,10 +44,10 @@ EOAPI Eina_Bool evas_obj_simple_a_set(int value);
  *
  * @ingroup Class_Simple
  */
-EOAPI int evas_obj_simple_a_get(void);
+EOAPI int evas_obj_simple_a_get(const Eo *obj);
 #endif
 
-EOAPI void evas_obj_simple_b_set(void);
+EOAPI void evas_obj_simple_b_set(Eo *obj);
 
 #ifdef CLASS_SIMPLE_BETA
 /**
@@ -60,10 +60,10 @@ EOAPI void evas_obj_simple_b_set(void);
  *
  * @ingroup Class_Simple
  */
-EOAPI char *evas_obj_simple_foo(int a, char *b, double *c);
+EOAPI char *evas_obj_simple_foo(Eo *obj, int a, char *b, double *c);
 #endif
 
-EOAPI int evas_obj_simple_bar(int x);
+EOAPI int evas_obj_simple_bar(Eo *obj, int x);
 
 
 #endif
diff --git a/src/tests/eolian/data/docs_ref.h b/src/tests/eolian/data/docs_ref.h
index 3b61d35..d8939e4 100644
--- a/src/tests/eolian/data/docs_ref.h
+++ b/src/tests/eolian/data/docs_ref.h
@@ -90,7 +90,7 @@ EAPI const Eo_Class *docs_class_get(void);
  *
  * @ingroup Docs
  */
-EOAPI void docs_prop_set(int val);
+EOAPI void docs_prop_set(Eo *obj, int val);
 
 /**
  * @brief Property common documentation.
@@ -103,7 +103,7 @@ EOAPI void docs_prop_set(int val);
  *
  * @ingroup Docs
  */
-EOAPI int docs_prop_get(void);
+EOAPI int docs_prop_get(const Eo *obj);
 
 /**
  * @brief Method documentation.
@@ -117,7 +117,7 @@ EOAPI int docs_prop_get(void);
  *
  * @ingroup Docs
  */
-EOAPI int docs_meth(int a, float *b, long *c);
+EOAPI int docs_meth(Eo *obj, int a, float *b, long *c);
 
 EOAPI extern const Eo_Event_Description _DOCS_EVENT_CLICKED;
 
diff --git a/src/tests/eolian/data/override_ref.c 
b/src/tests/eolian/data/override_ref.c
index 934e15e..5e9d08f 100644
--- a/src/tests/eolian/data/override_ref.c
+++ b/src/tests/eolian/data/override_ref.c
@@ -23,15 +23,15 @@ static int __eolian_override_c_get(Eo *obj EINA_UNUSED, 
Override_Data *pd EINA_U
return 50;
 }
 
-EOAPI EO_FUNC_BODYV(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx);
+EOAPI EO_FUNC_BODYV_CONST(override_c_get, int, 50, EO_FUNC_CALL(idx), int idx);
 
 void _override_a_get(Eo *obj, Override_Data *pd);
 
-EOAPI EO_VOID_FUNC_BODY(override_a_get);
+EOAPI EO_VOID_FUNC_BODY_CONST(override_a_get);
 
 void _override_b_get(Eo *obj, Override_Data *pd, int idx, float *a, char *b, 
int *c);
 
-EOAPI EO_VOID_FUNC_BODYV(override_b_get, EO_FUNC_CALL(idx, a, b, c), int idx, 
float *a, char *b, int *c);
+EOAPI EO_VOID_FUNC_BODYV_CONST(override_b_get, EO_FUNC_CALL(idx, a, b, c), int 
idx, float *a, char *b, int *c);
 
 void _override_c_set(Eo *obj, Override_Data *pd, int idx, int c);
 
@@ -78,4 +78,4 @@ static const Eo_Class_Description _override_class_desc = {
  NULL
 };
 
-EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
+EO_DEFINE_CLASS(override_class_get, &_override_class_desc, BASE_CLASS, NULL);
\ No newline at end of file
diff --git a/src/tests/eolian/data/struct_ref.c 
b/src/tests/eolian/data/struct_ref.c
index 7739427..567ff9fd 100644
--- a/src/tests/eolian/data/struct_ref.c
+++ b/src/tests/eolian/data/struct_ref.c
@@ -37,9 +37,9 @@ EAPI const Eo_Class *struct_class_get(void);
  *
  * @ingroup Struct
  */
-EOAPI char *struct_foo(int idx);
+EOAPI char *struct_foo(Eo *obj, int idx);
 
-EOAPI Named *struct_bar(void);
+EOAPI Named *struct_bar(Eo *obj);
 
 
 #endif
diff 

[EGIT] [core/efl] master 01/14: eolian generator: add obj as first param to header method prototypes

[Daniel Kolesa]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=eb5aa57159fcdea0c8fc1c4ee9f4e8ca5ff1aba0

commit eb5aa57159fcdea0c8fc1c4ee9f4e8ca5ff1aba0
Author: Daniel Kolesa 
Date:   Tue Mar 1 11:38:17 2016 +

eolian generator: add obj as first param to header method prototypes
---
 src/bin/eolian/eo_generator.c | 14 +++---
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 1223ff5..1128e41 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -97,7 +97,7 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
 eina_strbuf_append_char(str_func, '\n');
 eina_strbuf_free(dbuf);
  }
-   eina_strbuf_append_printf(str_func, "EOAPI 
@#rettype@#retspace%s(@#full_params);\n", func_env.lower_eo_func);
+   eina_strbuf_append_printf(str_func, "EOAPI @#rettype@#retspace%s(Eo 
*obj@#full_params);\n", func_env.lower_eo_func);
 
if (scope == EOLIAN_SCOPE_PROTECTED)
   eina_strbuf_append_printf(str_func, "#endif\n");
@@ -106,7 +106,6 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
eina_strbuf_append_printf(str_func, "\n");
 
Eina_Strbuf *str_par = eina_strbuf_new();
-   Eina_Strbuf *str_pardesc = eina_strbuf_new();
 
itr = eolian_property_keys_get(func, ftype);
EINA_ITERATOR_FOREACH(itr, data)
@@ -115,9 +114,7 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
 const Eolian_Type *ptypet = eolian_parameter_type_get(param);
 const char *pname = eolian_parameter_name_get(param);
 const char *ptype = eolian_type_c_type_get(ptypet);
-
-if (eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par, ", ");
-eina_strbuf_append_printf(str_par, "%s %s", ptype, pname);
+eina_strbuf_append_printf(str_par, ", %s %s", ptype, pname);
 eina_stringshare_del(ptype);
  }
eina_iterator_free(itr);
@@ -142,8 +139,7 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
  if (ftype == EOLIAN_UNRESOLVED || ftype == EOLIAN_METHOD) 
add_star = (pdir == EOLIAN_OUT_PARAM || pdir == EOLIAN_INOUT_PARAM);
  Eina_Bool had_star = !!strchr(ptype, '*');
 
- if (eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par, 
", ");
- eina_strbuf_append_printf(str_par, "%s%s%s%s",
+ eina_strbuf_append_printf(str_par, ", %s%s%s%s",
ptype, had_star?"":" ", add_star?"*":"", pname);
 
  eina_stringshare_del(ptype);
@@ -159,15 +155,11 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
else
  eina_strbuf_replace_all(str_func, "@#retspace", "");
 
-   eina_strbuf_replace_all(str_func, "@#list_param", 
eina_strbuf_string_get(str_par));
-   if (!eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par, "void");
eina_strbuf_replace_all(str_func, "@#full_params", 
eina_strbuf_string_get(str_par));
-   eina_strbuf_replace_all(str_func, "@#list_desc_param", 
eina_strbuf_string_get(str_pardesc));
 
if (rettype) eina_stringshare_del(rettype);
 
eina_strbuf_free(str_par);
-   eina_strbuf_free(str_pardesc);
 
eina_strbuf_append(functext, eina_strbuf_string_get(str_func));
eina_strbuf_free(str_func);

-- 

[EGIT] [core/efl] master 05/14: eolian generator: @class methods take const object

[Daniel Kolesa]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=a6347f88fd60550c871b1505dbff63c3509f651c

commit a6347f88fd60550c871b1505dbff63c3509f651c
Author: Daniel Kolesa 
Date:   Wed Mar 2 14:35:02 2016 +

eolian generator: @class methods take const object
---
 src/bin/eolian/eo_generator.c | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index ea54b9a..a97f2f0 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -98,7 +98,10 @@ eo_fundef_generate(const Eolian_Class *class, const 
Eolian_Function *func, Eolia
 eina_strbuf_free(dbuf);
  }
eina_strbuf_append_printf(str_func, "EOAPI @#rettype@#retspace%s(%sEo 
*obj@#full_params);\n",
- func_env.lower_eo_func, (ftype == EOLIAN_PROP_GET 
|| eolian_function_object_is_const(func))?"const ":"");
+ func_env.lower_eo_func,
+ (ftype == EOLIAN_PROP_GET ||
+  eolian_function_object_is_const(func) ||
+  eolian_function_is_class(func))?"const ":"");
 
if (scope == EOLIAN_SCOPE_PROTECTED)
   eina_strbuf_append_printf(str_func, "#endif\n");
@@ -510,7 +513,9 @@ eo_bind_func_generate(const Eolian_Class *class, const 
Eolian_Function *funcid,
 eina_strbuf_append_printf(eo_func_decl,
   "EOAPI EO_%sFUNC_BODY%s%s(%s",
   ret_is_void?"VOID_":"", has_params?"V":"",
-  (ftype == EOLIAN_PROP_GET || 
eolian_function_object_is_const(funcid))?"_CONST":"", func_env.lower_eo_func);
+  (ftype == EOLIAN_PROP_GET ||
+   eolian_function_object_is_const(funcid) ||
+   eolian_function_is_class(funcid))?"_CONST":"", 
func_env.lower_eo_func);
 if (!ret_is_void)
   {
  const char *val_str = NULL;

-- 

[EGIT] [core/efl] master 10/14: Eo tests: Update tests according to the new syntax

[Tom Hacohen]

tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8780da1fbdb4e06a12508bcc86023ee2d1b4e30a

commit 8780da1fbdb4e06a12508bcc86023ee2d1b4e30a
Author: Tom Hacohen 
Date:   Tue Mar 1 19:06:05 2016 +

Eo tests: Update tests according to the new syntax

These tests don't use eolian, but are plain Eo, so they need manual
updating.
---
 src/tests/eo/access/access_inherit.h   |   2 +-
 src/tests/eo/access/access_simple.h|   2 +-
 .../composite_objects/composite_objects_simple.h   | 132 ++---
 src/tests/eo/constructors/constructors_mixin.h |   2 +-
 src/tests/eo/constructors/constructors_simple.h|   8 +-
 .../function_overrides_inherit2.h  |   4 +-
 .../function_overrides/function_overrides_simple.h |   8 +-
 src/tests/eo/interface/interface_interface.h   |   2 +-
 src/tests/eo/interface/interface_interface2.h  |   2 +-
 src/tests/eo/interface/interface_simple.h  |   8 +-
 src/tests/eo/mixin/mixin_mixin.h   |   2 +-
 src/tests/eo/mixin/mixin_simple.h  |   8 +-
 src/tests/eo/signals/signals_simple.h  |   2 +-
 src/tests/eo/suite/eo_test_class_simple.h  |  16 +--
 src/tests/eo/suite/eo_test_general.c   |  36 --
 15 files changed, 99 insertions(+), 135 deletions(-)

diff --git a/src/tests/eo/access/access_inherit.h 
b/src/tests/eo/access/access_inherit.h
index 0c15436..c1535f1 100644
--- a/src/tests/eo/access/access_inherit.h
+++ b/src/tests/eo/access/access_inherit.h
@@ -1,7 +1,7 @@
 #ifndef INHERIT_H
 #define INHERIT_H
 
-EAPI void inherit_prot_print(void);
+EAPI void inherit_prot_print(Eo *obj);
 
 #define INHERIT_CLASS inherit_class_get()
 const Eo_Class *inherit_class_get(void);
diff --git a/src/tests/eo/access/access_simple.h 
b/src/tests/eo/access/access_simple.h
index 3c92d21..e2e1031 100644
--- a/src/tests/eo/access/access_simple.h
+++ b/src/tests/eo/access/access_simple.h
@@ -1,7 +1,7 @@
 #ifndef SIMPLE_H
 #define SIMPLE_H
 
-EAPI void simple_a_set(int a);
+EAPI void simple_a_set(Eo *obj, int a);
 
 typedef struct
 {
diff --git a/src/tests/eo/composite_objects/composite_objects_simple.h 
b/src/tests/eo/composite_objects/composite_objects_simple.h
index 55b8f9e..4de0ac4 100644
--- a/src/tests/eo/composite_objects/composite_objects_simple.h
+++ b/src/tests/eo/composite_objects/composite_objects_simple.h
@@ -6,73 +6,73 @@ typedef struct
int a;
 } Simple_Public_Data;
 
-EAPI void simple_a_set(int a);
-EAPI int simple_a_get(void);
+EAPI void simple_a_set(Eo *obj, int a);
+EAPI int simple_a_get(Eo *obj);
 
-EAPI void simple_a_set1(int a);
-EAPI void simple_a_set2(int a);
-EAPI void simple_a_set3(int a);
-EAPI void simple_a_set4(int a);
-EAPI void simple_a_set5(int a);
-EAPI void simple_a_set6(int a);
-EAPI void simple_a_set7(int a);
-EAPI void simple_a_set8(int a);
-EAPI void simple_a_set9(int a);
-EAPI void simple_a_set10(int a);
-EAPI void simple_a_set11(int a);
-EAPI void simple_a_set12(int a);
-EAPI void simple_a_set13(int a);
-EAPI void simple_a_set14(int a);
-EAPI void simple_a_set15(int a);
-EAPI void simple_a_set16(int a);
-EAPI void simple_a_set17(int a);
-EAPI void simple_a_set18(int a);
-EAPI void simple_a_set19(int a);
-EAPI void simple_a_set20(int a);
-EAPI void simple_a_set21(int a);
-EAPI void simple_a_set22(int a);
-EAPI void simple_a_set23(int a);
-EAPI void simple_a_set24(int a);
-EAPI void simple_a_set25(int a);
-EAPI void simple_a_set26(int a);
-EAPI void simple_a_set27(int a);
-EAPI void simple_a_set28(int a);
-EAPI void simple_a_set29(int a);
-EAPI void simple_a_set30(int a);
-EAPI void simple_a_set31(int a);
-EAPI void simple_a_set32(int a);
-EAPI void simple_a_get1(int a);
-EAPI void simple_a_get2(int a);
-EAPI void simple_a_get3(int a);
-EAPI void simple_a_get4(int a);
-EAPI void simple_a_get5(int a);
-EAPI void simple_a_get6(int a);
-EAPI void simple_a_get7(int a);
-EAPI void simple_a_get8(int a);
-EAPI void simple_a_get9(int a);
-EAPI void simple_a_get10(int a);
-EAPI void simple_a_get11(int a);
-EAPI void simple_a_get12(int a);
-EAPI void simple_a_get13(int a);
-EAPI void simple_a_get14(int a);
-EAPI void simple_a_get15(int a);
-EAPI void simple_a_get16(int a);
-EAPI void simple_a_get17(int a);
-EAPI void simple_a_get18(int a);
-EAPI void simple_a_get19(int a);
-EAPI void simple_a_get20(int a);
-EAPI void simple_a_get21(int a);
-EAPI void simple_a_get22(int a);
-EAPI void simple_a_get23(int a);
-EAPI void simple_a_get24(int a);
-EAPI void simple_a_get25(int a);
-EAPI void simple_a_get26(int a);
-EAPI void simple_a_get27(int a);
-EAPI void simple_a_get28(int a);
-EAPI void simple_a_get29(int a);
-EAPI void simple_a_get30(int a);
-EAPI void simple_a_get31(int a);
-EAPI void simple_a_get32(int a);
+EAPI void simple_a_set1(Eo *obj, int a);
+EAPI void simple_a_set2(Eo *obj, int a);
+EAPI void simple_a_set3(Eo *obj, int a);
+EAPI void simple_a_set4(Eo *obj, int 

[EGIT] [tools/exactness-elm-data] master 01/01: Update shots after test fix

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/tools/exactness-elm-data.git/commit/?id=6994fb1bf496abeafa805fffc03ea335ed7cfaf9

commit 6994fb1bf496abeafa805fffc03ea335ed7cfaf9
Author: Daniel Zaoui 
Date:   Thu Mar 3 10:57:44 2016 +0200

Update shots after test fix
---
 default-profile/orig/scaling_2+001.png | Bin 14245 -> 13206 bytes
 default-profile/orig/scaling_2+002.png | Bin 14245 -> 13206 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/default-profile/orig/scaling_2+001.png 
b/default-profile/orig/scaling_2+001.png
index 6eb8a0b..de20a48 100644
Binary files a/default-profile/orig/scaling_2+001.png and 
b/default-profile/orig/scaling_2+001.png differ
diff --git a/default-profile/orig/scaling_2+002.png 
b/default-profile/orig/scaling_2+002.png
index 6eb8a0b..de20a48 100644
Binary files a/default-profile/orig/scaling_2+002.png and 
b/default-profile/orig/scaling_2+002.png differ

-- 

[EGIT] [core/elementary] master 01/01: Scaling test: reorder instructions to set the correct scale

[Daniel Zaoui]

jackdanielz pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=36669f1eccc3b6c320fb4c4ecc0e029b95834f57

commit 36669f1eccc3b6c320fb4c4ecc0e029b95834f57
Author: Daniel Zaoui 
Date:   Thu Mar 3 10:25:22 2016 +0200

Scaling test: reorder instructions to set the correct scale

If the scale is set on an object before contents are set, it will not
pass to them. Because of this, in the test, scale of the first label
remains 1.0, i.e the window scale, instead of 0.5.
The patch modifies the order of the instructions by setting the scale
after setting the label as content of the frame.
---
 src/bin/test_scaling.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index d0d0f3c..84b20c6 100644
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -76,7 +76,6 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_
evas_object_show(bx);
 
fr = elm_frame_add(win);
-   elm_object_scale_set(fr, 0.5);
elm_object_text_set(fr, "Scale: 0.5");
lb = elm_label_add(win);
elm_object_text_set(lb,
@@ -84,6 +83,7 @@ test_scaling2(void *data EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_
"is 0.5. Child should"
"inherit it.");
elm_object_content_set(fr, lb);
+   elm_object_scale_set(fr, 0.5);
evas_object_show(lb);
elm_box_pack_end(bx, fr);
evas_object_show(fr);

--