Re: [E-devel] Weekly news from the automated build and QA front

2016-11-02 Thread Daniel Zaoui
Oooo... After more investigation, it more seems that exactness data 
repository is not updated in the server.

Now, I have to convince you to update Exactness repos.

On Thu, 03 Nov 2016 07:38:54 +0200
Daniel Zaoui  wrote:

> Hi,
> 
> Thank you guys to have brought Jenkins/Exactness back to life.
> 
> I checked the screenshots and it seems to be some issue with fonts,
> kind of freetype is not the last version. Can you tell me which
> version you are using there and how I can convince you to upgrade
> it :-) ?
> 
> Thanks
> JackDanielZ
> 
> On Tue, 01 Nov 2016 14:53:42 +0100
> Stefan Schmidt  wrote:
> 
> > Hello.
> > 
> > Summary:
> > o DNS problem on Jenkins is fixed and builds are slowly catching up
> > o No new coverity reports. We submitted new builds but the Coverity 
> > server has a big backlog right now (around 100 builds in front our
> > ours) o We reached 1000 open issues in total on phab so it was time
> > to split the statistics a bit more. We now have open issues for EFL
> > and E.
> > 
> > 
> > This should give everyone an overview over what has happened in the
> > last week on the QA front. The numbers in parentheses reflect the
> > values from last week to give you a trend.
> > 
> > CI:
> > o Overall build statistic: 10.63% (38.92%) failed.
> > https://build.enlightenment.org/
> > 
> > Unit tests:
> > o N/A (886) unit tests for efl
> > 
> > Coverage:
> > o EFL total coverage is at N/A (N/A) lines, N/A (N/A) functions and
> > N/A (N/A) branches
> > https://build.enlightenment.org/view/Test%20Coverage/
> > 
> > Coverity:
> > o EFL: Outstanding defects 85 (85) with a density of 0.08 (0.08)
> > o Enlightenment: Outstanding defects 1 (1) with a density of 0 (0)
> > o Terminology: Outstanding defects 0 (0) with a density of 0 (0)
> > o Rage: Outstanding defects 0 (0) with a density of 0 (0)
> > 
> > Phab:
> > o EFL bug count: 294 (N/A)
> > o E bug count: 386 (N/A)
> > https://phab.enlightenment.org/maniphest/report/burn/
> > o Pending patch reviews: 105 (99)
> > 
> > regards
> > Stefan Schmidt
> > 
> > --
> > Developer Access Program for Intel Xeon Phi Processors
> > Access to Intel Xeon Phi processor-based developer platforms.
> > With one year of Intel Parallel Studio XE.
> > Training and support from Colfax.
> > Order your platform today. http://sdm.link/xeonphi
> > ___
> > enlightenment-devel mailing list
> > enlightenment-devel@lists.sourceforge.net
> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> > 
> >   
> 
> 
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> 
> 


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] Weekly news from the automated build and QA front

2016-11-02 Thread Daniel Zaoui
Hi,

Thank you guys to have brought Jenkins/Exactness back to life.

I checked the screenshots and it seems to be some issue with fonts, kind of 
freetype is not the last version. Can you tell me which version you are using 
there and how I can convince you to upgrade it :-) ?

Thanks
JackDanielZ

On Tue, 01 Nov 2016 14:53:42 +0100
Stefan Schmidt  wrote:

> Hello.
> 
> Summary:
> o DNS problem on Jenkins is fixed and builds are slowly catching up
> o No new coverity reports. We submitted new builds but the Coverity 
> server has a big backlog right now (around 100 builds in front our
> ours) o We reached 1000 open issues in total on phab so it was time
> to split the statistics a bit more. We now have open issues for EFL
> and E.
> 
> 
> This should give everyone an overview over what has happened in the
> last week on the QA front. The numbers in parentheses reflect the
> values from last week to give you a trend.
> 
> CI:
> o Overall build statistic: 10.63% (38.92%) failed.
> https://build.enlightenment.org/
>   
> Unit tests:
> o N/A (886) unit tests for efl
> 
> Coverage:
> o EFL total coverage is at N/A (N/A) lines, N/A (N/A) functions and
> N/A (N/A) branches
> https://build.enlightenment.org/view/Test%20Coverage/
> 
> Coverity:
> o EFL: Outstanding defects 85 (85) with a density of 0.08 (0.08)
> o Enlightenment: Outstanding defects 1 (1) with a density of 0 (0)
> o Terminology: Outstanding defects 0 (0) with a density of 0 (0)
> o Rage: Outstanding defects 0 (0) with a density of 0 (0)
> 
> Phab:
> o EFL bug count: 294 (N/A)
> o E bug count: 386 (N/A)
> https://phab.enlightenment.org/maniphest/report/burn/
> o Pending patch reviews: 105 (99)
> 
> regards
> Stefan Schmidt
> 
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> 
> 


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


[EGIT] [core/enlightenment] master 01/01: Fix out of tree builds

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 9c26487b37c046e954b8223a0a32e46c7b16c9f4
Author: Derek Foreman 
Date:   Wed Nov 2 16:16:08 2016 -0500

Fix out of tree builds

I broke out of tree builds when I landed the wayland protocol autogen
patches.  This should fix it up.
---
 src/bin/Makefile.mk  | 2 +-
 src/modules/Makefile_shot.mk | 2 +-
 src/modules/Makefile_wl_desktop_shell.mk | 3 ++-
 src/modules/Makefile_wl_text_input.mk| 3 ++-
 src/modules/Makefile_wl_weekeyboard.mk   | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 4c91854..e214a7d 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -21,7 +21,7 @@ E_CPPFLAGS = \
 -I$(top_srcdir) \
 -I$(top_srcdir)/src/bin \
 -I$(top_srcdir)/src/bin/efx \
--I$(top_srcdir)/src/bin/generated \
+-I$(top_builddir)/src/bin/generated \
 @e_cflags@ \
 @cf_cflags@ \
 @VALGRIND_CFLAGS@ \
diff --git a/src/modules/Makefile_shot.mk b/src/modules/Makefile_shot.mk
index 31e104d..2c20672 100644
--- a/src/modules/Makefile_shot.mk
+++ b/src/modules/Makefile_shot.mk
@@ -12,7 +12,7 @@ shotpkg_LTLIBRARIES = src/modules/shot/module.la
 nodist_src_modules_shot_module_la_SOURCES =
 src_modules_shot_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
 src_modules_shot_module_la_CPPFLAGS = \
-$(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
+$(MOD_CPPFLAGS) @WAYLAND_CFLAGS@ -I$(top_builddir)/src/modules/shot
 src_modules_shot_module_la_LDFLAGS = $(MOD_LDFLAGS)
 src_modules_shot_module_la_SOURCES = \
 src/modules/shot/e_mod_main.c
diff --git a/src/modules/Makefile_wl_desktop_shell.mk 
b/src/modules/Makefile_wl_desktop_shell.mk
index 83b0d5a..3995799 100644
--- a/src/modules/Makefile_wl_desktop_shell.mk
+++ b/src/modules/Makefile_wl_desktop_shell.mk
@@ -17,7 +17,8 @@ wl_desktop_shell_wayland_sources = \
   src/modules/wl_desktop_shell/input-method-unstable-v1-server-protocol.h
 
 src_modules_wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES)
-src_modules_wl_desktop_shell_module_la_CPPFLAGS  = $(MOD_CPPFLAGS) 
@WAYLAND_CFLAGS@
+src_modules_wl_desktop_shell_module_la_CPPFLAGS  = $(MOD_CPPFLAGS) 
@WAYLAND_CFLAGS@ \
+  -I$(top_builddir)/src/modules/wl_desktop_shell
 src_modules_wl_desktop_shell_module_la_LIBADD   = $(MOD_LIBS) @WAYLAND_LIBS@
 src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
 
diff --git a/src/modules/Makefile_wl_text_input.mk 
b/src/modules/Makefile_wl_text_input.mk
index 305013d..4db6f7e 100644
--- a/src/modules/Makefile_wl_text_input.mk
+++ b/src/modules/Makefile_wl_text_input.mk
@@ -10,7 +10,8 @@ wl_text_input_wayland_sources = \
   src/modules/wl_text_input/input-method-unstable-v1-protocol.c\
   src/modules/wl_text_input/input-method-unstable-v1-server-protocol.h
 src_modules_wl_text_input_module_la_DEPENDENCIES = $(MDEPENDENCIES)
-src_modules_wl_text_input_module_la_CPPFLAGS  = $(MOD_CPPFLAGS) 
@WAYLAND_CFLAGS@
+src_modules_wl_text_input_module_la_CPPFLAGS  = $(MOD_CPPFLAGS) 
@WAYLAND_CFLAGS@ \
+  -I$(top_builddir)/src/modules/wl_text_input
 src_modules_wl_text_input_module_la_LIBADD   = $(MOD_LIBS) @WAYLAND_LIBS@
 src_modules_wl_text_input_module_la_LDFLAGS = $(MOD_LDFLAGS)
 nodist_src_modules_wl_text_input_module_la_SOURCES = \
diff --git a/src/modules/Makefile_wl_weekeyboard.mk 
b/src/modules/Makefile_wl_weekeyboard.mk
index d90ebdf..d993747 100644
--- a/src/modules/Makefile_wl_weekeyboard.mk
+++ b/src/modules/Makefile_wl_weekeyboard.mk
@@ -17,7 +17,8 @@ src_modules_wl_weekeyboard_module_la_DEPENDENCIES = 
$(MDEPENDENCIES)
 src_modules_wl_weekeyboard_module_la_CPPFLAGS  = \
$(MOD_CPPFLAGS)   \
@WAYLAND_CFLAGS@  \
-   -DPKGDATADIR='"$pkgdatadir)"'
+   -DPKGDATADIR='"$pkgdatadir)"' \
+   -I$(top_builddir)/src/modules/wl_weekeyboard
 src_modules_wl_weekeyboard_module_la_LIBADD   = $(MOD_LIBS) @WAYLAND_LIBS@
 src_modules_wl_weekeyboard_module_la_LDFLAGS = $(MOD_LDFLAGS)
 wl_weekeyboard_wayland_sources = \

-- 




[EGIT] [core/efl] master 04/16: wayland_egl: Remove Evas_Engine_Info_Wayland_Egl_Swap_Mode enum

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 96aba5021cd1aa6af5cd69ae3f2542fc8f8c7379
Author: Derek Foreman 
Date:   Tue Nov 1 11:24:12 2016 -0500

wayland_egl: Remove Evas_Engine_Info_Wayland_Egl_Swap_Mode enum

Nothing uses this.
---
 .../evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h   | 12 
 1 file changed, 12 deletions(-)

diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 8ccc280..a3f0e1a 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -1,20 +1,8 @@
 #ifndef _EVAS_ENGINE_WAYLAND_EGL_H
 # define _EVAS_ENGINE_WAYLAND_EGL_H
 
-# define EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_EXISTS 1
-
 typedef struct _Evas_Engine_Info_Wayland_Egl Evas_Engine_Info_Wayland_Egl;
 
-typedef enum _Evas_Engine_Info_Wayland_Egl_Swap_Mode
-{
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_AUTO = 0,
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_FULL = 1,
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_COPY = 2,
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_DOUBLE = 3,
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_TRIPLE = 4,
-   EVAS_ENGINE_WAYLAND_EGL_SWAP_MODE_QUADRUPLE = 5
-} Evas_Engine_Info_Wayland_Egl_Swap_Mode;
-
 struct _Evas_Engine_Info_Wayland_Egl
 {
/* PRIVATE - don't mess with this baby or evas will poke its tongue out

-- 




[EGIT] [core/efl] master 07/16: wayland evas engines: rename wayland display to wl_display

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 54cf6dac4afff6b470f1a95874d76172fb9790c7
Author: Derek Foreman 
Date:   Tue Nov 1 12:07:10 2016 -0500

wayland evas engines: rename wayland display to wl_display

Continuing to make the shm and egl engines closer to eachother.
---
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c | 6 +++---
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c | 4 ++--
 src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h  | 2 +-
 src/modules/evas/engines/wayland_egl/evas_engine.c  | 4 ++--
 src/modules/evas/engines/wayland_egl/evas_wl_main.c | 2 +-
 src/modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h  | 2 +-
 src/modules/evas/engines/wayland_shm/evas_dmabuf.c  | 2 +-
 src/modules/evas/engines/wayland_shm/evas_shm.c | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 1aae6dd..9bad938 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -128,7 +128,7 @@ _ee_egl_display_unset(Ecore_Evas *ee)
Ecore_Evas_Engine_Wl_Data *wdata;
 
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
-   einfo->info.display = NULL;
+   einfo->info.wl_display = NULL;
wdata = ee->engine.data;
wdata->regen_objs = _evas_canvas_image_data_unset(ecore_evas_get(ee));
evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
@@ -148,7 +148,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void 
*event EINA_UNUSED)
 
if ((einfo = (Evas_Engine_Info_Wayland_Egl 
*)evas_engine_info_get(ee->evas)))
  {
-einfo->info.display = ecore_wl2_display_get(wdata->display);
+einfo->info.wl_display = ecore_wl2_display_get(wdata->display);
 einfo->info.destination_alpha = EINA_TRUE;
 einfo->info.rotation = ee->rotation;
 einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
@@ -391,7 +391,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, 
unsigned int parent,
 wdata->sync_done = EINA_TRUE;
 if ((einfo = (Evas_Engine_Info_Wayland_Egl 
*)evas_engine_info_get(ee->evas)))
   {
- einfo->info.display = ecore_wl2_display_get(ewd);
+ einfo->info.wl_display = ecore_wl2_display_get(ewd);
  einfo->info.destination_alpha = EINA_TRUE;
  einfo->info.rotation = ee->rotation;
  einfo->info.depth = 32;
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 3398f19..2457867 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -133,7 +133,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void 
*event EINA_UNUSED)
if ((einfo = (Evas_Engine_Info_Wayland_Shm 
*)evas_engine_info_get(ee->evas)))
  {
 ecore_evas_manual_render_set(ee, 0);
-einfo->info.wl_disp = ecore_wl2_display_get(wdata->display);
+einfo->info.wl_display = ecore_wl2_display_get(wdata->display);
 einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(wdata->display);
 einfo->info.wl_shm = ecore_wl2_display_shm_get(wdata->display);
 einfo->info.compositor_version = 
ecore_wl2_display_compositor_version_get(wdata->display);
@@ -316,7 +316,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, 
unsigned int parent,
 wdata->sync_done = EINA_TRUE;
 if ((einfo = (Evas_Engine_Info_Wayland_Shm 
*)evas_engine_info_get(ee->evas)))
   {
- einfo->info.wl_disp = ecore_wl2_display_get(ewd);
+ einfo->info.wl_display = ecore_wl2_display_get(ewd);
  einfo->info.wl_dmabuf = ecore_wl2_display_dmabuf_get(ewd);
  einfo->info.wl_shm = ecore_wl2_display_shm_get(ewd);
  einfo->info.destination_alpha = EINA_TRUE;
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 5541d1f..4b9b221 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -12,7 +12,7 @@ struct _Evas_Engine_Info_Wayland_Egl
/* engine specific data & parameters it needs to set up */
struct 
  {
-struct wl_display *display;
+struct wl_display *wl_display;
 struct wl_surface *wl_surface;
 struct wl_egl_window *win;
 int depth, rotation, edges;
diff --git 

[EGIT] [core/efl] master 16/16: ecore_evas_wayland: Minimize differences between shm and egl

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit c425140a67745adfecc34c849a895a039705ef26
Author: Derek Foreman 
Date:   Wed Nov 2 13:13:07 2016 -0500

ecore_evas_wayland: Minimize differences between shm and egl

Finally bring these together as much as possible to avoid future
diversions when bugs are only fixed in one or the other.

There are functional changes - state tracking for client side effects is
now added to the shm engine, some bug fixes for the egl engine have been
brought to the shm engine.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 409 +++-
 .../engines/wayland/ecore_evas_wayland_egl.c   | 410 +
 .../engines/wayland/ecore_evas_wayland_private.h   |   2 +
 .../engines/wayland/ecore_evas_wayland_shm.c   | 337 +
 4 files changed, 417 insertions(+), 741 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 260c17c..90ae50c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -5,6 +5,88 @@
 #include "ecore_evas_wayland_private.h"
 #include 
 
+extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
+extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
+
+static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
+{
+   _ecore_evas_wl_common_free,
+   _ecore_evas_wl_common_callback_resize_set,
+   _ecore_evas_wl_common_callback_move_set,
+   NULL,
+   NULL,
+   _ecore_evas_wl_common_callback_delete_request_set,
+   NULL,
+   _ecore_evas_wl_common_callback_focus_in_set,
+   _ecore_evas_wl_common_callback_focus_out_set,
+   _ecore_evas_wl_common_callback_mouse_in_set,
+   _ecore_evas_wl_common_callback_mouse_out_set,
+   NULL, // sticky_set
+   NULL, // unsticky_set
+   NULL, // pre_render_set
+   NULL, // post_render_set
+   _ecore_evas_wl_common_move,
+   NULL, // managed_move
+   _ecore_evas_wl_common_resize,
+   _ecore_evas_wl_common_move_resize,
+   _ecore_evas_wl_common_rotation_set,
+   NULL, // shaped_set
+   _ecore_evas_wl_common_show,
+   _ecore_evas_wl_common_hide,
+   _ecore_evas_wl_common_raise,
+   NULL, // lower
+   NULL, // activate
+   _ecore_evas_wl_common_title_set,
+   _ecore_evas_wl_common_name_class_set,
+   _ecore_evas_wl_common_size_min_set,
+   _ecore_evas_wl_common_size_max_set,
+   _ecore_evas_wl_common_size_base_set,
+   _ecore_evas_wl_common_size_step_set,
+   _ecore_evas_wl_common_object_cursor_set,
+   _ecore_evas_wl_common_object_cursor_unset,
+   _ecore_evas_wl_common_layer_set,
+   NULL, // focus set
+   _ecore_evas_wl_common_iconified_set,
+   _ecore_evas_wl_common_borderless_set,
+   NULL, // override set
+   _ecore_evas_wl_common_maximized_set,
+   _ecore_evas_wl_common_fullscreen_set,
+   NULL, // func avoid_damage set
+   _ecore_evas_wl_common_withdrawn_set,
+   NULL, // func sticky set
+   _ecore_evas_wl_common_ignore_events_set,
+   _ecore_evas_wl_common_alpha_set,
+   _ecore_evas_wl_common_transparent_set,
+   NULL, // func profiles set
+   NULL, // func profile set
+   NULL, // window group set
+   _ecore_evas_wl_common_aspect_set,
+   NULL, // urgent set
+   NULL, // modal set
+   NULL, // demand attention set
+   NULL, // focus skip set
+   NULL, //_ecore_evas_wl_common_render,
+   _ecore_evas_wl_common_screen_geometry_get,
+   _ecore_evas_wl_common_screen_dpi_get,
+   NULL, // func msg parent send
+   NULL, // func msg send
+
+   _ecore_evas_wl_common_pointer_xy_get,
+   NULL, // pointer_warp
+
+   NULL, // wm_rot_preferred_rotation_set
+   NULL, // wm_rot_available_rotations_set
+   NULL, // wm_rot_manual_rotation_done_set
+   NULL, // wm_rot_manual_rotation_done
+
+   NULL, // aux_hints_set
+
+   NULL, // fn_animator_register
+   NULL, // fn_animator_unregister
+
+   NULL, // fn_evas_changed
+};
+
 #define _smart_frame_type "ecore_evas_wl_frame"
 
 static const char *interface_wl_name = "wayland";
@@ -1633,11 +1715,13 @@ static const struct wl_callback_listener _anim_listener 
=
 };
 
 void
-_ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas EINA_UNUSED, 
void *event EINA_UNUSED)
+_ecore_evas_wl_common_render_flush_pre(void *data, Evas *evas, void *event 
EINA_UNUSED)
 {
Ecore_Evas *ee = data;
+   Evas_Engine_Info_Wayland *einfo;
Ecore_Evas_Engine_Wl_Data *wdata;
struct wl_surface *surf;
+   int fx, fy;
 
wdata = ee->engine.data;
surf = ecore_wl2_window_surface_get(wdata->win);
@@ -1651,6 +1735,39 @@ _ecore_evas_wl_common_render_flush_pre(void *data, Evas 
*evas EINA_UNUSED, void
  wdata->win->configure_ack(wdata->win->xdg_surface,
wdata->win->configure_serial);
wdata->win->configure_serial = 0;
+
+   /* Surviving bits of 

[EGIT] [core/efl] master 08/16: wayland_egl: Remove unused wl_egl_window variables

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 0b9f77ac9664c086282f0b74ff6b893af1c59fc7
Author: Derek Foreman 
Date:   Tue Nov 1 12:38:44 2016 -0500

wayland_egl: Remove unused wl_egl_window variables
---
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h | 3 ---
 src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h  | 1 -
 2 files changed, 4 deletions(-)

diff --git 
a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index dc53701..8fe07db 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -41,9 +41,6 @@ struct _Ecore_Evas_Engine_Wl_Data
Ecore_Event_Handler *sync_handler;
Evas_Object *frame;
int fx, fy, fw, fh;
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-   struct wl_egl_window *egl_win;
-#endif
Eina_Rectangle content;
struct wl_callback *anim_callback;
int x_rel;
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 4b9b221..6a8bc07 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -14,7 +14,6 @@ struct _Evas_Engine_Info_Wayland_Egl
  {
 struct wl_display *wl_display;
 struct wl_surface *wl_surface;
-struct wl_egl_window *win;
 int depth, rotation, edges;
 unsigned int destination_alpha : 1;
  } info;

-- 




[EGIT] [core/efl] master 12/16: ecore_evas_wayland: Make alpha set common

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 9ca6e274a4060912e79dcab0bb7d0d32e595a307
Author: Derek Foreman 
Date:   Tue Nov 1 16:34:26 2016 -0500

ecore_evas_wayland: Make alpha set common

Moves alpha set into the common implementation - there is a functional
change here - the egl engine now calls alpha_do in render_updates like
the shm engine.

It is probable that this was the intended behaviour all along.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 53 +-
 .../engines/wayland/ecore_evas_wayland_egl.c   | 44 +-
 .../engines/wayland/ecore_evas_wayland_private.h   |  2 +-
 .../engines/wayland/ecore_evas_wayland_shm.c   | 43 +-
 4 files changed, 44 insertions(+), 98 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index a7927cf..b9f7939 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1822,18 +1822,6 @@ _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
 }
 
 static void
-_ecore_evas_wayland_alpha_do(Ecore_Evas *ee, int alpha)
-{
-   if (!ee) return;
-   if (!strcmp(ee->driver, "wayland_shm"))
- {
-#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
-_ecore_evas_wayland_shm_alpha_do(ee, alpha);
-#endif
- }
-}
-
-static void
 _ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
 {
if (!ee) return;
@@ -2006,3 +1994,44 @@ _ecore_evas_wl_common_hide(Ecore_Evas *ee)
 
if (ee->func.fn_hide) ee->func.fn_hide(ee);
 }
+
+static void
+_ecore_evas_wayland_alpha_do(Ecore_Evas *ee, int alpha)
+{
+   Evas_Engine_Info_Wayland *einfo;
+   Ecore_Evas_Engine_Wl_Data *wdata;
+   int fw, fh;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if (!ee) return;
+   if (ee->alpha == alpha) return;
+   ee->alpha = alpha;
+   wdata = ee->engine.data;
+   if (!wdata->sync_done) return;
+
+   if (wdata->win) ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
+
+   evas_output_framespace_get(ee->evas, NULL, NULL, , );
+
+   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
+ {
+einfo->info.destination_alpha = EINA_TRUE;
+if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
+ }
+}
+
+void
+_ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int alpha)
+{
+   if (ee->in_async_render)
+ {
+ee->delayed.alpha = alpha;
+ee->delayed.alpha_changed = EINA_TRUE;
+return;
+ }
+
+   _ecore_evas_wayland_alpha_do(ee, alpha);
+}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index f412871..07e4f62 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas 
*eo_e);
 extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
 
 /* local function prototypes */
-static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
 static void _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent);
 static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int 
resize);
 
@@ -85,7 +84,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_withdrawn_set,
NULL, // func sticky set
_ecore_evas_wl_common_ignore_events_set,
-   _ecore_evas_wl_alpha_set,
+   _ecore_evas_wl_common_alpha_set,
_ecore_evas_wl_transparent_set,
NULL, // func profiles set
NULL, // func profile set
@@ -468,47 +467,6 @@ _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, 
int resize)
 }
 
 static void 
-_ecore_evas_wayland_egl_alpha_do(Ecore_Evas *ee, int alpha)
-{
-   Evas_Engine_Info_Wayland *einfo;
-   Ecore_Evas_Engine_Wl_Data *wdata;
-   int fw, fh;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!ee) return;
-   if (ee->alpha == alpha) return;
-   ee->alpha = alpha;
-   wdata = ee->engine.data;
-   if (!wdata->sync_done) return;
-
-   if (wdata->win) ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
-
-   evas_output_framespace_get(ee->evas, NULL, NULL, , );
-
-   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
- {
-einfo->info.destination_alpha = EINA_TRUE;
-if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
-  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
-evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
- }

[EGIT] [core/efl] master 15/16: ecore_evas_wayland: Make resize code common

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 4260d5d3a2aa47a24cdd5afff1fb6741ad1e8cc5
Author: Derek Foreman 
Date:   Wed Nov 2 07:41:33 2016 -0500

ecore_evas_wayland: Make resize code common

Brings resize code into the common implementation - there is a functional
change.  There appears to have been a bug in the egl resize where it
used the same w, h order for portrait evases as for landscape.  This was
fixed in shm.  I've used the shm variant for the common code.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 31 +++---
 .../engines/wayland/ecore_evas_wayland_egl.c   | 29 
 .../engines/wayland/ecore_evas_wayland_private.h   | 10 ---
 .../engines/wayland/ecore_evas_wayland_shm.c   | 29 
 4 files changed, 21 insertions(+), 78 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 80b1ff9..260c17c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1791,20 +1791,31 @@ _ecore_evas_wl_common_screen_dpi_get(const Ecore_Evas 
*ee EINA_UNUSED, int *xdpi
 }
 
 static void
+_ecore_evas_wayland_resize_edge_set(Ecore_Evas *ee, int edge)
+{
+   Evas_Engine_Info_Wayland *einfo;
+
+   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
+ einfo->info.edges = edge;
+}
+
+static void
 _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
 {
+   Ecore_Evas_Engine_Wl_Data *wdata;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
if (!ee) return;
-   if (!strcmp(ee->driver, "wayland_shm"))
- {
-#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
-_ecore_evas_wayland_shm_resize(ee, location);
-#endif
- }
-   else if (!strcmp(ee->driver, "wayland_egl"))
+   wdata = ee->engine.data;
+   if (wdata->win)
  {
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-_ecore_evas_wayland_egl_resize(ee, location);
-#endif
+_ecore_evas_wayland_resize_edge_set(ee, location);
+
+if (ECORE_EVAS_PORTRAIT(ee))
+  ecore_wl2_window_resize(wdata->win, ee->w, ee->h, location);
+else
+  ecore_wl2_window_resize(wdata->win, ee->h, ee->w, location);
  }
 }
 
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 366c7d2..631e603 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -442,33 +442,4 @@ conn_err:
return NULL;
 }
 
-void 
-_ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
-{
-   Ecore_Evas_Engine_Wl_Data *wdata;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!ee) return;
-   wdata = ee->engine.data;
-   if (wdata->win) 
- {
-_ecore_evas_wayland_egl_resize_edge_set(ee, location);
-
-if (ECORE_EVAS_PORTRAIT(ee))
-  ecore_wl2_window_resize(wdata->win, ee->w, ee->h, location);
-else
-  ecore_wl2_window_resize(wdata->win, ee->w, ee->h, location);
- }
-}
-
-void 
-_ecore_evas_wayland_egl_resize_edge_set(Ecore_Evas *ee, int edge)
-{
-   Evas_Engine_Info_Wayland *einfo;
-
-   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
- einfo->info.edges = edge;
-}
-
 #endif
diff --git 
a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index eb4a4c5..89c84a0 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -110,14 +110,4 @@ void _ecore_evas_wl_common_pointer_xy_get(const Ecore_Evas 
*ee, Evas_Coord *x, E
 
 extern Eina_List *ee_list;
 
-#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
-void _ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location);
-void _ecore_evas_wayland_shm_resize_edge_set(Ecore_Evas *ee, int edge);
-#endif
-
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-void _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location);
-void _ecore_evas_wayland_egl_resize_edge_set(Ecore_Evas *ee, int edge);
-#endif
-
 #endif /* _ECORE_EVAS_WAYLAND_PRIVATE_H_ */
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 662912a..c6cdb77 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -371,33 +371,4 @@ conn_err:
return NULL;
 }
 
-void 
-_ecore_evas_wayland_shm_resize(Ecore_Evas *ee, int location)
-{
-   Ecore_Evas_Engine_Wl_Data *wdata;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
- 

[EGIT] [core/efl] master 03/16: wayland_egl: Remove screen from engine info

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 47718ae3eacd287e4a2f022a1e895e2545fcd884
Author: Derek Foreman 
Date:   Tue Nov 1 08:36:55 2016 -0500

wayland_egl: Remove screen from engine info

Doesn't appear to actually be used for anything.
---
 src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h | 2 +-
 src/modules/evas/engines/wayland_egl/evas_engine.c | 1 -
 src/modules/evas/engines/wayland_egl/evas_wl_main.c| 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index a087ee9..8ccc280 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -27,7 +27,7 @@ struct _Evas_Engine_Info_Wayland_Egl
 struct wl_display *display;
 struct wl_surface *surface;
 struct wl_egl_window *win;
-int depth, screen, rotation, edges;
+int depth, rotation, edges;
 unsigned int destination_alpha : 1;
  } info;
 
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c 
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index 707f4dd..f50b9f8 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -657,7 +657,6 @@ eng_setup(Evas *evas, void *info)
   */
  /* (ob->info->info.win != ob->win) || */
  (ob->info->info.depth != ob->depth) ||
- (ob->info->info.screen != ob->screen) ||
  (ob->info->info.destination_alpha != ob->alpha))
{
   gl_wins--;
diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c 
b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index 9c03d24..c78be60 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -34,7 +34,6 @@ eng_window_new(Evas *evas, Evas_Engine_Info_Wayland_Egl 
*einfo, int w, int h, Re
  context = EGL_NO_CONTEXT;
display = gw->disp;
gw->surface = einfo->info.surface;
-   gw->screen = einfo->info.screen;
gw->depth = einfo->info.depth;
gw->alpha = einfo->info.destination_alpha;
gw->rot = einfo->info.rotation;

-- 




[EGIT] [core/efl] master 02/16: wayland ecore evas: move move_resize to common

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit b898d3f929c9e21833196d1a41430f9760a364ee
Author: Derek Foreman 
Date:   Tue Nov 1 07:42:23 2016 -0500

wayland ecore evas: move move_resize to common

It's identical in both shm and egl variants, share it.
---
 .../engines/wayland/ecore_evas_wayland_common.c   | 12 
 .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c   | 15 +--
 .../engines/wayland/ecore_evas_wayland_private.h  |  1 +
 .../ecore_evas/engines/wayland/ecore_evas_wayland_shm.c   | 15 +--
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 48f0317..fdfcc99 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -992,6 +992,18 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
 }
 
 void
+_ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
+{
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if (!ee) return;
+   if ((ee->x != x) || (ee->y != y))
+ _ecore_evas_wl_common_move(ee, x, y);
+   if ((ee->w != w) || (ee->h != h))
+ _ecore_evas_wl_common_resize(ee, w, h);
+}
+
+void
 _ecore_evas_wl_common_callback_resize_set(Ecore_Evas *ee, void 
(*func)(Ecore_Evas *ee))
 {
if (!ee) return;
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 9880e85..3b2ad37 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas 
*eo_e);
 extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
 
 /* local function prototypes */
-static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, 
int h);
 static void _ecore_evas_wl_show(Ecore_Evas *ee);
 static void _ecore_evas_wl_hide(Ecore_Evas *ee);
 static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
@@ -61,7 +60,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_move,
NULL, // managed_move
_ecore_evas_wl_common_resize,
-   _ecore_evas_wl_move_resize,
+   _ecore_evas_wl_common_move_resize,
_ecore_evas_wl_rotation_set,
NULL, // shaped_set
_ecore_evas_wl_show,
@@ -450,18 +449,6 @@ conn_err:
return NULL;
 }
 
-static void 
-_ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
-{
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!ee) return;
-   if ((ee->x != x) || (ee->y != y))
- _ecore_evas_wl_common_move(ee, x, y);
-   if ((ee->w != w) || (ee->h != h))
- _ecore_evas_wl_common_resize(ee, w, h);
-}
-
 static void
 _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
 {
diff --git 
a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
index bea9870..dc53701 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_private.h
@@ -71,6 +71,7 @@ void _ecore_evas_wl_common_callback_mouse_in_set(Ecore_Evas 
*ee, void (*func)(Ec
 void _ecore_evas_wl_common_callback_mouse_out_set(Ecore_Evas *ee, void 
(*func)(Ecore_Evas *ee));
 void _ecore_evas_wl_common_move(Ecore_Evas *ee, int x, int y);
 void _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h);
+void _ecore_evas_wl_common_move_resize(Ecore_Evas *ee, int x, int y, int w, 
int h);
 void _ecore_evas_wl_common_raise(Ecore_Evas *ee);
 void _ecore_evas_wl_common_title_set(Ecore_Evas *ee, const char *title);
 void _ecore_evas_wl_common_name_class_set(Ecore_Evas *ee, const char *n, const 
char *c);
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 4b3b492..3398f19 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -31,7 +31,6 @@
 #endif /* ! _WIN32 */
 
 /* local function prototypes */
-static void _ecore_evas_wl_move_resize(Ecore_Evas *ee, int x, int y, int w, 
int h);
 static void _ecore_evas_wl_show(Ecore_Evas *ee);
 static void _ecore_evas_wl_hide(Ecore_Evas *ee);
 static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
@@ -58,7 +57,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_move,
NULL, // managed_move
_ecore_evas_wl_common_resize,
-   _ecore_evas_wl_move_resize,
+   _ecore_evas_wl_common_move_resize,

[EGIT] [core/efl] master 06/16: wayland_egl: Rename surface to wl_surface

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 3f75c45122f54e35b4c09f0ed4566f79c1d55227
Author: Derek Foreman 
Date:   Tue Nov 1 11:41:47 2016 -0500

wayland_egl: Rename surface to wl_surface

Making this code more closely match the wayland_shm engine
---
 .../ecore_evas/engines/wayland/ecore_evas_wayland_egl.c| 10 +-
 src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h |  2 +-
 src/modules/evas/engines/wayland_egl/evas_engine.c |  6 +++---
 src/modules/evas/engines/wayland_egl/evas_wl_main.c|  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 3b2ad37..1aae6dd 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -151,7 +151,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void 
*event EINA_UNUSED)
 einfo->info.display = ecore_wl2_display_get(wdata->display);
 einfo->info.destination_alpha = EINA_TRUE;
 einfo->info.rotation = ee->rotation;
-einfo->info.surface = ecore_wl2_window_surface_get(wdata->win);
+einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
 
 if (wdata->reset_pending)
   {
@@ -395,7 +395,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, 
unsigned int parent,
  einfo->info.destination_alpha = EINA_TRUE;
  einfo->info.rotation = ee->rotation;
  einfo->info.depth = 32;
- einfo->info.surface = ecore_wl2_window_surface_get(wdata->win);
+ einfo->info.wl_surface = ecore_wl2_window_surface_get(wdata->win);
  if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
{
   ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
@@ -500,9 +500,9 @@ _ecore_evas_wl_show(Ecore_Evas *ee)
  struct wl_surface *surf;
 
  surf = ecore_wl2_window_surface_get(wdata->win);
- if ((!einfo->info.surface) || (einfo->info.surface != surf))
+ if ((!einfo->info.wl_surface) || (einfo->info.wl_surface != surf))
{
-  einfo->info.surface = surf;
+  einfo->info.wl_surface = surf;
   evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
   evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h 
+ fh);
}
@@ -543,7 +543,7 @@ _ecore_evas_wl_hide(Ecore_Evas *ee)
einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(ee->evas);
if (einfo)
  {
-einfo->info.surface = NULL;
+einfo->info.wl_surface = NULL;
 evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
  }
 
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 97e81a8..5541d1f 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -13,7 +13,7 @@ struct _Evas_Engine_Info_Wayland_Egl
struct 
  {
 struct wl_display *display;
-struct wl_surface *surface;
+struct wl_surface *wl_surface;
 struct wl_egl_window *win;
 int depth, rotation, edges;
 unsigned int destination_alpha : 1;
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c 
b/src/modules/evas/engines/wayland_egl/evas_engine.c
index f50b9f8..146f3b2 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -283,7 +283,7 @@ evgl_eng_native_window_create(void *data)
if (!(re = (Render_Engine *)data)) return NULL;
if (!(ob = eng_get_ob(re))) return NULL;
 
-   if (!(win = wl_egl_window_create(ob->info->info.surface, 1, 1)))
+   if (!(win = wl_egl_window_create(ob->info->info.wl_surface, 1, 1)))
  {
 ERR("Could not create wl_egl window");
 return NULL;
@@ -637,7 +637,7 @@ eng_setup(Evas *evas, void *info)
 re = epd->engine.data.output;
 ob = eng_get_ob(re);
 
-if (!inf->info.surface && (ob->egl_surface[0] != EGL_NO_SURFACE))
+if (!inf->info.wl_surface && (ob->egl_surface[0] != EGL_NO_SURFACE))
   {
  eglDestroySurface(ob->egl_disp, ob->egl_surface[0]);
  eglMakeCurrent(ob->egl_disp, EGL_NO_SURFACE, EGL_NO_SURFACE,
@@ -650,7 +650,7 @@ eng_setup(Evas *evas, void *info)
   {
  ob->info = inf;
  if ((ob->info->info.display != ob->disp) ||
- (ob->info->info.surface != ob->surface) ||
+ (ob->info->info.wl_surface != ob->surface) ||
  

[EGIT] [core/efl] master 10/16: wayland evas engines: share engine info structure

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit af4a71bcf0975a4a986c4b1901b795850d1192ae
Author: Derek Foreman 
Date:   Tue Nov 1 15:46:35 2016 -0500

wayland evas engines: share engine info structure

These engines are incredibly similar - by sharing the same engine info
structure we'll be able to simplify the wayland ecore_evas bits and
make them much more maintainable.
---
 configure.ac   | 13 +++
 src/Makefile_Ecore_Evas.am |  1 +
 src/Makefile_Evas.am   | 10 +++--
 .../engines/wayland/ecore_evas_wayland_egl.c   | 44 +++---
 .../engines/wayland/ecore_evas_wayland_shm.c   | 34 -
 .../Evas_Engine_Wayland.h} | 17 ++---
 src/modules/evas/engines/wayland_egl/evas_engine.c | 12 +++---
 src/modules/evas/engines/wayland_egl/evas_engine.h |  6 +--
 .../evas/engines/wayland_egl/evas_wl_main.c|  2 +-
 .../engines/wayland_shm/Evas_Engine_Wayland_Shm.h  | 33 
 src/modules/evas/engines/wayland_shm/evas_engine.c | 16 
 src/modules/evas/engines/wayland_shm/evas_engine.h |  8 ++--
 src/modules/evas/engines/wayland_shm/evas_outbuf.c |  4 +-
 13 files changed, 95 insertions(+), 105 deletions(-)

diff --git a/configure.ac b/configure.ac
index dfd0957..cd7ba3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2710,6 +2710,19 @@ fi
 
 AM_CONDITIONAL([EVAS_STATIC_BUILD_GL_COMMON], [test 
"x${have_static_evas_engine_gl_common}" = "xyes"])
 
+have_evas_engine_wayland_common="no"
+if test "x$have_evas_engine_wayland_egl" = "xstatic" || \
+   test "x$have_evas_engine_wayland_shm" = "xstatic" || \
+   test "x$have_evas_engine_wayland_egl" = "xyes" || \
+   test "x$have_evas_engine_wayland_shm" = "xyes"; then
+   have_evas_engine_wayland_common="yes"
+fi
+
+if test "x$have_evas_engine_wayland_common" = "xyes"; then
+   AC_DEFINE([BUILD_ENGINE_WAYLAND_COMMON], [1], [Building any wayland evas 
engine])
+fi
+AM_CONDITIONAL([BUILD_ENGINE_WAYLAND_COMMON], [test 
"x${have_evas_engine_wayland_common}" = "xyes"])
+
 ## Vg Loaders
 
 EVAS_CHECK_VG_LOADER([SVG], [${want_evas_vg_loader_svg}])
diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am
index 5d6a387..ea854c4 100644
--- a/src/Makefile_Ecore_Evas.am
+++ b/src/Makefile_Ecore_Evas.am
@@ -189,6 +189,7 @@ modules_ecore_evas_engines_wayland_module_la_CPPFLAGS = 
-I$(top_builddir)/src/li
 @ECORE_WL2_CFLAGS@ \
 -I$(top_srcdir)/src/modules/evas/engines/wayland_shm \
 -I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
 @ECORE_WAYLAND_CFLAGS@ \
 @ECORE_WL2_CFLAGS@
 modules_ecore_evas_engines_wayland_module_la_LIBADD = \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 26cdd79..a7bb362 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1207,8 +1207,11 @@ modules_evas_engines_software_x11_module_la_LIBTOOLFLAGS 
= --tag=disable-static
 endif
 endif
 
+if BUILD_ENGINE_WAYLAND_COMMON
+dist_installed_evasmainheaders_DATA += 
modules/evas/engines/wayland_common/Evas_Engine_Wayland.h
+endif
+
 if BUILD_ENGINE_WAYLAND_EGL
-dist_installed_evasmainheaders_DATA += 
modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
 WAYLAND_EGL_SOURCES = \
 modules/evas/engines/wayland_egl/evas_engine.c \
 modules/evas/engines/wayland_egl/evas_wl_main.c \
@@ -1231,6 +1234,7 @@ modules_evas_engines_wayland_egl_module_la_CPPFLAGS = 
-I$(top_builddir)/src/lib/
 -I$(top_srcdir)/src/lib/evas/include \
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/modules/evas/engines/wayland_egl \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
 @EVAS_CFLAGS@ \
 @evas_engine_wayland_egl_cflags@
 modules_evas_engines_wayland_egl_module_la_LIBADD = \
@@ -1243,9 +1247,8 @@ endif
 endif
 
 if BUILD_ENGINE_WAYLAND_SHM
-dist_installed_evasmainheaders_DATA += 
modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h
 WAYLAND_SHM_SOURCES = \
-modules/evas/engines/wayland_shm/Evas_Engine_Wayland_Shm.h \
+modules/evas/engines/wayland_common/Evas_Engine_Wayland.h \
 modules/evas/engines/wayland_shm/evas_engine.c \
 modules/evas/engines/wayland_shm/evas_engine.h \
 modules/evas/engines/wayland_shm/evas_shm.c \
@@ -1280,6 +1283,7 @@ modules_evas_engines_wayland_shm_module_la_CPPFLAGS = 
-I$(top_builddir)/src/lib/
 -I$(top_srcdir)/src/lib/evas/cserve2 \
 -I$(top_srcdir)/src/lib/ecore_wl2 \
 -I$(top_srcdir)/src/static_libs/libdrm \
+-I$(top_srcdir)/src/modules/evas/engines/wayland_common \
 @EVAS_CFLAGS@ \
 @evas_engine_wayland_shm_cflags@
 modules_evas_engines_wayland_shm_module_la_LIBADD = \
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 9bad938..620ea66 100644
--- 

[EGIT] [core/efl] master 01/16: wayland_egl: Remove some leftovers from www

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit d960adee723a6a5198b4c770486e4c90480adb13
Author: Derek Foreman 
Date:   Tue Nov 1 07:41:09 2016 -0500

wayland_egl: Remove some leftovers from www

The render post callback and "wobbling" variable were only required for
the client side effect.
---
 .../engines/wayland/ecore_evas_wayland_egl.c  | 19 ---
 .../engines/wayland_egl/Evas_Engine_Wayland_Egl.h |  1 -
 2 files changed, 20 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 305b095..9880e85 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -257,23 +257,6 @@ _ecore_evas_wl_egl_render_flush_pre(void *data, Evas *e, 
void *event_info EINA_U
einfo->drag_ack = wdata->dragging;
 }
 
-static void
-_ecore_evas_wl_egl_render_post(void *data, Evas *e, void *event_info 
EINA_UNUSED)
-{
-   Ecore_Evas *ee = data;
-   Evas_Engine_Info_Wayland_Egl *einfo;
-   Ecore_Evas_Engine_Wl_Data *wdata;
-   int fw, fh;
-
-   einfo = (Evas_Engine_Info_Wayland_Egl *)evas_engine_info_get(e);
-   wdata = ee->engine.data;
-   if (!einfo->wobbling) return;
-   evas_output_framespace_get(e, NULL, NULL, , );
-   evas_damage_rectangle_add(e, 0, 0, ee->w + fw, ee->h + fh);
-   ecore_wl2_window_opaque_region_set(wdata->win,
- wdata->win->opaque.x, wdata->win->opaque.y, wdata->win->opaque.w, 
wdata->win->opaque.h);
-}
-
 /* external functions */
 EAPI Ecore_Evas *
 ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent,
@@ -399,8 +382,6 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, 
unsigned int parent,
_ecore_evas_wl_common_render_flush_pre, ee);
evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_FLUSH_PRE,
_ecore_evas_wl_egl_render_flush_pre, ee);
-   evas_event_callback_add(ee->evas, EVAS_CALLBACK_RENDER_POST,
-   _ecore_evas_wl_egl_render_post, ee);
 
/* FIXME: This needs to be set based on theme & scale */
if (ee->prop.draw_frame)
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index 204e286..a087ee9 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -44,7 +44,6 @@ struct _Evas_Engine_Info_Wayland_Egl
Eina_Bool vsync : 1;
Eina_Bool indirect : 1;
 
-   Eina_Bool wobbling : 1;
Eina_Bool www_avail : 1;
Eina_Bool just_mapped : 1;
Eina_Rectangle window;

-- 




[EGIT] [core/efl] master 14/16: ecore_evas_wayland: Make rotation_set common

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit b23797c55a605daf843aba972d489023fa7e916f
Author: Derek Foreman 
Date:   Tue Nov 1 17:16:07 2016 -0500

ecore_evas_wayland: Make rotation_set common

Rotation set can be moved into common now - should be no functional
change.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 40 +++---
 .../engines/wayland/ecore_evas_wayland_egl.c   | 25 +-
 .../engines/wayland/ecore_evas_wayland_shm.c   | 25 +-
 3 files changed, 29 insertions(+), 61 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 63a3cd3..80b1ff9 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -397,19 +397,6 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
  }
 }
 
-void
-_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
-{
-   if (ee->in_async_render)
- {
-ee->delayed.rotation = rotation;
-ee->delayed.rotation_resize = resize;
-ee->delayed.rotation_changed = EINA_TRUE;
-return;
- }
-   _rotation_do(ee, rotation, resize);
-}
-
 static Eina_Bool
 _ecore_evas_wl_common_cb_www_drag(void *d EINA_UNUSED, int t EINA_UNUSED, void 
*event)
 {
@@ -2066,3 +2053,30 @@ _ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, 
int transparent)
 
_ecore_evas_wayland_transparent_do(ee, transparent);
 }
+
+void
+_ecore_evas_wl_common_rotation_set(Ecore_Evas *ee, int rotation, int resize)
+{
+   Evas_Engine_Info_Wayland *einfo;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if (ee->rotation == rotation) return;
+
+   if (ee->in_async_render)
+ {
+ee->delayed.rotation = rotation;
+ee->delayed.rotation_resize = resize;
+ee->delayed.rotation_changed = EINA_TRUE;
+ }
+   else
+ _rotation_do(ee, rotation, resize);
+
+   einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
+   if (!einfo) return;
+
+   einfo->info.rotation = rotation;
+
+   if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+ ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 56799c6..366c7d2 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -33,9 +33,6 @@
 extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas *eo_e);
 extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
 
-/* local function prototypes */
-static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int 
resize);
-
 static Ecore_Evas_Engine_Func _ecore_wl_engine_func = 
 {
_ecore_evas_wl_common_free,
@@ -57,7 +54,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // managed_move
_ecore_evas_wl_common_resize,
_ecore_evas_wl_common_move_resize,
-   _ecore_evas_wl_rotation_set,
+   _ecore_evas_wl_common_rotation_set,
NULL, // shaped_set
_ecore_evas_wl_common_show,
_ecore_evas_wl_common_hide,
@@ -445,26 +442,6 @@ conn_err:
return NULL;
 }
 
-static void
-_ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int resize)
-{
-   Evas_Engine_Info_Wayland *einfo;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (ee->rotation == rotation) return;
-
-   _ecore_evas_wl_common_rotation_set(ee, rotation, resize);
-
-   einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
-   if (!einfo) return;
-
-   einfo->info.rotation = rotation;
-
-   if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
- ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
-}
-
 void 
 _ecore_evas_wayland_egl_resize(Ecore_Evas *ee, int location)
 {
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index cc9b6b1..662912a 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -30,9 +30,6 @@
 # endif
 #endif /* ! _WIN32 */
 
-/* local function prototypes */
-static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int 
resize);
-
 static Ecore_Evas_Engine_Func _ecore_wl_engine_func = 
 {
_ecore_evas_wl_common_free,
@@ -54,7 +51,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // managed_move
_ecore_evas_wl_common_resize,
_ecore_evas_wl_common_move_resize,
-   _ecore_evas_wl_rotation_set,
+   _ecore_evas_wl_common_rotation_set,
NULL, // shaped_set

[EGIT] [core/efl] master 09/16: ecore_evas_wayland: Don't include Evas_Engine_Wayland_Egl.h

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 55de5c61cdc896eb3916068044f5355617955e3f
Author: Derek Foreman 
Date:   Tue Nov 1 15:47:08 2016 -0500

ecore_evas_wayland: Don't include Evas_Engine_Wayland_Egl.h

There doesn't seem to be any need for this.
---
 src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index fd5b91c..55f865d 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -3,9 +3,6 @@
 #endif
 
 #include "ecore_evas_wayland_private.h"
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-# include 
-#endif
 
 #define _smart_frame_type "ecore_evas_wl_frame"
 

-- 




[EGIT] [core/efl] master 05/16: wayland_egl: Remove pre_post_swap_callback_set

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 9e43a155261622eb23124d6aac8cee80cd919a8d
Author: Derek Foreman 
Date:   Tue Nov 1 11:26:14 2016 -0500

wayland_egl: Remove pre_post_swap_callback_set

This stuff seems copied from gl_x11 which actually has API to use it.

In this engine nothing can actually set it, so it's just all dead code.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 24 --
 .../engines/wayland_egl/Evas_Engine_Wayland_Egl.h  |  7 ---
 .../evas/engines/wayland_egl/evas_wl_main.c|  6 --
 3 files changed, 37 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index fdfcc99..fd5b91c 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1884,25 +1884,6 @@ _ecore_evas_wayland_window_get(const Ecore_Evas *ee)
return wdata->win;
 }
 
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-static void
-_ecore_evas_wayland_pre_post_swap_callback_set(const Ecore_Evas *ee, void 
*data, void (*pre_cb) (void *data, Evas *e), void (*post_cb) (void *data, Evas 
*e))
-{
-   Evas_Engine_Info_Wayland_Egl *einfo;
-
-   if (!(!strcmp(ee->driver, "wayland_egl"))) return;
-
-   if ((einfo = (Evas_Engine_Info_Wayland_Egl 
*)evas_engine_info_get(ee->evas)))
- {
-einfo->callback.pre_swap = pre_cb;
-einfo->callback.post_swap = post_cb;
-einfo->callback.data = data;
-if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
-  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
- }
-}
-#endif
-
 /* static void */
 /* _ecore_evas_wayland_pointer_set(Ecore_Evas *ee EINA_UNUSED, int hot_x 
EINA_UNUSED, int hot_y EINA_UNUSED) */
 /* { */
@@ -1926,10 +1907,5 @@ _ecore_evas_wl_interface_new(void)
iface->type_set = _ecore_evas_wayland_type_set;
iface->window2_get = _ecore_evas_wayland_window_get;
 
-#ifdef BUILD_ECORE_EVAS_WAYLAND_EGL
-   iface->pre_post_swap_callback_set = 
- _ecore_evas_wayland_pre_post_swap_callback_set;
-#endif
-
return iface;
 }
diff --git a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h 
b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
index a3f0e1a..97e81a8 100644
--- a/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
+++ b/src/modules/evas/engines/wayland_egl/Evas_Engine_Wayland_Egl.h
@@ -19,13 +19,6 @@ struct _Evas_Engine_Info_Wayland_Egl
 unsigned int destination_alpha : 1;
  } info;
 
-   struct 
- {
-void (*pre_swap) (void *data, Evas *evas);
-void (*post_swap) (void *data, Evas *evas);
-void *data;
- } callback;
-
/* non-blocking or blocking mode */
Evas_Engine_Render_Mode render_mode;
 
diff --git a/src/modules/evas/engines/wayland_egl/evas_wl_main.c 
b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
index c78be60..7885845 100644
--- a/src/modules/evas/engines/wayland_egl/evas_wl_main.c
+++ b/src/modules/evas/engines/wayland_egl/evas_wl_main.c
@@ -509,9 +509,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, 
Tilebuf_Rect *buffer_
 ob->vsync = EINA_TRUE;
  }
 
-   if (ob->info->callback.pre_swap)
- ob->info->callback.pre_swap(ob->info->callback.data, ob->evas);
-
if ((glsym_eglSwapBuffersWithDamage) && (surface_damage) &&
(ob->swap_mode != MODE_FULL))
  {
@@ -535,9 +532,6 @@ eng_outbuf_flush(Outbuf *ob, Tilebuf_Rect *surface_damage, 
Tilebuf_Rect *buffer_
else
   eglSwapBuffers(ob->egl_disp, ob->egl_surface[0]);
 
-   if (ob->info->callback.post_swap)
- ob->info->callback.post_swap(ob->info->callback.data, ob->evas);
-
ob->frame_cnt++;
 
  end:

-- 




[EGIT] [core/efl] master 11/16: ecore_evas_wayland: Move more functions into the common implementation

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 82277ae6b39401a41b6c5148b880fa9fd60aed91
Author: Derek Foreman 
Date:   Tue Nov 1 16:20:49 2016 -0500

ecore_evas_wayland: Move more functions into the common implementation

Show and hide can be made common with almost no functional changes.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 100 
 .../engines/wayland/ecore_evas_wayland_egl.c   | 101 +---
 .../engines/wayland/ecore_evas_wayland_private.h   |   2 +
 .../engines/wayland/ecore_evas_wayland_shm.c   | 103 +
 4 files changed, 106 insertions(+), 200 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 55f865d..a7927cf 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -3,6 +3,7 @@
 #endif
 
 #include "ecore_evas_wayland_private.h"
+#include 
 
 #define _smart_frame_type "ecore_evas_wl_frame"
 
@@ -1906,3 +1907,102 @@ _ecore_evas_wl_interface_new(void)
 
return iface;
 }
+
+void
+_ecore_evas_wl_common_show(Ecore_Evas *ee)
+{
+   Evas_Engine_Info_Wayland *einfo;
+   Ecore_Evas_Engine_Wl_Data *wdata;
+   int fw, fh;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if ((!ee) || (ee->visible)) return;
+
+   wdata = ee->engine.data;
+   if (!wdata->sync_done)
+ {
+wdata->defer_show = EINA_TRUE;
+return;
+ }
+
+   evas_output_framespace_get(ee->evas, NULL, NULL, , );
+
+   if (wdata->win)
+ {
+ecore_wl2_window_show(wdata->win);
+ecore_wl2_window_alpha_set(wdata->win, ee->alpha);
+
+einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
+if (einfo)
+  {
+ struct wl_surface *surf;
+
+ surf = ecore_wl2_window_surface_get(wdata->win);
+ if ((!einfo->info.wl_surface) || (einfo->info.wl_surface != surf))
+   {
+  einfo->info.wl_surface = surf;
+  if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info 
*)einfo))
+ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
+  evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h 
+ fh);
+   }
+ einfo->www_avail = !!wdata->win->www_surface;
+ einfo->just_mapped = EINA_TRUE;
+  }
+ }
+
+   if (wdata->frame)
+ {
+evas_object_show(wdata->frame);
+evas_object_resize(wdata->frame, ee->w + fw, ee->h + fh);
+ }
+
+   ee->prop.withdrawn = EINA_FALSE;
+   if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+
+   if (ee->visible) return;
+   ee->visible = 1;
+   ee->should_be_visible = 1;
+   ee->draw_ok = EINA_TRUE;
+   if (ee->func.fn_show) ee->func.fn_show(ee);
+}
+
+void
+_ecore_evas_wl_common_hide(Ecore_Evas *ee)
+{
+   Evas_Engine_Info_Wayland *einfo;
+   Ecore_Evas_Engine_Wl_Data *wdata;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if ((!ee) || (!ee->visible)) return;
+   wdata = ee->engine.data;
+
+   evas_sync(ee->evas);
+
+   einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas);
+   if (einfo)
+ {
+einfo->info.wl_surface = NULL;
+if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+  {
+ ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
+  }
+ }
+
+   if (wdata->win)
+ ecore_wl2_window_hide(wdata->win);
+
+   if (ee->prop.override)
+ {
+ee->prop.withdrawn = EINA_TRUE;
+if (ee->func.fn_state_change) ee->func.fn_state_change(ee);
+ }
+
+   if (!ee->visible) return;
+   ee->visible = 0;
+   ee->should_be_visible = 0;
+   ee->draw_ok = EINA_FALSE;
+
+   if (ee->func.fn_hide) ee->func.fn_hide(ee);
+}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 620ea66..f412871 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -34,8 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas 
*eo_e);
 extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
 
 /* local function prototypes */
-static void _ecore_evas_wl_show(Ecore_Evas *ee);
-static void _ecore_evas_wl_hide(Ecore_Evas *ee);
 static void _ecore_evas_wl_alpha_set(Ecore_Evas *ee, int alpha);
 static void _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent);
 static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int 
resize);
@@ -63,8 +61,8 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
_ecore_evas_wl_common_move_resize,

[EGIT] [core/efl] master 13/16: ecore_evas_wayland: Make transparent_set common

2016-11-02 Thread Derek Foreman
derekf pushed a commit to branch master.

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

commit 5d2a25a01de24cce6ac693d827f8775987cff5f8
Author: Derek Foreman 
Date:   Tue Nov 1 17:15:24 2016 -0500

ecore_evas_wayland: Make transparent_set common

Moves transparent set into the common implementation - there is a
functional change here - the egl engine now calls transparent_set in
render_updates like the shm engine.

It is probable the this was the intended behaviour all along.
---
 .../engines/wayland/ecore_evas_wayland_common.c| 55 +-
 .../engines/wayland/ecore_evas_wayland_egl.c   | 46 +-
 .../engines/wayland/ecore_evas_wayland_private.h   |  2 +-
 .../engines/wayland/ecore_evas_wayland_shm.c   | 45 +-
 4 files changed, 46 insertions(+), 102 deletions(-)

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index b9f7939..63a3cd3 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -1822,18 +1822,6 @@ _ecore_evas_wayland_resize(Ecore_Evas *ee, int location)
 }
 
 static void
-_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
-{
-   if (!ee) return;
-   if (!strcmp(ee->driver, "wayland_shm"))
- {
-#ifdef BUILD_ECORE_EVAS_WAYLAND_SHM
-_ecore_evas_wayland_shm_transparent_do(ee, transparent);
-#endif
- }
-}
-
-static void
 _ecore_evas_wayland_move(Ecore_Evas *ee, int x, int y)
 {
Ecore_Evas_Engine_Wl_Data *wdata;
@@ -2035,3 +2023,46 @@ _ecore_evas_wl_common_alpha_set(Ecore_Evas *ee, int 
alpha)
 
_ecore_evas_wayland_alpha_do(ee, alpha);
 }
+
+static void
+_ecore_evas_wayland_transparent_do(Ecore_Evas *ee, int transparent)
+{
+   Evas_Engine_Info_Wayland *einfo;
+   Ecore_Evas_Engine_Wl_Data *wdata;
+   int fw, fh;
+
+   LOGFN(__FILE__, __LINE__, __FUNCTION__);
+
+   if (!ee) return;
+   if (ee->transparent == transparent) return;
+   ee->transparent = transparent;
+
+   wdata = ee->engine.data;
+   if (!wdata->sync_done) return;
+
+   if (wdata->win)
+ ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
+
+   evas_output_framespace_get(ee->evas, NULL, NULL, , );
+
+   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
+ {
+einfo->info.destination_alpha = EINA_TRUE;
+if (!evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
+  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
+evas_damage_rectangle_add(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
+ }
+}
+
+void
+_ecore_evas_wl_common_transparent_set(Ecore_Evas *ee, int transparent)
+{
+   if (ee->in_async_render)
+ {
+ee->delayed.transparent = transparent;
+ee->delayed.transparent_changed = EINA_TRUE;
+return;
+ }
+
+   _ecore_evas_wayland_transparent_do(ee, transparent);
+}
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c 
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 07e4f62..56799c6 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -34,7 +34,6 @@ extern EAPI Eina_List *_evas_canvas_image_data_unset(Evas 
*eo_e);
 extern EAPI void _evas_canvas_image_data_regenerate(Eina_List *list);
 
 /* local function prototypes */
-static void _ecore_evas_wl_transparent_set(Ecore_Evas *ee, int transparent);
 static void _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, int 
resize);
 
 static Ecore_Evas_Engine_Func _ecore_wl_engine_func = 
@@ -85,7 +84,7 @@ static Ecore_Evas_Engine_Func _ecore_wl_engine_func =
NULL, // func sticky set
_ecore_evas_wl_common_ignore_events_set,
_ecore_evas_wl_common_alpha_set,
-   _ecore_evas_wl_transparent_set,
+   _ecore_evas_wl_common_transparent_set,
NULL, // func profiles set
NULL, // func profile set
NULL, // window group set
@@ -466,49 +465,6 @@ _ecore_evas_wl_rotation_set(Ecore_Evas *ee, int rotation, 
int resize)
  ERR("evas_engine_info_set() for engine '%s' failed.", ee->driver);
 }
 
-static void 
-_ecore_evas_wayland_egl_transparent_do(Ecore_Evas *ee, int transparent)
-{
-   Evas_Engine_Info_Wayland *einfo;
-   Ecore_Evas_Engine_Wl_Data *wdata;
-   int fw, fh;
-
-   LOGFN(__FILE__, __LINE__, __FUNCTION__);
-
-   if (!ee) return;
-   if (ee->transparent == transparent) return;
-   ee->transparent = transparent;
-
-   wdata = ee->engine.data;
-   if (!wdata->sync_done) return;
-
-   if (wdata->win)
- ecore_wl2_window_transparent_set(wdata->win, ee->transparent);
-
-   evas_output_framespace_get(ee->evas, NULL, NULL, , );
-
-   if ((einfo = (Evas_Engine_Info_Wayland *)evas_engine_info_get(ee->evas)))
- {
-   

[EGIT] [core/efl] master 01/01: ecore-wl2: Update cursor regardless of cursor surface

2016-11-02 Thread Christopher Michael
devilhorns pushed a commit to branch master.

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

commit e3f02acc93142353977c91d80ba00969d35e93fb
Author: Chris Michael 
Date:   Wed Nov 2 12:12:04 2016 -0400

ecore-wl2: Update cursor regardless of cursor surface

If a NULL surface gets passed into ecore_wl2_window_pointer_set that
would mean we are unsetting the cursor surface, so we should still be
calling wl_pointer_set_cursor even with a NULL surface.

Signed-off-by: Chris Michael 
---
 src/lib/ecore_wl2/ecore_wl2_window.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c 
b/src/lib/ecore_wl2/ecore_wl2_window.c
index c2be35d..b2aa63f 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -945,8 +945,7 @@ ecore_wl2_window_pointer_set(Ecore_Wl2_Window *window, 
struct wl_surface *surfac
input->cursor.hot_x = hot_x;
input->cursor.hot_y = hot_y;
 
-   if (input->cursor.surface)
- _ecore_wl2_input_cursor_update(input);
+   _ecore_wl2_input_cursor_update(input);
 }
 
 EAPI void

-- 




[EGIT] [core/enlightenment] master 01/02: use only aspect hints for new pager gadget

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=602b01b8b255479bef761f81b1bb2c324685d80b

commit 602b01b8b255479bef761f81b1bb2c324685d80b
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 10:29:56 2016 -0400

use only aspect hints for new pager gadget

ref T4809
---
 src/modules/pager/gadget/pager.c | 15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index df621f8..c01f5ca 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -266,20 +266,14 @@ _pager_orient(Instance *inst, E_Gadget_Site_Orient orient)
  {
 aspect_w = inst->pager->ynum * inst->pager->zone->w;
 aspect_h = inst->pager->xnum * inst->pager->zone->h;
-evas_object_size_hint_aspect_set(inst->o_pager, 
EVAS_ASPECT_CONTROL_HORIZONTAL, aspect_w, aspect_h);
+evas_object_size_hint_aspect_set(inst->o_pager, 
EVAS_ASPECT_CONTROL_BOTH, aspect_w, aspect_h);
  }
else
  {
 aspect_w = inst->pager->xnum * inst->pager->zone->w;
 aspect_h = inst->pager->ynum * inst->pager->zone->h;
-evas_object_size_hint_aspect_set(inst->o_pager, 
EVAS_ASPECT_CONTROL_VERTICAL, aspect_w, aspect_h);
+evas_object_size_hint_aspect_set(inst->o_pager, 
EVAS_ASPECT_CONTROL_BOTH, aspect_w, aspect_h);
  }
-   aspect_ratio = (double)aspect_w / (double)aspect_h;
-
-   if (aspect_ratio > 1.0)
- evas_object_size_hint_min_set(inst->o_pager, 4 * aspect_ratio, 4);
-   else
- evas_object_size_hint_min_set(inst->o_pager, 4, 4 * aspect_ratio);
 }
 
 static void
@@ -308,10 +302,6 @@ _pager_recalc(void *data)
if ((p->inst) && (p->inst->o_pager))
  {
 _pager_orient(p->inst, 
e_gadget_site_orient_get(e_gadget_site_get(p->inst->o_pager)));
-if (p->invert)
-  evas_object_size_hint_min_set(p->inst->o_pager, p->ynum * w, p->xnum 
* h);
-else
-  evas_object_size_hint_min_set(p->inst->o_pager, p->xnum * w, p->ynum 
* h);
  }
 }
 
@@ -442,7 +432,6 @@ _pager_desk_new(Pager *p, E_Desk *desk, int xpos, int ypos, 
Eina_Bool invert)
  edje_object_signal_emit(o, "e,name,show", "e");
 
edje_object_size_min_calc(o, , );
-   evas_object_size_hint_min_set(o, w, h);
 
E_EXPAND(o);
E_FILL(o);

-- 




[EGIT] [core/enlightenment] master 02/02: force gadget site recalc from style object if gadget's hints change

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=46cad09e3e2f7aa6d89b661b4745c60f1e199348

commit 46cad09e3e2f7aa6d89b661b4745c60f1e199348
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 11:16:57 2016 -0400

force gadget site recalc from style object if gadget's hints change

ensure that these intermediate objects trigger recalcs as expected

fix T4809
---
 src/bin/e_gadget.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 2aceb4d..1c03a45 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -1613,6 +1613,13 @@ e_gadget_drop_handler_add(Evas_Object *g, void *data,
return drop_object;
 }
 
+static void
+_gadget_style_hints(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+   E_Gadget_Config *zgc = data;
+   evas_object_smart_need_recalculate_set(zgc->site->layout, 1);
+}
+
 E_API Evas_Object *
 e_gadget_util_layout_style_init(Evas_Object *g, Evas_Object *style)
 {
@@ -1647,6 +1654,7 @@ e_gadget_util_layout_style_init(Evas_Object *g, 
Evas_Object *style)
   elm_box_unpack(zgc->site->layout, prev);
  }
evas_object_raise(zgc->site->events);
+   evas_object_event_callback_del(prev, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 
_gadget_style_hints);
if (!style) return prev;
 
evas_object_data_set(style, "__e_gadget", zgc);
@@ -1654,6 +1662,7 @@ e_gadget_util_layout_style_init(Evas_Object *g, 
Evas_Object *style)
elm_layout_sizing_eval(style);
evas_object_smart_calculate(style);
evas_object_size_hint_min_get(style, >style.minw, >style.minh);
+   evas_object_event_callback_add(style, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 
_gadget_style_hints, zgc);
evas_object_show(style);
evas_object_smart_callback_add(zgc->display, "gadget_popup", _gadget_popup, 
zgc->site);
return prev;

-- 




[EGIT] [core/efl] master 01/01: theme: remove text.min from bryce sizing text

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

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

commit 90afe6ab6174b5b4d54b41f22d236f9921fd3705
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 11:29:49 2016 -0400

theme: remove text.min from bryce sizing text

this causes bogus min size calc values

ref T4809
---
 data/elementary/themes/edc/bryce.edc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/elementary/themes/edc/bryce.edc 
b/data/elementary/themes/edc/bryce.edc
index f265d3d..3f59540 100644
--- a/data/elementary/themes/edc/bryce.edc
+++ b/data/elementary/themes/edc/bryce.edc
@@ -118,7 +118,6 @@ group { name: "e/bryce/default/base"; nomouse;
  desc { hid;
 color: 255 255 255 0;
 text { font: "Sans:style=Bold"; size: 14;
-   min: 1 1;
ellipsis: -1;
 }
  }

-- 




[EGIT] [core/enlightenment] master 01/01: Pager Gadget: Respect HOLD flag as well as modifiers on mouse events.

2016-11-02 Thread Stephen okra Houston
okra pushed a commit to branch master.

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

commit df0c4cf65857dc377500bb32a3de466cd6c1ba8c
Author: Stephen okra Houston 
Date:   Wed Nov 2 10:22:50 2016 -0500

Pager Gadget: Respect HOLD flag as well as modifiers on mouse events.
---
 src/modules/pager/gadget/pager.c | 51 ++--
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/src/modules/pager/gadget/pager.c b/src/modules/pager/gadget/pager.c
index 85aa659..df621f8 100644
--- a/src/modules/pager/gadget/pager.c
+++ b/src/modules/pager/gadget/pager.c
@@ -141,6 +141,16 @@ static Eina_List *pagers = NULL;
 static E_Action *act_popup_show = NULL;
 static E_Action *act_popup_switch = NULL;
 
+static Eina_Bool
+_pager_check_modifiers(Evas_Modifier *modifiers)
+{
+   if ((evas_key_modifier_is_set(modifiers, "Alt")) ||
+   (evas_key_modifier_is_set(modifiers, "Control")) ||
+   (evas_key_modifier_is_set(modifiers, "Shift")))
+ return EINA_TRUE;
+   return EINA_FALSE;
+}
+
 static Pager_Win *
 _pager_desk_window_find(Pager_Desk *pd, E_Client *client)
 {
@@ -843,6 +853,7 @@ _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj EINA_UNU
Evas_Event_Mouse_Down *ev = event_info;
 
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
if (ev->button != 3) return;
if(!pager_config) return;
if (cfg_dialog) return;
@@ -1021,20 +1032,26 @@ _pager_window_cb_del(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj EINA_UNUS
 }
 
 static void
-_pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info EINA_UNUSED)
+_pager_window_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
+   Evas_Event_Mouse_Up *ev = event_info;
Pager_Win *pw = data;
 
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
+
pw->drag.button = 0;
 }
 
 static void
 _pager_window_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
-   Evas_Event_Mouse_Down *ev;
+   Evas_Event_Mouse_Down *ev = event_info;
Pager_Win *pw;
 
-   ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
+
pw = data;
 
if (!pw) return;
@@ -1063,7 +1080,7 @@ _pager_window_cb_mouse_down(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj EI
 static void
 _pager_window_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
-   Evas_Event_Mouse_Move *ev;
+   Evas_Event_Mouse_Move *ev = event_info;
Pager_Win *pw;
E_Drag *drag;
Evas_Object *o;
@@ -1073,9 +1090,10 @@ _pager_window_cb_mouse_move(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj EI
Evas_Coord dx, dy;
unsigned int resist = 0;
 
-   ev = event_info;
pw = data;
 
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
if (!pw) return;
if (pw->client->lock_user_location) return;
if ((pw->desk->pager->popup) && (!act_popup)) return;
@@ -1365,11 +1383,13 @@ _pager_drop_cb_drop(void *data, const char *type, void 
*event_info)
 static void
 _pager_desk_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
-   Evas_Event_Mouse_Down *ev;
+   Evas_Event_Mouse_Down *ev = event_info;
Pager_Desk *pd;
Evas_Coord ox, oy;
 
-   ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
+
pd = data;
if (!pd) return;
if ((!pd->pager->popup) && (ev->button == 3)) return;
@@ -1394,11 +1414,13 @@ _pager_desk_cb_mouse_down(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj EINA
 static void
 _pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
-   Evas_Event_Mouse_Up *ev;
+   Evas_Event_Mouse_Up *ev = event_info;
Pager_Desk *pd;
Pager *p;
 
-   ev = event_info;
+   if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
+   if (_pager_check_modifiers(ev->modifiers)) return;
+
pd = data;
 
if (!pd) return;
@@ -1426,7 +1448,7 @@ _pager_desk_cb_mouse_up(void *data, Evas *e EINA_UNUSED, 
Evas_Object *obj EINA_U
 static void
 _pager_desk_cb_mouse_move(void *data, Evas *e EINA_UNUSED, Evas_Object *obj 
EINA_UNUSED, void *event_info)
 {
-   Evas_Event_Mouse_Move *ev;
+   Evas_Event_Mouse_Move *ev = event_info;
Pager_Desk *pd;
Evas_Coord dx, dy;
unsigned int resist = 0;
@@ -1435,7 +1457,8 @@ _pager_desk_cb_mouse_move(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj EINA
Evas_Coord x, y, w, h;
const char *drag_types[] = { "enlightenment/vdesktop" };
 
-   ev = event_info;
+ 

[EGIT] [core/efl] master 01/01: theme: trigger recalc from time's clock themes when object is resized

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

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

commit e92a8cdb81211d486be1b48e2985354a7db30b49
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 11:19:54 2016 -0400

theme: trigger recalc from time's clock themes when object is resized
---
 data/elementary/themes/edc/time.edc | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/data/elementary/themes/edc/time.edc 
b/data/elementary/themes/edc/time.edc
index 41674d7..712d4a7 100644
--- a/data/elementary/themes/edc/time.edc
+++ b/data/elementary/themes/edc/time.edc
@@ -104,6 +104,9 @@ group { "e/gadget/clock/digital/advanced"; nomouse;
  action: STATE_SET "only";
  targets: "e.text" "e.text.sub" "e.sizer";
   }
+  program { signal: "resize";
+action: SIGNAL_EMIT "e,state,sizing,changed" "e";
+  }
}
 }
 group { name: "e/gadget/clock/digital";
@@ -691,6 +694,9 @@ group { name: "e/gadget/clock/digital";
 reset();
  }
   }
+  program { signal: "resize";
+action: SIGNAL_EMIT "e,state,sizing,changed" "e";
+  }
 #define DIGPRG(_NAME) \
   program { \
  signal: "show,"_NAME; source: "c"; \

-- 




[EGIT] [tools/eflete] master 01/01: workspace: move part marker on scroll

2016-11-02 Thread Vitalii Vorobiov
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=80ac01de0a001c1795df9a7dfb32c63d4f75fd3d

commit 80ac01de0a001c1795df9a7dfb32c63d4f75fd3d
Author: Vitalii Vorobiov 
Date:   Wed Nov 2 15:56:46 2016 +0200

workspace: move part marker on scroll

because on scroll all sizes weren't changing, its important to get
sizes and positions of the primitive and use those, more fresh data.
Groupedit_Geometry is not required since its not always updated

Fixes T4475
---
 src/bin/ui/workspace/groupview.c | 29 ++
 src/bin/ui/workspace/groupview.h | 63 ++--
 src/bin/ui/workspace/workspace.c | 46 ++---
 3 files changed, 112 insertions(+), 26 deletions(-)

diff --git a/src/bin/ui/workspace/groupview.c b/src/bin/ui/workspace/groupview.c
index da68fe1..b01e181 100644
--- a/src/bin/ui/workspace/groupview.c
+++ b/src/bin/ui/workspace/groupview.c
@@ -345,6 +345,19 @@ groupview_part_geom_get(Evas_Object *obj, const char *part)
return geom;
 }
 
+void
+groupview_primitive_geom_get(Evas_Object *obj, const char *part, Evas_Coord 
*x1, Evas_Coord *y1, Evas_Coord *w1, Evas_Coord *h1)
+{
+   Groupview_Part *gp;
+
+   GROUPVIEW_DATA_GET(obj, sd)
+
+   gp = _parts_list_find(sd->parts, part);
+   if (!gp) return;
+
+   evas_object_geometry_get(gp->draw, x1, y1, w1, h1);
+}
+
 const Groupview_Geom *
 groupview_part_selected_geom_get(Evas_Object *obj)
 {
@@ -357,6 +370,14 @@ groupview_part_selected_geom_get(Evas_Object *obj)
return geom;
 }
 
+void
+groupview_primitive_selected_geom_get(Evas_Object *obj, Evas_Coord *x1, 
Evas_Coord *y1, Evas_Coord *w1, Evas_Coord *h1)
+{
+   GROUPVIEW_DATA_GET(obj, sd)
+
+   evas_object_geometry_get(sd->selected->draw, x1, y1, w1, h1);
+}
+
 Eina_Bool
 groupview_part_add(Evas_Object *obj, Part2 *part)
 {
@@ -420,6 +441,14 @@ groupview_part_object_area_visible_set(Evas_Object *obj, 
Eina_Bool visible)
highlight_handler_align_visible_set(sd->highlight, visible);
 }
 
+void
+groupview_primitive_area_selected_geom_get(Evas_Object *obj, Evas_Coord *x1, 
Evas_Coord *y1, Evas_Coord *w1, Evas_Coord *h1)
+{
+   GROUPVIEW_DATA_GET(obj, sd)
+
+   evas_object_geometry_get(sd->object_area, x1, y1, w1, h1);
+}
+
 Eina_Bool
 groupview_part_object_area_visible_get(Evas_Object *obj)
 {
diff --git a/src/bin/ui/workspace/groupview.h b/src/bin/ui/workspace/groupview.h
index e1986b0..cbd9282 100644
--- a/src/bin/ui/workspace/groupview.h
+++ b/src/bin/ui/workspace/groupview.h
@@ -48,6 +48,7 @@
 #include "highlight.h"
 #include "resource_manager2.h"
 
+TODO("Check if this structure is really important and required for 
workspace/groupedit modules")
 struct _Geom{
int x, y, w, h;
 };
@@ -133,10 +134,10 @@ groupview_hard_update(Evas_Object *obj);
 /**
  * Get the geomentry.
  *
- * @paramaram obj The groupview object,
- * @paramaram part The part name.
+ * @param obj The groupview object,
+ * @param part The part name.
  *
- * @returneturn The Groupview_Geom, or NULL if any part is notselected
+ * @return The Groupview_Geom, or NULL if any part is notselected
  *
  * @ingroup Groupview
  */
@@ -144,6 +145,26 @@ const Groupview_Geom *
 groupview_part_geom_get(Evas_Object *obj, const char *part);
 
 /**
+ * Get the geomentry of the primitive of given part.
+ *
+ * @param obj The groupview object,
+ * @param part The part name.
+ * @param x Variable to store geometry value x (position).
+ * @param y Variable to store geometry value y (position).
+ * @param w Variable to store geometry value w (width).
+ * @param h Variable to store geometry value h (height).
+ *
+ * @ingroup Groupview
+ */
+void
+groupview_primitive_geom_get(Evas_Object *obj,
+ const char *part,
+ Evas_Coord *x,
+ Evas_Coord *y,
+ Evas_Coord *w,
+ Evas_Coord *h);
+
+/**
  * Get the selected part geomentry.
  *
  * @param obj The groupview object,
@@ -156,6 +177,24 @@ const Groupview_Geom *
 groupview_part_selected_geom_get(Evas_Object *obj);
 
 /**
+ * Get the geomentry of the primitive of selected part.
+ *
+ * @param obj The groupview object,
+ * @param x Variable to store geometry value x (position).
+ * @param y Variable to store geometry value y (position).
+ * @param w Variable to store geometry value w (width).
+ * @param h Variable to store geometry value h (height).
+ *
+ * @ingroup Groupview
+ */
+void
+groupview_primitive_selected_geom_get(Evas_Object *obj,
+  Evas_Coord *x,
+  Evas_Coord *y,
+  Evas_Coord *w,
+  Evas_Coord *h);
+
+/**
  * Add to groupview a new part. The function add part to edje edit object and
  * add groupview part.
  *
@@ -193,6 +232,24 @@ 

[EGIT] [core/enlightenment] master 01/01: Luncher/Pager Gadget: Fix coverity issues.

2016-11-02 Thread Stephen okra Houston
okra pushed a commit to branch master.

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

commit ef8d86d7f368859c0a7e3c2e017b31ba27f8
Author: Stephen okra Houston 
Date:   Wed Nov 2 09:34:10 2016 -0500

Luncher/Pager Gadget: Fix coverity issues.
---
 src/modules/luncher/bar.c| 19 ++-
 src/modules/luncher/config.c |  4 ++--
 src/modules/pager/gadget/pager.c | 12 ++--
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/modules/luncher/bar.c b/src/modules/luncher/bar.c
index fc8d498..45cc717 100644
--- a/src/modules/luncher/bar.c
+++ b/src/modules/luncher/bar.c
@@ -271,6 +271,7 @@ static Evas_Object *
 _bar_icon_menu_item_new(Icon *ic, Evas_Object *popup, Evas_Object *parent, 
const char *name, const char *icon)
 {
const char *path = NULL, *k = NULL;
+   char buf[4096];
int len = 0;
Evas_Object *layout, *label, *img;
 
@@ -312,7 +313,6 @@ _bar_icon_menu_item_new(Icon *ic, Evas_Object *popup, 
Evas_Object *parent, const
  }
if (!path)
  {
-char buf[4096];
 snprintf(buf, sizeof(buf), "e/icons/%s", icon);
 if (eina_list_count(e_theme_collection_items_find("base/theme/icons", 
buf)))
   {
@@ -743,7 +743,9 @@ _bar_icon_preview_show(void *data)
ic->mouse_in_timer = NULL;
if (ic->drag.dnd)
  return EINA_FALSE;
-   if (!ic->inst && !ic->inst->o_icon_con)
+   if (!ic->inst)
+ return EINA_FALSE;
+   if (!ic->inst->o_icon_con)
  return EINA_FALSE;
 
orient = e_gadget_site_orient_get(e_gadget_site_get(ic->inst->o_main));
@@ -893,6 +895,7 @@ static Icon *
 _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, E_Client 
*non_desktop_client)
 {
const char *path = NULL, *k = NULL;
+   char buf[4096];
int len = 0;
Icon *ic;
const Eina_List *l;
@@ -943,7 +946,6 @@ _bar_icon_add(Instance *inst, Efreet_Desktop *desktop, 
E_Client *non_desktop_cli
   }
 if (!path)
   {
- char buf[4096];
  snprintf(buf, sizeof(buf), "e/icons/%s", desktop->icon);
  if 
(eina_list_count(e_theme_collection_items_find("base/theme/icons", buf)))
{
@@ -1079,10 +1081,10 @@ _bar_cb_client_remove(void *data EINA_UNUSED, int type 
EINA_UNUSED, E_Event_Clie
   {
  if (ic->starting) elm_layout_signal_emit(ic->o_layout, 
"e,state,started", "e");
  ic->starting = EINA_FALSE;
- if (ev->ec->exe_inst)
-   ic->execs = eina_list_remove(ic->execs, ev->ec->exe_inst);
  if (ev->ec)
ic->clients = eina_list_remove(ic->clients, ev->ec);
+ if (ev->ec->exe_inst)
+   ic->execs = eina_list_remove(ic->execs, ev->ec->exe_inst);
  if (!eina_list_count(ic->execs) && !eina_list_count(ic->clients))
{
   elm_layout_signal_emit(ic->o_layout, "e,state,off", "e");
@@ -1176,8 +1178,7 @@ _bar_cb_exec_client_prop(void *data EINA_UNUSED, int type 
EINA_UNUSED, E_Event_C
 Icon *ic = NULL;
 char buf[4096];
 
-if (ev->ec)
-  ic = _bar_icon_match(inst, ev->ec);
+ic = _bar_icon_match(inst, ev->ec);
 
 if (skip && !ic) continue;
 if (!skip)
@@ -1362,7 +1363,6 @@ _bar_fill(Instance *inst)
   if (!ec->netwm.state.skip_taskbar)
 {
skip = EINA_FALSE;
-   break;
 }
   if (skip) continue;
   ic = _bar_icon_match(inst, ec);
@@ -1406,11 +1406,12 @@ _bar_resize_job(void *data)
Instance *inst = data;
Eina_List *l;
Icon *ic;
-   E_Gadget_Site_Orient orient = 
e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
+   E_Gadget_Site_Orient orient;
Evas_Coord x, y, w, h, size;
 
if (inst)
  {
+ orient = e_gadget_site_orient_get(e_gadget_site_get(inst->o_main));
 elm_layout_sizing_eval(inst->o_main);
 evas_object_geometry_get(inst->o_main, , , , );
 switch (orient)
diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c
index 07c0cc5..00c9916 100644
--- a/src/modules/luncher/config.c
+++ b/src/modules/luncher/config.c
@@ -19,7 +19,7 @@ _config_source_changed(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_inf
  return;
if (inst->cfg->dir) eina_stringshare_del(inst->cfg->dir);
inst->cfg->dir = NULL;
-   if (dir) inst->cfg->dir = eina_stringshare_ref(dir); 
+   inst->cfg->dir = eina_stringshare_ref(dir); 
bar_reorder(inst);
 }
 
@@ -176,6 +176,7 @@ static void
 _icon_theme_file_set(Evas_Object *img, const char *icon)
 {
const char *path = NULL, *k = NULL;
+   char buf[4096];
int len = 0;
 
if (!icon)
@@ -195,7 +196,6 @@ _icon_theme_file_set(Evas_Object *img, const char *icon)
  }
if (!path)
  {
-char buf[4096];
 snprintf(buf, 

[EGIT] [core/enlightenment] master 01/01: mixer: fix coverity issues

2016-11-02 Thread yoz
yoz pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2a0b4dfbc416b24761fed67362c7292228bce031

commit 2a0b4dfbc416b24761fed67362c7292228bce031
Author: Michaël Bouchaud (yoz) 
Date:   Wed Nov 2 15:27:17 2016 +0100

mixer: fix coverity issues
---
 src/modules/mixer/e_mod_main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c
index e3a3773..29cb046 100644
--- a/src/modules/mixer/e_mod_main.c
+++ b/src/modules/mixer/e_mod_main.c
@@ -387,7 +387,7 @@ _actions_unregister(void)
 mixer_context->actions.decr_app = NULL;
  }
 
-   if (mixer_context->actions.incr_app)
+   if (mixer_context->actions.mute_app)
  {
 e_action_predef_name_del("Mixer",
  _("Mute Volume of Focuse Application"));
@@ -890,7 +890,7 @@ _get_ppid(pid_t pid)
 ERR("Can't open %s, maybee the process exited.", buf);
 return -1;
  }
-   read(fd, buf, sizeof(buf));
+   if ((read(fd, buf, sizeof(buf))) < 4) return -1;
buf[sizeof(buf) - 1] = '0';
s = strrchr(buf, ')');
s += 3;

-- 




[EGIT] [core/enlightenment] master 01/01: feed mouse-up when dropping a gadget site before enabling events on the site

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6723756d6b86b056c1c24efaab6268f91eddc283

commit 6723756d6b86b056c1c24efaab6268f91eddc283
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 10:20:04 2016 -0400

feed mouse-up when dropping a gadget site before enabling events on the site

prevents unintentional activation of gadget actions during moves
---
 src/bin/e_gadget.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/e_gadget.c b/src/bin/e_gadget.c
index 74e1702..2aceb4d 100644
--- a/src/bin/e_gadget.c
+++ b/src/bin/e_gadget.c
@@ -1955,6 +1955,7 @@ _editor_pointer_button(Gadget_Item *active, int t 
EINA_UNUSED, Ecore_Event_Mouse
 evas_object_geometry_get(active->site, , , , );
 if ((ev->buttons == 1) && E_INSIDE(ev->x, ev->y, x, y, w, h))
   evas_object_smart_callback_call(active->site, "gadget_site_dropped", 
pointer_site);
+e_comp_canvas_feed_mouse_up(0);
 evas_object_pass_events_set(active->site, 0);
 elm_object_disabled_set(active->editor, 1);
 e_comp_object_util_del_list_remove(active->editor, pointer_site);
@@ -1982,6 +1983,7 @@ _editor_pointer_button(Gadget_Item *active, int t 
EINA_UNUSED, Ecore_Event_Mouse
   }
 zgs = evas_object_data_get(pointer_site, "__e_gadget_site");
 zgc = eina_list_data_get(zgs->gadgets);
+e_comp_canvas_feed_mouse_up(0);
 evas_object_pass_events_set(zgc->orig->site->layout, 0);
 if (zzgs)
   {

-- 




[EGIT] [core/enlightenment] master 01/01: add bool return for e_exec_phony_del() to return deletion success

2016-11-02 Thread Mike Blumenkrantz
discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=4e08ad17e8bc3fde90dede68b2c29a04f811fc40

commit 4e08ad17e8bc3fde90dede68b2c29a04f811fc40
Author: Mike Blumenkrantz 
Date:   Wed Nov 2 10:11:02 2016 -0400

add bool return for e_exec_phony_del() to return deletion success

CID 1181927
---
 src/bin/e_client.c |  9 ++---
 src/bin/e_exec.c   | 17 +
 src/bin/e_exec.h   |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 6c204f4..65766fb 100644
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -586,15 +586,18 @@ _e_client_del(E_Client *ec)
if (ec->exe_inst)
  {
 if (ec->exe_inst->phony && (eina_list_count(ec->exe_inst->clients) == 
1))
-  e_exec_phony_del(ec->exe_inst);
+  {
+ if (e_exec_phony_del(ec->exe_inst))
+   ec->exe_inst = NULL;
+  }
 else
   {
  if (!ec->exe_inst->deleted)
ec->exe_inst->clients = eina_list_remove(ec->exe_inst->clients, 
ec);
   }
-if (!ec->exe_inst->deleted)
-  ec->exe_inst = NULL;
  }
+   if (ec->exe_inst && (!ec->exe_inst->deleted))
+ ec->exe_inst = NULL;
 
_e_client_mouse_action_end(ec);
if (action_client == ec) _e_client_action_finish();
diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c
index d9f29fc..702ede4 100644
--- a/src/bin/e_exec.c
+++ b/src/bin/e_exec.c
@@ -65,7 +65,7 @@ static Evas_Object *_basic_create_widgets(E_Config_Dialog 
*cfd, Evas *evas,
 static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas 
*evas, E_Config_Dialog_Data *cfdata);
 static Evas_Object *_dialog_scrolltext_create(Evas *evas, char *title, 
Ecore_Exe_Event_Data_Line *lines);
 static void _dialog_save_cb(void *data, void *data2);
-static void _e_exec_instance_free(E_Exec_Instance *inst);
+static Eina_Bool_e_exec_instance_free(E_Exec_Instance *inst);
 
 /* local subsystem globals */
 static Eina_List *e_exec_start_pending = NULL;
@@ -211,14 +211,14 @@ e_exec(E_Zone *zone, Efreet_Desktop *desktop, const char 
*exec,
return inst;
 }
 
-E_API void
+E_API Eina_Bool
 e_exec_phony_del(E_Exec_Instance *inst)
 {
-   if (!inst) return;
-   EINA_SAFETY_ON_TRUE_RETURN(!inst->phony);
+   if (!inst) return EINA_TRUE;
+   EINA_SAFETY_ON_TRUE_RETURN_VAL(!inst->phony, EINA_FALSE);
inst->ref--;
_e_exe_instance_watchers_call(inst, E_EXEC_WATCH_STOPPED);
-   _e_exec_instance_free(inst);
+   return _e_exec_instance_free(inst);
 }
 
 E_API E_Exec_Instance *
@@ -587,13 +587,13 @@ _e_exec_cb_expire_timer(void *data)
return ECORE_CALLBACK_CANCEL;
 }
 
-static void
+static Eina_Bool
 _e_exec_instance_free(E_Exec_Instance *inst)
 {
Eina_List *instances;
E_Client *ec;
 
-   if (inst->ref) return;
+   if (inst->ref) return EINA_FALSE;
E_FREE_LIST(inst->watchers, free);
if (inst->key)
  {
@@ -613,7 +613,7 @@ _e_exec_instance_free(E_Exec_Instance *inst)
 inst->deleted = 1;
 inst->ref++;
 ecore_event_add(E_EVENT_EXEC_DEL, inst, _e_exec_cb_exec_del_free, 
inst);
-return;
+return EINA_FALSE;
  }
if (inst->desktop)
  e_exec_start_pending = eina_list_remove(e_exec_start_pending,
@@ -629,6 +629,7 @@ _e_exec_instance_free(E_Exec_Instance *inst)
 if (inst->exe) ecore_exe_data_set(inst->exe, NULL);
  }
free(inst);
+   return EINA_TRUE;
 }
 
 /*
diff --git a/src/bin/e_exec.h b/src/bin/e_exec.h
index df59b1d..2aa1f42 100644
--- a/src/bin/e_exec.h
+++ b/src/bin/e_exec.h
@@ -36,7 +36,7 @@ EINTERN int  e_exec_shutdown(void);
 E_API void e_exec_executor_set(E_Exec_Instance *(*func) (void *data, E_Zone 
*zone, Efreet_Desktop *desktop, const char *exec, Eina_List *files, const char 
*launch_method), const void *data);
 E_API E_Exec_Instance *e_exec(E_Zone *zone, Efreet_Desktop *desktop, const 
char *exec, Eina_List *files, const char *launch_method);
 E_API E_Exec_Instance *e_exec_phony(E_Client *ec);
-E_API void e_exec_phony_del(E_Exec_Instance *inst);
+E_API Eina_Bool e_exec_phony_del(E_Exec_Instance *inst);
 E_API E_Exec_Instance *e_exec_startup_id_pid_instance_find(int id, pid_t pid);
 E_API Efreet_Desktop *e_exec_startup_id_pid_find(int startup_id, pid_t pid);
 E_API E_Exec_Instance *e_exec_startup_desktop_instance_find(Efreet_Desktop 
*desktop);

-- 




[EGIT] [core/efl] master 01/01: elput: Add API to allow setting pointer acceleration profile

2016-11-02 Thread Christopher Michael
devilhorns pushed a commit to branch master.

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

commit 93f7639c0d23e752ad330ab6fb1cd02d5e5d3432
Author: Chris Michael 
Date:   Wed Nov 2 09:44:13 2016 -0400

elput: Add API to allow setting pointer acceleration profile

This patch adds an API that can be used to set a pointer acceleration
profile. This API should be used when addressing T4736

ref T4736

@feature

Signed-off-by: Chris Michael 
---
 src/lib/elput/Elput.h   | 12 
 src/lib/elput/elput_input.c | 35 +++
 2 files changed, 47 insertions(+)

diff --git a/src/lib/elput/Elput.h b/src/lib/elput/Elput.h
index a587b14..bd4fe7a 100644
--- a/src/lib/elput/Elput.h
+++ b/src/lib/elput/Elput.h
@@ -413,6 +413,18 @@ EAPI void 
elput_input_keyboard_cached_keymap_set(Elput_Manager *manager, void *k
  */
 EAPI Eina_Stringshare *elput_input_device_output_name_get(Elput_Device 
*device);
 
+/**
+ * Set the pointer acceleration profile
+ *
+ * @param manager
+ * @param seat
+ * @param profile
+ *
+ * @ingroup Elput_Input_Group
+ * @since 1.19
+ */
+EAPI void elput_input_pointer_accel_profile_set(Elput_Manager *manager, const 
char *seat, uint32_t profile);
+
 # endif
 
 # undef EAPI
diff --git a/src/lib/elput/elput_input.c b/src/lib/elput/elput_input.c
index daa3675..1dde85a 100644
--- a/src/lib/elput/elput_input.c
+++ b/src/lib/elput/elput_input.c
@@ -638,3 +638,38 @@ elput_input_device_output_name_get(Elput_Device *device)
if (!device->output_name) return NULL;
return eina_stringshare_ref(device->output_name);
 }
+
+EAPI void
+elput_input_pointer_accel_profile_set(Elput_Manager *manager, const char 
*seat, uint32_t profile)
+{
+   Elput_Seat *eseat;
+   Elput_Device *edev;
+   Eina_List *l, *ll;
+
+   EINA_SAFETY_ON_NULL_RETURN(manager);
+
+   /* if no seat name is passed in, just use default seat name */
+   if (!seat) seat = "seat0";
+
+   EINA_LIST_FOREACH(manager->input.seats, l, eseat)
+ {
+if ((eseat->name) && (strcmp(eseat->name, seat)))
+  continue;
+
+EINA_LIST_FOREACH(eseat->devices, ll, edev)
+  {
+ if (!libinput_device_has_capability(edev->device,
+ LIBINPUT_DEVICE_CAP_POINTER))
+   continue;
+
+ if (libinput_device_config_accel_set_profile(edev->device,
+  profile) !=
+ LIBINPUT_CONFIG_STATUS_SUCCESS)
+   {
+  WRN("Failed to set acceleration profile for device: %s",
+  libinput_device_get_name(edev->device));
+  continue;
+   }
+  }
+ }
+}

-- 




[EGIT] [tools/eflete] master 01/01: main_window: use elm_object_parent_widget_get instead efl_parent_get

2016-11-02 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=85cd1ed49a3e0853a9813d86f6a8b09abebdb3e5

commit 85cd1ed49a3e0853a9813d86f6a8b09abebdb3e5
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 2 15:07:24 2016 +0200

main_window: use elm_object_parent_widget_get instead efl_parent_get

This is need for more easly port to efl-1.16

Change-Id: Ibca477226e267e46717f52ba1d09c3497de7
---
 src/bin/ui/main_window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 2fded4d..fd8b676 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -409,7 +409,7 @@ _content_get(void *data __UNUSED__, Evas_Object *obj, const 
char *pr __UNUSED__)
if (!strcmp(pr, "change.button"))
  {
 Evas_Object *change_button = elm_button_add(obj);
-Evas_Object *layout = efl_parent_get(obj);
+Evas_Object *layout = elm_object_parent_widget_get(obj);
 evas_object_data_set(change_button, "layout", layout);
 elm_object_style_set(change_button, "edit");
 evas_object_smart_callback_add(change_button, "clicked", 
_change_shortcut, data);

-- 




[EGIT] [core/efl] master 01/01: eolian: rename ref to ptr to avoid confusion with eo refs

2016-11-02 Thread Daniel Kolesa
q66 pushed a commit to branch master.

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

commit c4f64a339022ab99fdc5e37162e15fbf5e6f50ca
Author: Daniel Kolesa 
Date:   Wed Nov 2 13:06:38 2016 +0100

eolian: rename ref to ptr to avoid confusion with eo refs
---
 src/lib/eo/efl_object.eo   | 28 ++---
 src/lib/eolian/eo_lexer.h  |  2 +-
 src/lib/eolian/eo_parser.c |  2 +-
 src/tests/eolian/data/class_simple.eo  |  4 +-
 src/tests/eolian/data/struct.eo|  2 +-
 .../eolian_cxx/name1_name2_type_generation.eo  | 46 +++---
 6 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo
index 703c53f..3192061 100644
--- a/src/lib/eo/efl_object.eo
+++ b/src/lib/eo/efl_object.eo
@@ -11,7 +11,7 @@ struct Efl.Event.Description {
 struct Efl.Event {
  [[Parameter passed in event callbacks holding extra event parameters]]
  object: Efl.Object; [[The object the event was called on.]]
- desc: ref(const(Efl.Event.Description)); [[The event description.]]
+ desc: ptr(const(Efl.Event.Description)); [[The event description.]]
  info: void_ptr; [[Extra event information passed by the event caller.]]
 }
 
@@ -23,7 +23,7 @@ struct Efl.Callback_Array_Item {
 
   See also \@ref efl_event_callback_array_add.
 ]]
-desc: ref(const(Efl.Event.Description)); [[The event description.]]
+desc: ptr(const(Efl.Event.Description)); [[The event description.]]
 func: Efl.Event_Cb; [[The callback function.]]
 }
 
@@ -199,13 +199,13 @@ abstract Efl.Object ()
being freed.
  ]]
  params {
-@in wref: ref(Efl.Object);
+@in wref: ptr(Efl.Object);
  }
   }
   wref_del {
  [[Delete the weak reference passed.]]
  params {
-@in wref: ref(Efl.Object);
+@in wref: ptr(Efl.Object);
  }
   }
   @property key_data {
@@ -289,7 +289,7 @@ abstract Efl.Object ()
 key: string; [[the key associated with the value]]
  }
  values {
-value: ref(generic_value); [[the value to set]]
+value: ptr(generic_value); [[the value to set]]
  }
   }
   event_thaw {
@@ -324,7 +324,7 @@ abstract Efl.Object ()
  ]]
  return: bool; [[Return $true when the callback has been successfully 
added.]]
  params {
-@in desc: ref(const(Efl.Event.Description)); [[The description of 
the event to listen to]]
+@in desc: ptr(const(Efl.Event.Description)); [[The description of 
the event to listen to]]
 @in priority: Efl.Callback_Priority; [[The priority of the 
callback]]
 @in cb: Efl.Event_Cb; [[the callback to call]]
 @in data: const(void_ptr); [[additional data to pass to the 
callback]]
@@ -334,7 +334,7 @@ abstract Efl.Object ()
  [[Del a callback with a specific data associated to it for an event.]]
  return: bool; [[Return $true when the callback has been successfully 
removed.]]
  params {
-@in desc: ref(const(Efl.Event.Description)); [[The description of 
the event to listen to]]
+@in desc: ptr(const(Efl.Event.Description)); [[The description of 
the event to listen to]]
 @in func: Efl.Event_Cb; [[the callback to delete]]
 @in user_data: const(void_ptr); [[The data to compare]]
  }
@@ -349,7 +349,7 @@ abstract Efl.Object ()
  ]]
  return: bool; [[Return $true when the callback has been successfully 
added.]]
  params {
-@in array: ref(const(Efl.Callback_Array_Item)); [[an 
#Efl_Callback_Array_Item of events to listen to]]
+@in array: ptr(const(Efl.Callback_Array_Item)); [[an 
#Efl_Callback_Array_Item of events to listen to]]
 @in priority: Efl.Callback_Priority; [[The priority of the 
callback]]
 @in data: const(void_ptr); [[additional data to pass to the 
callback]]
  }
@@ -360,14 +360,14 @@ abstract Efl.Object ()
  ]]
  return: bool; [[Return $true when the callback has been successfully 
removed.]]
  params {
-@in array: ref(const(Efl.Callback_Array_Item)); [[an 
#Efl_Callback_Array_Item of events to listen to]]
+@in array: ptr(const(Efl.Callback_Array_Item)); [[an 
#Efl_Callback_Array_Item of events to listen to]]
 @in user_data: const(void_ptr); [[The data to compare]]
  }
   }
   event_callback_call {
  [[Call the callbacks for an event of an object.]]
  params {
-@in desc: ref(const(Efl.Event.Description)); [[The description of 
the event to call]]
+@in desc: ptr(const(Efl.Event.Description)); [[The description of 
the event to call]]
 

Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

2016-11-02 Thread Stephen Houston
Bahhh. Thought I did rebase. My bad. Git and I are still working on our
relationship.

On Wed, Nov 2, 2016, 3:41 AM Stefan Schmidt  wrote:

> Hello.
>
> On 01/11/16 20:21, Stephen okra Houston wrote:
> > okra pushed a commit to branch master.
> >
> >
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=722ef6442630a5598bec8ec55bb3d309518f7440
> >
> > commit 722ef6442630a5598bec8ec55bb3d309518f7440
> > Merge: 7304758 4d86c98
> > Author: Stephen okra Houston 
> > Date:   Tue Nov 1 13:28:33 2016 -0500
> >
> > Merge branch 'master' of git+ssh://
> git.enlightenment.org/core/enlightenment
>
> Let me remind you that we do not do merges. The only exception is fast
> forward merge commits for a bigger patch series. This merge commit needs
> to have a good commit message describing the whole series though.
>
> To me this looks more as if you merge a branch you worked in into master
> without rebasing. Please avoid this in the future.
>
> regards
> Stefan Schmidt
>
>
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


[E-devel] Fwd: Donations

2016-11-02 Thread Vincent Torri
Hello

The « Enlighenment.fr » association aims to help all the  actions
which are involved in  the development and diffusion of  «
Enlightenment » and the software libraries « EFL », as well as all the
FOSS using or linked in a way or another with these two components.

Currently, the donations can be done on https://www.enlightenment.org
(flatter or paypal), or (in french) http://enlightenment.fr/dons/

The donations have already been useful to help some people who want to
participate to events like fosdem, EDD, ... (travel, hostel, buying tshirts or
goodies to sell on the stands, etc...)

Currently, most of the donations are in a bank account (necessary for
the administrative part of the association). This account is not free,
that is, every trimester, some amount of money is taken from the
account. That is, if nobody donates, we will have no more money in the future.

So if you wish to help the project and its diffusion, feel free to
make some donations :-)

Vincent Torri
Treasurer of the Enlightenment.fr association

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


[EGIT] [core/efl] master 01/01: naviframe: Fix to process title show/hide signal immediately

2016-11-02 Thread Jaehyun Cho
jaehyun pushed a commit to branch master.

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

commit cccbad229898dd13331641b3ff82785190d6e93c
Author: Jaehyun Cho 
Date:   Wed Nov 2 19:51:47 2016 +0900

naviframe: Fix to process title show/hide signal immediately
---
 src/lib/elementary/elc_naviframe.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/elementary/elc_naviframe.c 
b/src/lib/elementary/elc_naviframe.c
index 959354e..b455a75 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -372,6 +372,7 @@ _item_title_enabled_update(Elm_Naviframe_Item_Data *nit, 
Eina_Bool transition)
 else
   elm_object_signal_emit(VIEW(nit), "elm,state,title,hide", "elm");
  }
+   edje_object_message_signal_process(elm_layout_edje_get(VIEW(nit)));
 }
 
 EOLIAN static Elm_Theme_Apply

-- 




[EGIT] [tools/eflete] master 01/03: eflete_exporter: update source code generation

2016-11-02 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=44894a48d514f4ba557f3973cd4dee7bed5954cc

commit 44894a48d514f4ba557f3973cd4dee7bed5954cc
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 2 10:36:12 2016 +0200

eflete_exporter: update source code generation

T4801

Change-Id: Ifb82b2b9c75041a5c52733b921224c2232b888ac
---
 src/bin/exporter/eflete_exporter.c | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/bin/exporter/eflete_exporter.c 
b/src/bin/exporter/eflete_exporter.c
index 8179e69..f0ab938 100644
--- a/src/bin/exporter/eflete_exporter.c
+++ b/src/bin/exporter/eflete_exporter.c
@@ -399,7 +399,7 @@ _group_source_code_export(const char *group)
 fclose(f);
 return NULL;
  }
-   code = edje_edit_source_generate(edje_obj);
+   code = edje_edit_object_source_generate(edje_obj);
fputs(_edc_header_get(), f);
fputs(code, f);
edje_edit_string_free(code);
@@ -416,7 +416,8 @@ _source_code_export(void *data __UNUSED__)
FILE *f;
Eina_List *l;
const char *g;
-   Eina_List *files;
+   Eina_Stringshare *source_code;
+   Eina_List *files, *color_classes;
 
fprintf(stdout, "Generate source code");
snprintf(buf, strlen(spath) + strlen("/"GEN_FILE_NAME) + 1,
@@ -440,6 +441,22 @@ _source_code_export(void *data __UNUSED__)
  }
else
  {
+color_classes = edje_edit_color_classes_list_get(obj);
+source_code = edje_edit_color_classes_source_generate(obj, 
color_classes);
+if (color_classes)
+  {
+ fputs(source_code, f);
+ fputs("\n", f);
+ eina_stringshare_del(source_code);
+  }
+fputs("collections {\n", f);
+source_code = edje_edit_data_source_generate(obj);
+if (source_code)
+  {
+ fputs(source_code, f);
+ fputs("\n", f);
+ eina_stringshare_del(source_code);
+  }
 EINA_LIST_FOREACH(groups, l, g)
   {
  char *name = _group_source_code_export(g);
@@ -464,6 +481,7 @@ _source_code_export(void *data __UNUSED__)
 }
}
   }
+fputs("}\n", f);
  }
fclose(f);
_build_script_write();

-- 




[EGIT] [tools/eflete] master 03/03: project_save: fix the return condition for export_edc flow

2016-11-02 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=b0a08f58226f6453c7536402602beeb983c05c25

commit b0a08f58226f6453c7536402602beeb983c05c25
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 2 10:41:57 2016 +0200

project_save: fix the return condition for export_edc flow

Change-Id: I0ec25a1f7bea60e2d3a4c314a7bd7033384a91ce
---
 src/bin/ui/project_close.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/project_close.c b/src/bin/ui/project_close.c
index df9377f..add6eb7 100644
--- a/src/bin/ui/project_close.c
+++ b/src/bin/ui/project_close.c
@@ -86,8 +86,8 @@ _progress_save_end(void *data __UNUSED__, PM_Project_Result 
result, Project *pro
   popup_add(_("Export source code"), NULL, BTN_CANCEL, NULL, 
NULL);
   return;
}
+ return;
   }
-return;
  }
progress_end(NULL, result, NULL);
 }

-- 




[EGIT] [tools/eflete] master 02/03: splash: fix the call events stack

2016-11-02 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=7224741b97040d187a0d0c05f001511867831f6f

commit 7224741b97040d187a0d0c05f001511867831f6f
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 2 10:37:13 2016 +0200

splash: fix the call events stack

The signal 'start' must be before signal 'end'.

@fix

Change-Id: Ide7da65d1a348d249cbdc07dc9ed5e8c77cbb928
---
 src/bin/ui/splash.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/splash.c b/src/bin/ui/splash.c
index b7c9848..6e0014e 100644
--- a/src/bin/ui/splash.c
+++ b/src/bin/ui/splash.c
@@ -61,13 +61,13 @@ _on_setup(void *data __UNUSED__,
   const char *source __UNUSED__)
 {
elm_object_focus_set(elm_object_focused_object_get(ap.win), false);
+   elm_layout_signal_emit(sdata.win, "start", "eflete");
if (sdata.setup)
  if (!sdata.setup(sdata.data, sdata.status))
{
   elm_layout_signal_emit(sdata.win, "end", "eflete");
   return;
}
-   elm_layout_signal_emit(sdata.win, "start", "eflete");
 }
 
 Evas_Object *

-- 




Re: [E-devel] [EGIT] [website/www-content] master 01/01: Wiki page debian-start changed with summary [Nuke more aptitude, don't forget to update before installing.] by Jean Guyomarc'h

2016-11-02 Thread Jean Guyomarc'h
Well, too late, now you have my noise back ;)
Jean


On Wed, Nov 2, 2016 at 9:47 AM, Jean Guyomarc'h
 wrote:
> Hi Stefan,
>
> the apt CLI is a tool that overcomes design flaws in apt-get, and is
> the (current) one recommanded by Debian.
> It is also prettier, output is colored by default :)
> You can find more details here:
> https://debian-handbook.info/browse/stable/sect.apt-get.html.
> Jean
>
>
> On Wed, Nov 2, 2016 at 9:41 AM, Stefan Schmidt  wrote:
>> Hello.
>>
>> On 01/11/16 21:24, Jean Guyomarc'h wrote:
>>> WWW-www.enlightenment.org pushed a commit to branch master.
>>>
>>> http://git.enlightenment.org/website/www-content.git/commit/?id=fbd104d2acd506bd4fd78a6e53912508993f9033
>>>
>>> commit fbd104d2acd506bd4fd78a6e53912508993f9033
>>> Author: Jean Guyomarc'h 
>>> Date:   Tue Nov 1 13:24:40 2016 -0700
>>>
>>> Wiki page debian-start changed with summary [Nuke more aptitude, don't 
>>> forget to update before installing.] by Jean Guyomarc'h
>>> ---
>>>  pages/distros/debian-start.txt | 3 ++-
>>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/pages/distros/debian-start.txt b/pages/distros/debian-start.txt
>>> index ec2de84..5e8a415 100644
>>> --- a/pages/distros/debian-start.txt
>>> +++ b/pages/distros/debian-start.txt
>>> @@ -18,6 +18,7 @@ cd enlight
>>>  Make sure all the dependencies are installed:
>>>
>>>  
>>> +sudo apt update
>>
>> Maybe I'm out of date here but would it not be apt-get?
>>
>> regards
>> Stefan Schmidt
>>
>> --
>> Developer Access Program for Intel Xeon Phi Processors
>> Access to Intel Xeon Phi processor-based developer platforms.
>> With one year of Intel Parallel Studio XE.
>> Training and support from Colfax.
>> Order your platform today. http://sdm.link/xeonphi
>> ___
>> enlightenment-devel mailing list
>> enlightenment-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] [EGIT] [website/www-content] master 01/01: Wiki page debian-start changed with summary [Nuke more aptitude, don't forget to update before installing.] by Jean Guyomarc'h

2016-11-02 Thread Jean Guyomarc'h
Hi Stefan,

the apt CLI is a tool that overcomes design flaws in apt-get, and is
the (current) one recommanded by Debian.
It is also prettier, output is colored by default :)
You can find more details here:
https://debian-handbook.info/browse/stable/sect.apt-get.html.
Jean


On Wed, Nov 2, 2016 at 9:41 AM, Stefan Schmidt  wrote:
> Hello.
>
> On 01/11/16 21:24, Jean Guyomarc'h wrote:
>> WWW-www.enlightenment.org pushed a commit to branch master.
>>
>> http://git.enlightenment.org/website/www-content.git/commit/?id=fbd104d2acd506bd4fd78a6e53912508993f9033
>>
>> commit fbd104d2acd506bd4fd78a6e53912508993f9033
>> Author: Jean Guyomarc'h 
>> Date:   Tue Nov 1 13:24:40 2016 -0700
>>
>> Wiki page debian-start changed with summary [Nuke more aptitude, don't 
>> forget to update before installing.] by Jean Guyomarc'h
>> ---
>>  pages/distros/debian-start.txt | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/pages/distros/debian-start.txt b/pages/distros/debian-start.txt
>> index ec2de84..5e8a415 100644
>> --- a/pages/distros/debian-start.txt
>> +++ b/pages/distros/debian-start.txt
>> @@ -18,6 +18,7 @@ cd enlight
>>  Make sure all the dependencies are installed:
>>
>>  
>> +sudo apt update
>
> Maybe I'm out of date here but would it not be apt-get?
>
> regards
> Stefan Schmidt
>
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] EDD 2017 location discussion

2016-11-02 Thread Stefan Schmidt
Hello.

On 02/11/16 08:00, Jonathan Aquilina wrote:
> Malta is listed, sorry for my last email. Meeting space can be arranged
> as welll just need to know numbers of attendees that is the issue.

Thanks for confirming. I will list it as an option when I put out the 
vote in a few days.

regards
Stefan Schmidt

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] [EGIT] [website/www-content] master 01/01: Wiki page debian-start changed with summary [Nuke more aptitude, don't forget to update before installing.] by Jean Guyomarc'h

2016-11-02 Thread Stefan Schmidt
Hello.

On 02/11/16 09:41, Stefan Schmidt wrote:
> Hello.
>
> On 01/11/16 21:24, Jean Guyomarc'h wrote:
>> WWW-www.enlightenment.org pushed a commit to branch master.
>>
>> http://git.enlightenment.org/website/www-content.git/commit/?id=fbd104d2acd506bd4fd78a6e53912508993f9033
>>
>> commit fbd104d2acd506bd4fd78a6e53912508993f9033
>> Author: Jean Guyomarc'h 
>> Date:   Tue Nov 1 13:24:40 2016 -0700
>>
>> Wiki page debian-start changed with summary [Nuke more aptitude, don't 
>> forget to update before installing.] by Jean Guyomarc'h
>> ---
>>  pages/distros/debian-start.txt | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/pages/distros/debian-start.txt b/pages/distros/debian-start.txt
>> index ec2de84..5e8a415 100644
>> --- a/pages/distros/debian-start.txt
>> +++ b/pages/distros/debian-start.txt
>> @@ -18,6 +18,7 @@ cd enlight
>>  Make sure all the dependencies are installed:
>>
>>  
>> +sudo apt update
>
> Maybe I'm out of date here but would it not be apt-get?

I stand corrected. Adrian explained to me on IRC that apt is a new 
command introduced with Debian Jessie.

Ignore my noise. I'm indeed old and outdated. :)

regards
Stefan Schmidt


--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] [EGIT] [website/www-content] master 01/01: Wiki page debian-start changed with summary [Nuke more aptitude, don't forget to update before installing.] by Jean Guyomarc'h

2016-11-02 Thread Stefan Schmidt
Hello.

On 01/11/16 21:24, Jean Guyomarc'h wrote:
> WWW-www.enlightenment.org pushed a commit to branch master.
>
> http://git.enlightenment.org/website/www-content.git/commit/?id=fbd104d2acd506bd4fd78a6e53912508993f9033
>
> commit fbd104d2acd506bd4fd78a6e53912508993f9033
> Author: Jean Guyomarc'h 
> Date:   Tue Nov 1 13:24:40 2016 -0700
>
> Wiki page debian-start changed with summary [Nuke more aptitude, don't 
> forget to update before installing.] by Jean Guyomarc'h
> ---
>  pages/distros/debian-start.txt | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/pages/distros/debian-start.txt b/pages/distros/debian-start.txt
> index ec2de84..5e8a415 100644
> --- a/pages/distros/debian-start.txt
> +++ b/pages/distros/debian-start.txt
> @@ -18,6 +18,7 @@ cd enlight
>  Make sure all the dependencies are installed:
>
>  
> +sudo apt update

Maybe I'm out of date here but would it not be apt-get?

regards
Stefan Schmidt

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] [EGIT] [core/enlightenment] master 02/03: Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

2016-11-02 Thread Stefan Schmidt
Hello.

On 01/11/16 20:21, Stephen okra Houston wrote:
> okra pushed a commit to branch master.
>
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=722ef6442630a5598bec8ec55bb3d309518f7440
>
> commit 722ef6442630a5598bec8ec55bb3d309518f7440
> Merge: 7304758 4d86c98
> Author: Stephen okra Houston 
> Date:   Tue Nov 1 13:28:33 2016 -0500
>
> Merge branch 'master' of 
> git+ssh://git.enlightenment.org/core/enlightenment

Let me remind you that we do not do merges. The only exception is fast 
forward merge commits for a bigger patch series. This merge commit needs 
to have a good commit message describing the whole series though.

To me this looks more as if you merge a branch you worked in into master 
without rebasing. Please avoid this in the future.

regards
Stefan Schmidt

--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] EDD 2017 location discussion

2016-11-02 Thread Jonathan Aquilina
Malta is listed, sorry for my last email. Meeting space can be arranged
as welll just need to know numbers of attendees that is the issue.

On 2016-11-01 11:10, Tom Hacohen wrote:

> On 01/11/16 09:58, Stefan Schmidt wrote: 
> 
>> Hello.
>> 
>> Thinking ahead about EDD 2017 it would be good if we could settle for a
>> location towards the end of the year.
>> 
>> After this years EDD I already asked for location proposals which have
>> been collected here:
>> https://phab.enlightenment.org/w/events/location_proposals/
>> 
>> I will put out a phab vote for it over the next weeks but wanted to
>> bring it up here for discussion to sort out valid and likely proposals
>> from the rest.
>> 
>> Here we go with the list and my comments on it:
>> 
>> Australia (proposed by David Seikel)
>> * Local organiser: None
>> * Meeting space offering: None
>> 
>> + Nice country to visit
>> - To high travel costs for almost all attendees
>> - Unlikely to attract many community people without company baking
>> - No local organiser or meeting space proposed
>> 
>> Malta (proposed by Jonathan Aquilina)
>> * Local organiser: Jonathan Aquilina
>> * Meeting space offering: None
>> 
>> + Within Europe
>> + Travel costs for people from Europe might/should be ok (tourist flights)
>> - Not sure how easy it it to get there from outside of the EU (VISA, etc)
>> - Meeting space offering is missing
>> 
>> USA (proposed by Stephen Houston)
>> * Local organiser: Stephen Houston
>> * Meeting space offering: None
>> 
>> o USA is big. Would this be east middle or west?
>> + We have a bunch of developers from there
>> - To high travel costs for many attendees
>> - We did it once on the west coast and sadly almost only people with
>> company baking attended
>> - Meeting space offering is missing
>> 
>> Tel Aviv (proposed by Tom Hacohen)
>> * Local organiser: None
>> * Meeting space offering: None
>> 
>> - No local organiser or meeting space (Originally there was Samsung
>> Israel listed here but as far as I understand that would not be possible)
>> 
>> Paris (proposed by Nicolas Aguirre)
>> * Local organiser: Nicolas Aguirre
>> * Meeting space offering: OpenWide office
>> 
>> + Within Europe
>> + Served us very well this year
>> + Organiser and meeting space available
>> 
>> Toulouse (proposed by Nicolas Aguirre)
>> * Local organiser: Nicolas Aguirre
>> * Meeting space offering: OpenWide office
>> 
>> + Within Europe
>> + Organiser and meeting space available
>> 
>> Seoul (proposed by Hermet Park)
>> * Local organiser: Hermet Park
>> * Meeting space offering: Somewhere in Seoul
>> 
>> - To high travel costs for almost all non-company attendees
>> - Unlikely to attract many community people without company baking
>> + Would give a lot local Samsung EFL developers the chance to attend
>> + Organiser and meeting space available
> 
> I don't think I proposed Israel, but anyhow, local organiser would be 
> JackDanielZ, and surely we could find a place if needed...
> 
> My take: australia, us and korea are probably very unlikely.
> 
> Malta sounds like the best idea.
> 
> --
> Tom.
> 
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel


Re: [E-devel] EDD 2017 location discussion

2016-11-02 Thread Jonathan Aquilina
Hi All, 

I would like to add Malta to the mix in this. Tiny island, but lots of
history and culture so lots to see and do after the conference. 

On 2016-11-02 04:47, Simon Lees wrote:

> On 11/01/2016 08:28 PM, Stefan Schmidt wrote: 
> 
>> Hello.
>> 
>> Thinking ahead about EDD 2017 it would be good if we could settle for a 
>> location towards the end of the year.
>> 
>> After this years EDD I already asked for location proposals which have 
>> been collected here: 
>> https://phab.enlightenment.org/w/events/location_proposals/
>> 
>> I will put out a phab vote for it over the next weeks but wanted to 
>> bring it up here for discussion to sort out valid and likely proposals 
>> from the rest.
>> 
>> Here we go with the list and my comments on it:
> 
> From a selfish perspective the only events i'm likely to come to are
> Seoul and Australia, based on the fact that Seoul probably won't cost me
> much more I'd vote for that. The only chance of me making one in Europe
> is if its the time of year when i'm already there and I don't know when
> that will be. But I am just one person. 
> --
> Developer Access Program for Intel Xeon Phi Processors
> Access to Intel Xeon Phi processor-based developer platforms.
> With one year of Intel Parallel Studio XE.
> Training and support from Colfax.
> Order your platform today. http://sdm.link/xeonphi 
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
--
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today. http://sdm.link/xeonphi
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel