[EGIT] [tools/enventor] master 01/01: lib/edj_viewer: fix the cursor position scale to view scale
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cf3ad3a914e2a7e8c5a92d55a0be4dc2b7c566c4 commit cf3ad3a914e2a7e8c5a92d55a0be4dc2b7c566c4 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:21:59 2015 +0900 lib/edj_viewer: fix the cursor position scale to view scale --- src/lib/edj_viewer.c | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index eb917fd..d54cb98 100644 --- a/src/lib/edj_viewer.c +++ b/src/lib/edj_viewer.c @@ -129,11 +129,19 @@ rect_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Coord x, y, w, h; evas_object_geometry_get(obj, x, y, w, h); - cursor.x = ev-cur.canvas.x - x; - cursor.y = ev-cur.canvas.y - y; cursor.relx = (float) ((ev-cur.canvas.x - x) / (float) w); cursor.rely = (float) ((ev-cur.canvas.y - y) / (float) h); + if (vd-view_config_size.w 0) + cursor.x = (((double)vd-view_config_size.w) * cursor.relx); + else + cursor.x = (ev-cur.canvas.x - x); + + if (vd-view_config_size.h 0) + cursor.y = (((double)vd-view_config_size.h) * cursor.rely); + else + cursor.y = (ev-cur.canvas.y - y); + evas_object_smart_callback_call(vd-enventor, SIG_LIVE_VIEW_CURSOR_MOVED, cursor); } --
[EGIT] [tools/enventor] master 02/02: updated README
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=a84a34a77978f1495fe8b55ae2c6bc15f6b424f7 commit a84a34a77978f1495fe8b55ae2c6bc15f6b424f7 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:34:40 2015 +0900 updated README --- README | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README b/README index 60be5e8..c7f2c70 100644 --- a/README +++ b/README @@ -100,6 +100,8 @@ Hermet (Chuneon Park) Jaehyun Cho Mykyta Biliavskyi Kateryna Fesyna +Yunho Jeong +Mincheol Seo Raoul Hecky And various contributors (See AUTHORS) --
[EGIT] [tools/enventor] master 01/02: lib: add export/import for libraries on Windows
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=05a848fdddb660ddd4edb34f3793e4b3e1505ad3
commit 05a848fdddb660ddd4edb34f3793e4b3e1505ad3
Author: Michelle Legrand legrand.miche...@outlook.com
Date: Sat Feb 28 14:33:17 2015 +0900
lib: add export/import for libraries on Windows
Summary: Exporting/Importing Enventor dll for Win32.
Differential Revision: https://phab.enlightenment.org/D2040
---
src/lib/Enventor_Eo.h | 18 ++
src/lib/Enventor_Legacy.h | 18 ++
src/lib/auto_comp.c | 1 +
src/lib/ctxpopup.c| 1 +
src/lib/dummy_obj.c | 1 +
src/lib/edc_editor.c | 1 +
src/lib/edc_parser.c | 1 +
src/lib/edj_mgr.c | 1 +
src/lib/edj_viewer.c | 1 +
src/lib/enventor_main.c | 1 +
src/lib/enventor_smart.c | 1 +
src/lib/indent.c | 1 +
src/lib/redoundo.c| 1 +
src/lib/syntax_color.c| 1 +
src/lib/syntax_helper.c | 1 +
src/lib/template.c| 1 +
16 files changed, 50 insertions(+)
diff --git a/src/lib/Enventor_Eo.h b/src/lib/Enventor_Eo.h
index ced23ed..1a0d253 100644
--- a/src/lib/Enventor_Eo.h
+++ b/src/lib/Enventor_Eo.h
@@ -1 +1,19 @@
+/***
+ * Compatible ABI for Win32
+ ***/
+#ifdef _WIN32
+# ifdef EAPI
+# undef EAPI
+# endif
+# ifdef EOAPI
+# undef EOAPI
+# endif
+# ifdef ENVENTOR_BUILD
+# define EAPI __declspec(dllexport)
+# define EOAPI __declspec(dllexport)
+# else
+# define EAPI __declspec(dllimport)
+# define EOAPI __declspec(dllimport)
+# endif
+#endif
#include enventor_object.eo.h
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index bd7743e..93fb349 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -1,3 +1,21 @@
+/***
+ * Compatible ABI for Win32
+ ***/
+#ifdef _WIN32
+# ifdef EAPI
+# undef EAPI
+# endif
+# ifdef ENVENTOR_BUILD
+# define EAPI __declspec(dllexport)
+# else
+# define EAPI __declspec(dllimport)
+# endif
+# ifdef EOAPI
+# undef EOAPI
+# endif
+#define EOAPI EAPI
+#endif
+
typedef enum
{
ENVENTOR_OUT_EDJ = 0,
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 849ee2a..9b66fc2 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include enventor_private.h
diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index a93ad7d..1538c00 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include enventor_private.h
diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c
index af36417..864a51a 100644
--- a/src/lib/dummy_obj.c
+++ b/src/lib/dummy_obj.c
@@ -4,6 +4,7 @@
#define ENVENTOR_BETA_API_SUPPORT 1
#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include Edje_Edit.h
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 49523eb..867650e 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include Eio.h
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index ff38e58..5017e76 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include enventor_private.h
diff --git a/src/lib/edj_mgr.c b/src/lib/edj_mgr.c
index 9af98e1..eb8a996 100644
--- a/src/lib/edj_mgr.c
+++ b/src/lib/edj_mgr.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include enventor_private.h
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index d54cb98..738f928 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -4,6 +4,7 @@
#define ENVENTOR_BETA_API_SUPPORT 1
#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include Edje_Edit.h
diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c
index 4012d83..1495946 100644
--- a/src/lib/enventor_main.c
+++ b/src/lib/enventor_main.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include Eio.h
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 277d6c1..8e20b81 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -4,6 +4,7 @@
#define ELM_INTERNAL_API_ARGESFSDFEFC 1
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include Eio.h
diff --git a/src/lib/indent.c b/src/lib/indent.c
index 8f5c94a..32870a5 100644
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@@ -3,6 +3,7 @@
#endif
#define ENVENTOR_BETA_API_SUPPORT 1
+#define ENVENTOR_BUILD
#include Enventor.h
#include enventor_private.h
diff --git
[EGIT] [tools/enventor] master 01/01: bump up version
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7720ce5cf5c9e439a4eaf0bfc0f23cd608b39264
commit 7720ce5cf5c9e439a4eaf0bfc0f23cd608b39264
Author: ChunEon Park her...@hermet.pe.kr
Date: Sat Feb 28 13:43:13 2015 +0900
bump up version
---
README | 22 +++---
configure.ac | 4 ++--
data/about/ABOUT | 13 +++--
3 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/README b/README
index 24b119e..60be5e8 100644
--- a/README
+++ b/README
@@ -1,20 +1,20 @@
-[Enventor v0.4.0]
+[Enventor v0.5.0]
-This is an EDC editor with some convenient functions. It's brand new and was
-only started near the begining of June 2013, so expecting it to do everything a
-mature script editor does is a bit premature, but considering it's young age,
-it does a lot.
+This is an EDC editor with some convenient functions. It's brand new and was
only started near the begining of June 2013, so expecting it to do everything a
mature script editor does is a bit premature, but considering it's young age,
it does a lot.
[Requirements]
- efl (= 1.12.0)
- elementary (= 1.12.0)
+ efl (= 1.13.0)
+ elementary (= 1.13.0)
-Please note that some features may not quite function correctly or completely
-less EFL 1.12. Newer would be better.
+Please note that some features may not quite function correctly or completely
less EFL 1.13. Newer would be better.
-Please see http://www.enlightenment.org for information on these.
+Please see next sites for more information on these.
+
+http://www.enlightenment.org
+https://phab.enlightenment.org/w/projects/enventor/
+http://www.openhub.net/p/enventor
[Compiling]
@@ -94,7 +94,7 @@ $ enventor sample.edc -id ./images -sd ./sounds
A lots of developers have joined in Enventor project. Here listed are the
dedicated Enventor developers but there are much more people who've gladly
contributed for Enventor improvement. For list of whole contributors, See
AUTHORS file.
-Copyright (C) 2013 - 2014 by:
+Copyright (C) 2013 - 2015 by:
Hermet (Chuneon Park)
Jaehyun Cho
diff --git a/configure.ac b/configure.ac
index a0791e5..17f7e7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [0])
-m4_define([v_min], [4])
+m4_define([v_min], [5])
m4_define([v_mic], [0])
#m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo
0) | tr -d '\n']))dnl
##-- When released, remove the dnl on the below line
@@ -58,7 +58,7 @@ EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT
EFL_ENABLE_EO_LATEST
-efl_version=1.12.0
+efl_version=1.13.0
requirement_enventor= \
eo = ${efl_version} \
eina = ${efl_version} \
diff --git a/data/about/ABOUT b/data/about/ABOUT
index b44df22..626790b 100644
--- a/data/about/ABOUT
+++ b/data/about/ABOUT
@@ -1,11 +1,12 @@
-font_size=11b[Enventor v0.4.0]/b/font_size
+font_size=11b[Enventor v0.5.0]/b/font_size
This is an EDC editor with some convenient functions. It's band new and was
only started near the begining of June 2013, so expecting it to do everything a
mature script editor does is a bit premature, but considering it's young age,
it does a lot.
-Please note that some features may not quite function correctly or completely
less EFL 1.12. Newer would be better.
-
-Please see http://www.enlightenment.org for information on these.
-
+Please see next sites for more information on these.
+
+http://www.enlightenment.org
+https://phab.enlightenment.org/w/projects/enventor/
+http://www.openhub.net/p/enventor
font_size=11b[Short Cut Keys]/b/font_size
@@ -75,7 +76,7 @@ $ enventor sample.edc -id ./images -sd ./sounds
A lots of developers have joined in Enventor project. Here listed are the
dedicated Enventor developers but there are much more people who've gladly
contributed for Enventor improvement. For list of whole contributors, See
AUTHORS file.
-Copyright (C) 2013 - 2014 by:
+Copyright (C) 2013 - 2015 by:
Hermet (Chuneon Park)
Jaehyun Cho
--
[EGIT] [tools/enventor] master 01/01: about: insert a empty line here.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=db36b48d19b987a6cb1a3c72f669b77fbbe4a67a commit db36b48d19b987a6cb1a3c72f669b77fbbe4a67a Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:43:05 2015 +0900 about: insert a empty line here. --- data/about/ABOUT | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/about/ABOUT b/data/about/ABOUT index 626790b..cba0bac 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -3,7 +3,7 @@ This is an EDC editor with some convenient functions. It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. Please see next sites for more information on these. - + http://www.enlightenment.org https://phab.enlightenment.org/w/projects/enventor/ http://www.openhub.net/p/enventor --
[EGIT] [tools/enventor] master 01/01: update COPYING
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=259102d5f7cf48ab2dd32cb47a59f60e1e914c74 commit 259102d5f7cf48ab2dd32cb47a59f60e1e914c74 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:38:51 2015 +0900 update COPYING --- COPYING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COPYING b/COPYING index c60279d..25a7a32 100644 --- a/COPYING +++ b/COPYING @@ -1,6 +1,6 @@ Copyright notice for Enventor: -Copyright (C) 2013-2014 ChunEon Park and various contributors (see AUTHORS) +Copyright (C) 2013-2015 ChunEon Park and various contributors (see AUTHORS) All rights reserved. --
[EGIT] [tools/enventor] master 01/01: updated AUTHORS
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=4551994771fcf4abb149fcc0868e1f52743a5bb4 commit 4551994771fcf4abb149fcc0868e1f52743a5bb4 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:36:31 2015 +0900 updated AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 910e172..32344d7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Lee Gwang-O mae...@live.co.kr Michelle Legrand michelle.legr...@openwide.fr Yunho Jung yunho7.j...@samsung.com Mincheol Seo mcmin@samsung.com +Michelle Legrand legrand.miche...@outlook.com --
[EGIT] [tools/enventor] master 01/01: enable ENVENTOR BETA API in configure.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=96d4919a6b7b076e2c1a821eadfde7373c7f5132 commit 96d4919a6b7b076e2c1a821eadfde7373c7f5132 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 14:50:17 2015 +0900 enable ENVENTOR BETA API in configure. --- configure.ac | 1 + m4/efl_beta.m4 | 6 ++ src/lib/auto_comp.c | 1 - src/lib/build.c | 2 -- src/lib/ctxpopup.c | 1 - src/lib/dummy_obj.c | 1 - src/lib/edc_parser.c | 1 - src/lib/edj_mgr.c| 1 - src/lib/edj_viewer.c | 1 - src/lib/enventor_main.c | 1 - src/lib/enventor_smart.c | 1 - src/lib/indent.c | 1 - src/lib/redoundo.c | 1 - src/lib/syntax_color.c | 1 - src/lib/syntax_helper.c | 1 - src/lib/template.c | 1 - 16 files changed, 7 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 17f7e7f..5edf314 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AC_SUBST(ENVENTOR_VERSION_MINOR) EFL_ENABLE_EO_API_SUPPORT EFL_ENABLE_BETA_API_SUPPORT +ENVENTOR_ENABLE_BETA_API_SUPPORT EFL_ENABLE_EO_LATEST efl_version=1.13.0 diff --git a/m4/efl_beta.m4 b/m4/efl_beta.m4 index c804729..b6e2694 100644 --- a/m4/efl_beta.m4 +++ b/m4/efl_beta.m4 @@ -3,3 +3,9 @@ AC_DEFUN([EFL_ENABLE_BETA_API_SUPPORT], [ AC_DEFINE([EFL_BETA_API_SUPPORT], [1], [Enable access to unstable EFL API that are still in beta]) ]) + +dnl use: ENVENTOR_ENABLE_BETA_API_SUPPORT +AC_DEFUN([ENVENTOR_ENABLE_BETA_API_SUPPORT], +[ + AC_DEFINE([ENVENTOR_BETA_API_SUPPORT], [1], [Enable access to unstable ENVENTOR API that are still in beta]) +]) diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c index 9b66fc2..2cd35c1 100644 --- a/src/lib/auto_comp.c +++ b/src/lib/auto_comp.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/build.c b/src/lib/build.c index a58d09b..2ce1146 100644 --- a/src/lib/build.c +++ b/src/lib/build.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 - #include Enventor.h #include enventor_private.h diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index 1538c00..80e19d8 100644 --- a/src/lib/ctxpopup.c +++ b/src/lib/ctxpopup.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c index 864a51a..537ce96 100644 --- a/src/lib/dummy_obj.c +++ b/src/lib/dummy_obj.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1 #define ENVENTOR_BUILD diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 5017e76..336f77c 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/edj_mgr.c b/src/lib/edj_mgr.c index eb8a996..c149ed4 100644 --- a/src/lib/edj_mgr.c +++ b/src/lib/edj_mgr.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index 738f928..dd673c9 100644 --- a/src/lib/edj_viewer.c +++ b/src/lib/edj_viewer.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1 #define ENVENTOR_BUILD diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index 1495946..bf43044 100644 --- a/src/lib/enventor_main.c +++ b/src/lib/enventor_main.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 8e20b81..5c231cf 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -3,7 +3,6 @@ #endif #define ELM_INTERNAL_API_ARGESFSDFEFC 1 -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/indent.c b/src/lib/indent.c index 32870a5..259bb67 100644 --- a/src/lib/indent.c +++ b/src/lib/indent.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/redoundo.c b/src/lib/redoundo.c index 1605ba7..7c54442 100644 --- a/src/lib/redoundo.c +++ b/src/lib/redoundo.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c index fd04ad2..af6b2bb 100644 --- a/src/lib/syntax_color.c +++ b/src/lib/syntax_color.c @@ -2,7 +2,6 @@ #include config.h #endif -#define ENVENTOR_BETA_API_SUPPORT 1 #define ENVENTOR_BUILD #include Enventor.h diff --git
[EGIT] [tools/enventor] master 01/01: migrate enventor ac define in configure.ac
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5ccaf382d0b4c6cb790098c47b52d2a6877e395c commit 5ccaf382d0b4c6cb790098c47b52d2a6877e395c Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 15:16:43 2015 +0900 migrate enventor ac define in configure.ac focus enventor configurations on configure.ac --- configure.ac | 1 + m4/efl_beta.m4 | 6 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 1a8a1b5..4ff97c3 100644 --- a/configure.ac +++ b/configure.ac @@ -59,6 +59,7 @@ EFL_ENABLE_BETA_API_SUPPORT ENVENTOR_ENABLE_BETA_API_SUPPORT EFL_ENABLE_EO_LATEST AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, Support Win32 dllexport) +AC_DEFINE_UNQUOTED(ENVENTOR_BETA_API_SUPPORT, 1, Enable access to unstable ENVENTOR API that are still in beta) efl_version=1.13.0 requirement_enventor= \ diff --git a/m4/efl_beta.m4 b/m4/efl_beta.m4 index b6e2694..c804729 100644 --- a/m4/efl_beta.m4 +++ b/m4/efl_beta.m4 @@ -3,9 +3,3 @@ AC_DEFUN([EFL_ENABLE_BETA_API_SUPPORT], [ AC_DEFINE([EFL_BETA_API_SUPPORT], [1], [Enable access to unstable EFL API that are still in beta]) ]) - -dnl use: ENVENTOR_ENABLE_BETA_API_SUPPORT -AC_DEFUN([ENVENTOR_ENABLE_BETA_API_SUPPORT], -[ - AC_DEFINE([ENVENTOR_BETA_API_SUPPORT], [1], [Enable access to unstable ENVENTOR API that are still in beta]) -]) --
[EGIT] [tools/enventor] master 01/01: clean up code for supporting dllexport in win32.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cdab9f0a5d3b0fabfada7d111dec0c2c2677e956 commit cdab9f0a5d3b0fabfada7d111dec0c2c2677e956 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Feb 28 15:13:23 2015 +0900 clean up code for supporting dllexport in win32. --- configure.ac | 1 + src/lib/Enventor_Eo.h | 2 +- src/lib/Enventor_Legacy.h | 2 +- src/lib/auto_comp.c | 2 -- src/lib/ctxpopup.c| 2 -- src/lib/dummy_obj.c | 1 - src/lib/edc_editor.c | 1 - src/lib/edc_parser.c | 2 -- src/lib/edj_mgr.c | 2 -- src/lib/edj_viewer.c | 1 - src/lib/enventor_main.c | 2 -- src/lib/enventor_smart.c | 1 - src/lib/indent.c | 2 -- src/lib/redoundo.c| 2 -- src/lib/syntax_color.c| 2 -- src/lib/syntax_helper.c | 2 -- src/lib/template.c| 2 -- 17 files changed, 3 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 5edf314..1a8a1b5 100644 --- a/configure.ac +++ b/configure.ac @@ -58,6 +58,7 @@ EFL_ENABLE_EO_API_SUPPORT EFL_ENABLE_BETA_API_SUPPORT ENVENTOR_ENABLE_BETA_API_SUPPORT EFL_ENABLE_EO_LATEST +AC_DEFINE_UNQUOTED(ENVENTOR_WIN32_BUILD_SUPPORT, 1, Support Win32 dllexport) efl_version=1.13.0 requirement_enventor= \ diff --git a/src/lib/Enventor_Eo.h b/src/lib/Enventor_Eo.h index 1a0d253..76f204c 100644 --- a/src/lib/Enventor_Eo.h +++ b/src/lib/Enventor_Eo.h @@ -8,7 +8,7 @@ # ifdef EOAPI # undef EOAPI # endif -# ifdef ENVENTOR_BUILD +# ifdef ENVENTOR_WIN32_BUILD_SUPPORT # define EAPI __declspec(dllexport) # define EOAPI __declspec(dllexport) # else diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h index 93fb349..d2bb2ce 100644 --- a/src/lib/Enventor_Legacy.h +++ b/src/lib/Enventor_Legacy.h @@ -5,7 +5,7 @@ # ifdef EAPI # undef EAPI # endif -# ifdef ENVENTOR_BUILD +# ifdef ENVENTOR_WIN32_BUILD_SUPPORT # define EAPI __declspec(dllexport) # else # define EAPI __declspec(dllimport) diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c index 2cd35c1..6d3f385 100644 --- a/src/lib/auto_comp.c +++ b/src/lib/auto_comp.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include enventor_private.h #include auto_comp_code.h diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c index 80e19d8..a258e36 100644 --- a/src/lib/ctxpopup.c +++ b/src/lib/ctxpopup.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include enventor_private.h diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c index 537ce96..9666a11 100644 --- a/src/lib/dummy_obj.c +++ b/src/lib/dummy_obj.c @@ -3,7 +3,6 @@ #endif #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1 -#define ENVENTOR_BUILD #include Enventor.h #include Edje_Edit.h diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 867650e..49523eb 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -3,7 +3,6 @@ #endif #define ENVENTOR_BETA_API_SUPPORT 1 -#define ENVENTOR_BUILD #include Enventor.h #include Eio.h diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 336f77c..bcf6d40 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include enventor_private.h diff --git a/src/lib/edj_mgr.c b/src/lib/edj_mgr.c index c149ed4..9059c5c 100644 --- a/src/lib/edj_mgr.c +++ b/src/lib/edj_mgr.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include enventor_private.h diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c index dd673c9..1b48ea5 100644 --- a/src/lib/edj_viewer.c +++ b/src/lib/edj_viewer.c @@ -3,7 +3,6 @@ #endif #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT 1 -#define ENVENTOR_BUILD #include Enventor.h #include Edje_Edit.h diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index bf43044..646cb49 100644 --- a/src/lib/enventor_main.c +++ b/src/lib/enventor_main.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include Eio.h #include enventor_private.h diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index 5c231cf..321cf67 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -3,7 +3,6 @@ #endif #define ELM_INTERNAL_API_ARGESFSDFEFC 1 -#define ENVENTOR_BUILD #include Enventor.h #include Eio.h diff --git a/src/lib/indent.c b/src/lib/indent.c index 259bb67..18bdbeb 100644 --- a/src/lib/indent.c +++ b/src/lib/indent.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include enventor_private.h diff --git a/src/lib/redoundo.c b/src/lib/redoundo.c index 7c54442..2b9dbf7 100644 --- a/src/lib/redoundo.c +++ b/src/lib/redoundo.c @@ -2,8 +2,6 @@ #include config.h #endif -#define ENVENTOR_BUILD - #include Enventor.h #include
[EGIT] [core/efl] master 01/01: build: Remove pkg-config for xcb-xprint as the pc file is now longer shipped.
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ea0cd3d7c3fbe227cbcb614fa852d9039763a816
commit ea0cd3d7c3fbe227cbcb614fa852d9039763a816
Author: Stefan Schmidt s.schm...@samsung.com
Date: Fri Feb 27 14:17:23 2015 +0100
build: Remove pkg-config for xcb-xprint as the pc file is now longer
shipped.
xcb no longer ships the xcp-print.pc file and thus pkg-config is not able to
detect it. Some distros might patch over it as the source files seem still
to
be shipped but we cannot rely on this.
http://lists.freedesktop.org/archives/xcb/2013-November/008907.html
As the above commit mentions the xprint support was actually removed from
the
Xorg server in 2008 (1.11 release) which means none of our code actually has
any server side it can talk to for some years now. :) Our xcb-xprint code is
actually ifdef'ed already so we might want to remove it alltogether.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 97b8828..f299d37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3530,7 +3530,7 @@ fi
if test ${want_x11_xcb} = yes; then
dnl note: added pixman-1 as ecore_xcb_region uses that
EFL_DEPEND_PKG([ECORE_X], [ECORE_X_XCB],
- [x11-xcb xcb xcb-shm xcb-event xcb-icccm = 0.3.8 xcb-util = 0.3.8
xcb-image xcb-keysyms = 0.3.8 xcb-composite xcb-present xcb-damage xcb-dpms
xcb-randr xcb-render xcb-screensaver xcb-shape xcb-sync xcb-xfixes xcb-xinerama
xcb-xprint xcb-xtest xcb-renderutil pixman-1])
+ [x11-xcb xcb xcb-shm xcb-event xcb-icccm = 0.3.8 xcb-util = 0.3.8
xcb-image xcb-keysyms = 0.3.8 xcb-composite xcb-present xcb-damage xcb-dpms
xcb-randr xcb-render xcb-screensaver xcb-shape xcb-sync xcb-xfixes xcb-xinerama
xcb-xtest xcb-renderutil pixman-1])
dnl TODO: remove these ifdefs from code!
AC_DEFINE([ECORE_XCB_COMPOSITE], [1], [Build support for XCB composite])
--
[EGIT] [tools/edi] master 01/01: filesystem: Use standardised icon names
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=d6bb571c8931c3d5a59f4a5b5d2bd3f031dc7c8e
commit d6bb571c8931c3d5a59f4a5b5d2bd3f031dc7c8e
Author: Andy Williams a...@andywilliams.me
Date: Fri Feb 27 14:47:00 2015 +
filesystem: Use standardised icon names
---
src/bin/edi_content_provider.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/edi_content_provider.c b/src/bin/edi_content_provider.c
index 44c8cf6..c147628 100644
--- a/src/bin/edi_content_provider.c
+++ b/src/bin/edi_content_provider.c
@@ -49,9 +49,9 @@ _edi_content_provider_diff_add(Evas_Object *parent,
Edi_Mainview_Item *item)
static Edi_Content_Provider _edi_content_provider_registry[] =
{
- {text, txt, EINA_TRUE, EINA_TRUE, edi_editor_add},
+ {text, text-x-generic, EINA_TRUE, EINA_TRUE, edi_editor_add},
{code, text-x-csrc, EINA_TRUE, EINA_TRUE, edi_editor_add},
- {image, image, EINA_FALSE, EINA_FALSE, _edi_content_provider_image_add},
+ {image, image-x-generic, EINA_FALSE, EINA_FALSE,
_edi_content_provider_image_add},
{diff, text-x-source, EINA_TRUE, EINA_FALSE,
_edi_content_provider_diff_add},
{NULL, NULL, EINA_FALSE, EINA_FALSE, NULL}
--
[EGIT] [core/efl] master 01/01: ecore_x/xcb: Remove xcb-xprint code to get the root window list and use fallback
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5f1ea9403f490a4285b826c2515d4df2177948da
commit 5f1ea9403f490a4285b826c2515d4df2177948da
Author: Stefan Schmidt s.schm...@samsung.com
Date: Fri Feb 27 15:19:34 2015 +0100
ecore_x/xcb: Remove xcb-xprint code to get the root window list and use
fallback
This was the only user of xcb-xprint and we already have a fallback in
place for
it. I talked to Chris about it and he was fine with it before his morning
coffee.
More serious this should be ok and we can get rid of this part which starts
to
make trouble in distros by now. E.g. gentoo is disabling it completely and
many
others just ship upstream which means no pc file. Arch seems to patch it in
but
we are on the safe side with just using the fallback.
---
configure.ac | 1 -
src/lib/ecore_x/xcb/ecore_xcb_window.c | 115 +
2 files changed, 1 insertion(+), 115 deletions(-)
diff --git a/configure.ac b/configure.ac
index f299d37..bc4b997 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3543,7 +3543,6 @@ dnl TODO: remove these ifdefs from code!
AC_DEFINE([ECORE_XCB_SYNC], [1], [Build support for XCB sync])
AC_DEFINE([ECORE_XCB_XFIXES], [1], [Build support for XCB xfixes])
AC_DEFINE([ECORE_XCB_XINERAMA], [1], [Build support for XCB xinerama])
- AC_DEFINE([ECORE_XCB_XPRINT], [1], [Build support for XCB xprint])
AC_DEFINE([ECORE_XCB_XTEST], [1], [Build support for XCB xtest])
AC_DEFINE([ECORE_XCB_CURSOR], [1], [Build support for XCB cursor])
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window.c
b/src/lib/ecore_x/xcb/ecore_xcb_window.c
index c6d7677..8258ef7 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_window.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_window.c
@@ -5,9 +5,6 @@
#ifdef ECORE_XCB_SHAPE
# include xcb/shape.h
#endif
-#ifdef ECORE_XCB_XPRINT
-#include xcb/xprint.h
-#endif
/* local function prototypes */
static Ecore_X_Window _ecore_xcb_window_argb_internal_new(Ecore_X_Window
parent,
@@ -26,9 +23,6 @@ static Ecore_X_Window
_ecore_xcb_window_at_xy_get(Ecore_X_Window base,
int skip_num);
static int _ecore_xcb_window_modifiers_get(unsigned int state);
static xcb_visualtype_t *_ecore_xcb_window_find_visual_by_id(xcb_visualid_t
id);
-#ifdef ECORE_XCB_XPRINT
-static xcb_screen_t *_ecore_xcb_window_screen_of_display(int screen);
-#endif
/* local variables */
static int ignore_num = 0;
@@ -1511,9 +1505,6 @@ ecore_x_window_root_list(int *num_ret)
xcb_screen_iterator_t iter;
uint8_t i, num;
Ecore_X_Window *roots = NULL;
-#ifdef ECORE_XCB_XPRINT
- const xcb_query_extension_reply_t *ext_reply;
-#endif
LOGFN(__FILE__, __LINE__, __FUNCTION__);
CHECK_XCB_CONN;
@@ -1529,98 +1520,11 @@ ecore_x_window_root_list(int *num_ret)
num = ecore_x_screen_count_get();
-#ifdef ECORE_XCB_XPRINT
- ext_reply = xcb_get_extension_data(_ecore_xcb_conn, xcb_x_print_id);
- if ((ext_reply) (ext_reply-present))
- {
-xcb_x_print_print_query_screens_cookie_t cookie;
-xcb_x_print_print_query_screens_reply_t *reply;
-
-cookie = xcb_x_print_print_query_screens_unchecked(_ecore_xcb_conn);
-reply =
- xcb_x_print_print_query_screens_reply(_ecore_xcb_conn, cookie, NULL);
-if (reply)
- {
- xcb_window_t *screens;
- int psnum = 0, overlap = 0, j = 0, k = 0;
-
- psnum = xcb_x_print_print_query_screens_roots_length(reply);
- screens = xcb_x_print_print_query_screens_roots(reply);
- for (i = 0; i num; i++)
- {
- for (j = 0; j psnum; j++)
-{
- xcb_screen_t *s;
-
- if ((s = _ecore_xcb_window_screen_of_display(i)))
- {
-if (s-root == screens[j])
- overlap++;
- }
-}
- }
- if (!(roots = malloc((num - overlap)
- * sizeof(Ecore_X_Window return NULL;
- for (i = 0; i num; i++)
- {
- Eina_Bool is_print = EINA_FALSE;
-
- for (j = 0; j psnum; j++)
-{
- xcb_screen_t *s;
-
- if ((s = _ecore_xcb_window_screen_of_display(i)))
- {
-if (s-root == screens[j])
- {
- is_print = EINA_TRUE;
- break;
- }
- }
-}
- if (!is_print)
-{
- xcb_screen_t *s;
-
- if ((s =
[EGIT] [core/enlightenment] master 01/01: wayland: Eliminate extraneous E_COMP_WL_PIXMAP_CHECK macro
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=8441520030aa5f422971454c37e9315374e458b0
commit 8441520030aa5f422971454c37e9315374e458b0
Author: Bryce Harrington br...@osg.samsung.com
Date: Fri Feb 27 09:21:55 2015 -0500
wayland: Eliminate extraneous E_COMP_WL_PIXMAP_CHECK macro
Summary:
Many of the functions in the compositor do some preliminary checks, to
ensure objects are valid and the right type. Most of the checks follow
a consistent pattern, for example:
if (!(ec = data)) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (ec-iconic) return;
This style makes it pretty straightforward to review the pre-conditions
of the function.
The one exception is the check to see if an object is a wayland pixmap;
this is implemented as a C macro.
E_COMP_WL_PIXMAP_CHECK;
The name of the macro is descriptive enough, but it conceals what is
actually being checked. I think that it is clearer and fits better with
the style of the rest of the pre-condition checks for this check to just
be shown as regular C code:
if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
Reviewers: zmike, cedric, devilhorns
Reviewed By: devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2066
---
src/bin/e_comp_wl.c | 33 -
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 79256fd..ed8aefc 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -7,9 +7,6 @@
#define COMPOSITOR_VERSION 3
-#define E_COMP_WL_PIXMAP_CHECK \
- if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return
-
/* Resource Data Mapping: (wl_resource_get_user_data)
*
* wl_surface == e_pixmap
@@ -497,8 +494,7 @@ _e_comp_wl_evas_cb_focus_in(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj
if (!(ec = data)) return;
if (e_object_is_del(E_OBJECT(ec))) return;
if (ec-iconic) return;
-
- E_COMP_WL_PIXMAP_CHECK;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
/* block spurious focus events */
focused = e_client_focused_get();
@@ -522,8 +518,7 @@ _e_comp_wl_evas_cb_focus_out(void *data, Evas *evas
EINA_UNUSED, Evas_Object *ob
if (!(ec = data)) return;
if (e_object_is_del(E_OBJECT(ec))) return;
-
- E_COMP_WL_PIXMAP_CHECK;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
/* lower client priority */
_e_comp_wl_client_priority_normal(ec);
@@ -553,8 +548,7 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj
EINA_UNUSED, void *event
E_Client *ec;
if (!(ec = data)) return;
-
- E_COMP_WL_PIXMAP_CHECK;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
if ((ec-shading) || (ec-shaded)) return;
ec-post_resize = EINA_TRUE;
@@ -769,7 +763,7 @@ _e_comp_wl_cb_comp_object_add(void *data EINA_UNUSED, int
type EINA_UNUSED, E_Ev
if (e_object_is_del(E_OBJECT(ec))) return ECORE_CALLBACK_RENEW;
/* check for wayland pixmap */
- E_COMP_WL_PIXMAP_CHECK ECORE_CALLBACK_RENEW;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return
ECORE_CALLBACK_RENEW;
/* if we have not setup evas callbacks for this client, do it */
if (!ec-comp_data-evas_init) _e_comp_wl_client_evas_init(ec);
@@ -2008,7 +2002,7 @@ _e_comp_wl_client_cb_new(void *data EINA_UNUSED, E_Client
*ec)
uint64_t win;
/* make sure this is a wayland client */
- E_COMP_WL_PIXMAP_CHECK;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
/* get window id from pixmap */
win = e_pixmap_window_get(ec-pixmap);
@@ -2061,7 +2055,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client
*ec)
struct wl_resource *cb;
/* make sure this is a wayland client */
- E_COMP_WL_PIXMAP_CHECK;
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
if ((!ec-already_unparented) (ec-comp_data-reparented))
_e_comp_wl_focus_down_set(ec);
@@ -2099,8 +2093,7 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client
*ec)
static void
_e_comp_wl_client_cb_post_new(void *data EINA_UNUSED, E_Client *ec)
{
- E_COMP_WL_PIXMAP_CHECK;
-
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
if (e_object_is_del(E_OBJECT(ec))) return;
ec-need_shape_merge = EINA_FALSE;
@@ -2118,8 +2111,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED,
E_Client *ec)
{
uint64_t parent;
- E_COMP_WL_PIXMAP_CHECK;
-
+ if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
if (!ec-comp_data-need_reparent) return;
DBG(Client Pre Frame: %d, wl_resource_get_id(ec-comp_data-surface));
@@ -2196,7 +2188,7 @@ _e_comp_wl_client_cb_pre_frame(void *data EINA_UNUSED,
E_Client *ec)
static void
_e_comp_wl_client_cb_focus_set(void
[EGIT] [core/enlightenment] master 01/01: wayland: Document the public API
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=c80223953458c504365a0c9a46b54b6aa9ea789f
commit c80223953458c504365a0c9a46b54b6aa9ea789f
Author: Bryce Harrington br...@osg.samsung.com
Date: Fri Feb 27 09:24:59 2015 -0500
wayland: Document the public API
Summary: Add doxygen comments for public API members
Reviewers: zmike, cedric, devilhorns
Reviewed By: devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2067
---
src/bin/e_comp_wl.c | 47 +++
1 file changed, 47 insertions(+)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index ed8aefc..66caff2 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2505,6 +2505,14 @@ disp_err:
}
/* public functions */
+
+/**
+ * Creates and initializes a Wayland compositor with ecore.
+ * Registers callback handlers for keyboard and mouse activity
+ * and other client events.
+ *
+ * @returns true on success, false if initialization failed.
+ */
EAPI Eina_Bool
e_comp_wl_init(void)
{
@@ -2576,6 +2584,11 @@ e_comp_wl_init(void)
return EINA_TRUE;
}
+/**
+ * Get the signal that is fired for the creation of a Wayland surface.
+ *
+ * @returns the corresponding Wayland signal
+ */
EAPI struct wl_signal
e_comp_wl_surface_create_signal_get(E_Comp *comp)
{
@@ -2720,6 +2733,16 @@ e_comp_wl_buffer_reference(E_Comp_Wl_Buffer_Ref *ref,
E_Comp_Wl_Buffer *buffer)
ref-destroy_listener.notify = _e_comp_wl_buffer_reference_cb_destroy;
}
+/**
+ * Get the buffer for a given resource.
+ *
+ * Retrieves the Wayland SHM buffer for the resource and
+ * uses it to create a new E_Comp_Wl_Buffer object. This
+ * buffer will be freed when the resource is destroyed.
+ *
+ * @param resource that owns the desired buffer
+ * @returns a new E_Comp_Wl_Buffer object
+ */
EAPI E_Comp_Wl_Buffer *
e_comp_wl_buffer_get(struct wl_resource *resource)
{
@@ -2746,12 +2769,36 @@ e_comp_wl_buffer_get(struct wl_resource *resource)
return buffer;
}
+/**
+ * Computes the time since the last input event.
+ *
+ * @returns time in seconds.
+ */
EAPI double
e_comp_wl_idle_time_get(void)
{
return (ecore_loop_time_get() - _last_event_time);
}
+/**
+ * Initializes information about one display output.
+ *
+ * Adds or updates the given data about a single display output,
+ * with an id matching the provided id.
+ *
+ * @param id identification of output to be added or changed
+ * @param make manufacturer name of the display output
+ * @param model model name of the display output
+ * @param x output's top left corner x coordinate
+ * @param y output's top left corner y coordinate
+ * @param w output's width in pixels
+ * @param h output's height in pixels
+ * @param pw output's physical width in millimeters
+ * @param ph output's physical height in millimeters
+ * @param refreshoutput's refresh rate in Hz
+ * @param subpixel output's subpixel layout
+ * @param transform output's rotation and/or mirror transformation
+ */
EAPI void
e_comp_wl_output_init(const char *id, const char *make, const char *model, int
x, int y, int w, int h, int pw, int ph, unsigned int refresh, unsigned int
subpixel, unsigned int transform)
{
--
Re: [E-devel] [EGIT] [core/efl] master 03/07: evas: Evas_3D - improve Shooter example.
On Fri, Feb 27, 2015 at 11:08 AM, Daniel Kolesa dan...@octaforge.org wrote: On Fri, Feb 27, 2015 at 7:41 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: On 26/02/15 23:08, Daniel Kolesa wrote: On Thu, Feb 26, 2015 at 9:29 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 8:53 PM, Daniel Kolesa dan...@octaforge.org wrote: On Thu, Feb 26, 2015 at 7:19 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 11:19 AM, Tom Hacohen tom.haco...@samsung.com wrote: On 25/02/15 14:52, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 5:41 PM, Tom Hacohen tom.haco...@samsung.com wrote: On 23/02/15 16:27, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 4:56 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:55 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:50 PM, Oleksandr Shcherbina o.shcherb...@samsung.com wrote: Sorry guys, capital letters will be changed asap. Also we plan reduce quality of resources. It example useful for testing, because gathers features together. Can you advice acceptable size for 3d models and images for textures? 256x256 for this kind of stuff at most (everything above that is an overkill; i believe in most cases even 128x128 would do). Fix up the names and paths (all lowercase, no spaces). Keep all textures with power-of-two sizes (32, 64, 128 etc) so that mipmapping behaves correctly (and so that the examples work with all versions of opengl and with all supported hardware). As for the models, you can probably dramatically reduce polycount on everything (and scale down the skins). Make sure the assets dir stays small, 50MB is really bad. I think the requirement on being power-of-two is irrelevant in the case of Evas as we should be using Evas_GL_Image which already does automatic packing into an atlas with the right size for us (Otherwise we would have trouble with all the other image we load for widgets). As for size, I agree 256x256 should be enough for this example and I should start paying attention to file size... And yeah, as Tom said, this would best go into a separate repository. We don't really want this kind of stuff in efl.git. This I disagree. I think this is not orthogonal to efl. We are pushing a 3d and a vector scenegraph in efl to use it for widget and application. Showing how to use that infrastructure does make sense. Same actually goes with exactness data, as we are doing a graphical toolkit and we don't have visual test in our make check. It's just a shame and a bad excuse for not having it. If you really want that out of the main git, I guess we could use some submodule and force make check/examples to pull that part if necessary, but that doesn't feel reliable at all. Submodules, as I've suggested a million times before. That's the only sane way of doing it. submodule only bring pain and agony to its users last time I tested them. And the web is still full of complains so nothing did change there, but you are welcome to enlighten me on how great they are. submodule are quite easy to use, but yeah, I guess they are a bit annoying for noobs. Luckily, we are not going to use them for anything that matters for the non technical user, we are only going to use it for external shit no one uses anyway. Seriously ? Either you never used submodule and are a complete ignorant, or you want to inflict pain on other and cripple EFL with problem. Everyone who used submodule will have lost commit, feel the pain of managing a branch or rebasing work while working with others. submodule is a sure recipe for poor quality delivered to user. Just use google to search about all the bad experience that come out of submodule (You don't even need to search for bad experience specifically, just google git submodule and you already have on the first page web page that explain why you should not use them...). I've used submodules successfully for similar purposes. Stop saying bullshit. They work just fine for this kind of stuff - people get problems when they use them wrong (for example when subtree should've been used instead); for an optional repo (and examples ARE optional) it's perfectly fine and easy to manage. Bullshit is not a valid argument to dismiss the fact that git submodule work by using a detached HEAD. That's what create problem and that didn't change in the past years as far as I know. How many people where active daily on your project where you used them ? How many branch did you manage ? The fact it worked for you is not a valid argument. Addressing the problem it create, would be. There is no problem, because majority of people are not even interested in downloading examples (look at how often make examples is broken - and nobody cares until release, when
[EGIT] [core/enlightenment] master 01/01: wayland: Fix missing check on E_NEW return
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=82e155eac68cb8b1c21379299bca4b71cd98c612
commit 82e155eac68cb8b1c21379299bca4b71cd98c612
Author: Bryce Harrington br...@osg.samsung.com
Date: Fri Feb 27 09:18:27 2015 -0500
wayland: Fix missing check on E_NEW return
Summary:
All other E_NEW calls in this file check the return value, except this
one place. In this function, other calls are being checked for NULL and
handled so this one should as well. The other handlers in this function
follow the style of issuing an error message, freeing objects, and
returning false; we don't need to free anything so just do the error
message and return.
Reviewers: zmike, cedric, devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2065
---
src/bin/e_comp_wl.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 722a598..79256fd 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2363,7 +2363,11 @@ _e_comp_wl_compositor_create(void)
}
/* create new compositor data */
- cdata = E_NEW(E_Comp_Data, 1);
+ if (!(cdata = E_NEW(E_Comp_Data, 1)))
+ {
+ ERR(Could not create compositor data: %m);
+ return EINA_FALSE;
+ }
/* set compositor wayland data */
comp-wl_comp_data = cdata;
@@ -2738,9 +2742,7 @@ e_comp_wl_buffer_get(struct wl_resource *resource)
return container_of(listener, E_Comp_Wl_Buffer, destroy_listener);
if (!(shmbuff = wl_shm_buffer_get(resource))) return NULL;
-
- buffer = E_NEW(E_Comp_Wl_Buffer, 1);
- if (!buffer) return NULL;
+ if (!(buffer = E_NEW(E_Comp_Wl_Buffer, 1))) return NULL;
buffer-w = wl_shm_buffer_get_width(shmbuff);
buffer-h = wl_shm_buffer_get_height(shmbuff);
--
[EGIT] [core/efl] efl-1.13 01/01: ecore-wl fullscreen state is based on either window type or attribute
discomfitor pushed a commit to branch efl-1.13. http://git.enlightenment.org/core/efl.git/commit/?id=c1b26bccd42bb5b098ca1f0f1a2ade212a2e83db commit c1b26bccd42bb5b098ca1f0f1a2ade212a2e83db Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Thu Feb 26 22:30:44 2015 -0500 ecore-wl fullscreen state is based on either window type or attribute fixes fullscreen state detection when being set to fullscreen by the compositor @fix --- src/lib/ecore_wayland/ecore_wl_window.c | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c index febb135..87da43d 100644 --- a/src/lib/ecore_wayland/ecore_wl_window.c +++ b/src/lib/ecore_wayland/ecore_wl_window.c @@ -558,10 +558,7 @@ ecore_wl_window_fullscreen_get(Ecore_Wl_Window *win) if (!win) return EINA_FALSE; - if (win-type == ECORE_WL_WINDOW_TYPE_FULLSCREEN) - return EINA_TRUE; - - return EINA_FALSE; + return win-fullscreen || (win-type == ECORE_WL_WINDOW_TYPE_FULLSCREEN); } EAPI void --
[EGIT] [core/efl] annotated tag v1.13.1 created (now 3fe1c67)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.13.1 in repository core/efl. at 3fe1c67 (tag) tagging 16e098df2d0ce216774c6a4241a8c1b8c1966739 (commit) replaces v1.13.0 tagged by Stefan Schmidt on Fri Feb 27 16:13:14 2015 +0100 - Log - v1.13.1 Carsten Haitzler (1): eina + ecore - fix main loop thread id tracking on fork Christopher Michael (1): ecore-drm: Fix bad German formatting ;) Jean-Philippe ANDRÉ (4): Evas masking: Fix some garbage pixels with the SW engine Evas masking: Fix potential issues with map masking Evas masking: Force BLEND mode in case of image masking (GL) Evas GL: Fix leak of surfaces with GLES 1.1 Mike Blumenkrantz (2): ecore-drm should not use sscanf when getting logind vt ee-win32 probably might compile now Minkyoung Kim (1): Evas GL:Add evasgl extension macro '_EVASGL_EXT_DRVNAME_PRIVATE'. Stefan Schmidt (4): ecore/drm: Add support for changed libinput API since 0.8 edje_cc: Avoid segfault when strcmp NULL items ecore/drm: Fix libinput = 0.8 check release: Update NEWS and bump version for 1.13.1 release mythri.venugopal (1): Evas GL: Fix issues in gles extensions initialisation --- No new revisions were added by this update. --
Re: [E-devel] Pre-release tarballs for efl and elm 1.13.1
From: thiagocmarti...@gmail.com
Date: Thu, 26 Feb 2015 19:39:05 -0300
To: enlightenment-devel@lists.sourceforge.net
Subject: Re: [E-devel] Pre-release tarballs for efl and elm 1.13.1
On 26 February 2015 at 17:52, Martinx - ジェームズ wrote:
On 26 February 2015 at 17:05, Martinx - ジェームズ wrote:
On 26 February 2015 at 12:08, Stefan Schmidt wrote:
Hello.
I just uploaded the elm tarballs for 1.13.1 which will become the final
release if I hear nothing problematic within the next 24h.
http://download.enlightenment.org/pre-releases/efl-1.13.1-pre.tar.gz
7e47069f5d40a07b46f9d7c0068f487c35e978102a039ff6afa9c9f784155e72
http://download.enlightenment.org/pre-releases/elementary-1.13.1-pre.tar.gz
732b5dd88154940b1d295042ce4c53d3b3836b0edeef4c4892ecdf3c11e1cb49
regards
Stefan Schmidt
Hey Stefan!
I'm trying to build efl-1.13.1 on Ubuntu 15.04, and I'm seeing the
following error (`./configure` runs okay):
---
ebuilder@e-builder-1:~/e-desktop/efl/efl-1.13.1$ make
CDPATH=${ZSH_VERSION+.}: cd . /bin/bash
/home/ebuilder/e-desktop/efl/efl-1.13.1/missing aclocal-1.13 -I m4
/home/ebuilder/e-desktop/efl/efl-1.13.1/missing: line 81:
aclocal-1.13: command not found
WARNING: 'aclocal-1.13' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
Makefile:1573: recipe for target 'aclocal.m4' failed
make: *** [aclocal.m4] Error 127
---
I have installed, `aclocal-1.14`... Look:
---
$ file /etc/alternatives/aclocal
/etc/alternatives/aclocal: symbolic link to `/usr/bin/aclocal-1.14'
---
Any tips?!
Thanks!
Thiago
BTW,
I executed `autoreconf` from within efl-1.13.1 subdirectory (to
reconfigure automake stuff?), it is now re ./configure -red and
`make` is working / compiling.
Any chances to make EFL upstream tarball, somehow, more dynamic (or
aware of this kind of situations)? The way it is now, it is
interfering with Debian packaging procedures... I mean, I am unable to
package it on Ubuntu 15.04.
Sorry if I'm not using a better terminology here but, I'm not a
coder... I'm not familiar with those tools... :-)
Cheers!
Thiago
Hey guys,
Please, ignore my latest two e-mails.
I managed to make it work, I'm research more about `autoreconf` and
dh-autoreconf...
Sorry about the buzz...
Best,
Thiago
We recently had a similar issue with Pacman, it was related to timestamps.
You can see it here:
https://lists.archlinux.org/pipermail/pacman-dev/2015-February/019893.html
--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/03: evas-software-x11: Remove improper EINA_UNUSED for function parameter
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=24c92d8caf5a29aa1bcf87e933df345437310e77
commit 24c92d8caf5a29aa1bcf87e933df345437310e77
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Feb 27 10:29:06 2015 -0500
evas-software-x11: Remove improper EINA_UNUSED for function parameter
Summary: In the _native_bind_cb function, the data parameter is
actually used inside here, so having EINA_UNUSED on the function
parameter is incorrect.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/modules/evas/engines/software_x11/evas_xlib_image.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_image.c
b/src/modules/evas/engines/software_x11/evas_xlib_image.c
index 166f22a..615d11a 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_image.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_image.c
@@ -33,7 +33,7 @@ evas_xlib_image_update(void *data EINA_UNUSED, void *image,
int x, int y, int w,
}
static void
-_native_bind_cb(void *data EINA_UNUSED, void *image, int x, int y, int w, int
h)
+_native_bind_cb(void *data, void *image, int x, int y, int w, int h)
{
RGBA_Image *im = image;
Native *n = im-native.data;
--
[EGIT] [core/efl] master 03/03: evas-software-x11: Provide TBM Native Surface support for xcb engine
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3bb11b938c7efef87a86638ea5427c174c7725ca
commit 3bb11b938c7efef87a86638ea5427c174c7725ca
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Feb 27 10:33:30 2015 -0500
evas-software-x11: Provide TBM Native Surface support for xcb engine
Summary: This adds support for native surfaces in xcb. Previously when
the TBM Native Surface support was added, it broke the xcb build.
These commits fix that issue.
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/Makefile_Evas.am | 4 +-
.../evas/engines/software_x11/evas_engine.c| 12 +-
.../evas/engines/software_x11/evas_native_tbm.c| 7 +-
.../evas/engines/software_x11/evas_xcb_image.c | 125 +
.../evas/engines/software_x11/evas_xcb_image.h | 15 +++
5 files changed, 155 insertions(+), 8 deletions(-)
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 755912e..d8c6ede 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1107,10 +1107,12 @@ modules/evas/engines/software_x11/evas_xcb_outbuf.c \
modules/evas/engines/software_x11/evas_xcb_buffer.c \
modules/evas/engines/software_x11/evas_xcb_color.c \
modules/evas/engines/software_x11/evas_xcb_main.c \
+modules/evas/engines/software_x11/evas_xcb_image.c \
modules/evas/engines/software_x11/evas_xcb_outbuf.h \
modules/evas/engines/software_x11/evas_xcb_buffer.h \
modules/evas/engines/software_x11/evas_xcb_color.h \
-modules/evas/engines/software_x11/evas_xcb_xdefaults.h
+modules/evas/engines/software_x11/evas_xcb_xdefaults.h \
+modules/evas/engines/software_x11/evas_xcb_image.h
SOFTWARE_X11_CPPFLAGS += @evas_engine_software_xcb_cflags@
SOFTWARE_X11_LIBADD += @evas_engine_software_xcb_libs@
endif
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c
b/src/modules/evas/engines/software_x11/evas_engine.c
index 2361226..65bb4df 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -18,6 +18,7 @@
# include evas_xcb_outbuf.h
# include evas_xcb_color.h
# include evas_xcb_xdefaults.h
+# include evas_xcb_image.h
#endif
#ifdef BUILD_ENGINE_SOFTWARE_XLIB
@@ -670,12 +671,15 @@ eng_image_native_set(void *data EINA_UNUSED, void *image,
void *native)
evas_cache_image_drop(ie);
ie = ie2;
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
if (ns-type == EVAS_NATIVE_SURFACE_X11)
{
+#ifdef BUILD_ENGINE_SOFTWARE_XLIB
return evas_xlib_image_native_set(re-generic.ob, ie, ns);
- }
#endif
+#ifdef BUILD_ENGINE_SOFTWARE_XCB
+return evas_xcb_image_native_set(re-generic.ob, ie, ns);
+#endif
+ }
if (ns-type == EVAS_NATIVE_SURFACE_TBM)
{
return evas_native_tbm_image_set(re-generic.ob, ie, ns);
@@ -687,16 +691,12 @@ eng_image_native_set(void *data EINA_UNUSED, void *image,
void *native)
static void *
eng_image_native_get(void *data EINA_UNUSED, void *image)
{
-#ifdef BUILD_ENGINE_SOFTWARE_XLIB
RGBA_Image *im = image;
Native *n;
if (!im) return NULL;
n = im-native.data;
if (!n) return NULL;
return (n-ns);
-#else
- return NULL;
-#endif
}
diff --git a/src/modules/evas/engines/software_x11/evas_native_tbm.c
b/src/modules/evas/engines/software_x11/evas_native_tbm.c
index ec7d037..85b3fc7 100644
--- a/src/modules/evas/engines/software_x11/evas_native_tbm.c
+++ b/src/modules/evas/engines/software_x11/evas_native_tbm.c
@@ -1,5 +1,10 @@
#include evas_common_private.h
-#include evas_xlib_image.h
+#ifdef BUILD_ENGINE_SOFTWARE_XLIB
+# include evas_xlib_image.h
+#endif
+#ifdef BUILD_ENGINE_SOFTWARE_XCB
+# include evas_xcb_image.h
+#endif
#include evas_private.h
#include Evas_Engine_Software_X11.h
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_image.c
b/src/modules/evas/engines/software_x11/evas_xcb_image.c
new file mode 100644
index 000..d15dbe3
--- /dev/null
+++ b/src/modules/evas/engines/software_x11/evas_xcb_image.c
@@ -0,0 +1,125 @@
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include evas_common_private.h
+#include evas_xcb_image.h
+
+static void
+_evas_xcb_image_update(void *data EINA_UNUSED, void *image, int x, int y, int
w, int h)
+{
+ RGBA_Image *im;
+ Native *n;
+
+ im = image;
+ n = im-native.data;
+
+ if (ecore_x_image_get(n-exim, n-pixmap, 0, 0, x, y, w, h))
+ {
+char *pix;
+int bpl, rows, bpp;
+
+pix = ecore_x_image_data_get(n-exim, bpl, rows, bpp);
+if (!ecore_x_image_is_argb32_get(n-exim))
+ {
+ Ecore_X_Colormap colormap;
+
+ if (!im-image.data)
+ im-image.data = (DATA32 *)malloc(im-cache_entry.w *
im-cache_entry.h * sizeof(DATA32));
+ colormap = ecore_x_default_colormap_get(ecore_x_display_get(),
ecore_x_default_screen_get());
+
[EGIT] [core/efl] master 01/01: Use doubles to store libinput's mouse motion
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95cb1938c22664095675ca21649856371385f393
commit 95cb1938c22664095675ca21649856371385f393
Author: Derek Foreman der...@osg.samsung.com
Date: Fri Feb 27 10:40:38 2015 -0500
Use doubles to store libinput's mouse motion
Summary:
Using can result in motion being completely discarded. Since we
only need integer data, we also only actually forward on an event
when the mouse moves more than a full unit.
Reviewers: zmike, devilhorns
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2062
---
src/lib/ecore_drm/ecore_drm_evdev.c | 75 +--
src/lib/ecore_drm/ecore_drm_private.h | 3 +-
2 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_evdev.c
b/src/lib/ecore_drm/ecore_drm_evdev.c
index 8320c30..054858a 100644
--- a/src/lib/ecore_drm/ecore_drm_evdev.c
+++ b/src/lib/ecore_drm/ecore_drm_evdev.c
@@ -347,15 +347,16 @@ _device_pointer_motion(Ecore_Drm_Evdev *edev, struct
libinput_event_pointer *eve
if ((output = edev-output))
{
-if (edev-mouse.x output-x)
- edev-mouse.x = output-x;
-else if (edev-mouse.x = (output-x + output-current_mode-width))
- edev-mouse.x = (output-x + output-current_mode-width - 1);
-
-if (edev-mouse.y output-y)
- edev-mouse.y = output-y;
-else if (edev-mouse.y = (output-y + output-current_mode-height))
- edev-mouse.y = (output-y + output-current_mode-height - 1);
+if (edev-mouse.ix output-x)
+ edev-mouse.dx = edev-mouse.ix = output-x;
+else if (edev-mouse.ix = (output-x + output-current_mode-width))
+ edev-mouse.dx =
+ edev-mouse.ix = (output-x + output-current_mode-width - 1);
+
+if (edev-mouse.iy output-y)
+ edev-mouse.dy = edev-mouse.iy = output-y;
+else if (edev-mouse.iy = (output-y + output-current_mode-height))
+ edev-mouse.dy = edev-mouse.iy = (output-y +
output-current_mode-height - 1);
}
ev-window = (Ecore_Window)input-dev-window;
@@ -367,8 +368,8 @@ _device_pointer_motion(Ecore_Drm_Evdev *edev, struct
libinput_event_pointer *eve
_device_modifiers_update(edev);
ev-modifiers = edev-xkb.modifiers;
- ev-x = edev-mouse.x;
- ev-y = edev-mouse.y;
+ ev-x = edev-mouse.ix;
+ ev-y = edev-mouse.iy;
ev-root.x = ev-x;
ev-root.y = ev-y;
@@ -393,10 +394,15 @@ _device_handle_pointer_motion(struct libinput_device
*device, struct libinput_ev
if (!(edev = libinput_device_get_user_data(device))) return;
- edev-mouse.x += libinput_event_pointer_get_dx(event);
- edev-mouse.y += libinput_event_pointer_get_dy(event);
+ edev-mouse.dx += libinput_event_pointer_get_dx(event);
+ edev-mouse.dy += libinput_event_pointer_get_dy(event);
- _device_pointer_motion(edev, event);
+ if (floor(edev-mouse.dx) == edev-mouse.ix
+ floor(edev-mouse.dy) == edev-mouse.iy) return;
+
+ edev-mouse.ix = edev-mouse.dx;
+ edev-mouse.iy = edev-mouse.dy;
+ _device_pointer_motion(edev, event);
}
static void
@@ -406,13 +412,16 @@ _device_handle_pointer_motion_absolute(struct
libinput_device *device, struct li
if (!(edev = libinput_device_get_user_data(device))) return;
- edev-mouse.x =
- libinput_event_pointer_get_absolute_x_transformed(event,
+ edev-mouse.dx =
+ libinput_event_pointer_get_absolute_x_transformed(event,
edev-output-current_mode-width);
- edev-mouse.y =
- libinput_event_pointer_get_absolute_y_transformed(event,
+ edev-mouse.dy =
+ libinput_event_pointer_get_absolute_y_transformed(event,
edev-output-current_mode-height);
+ if (floor(edev-mouse.dx) == edev-mouse.ix
+ floor(edev-mouse.dy) == edev-mouse.iy) return;
+
_device_pointer_motion(edev, event);
}
@@ -447,8 +456,8 @@ _device_handle_button(struct libinput_device *device,
struct libinput_event_poin
_device_modifiers_update(edev);
ev-modifiers = edev-xkb.modifiers;
- ev-x = edev-mouse.x;
- ev-y = edev-mouse.y;
+ ev-x = edev-mouse.ix;
+ ev-y = edev-mouse.iy;
ev-root.x = ev-x;
ev-root.y = ev-y;
@@ -529,8 +538,8 @@ _device_handle_axis(struct libinput_device *device, struct
libinput_event_pointe
_device_modifiers_update(edev);
ev-modifiers = edev-xkb.modifiers;
- ev-x = edev-mouse.x;
- ev-y = edev-mouse.y;
+ ev-x = edev-mouse.ix;
+ ev-y = edev-mouse.iy;
ev-root.x = ev-x;
ev-root.y = ev-y;
@@ -640,8 +649,8 @@ _device_handle_touch_event(Ecore_Drm_Evdev *edev, struct
libinput_event_touch *e
_device_modifiers_update(edev);
ev-modifiers = edev-xkb.modifiers;
- ev-x = edev-mouse.x;
- ev-y = edev-mouse.y;
+ ev-x = edev-mouse.ix;
+ ev-y = edev-mouse.iy;
[EGIT] [core/efl] master 01/03: ecore-xcb: Fix 'variable set but not used' message
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=99e0695e424823225fce00dc543102ceac5a7961
commit 99e0695e424823225fce00dc543102ceac5a7961
Author: Chris Michael cp.mich...@samsung.com
Date: Fri Feb 27 09:44:16 2015 -0500
ecore-xcb: Fix 'variable set but not used' message
Summary: As we do not use the returned Ecore_Event here, there is no
need to assign it
@fix
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_x/xcb/ecore_xcb_events.c | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_events.c
b/src/lib/ecore_x/xcb/ecore_xcb_events.c
index ffcca53..e37b2aa 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -2521,7 +2521,6 @@ _ecore_xcb_event_mouse_move(uint16_t timestamp,
int16_t mry)
{
Ecore_Event_Mouse_Move *e;
- Ecore_Event *event;
if (!(e = malloc(sizeof(Ecore_Event_Mouse_Move return;
@@ -2546,14 +2545,13 @@ _ecore_xcb_event_mouse_move(uint16_t timestamp,
e-multi.root.x = mrx;
e-multi.root.y = mry;
- event = ecore_event_add(ECORE_EVENT_MOUSE_MOVE, e,
- _ecore_xcb_event_mouse_move_free, NULL);
+ ecore_event_add(ECORE_EVENT_MOUSE_MOVE, e,
+ _ecore_xcb_event_mouse_move_free, NULL);
_ecore_xcb_event_last_time = e-timestamp;
_ecore_xcb_event_last_window = e-window;
_ecore_xcb_event_last_root_x = root_x;
_ecore_xcb_event_last_root_y = root_y;
-// _ecore_xcb_event_last_mouse_move_event = event;
}
static void
--
[EGIT] [core/enlightenment] master 01/01: remove missed use of E_COMP_WL_PIXMAP_CHECK macro
devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=8a760180255872fabb7cf9dd9b4276c4ef672ecd commit 8a760180255872fabb7cf9dd9b4276c4ef672ecd Author: Chris Michael cp.mich...@samsung.com Date: Fri Feb 27 10:59:59 2015 -0500 remove missed use of E_COMP_WL_PIXMAP_CHECK macro Signed-off-by: Chris Michael cp.mich...@samsung.com --- src/bin/e_comp_wl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index 66caff2..993fa92 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -562,7 +562,9 @@ _e_comp_wl_evas_cb_state_update(void *data, Evas_Object *obj EINA_UNUSED, void * if (e_object_is_del(E_OBJECT(ec))) return; - E_COMP_WL_PIXMAP_CHECK; + /* check for wayland pixmap */ + if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return; + if (ec-comp_data-shell.configure_send) ec-comp_data-shell.configure_send(ec-comp_data-shell.surface, 0, 0, 0); } --
[EGIT] [core/elementary] annotated tag v1.13.1 created (now 6967787)
This is an automated email from the git hooks/post-receive script. stefan pushed a change to annotated tag v1.13.1 in repository core/elementary. at 6967787 (tag) tagging 72ae2849955b16c19e5089bee7ef5d28809e8c3a (commit) replaces v1.13.0 tagged by Stefan Schmidt on Fri Feb 27 16:10:10 2015 +0100 - Log - v1.13.1 Andy Williams (1): entry: Don't unlink empty files when saving @fix T2122. Carsten Haitzler (1): elm engine - restore explicit use of ELM_ENGNE env var Jee-Yong Um (1): elm_box: Fix miscalculated items' size issue in homogeneous box Mike Blumenkrantz (2): comp theme now allows for modification of focus rect edgebindings theme now sets align to setup layout as expected SangHyeon Lee (1): genlist/gengrid : Add upadating 'focus' state in item realized function. Stefan Schmidt (1): release: Update NEWS and bump version for 1.13.1 release woochan lee (1): datetime: Fix elm_datetime_field_limit_set. --- No new revisions were added by this update. --
[E-devel] Efl and Elementary 1.13.1 release
Another update for the 1.13.x series Efl fixes: * Evas masking: Fix some garbage pixels with the SW engine * Evas masking: Fix potential issues with map masking * Evas masking: Force BLEND mode in case of image masking (GL) * ecore-drm should not use sscanf when getting logind vt * ecore/drm: Fix libinput = 0.8 check * ee-win32 probably might compile now * Evas GL: Fix leak of surfaces with GLES 1.1 * eina + ecore - fix main loop thread id tracking on fork Elementary fixes: * elm engine: Restore explicit use of ELM_ENGNE env var * entry: Don't unlink empty files when saving @fix T2122. * datetime: Fix elm_datetime_field_limit_set. * genlist/gengrid: Add upadating 'focus' state in item realized function. Download http://download.enlightenment.org/rel/libs/efl/efl-1.13.1.tar.gz 7e47069f5d40a07b46f9d7c0068f487c35e978102a039ff6afa9c9f784155e72 http://download.enlightenment.org/rel/libs/elementary/elementary-1.13.1.tar.gz 732b5dd88154940b1d295042ce4c53d3b3836b0edeef4c4892ecdf3c11e1cb49 Building and Dependencies If you have an existing EFL or Elementary install, you may wish to delete its header files and libraries before compiling and installing to avoid possible conflicts during compilation. If you are compiling the above, please compile them in the following order: efl elementary If you have an existing EFL or Elementary install, you may wish to delete its header files and libraries before building the above. -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: disable fileman popups in wl-only mode
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=e6c47e8d90e75182cffd1d8cbdbb9e3821a4dbf1 commit e6c47e8d90e75182cffd1d8cbdbb9e3821a4dbf1 Author: Mike Blumenkrantz zm...@osg.samsung.com Date: Fri Feb 27 14:44:27 2015 -0500 disable fileman popups in wl-only mode these crash for now and I'm annoyed --- src/modules/fileman/e_fwin.c | 4 1 file changed, 4 insertions(+) diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c index ac1c5f4..54c9c8f 100644 --- a/src/modules/fileman/e_fwin.c +++ b/src/modules/fileman/e_fwin.c @@ -941,6 +941,10 @@ _e_fwin_icon_mouse_in(void *data, Evas_Object *obj __UNUSED__, void *event_info) if (fwin-popup_timer) ecore_timer_del(fwin-popup_timer); fwin-popup_timer = NULL; if (!fileman_config-tooltip.enable) return; +#ifdef HAVE_WAYLAND_ONLY + return; +#warning REMOVE FOR WL RELEASE +#endif fwin-popup_timer = ecore_timer_add(fileman_config-tooltip.delay, _e_fwin_icon_popup, fwin); fwin-popup_icon = ici; #ifndef HAVE_WAYLAND_ONLY --
[EGIT] [core/enlightenment] master 01/01: noop when setting pointer object if re-setting same object
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=2e6c5932953239d2d16f8f3bae5d47eb761584ed
commit 2e6c5932953239d2d16f8f3bae5d47eb761584ed
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Feb 27 15:07:24 2015 -0500
noop when setting pointer object if re-setting same object
---
src/bin/e_pointer.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index a0d3de2..765e82e 100644
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -756,6 +756,7 @@ e_pointer_object_set(E_Pointer *ptr, Evas_Object *obj, int
x, int y)
ecore_evas_cursor_get(ptr-ee, o, NULL, NULL, NULL);
if (o)
{
+if (o == obj) return;
ec = e_comp_object_client_get(o);
if (ec)
ec-hidden = 1;
--
[EGIT] [core/enlightenment] master 01/01: remove wl client resize idler, send ec-w/h instead of ec-client.w/h on resize
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5bac79422e3e836c115fba31334731e3b417f9b2
commit 5bac79422e3e836c115fba31334731e3b417f9b2
Author: Mike Blumenkrantz zm...@osg.samsung.com
Date: Fri Feb 27 15:55:41 2015 -0500
remove wl client resize idler, send ec-w/h instead of ec-client.w/h on
resize
this idler makes sense in X where there is a third party display server but
not in wl
---
src/bin/e_comp_wl.c | 56 -
1 file changed, 4 insertions(+), 52 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 993fa92..46c1e66 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -16,13 +16,10 @@
*/
static void _e_comp_wl_subsurface_parent_commit(E_Client *ec, Eina_Bool
parent_synchronized);
-static void _e_comp_wl_client_idler_add(E_Client *ec);
/* local variables */
/* static Eina_Hash *clients_win_hash = NULL; */
static Eina_List *handlers = NULL;
-static Eina_List *_idle_clients = NULL;
-static Ecore_Idle_Enterer *_client_idler = NULL;
static double _last_event_time = 0.0;
/* local functions */
@@ -135,13 +132,6 @@ _e_comp_wl_evas_cb_show(void *data, Evas *evas
EINA_UNUSED, Evas_Object *obj EIN
}
else if (!ec-internal_elm_win)
evas_object_show(ec-frame);
-
-if (ec-internal_elm_win)
- {
- _e_comp_wl_client_idler_add(ec);
- ec-post_move = EINA_TRUE;
- ec-post_resize = EINA_TRUE;
- }
}
EINA_LIST_FOREACH(ec-e.state.video_child, l, tmp)
@@ -419,46 +409,6 @@ _e_comp_wl_client_priority_normal(E_Client *ec)
EINA_FALSE, EINA_TRUE, EINA_FALSE);
}
-static Eina_Bool
-_e_comp_wl_client_cb_idle(void *data EINA_UNUSED)
-{
- E_Client *ec;
- E_Comp_Client_Data *cdata;
-
- EINA_LIST_FREE(_idle_clients, ec)
- {
-if (e_object_is_del(E_OBJECT(ec))) continue;
-
-if (!(cdata = ec-comp_data)) continue;
-
-if ((ec-post_resize) (!ec-maximized))
- {
- if (cdata-shell.configure_send)
- cdata-shell.configure_send(cdata-shell.surface,
-
ec-comp-wl_comp_data-resize.edges,
- ec-client.w, ec-client.h);
- }
-
-ec-post_move = EINA_FALSE;
-ec-post_resize = EINA_FALSE;
- }
-
- _client_idler = NULL;
- return EINA_FALSE;
-}
-
-static void
-_e_comp_wl_client_idler_add(E_Client *ec)
-{
- if (!ec) return;
-
- if (!_client_idler)
- _client_idler = ecore_idle_enterer_add(_e_comp_wl_client_cb_idle, NULL);
-
- if (!eina_list_data_find(_idle_clients, ec))
- _idle_clients = eina_list_append(_idle_clients, ec);
-}
-
static void
_e_comp_wl_client_focus(E_Client *ec)
{
@@ -551,8 +501,10 @@ _e_comp_wl_evas_cb_resize(void *data, Evas_Object *obj
EINA_UNUSED, void *event
if (e_pixmap_type_get(ec-pixmap) != E_PIXMAP_TYPE_WL) return;
if ((ec-shading) || (ec-shaded)) return;
- ec-post_resize = EINA_TRUE;
- _e_comp_wl_client_idler_add(ec);
+ if (ec-comp_data-shell.configure_send)
+ ec-comp_data-shell.configure_send(ec-comp_data-shell.surface,
+ ec-comp-wl_comp_data-resize.edges,
+ ec-w, ec-h);
}
static void
--
Re: [E-devel] Pre-release tarballs for efl and elm 1.13.1
Hello.
On 26/02/15 23:39, Martinx - ジェームズ wrote:
On 26 February 2015 at 17:52, Martinx - ジェームズ thiagocmarti...@gmail.com
wrote:
On 26 February 2015 at 17:05, Martinx - ジェームズ thiagocmarti...@gmail.com
wrote:
On 26 February 2015 at 12:08, Stefan Schmidt ste...@datenfreihafen.org
wrote:
Hello.
I just uploaded the elm tarballs for 1.13.1 which will become the final
release if I hear nothing problematic within the next 24h.
http://download.enlightenment.org/pre-releases/efl-1.13.1-pre.tar.gz
7e47069f5d40a07b46f9d7c0068f487c35e978102a039ff6afa9c9f784155e72
http://download.enlightenment.org/pre-releases/elementary-1.13.1-pre.tar.gz
732b5dd88154940b1d295042ce4c53d3b3836b0edeef4c4892ecdf3c11e1cb49
regards
Stefan Schmidt
Hey Stefan!
I'm trying to build efl-1.13.1 on Ubuntu 15.04, and I'm seeing the
following error (`./configure` runs okay):
---
ebuilder@e-builder-1:~/e-desktop/efl/efl-1.13.1$ make
CDPATH=${ZSH_VERSION+.}: cd . /bin/bash
/home/ebuilder/e-desktop/efl/efl-1.13.1/missing aclocal-1.13 -I m4
/home/ebuilder/e-desktop/efl/efl-1.13.1/missing: line 81:
aclocal-1.13: command not found
WARNING: 'aclocal-1.13' is missing on your system.
You should only need it if you modified 'acinclude.m4' or
'configure.ac' or m4 files included by 'configure.ac'.
The 'aclocal' program is part of the GNU Automake package:
http://www.gnu.org/software/automake
It also requires GNU Autoconf, GNU m4 and Perl in order to run:
http://www.gnu.org/software/autoconf
http://www.gnu.org/software/m4/
http://www.perl.org/
Makefile:1573: recipe for target 'aclocal.m4' failed
make: *** [aclocal.m4] Error 127
---
I have installed, `aclocal-1.14`... Look:
---
$ file /etc/alternatives/aclocal
/etc/alternatives/aclocal: symbolic link to `/usr/bin/aclocal-1.14'
---
Any tips?!
Thanks!
Thiago
BTW,
I executed `autoreconf` from within efl-1.13.1 subdirectory (to
reconfigure automake stuff?), it is now re ./configure -red and
`make` is working / compiling.
Any chances to make EFL upstream tarball, somehow, more dynamic (or
aware of this kind of situations)? The way it is now, it is
interfering with Debian packaging procedures... I mean, I am unable to
package it on Ubuntu 15.04.
Sorry if I'm not using a better terminology here but, I'm not a
coder... I'm not familiar with those tools... :-)
Cheers!
Thiago
Hey guys,
Please, ignore my latest two e-mails.
I managed to make it work, I'm research more about `autoreconf` and
dh-autoreconf...
Sorry about the buzz...
We seem to be both a bit confused now. :)
You should not need to run autoreconf in a released tarball. The
configure and realted files generrated during my tarball preparation
should be generic and not depend on a specific aclocal version.
The stable tarballs are indeed generated on a system with aclocal
1.13.4. I just downloaded the tarball on a machine with aclocal 1.14 and
it works as expected with ./configure make
A quick grep through the files also showed that we don't have a hard
dependency on aclocal-1.13
regards
Stefan Schmidt
--
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/enventor] master 01/01: fix all annoying warnings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5e8f437df5568ea8130988d7849c909c37eb9d73
commit 5e8f437df5568ea8130988d7849c909c37eb9d73
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Feb 27 17:25:45 2015 +0900
fix all annoying warnings.
---
src/bin/config_data.c | 1 -
src/bin/live_edit.c| 32 +++---
src/bin/main.c | 3 +-
src/bin/text_setting.c | 7 ++--
src/bin/tools.c| 8 ++---
src/include/base_gui.h | 2 ++
src/include/config_data.h | 2 ++
src/include/text_setting.h | 2 ++
src/lib/ctxpopup.c | 4 +--
src/lib/edc_parser.c | 82 +++---
src/lib/enventor_private.h | 1 +
src/lib/syntax_color.c | 5 ++-
src/lib/template.c | 5 +++
13 files changed, 88 insertions(+), 66 deletions(-)
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index f641897..daf21d9 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -40,7 +40,6 @@ typedef struct config_s
static config_data *g_cd = NULL;
static Eet_Data_Descriptor *edd_base = NULL;
-static Eet_Data_Descriptor *edd_color = NULL;
static void
config_edj_path_update(config_data *cd)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c3082bf..2018237 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -241,7 +241,8 @@ ctrl_pt_update(live_data *ld)
}
static void
-cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -266,8 +267,9 @@ cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
- void *event_info)
+cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+Evas_Object *obj EINA_UNUSED,
+void *event_info)
{
live_data *ld = data;
Evas_Event_Mouse_Move *ev = event_info;
@@ -328,7 +330,8 @@ align_line_update(live_data *ld)
}
static void
-cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -359,7 +362,8 @@ cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -391,7 +395,8 @@ cp_rel2_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -426,7 +431,8 @@ cp_rel3_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -462,7 +468,8 @@ cp_rel4_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -488,7 +495,8 @@ cp_left_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
}
static void
-cp_right_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+cp_right_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
void *event_info)
{
live_data *ld = data;
@@ -549,6 +557,8 @@ cp_mouse_move_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
case Ctrl_Pt_Right:
cp_right_mouse_move_cb(data, e, obj, event_info);
break;
+case Ctrl_Pt_Cnt: //for avoiding compiler warning.
+ break;
}
live_edit_update(ld);
}
@@ -841,10 +851,10 @@ live_edit_layer_set(live_data *ld)
}
static void
-ctxpopup_it_selected_cb(void *data, Evas_Object *obj, void *event_info)
+ctxpopup_it_selected_cb(void *data, Evas_Object *obj,
+void *event_info EINA_UNUSED)
{
live_data *ld = g_ld;
- const Elm_Object_Item *it = event_info;
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas scale sample - fix useage of eina thread queue
On Fri, Feb 27, 2015 at 8:51 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On 27/02/15 02:33, Carsten Haitzler wrote: raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6d5b2b32a0d1e2d7f2c7b46d4a0adc09d5c35ef6 commit 6d5b2b32a0d1e2d7f2c7b46d4a0adc09d5c35ef6 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Feb 27 10:35:01 2015 +0900 evas scale sample - fix useage of eina thread queue pass in ref not ref (other uses were fine - this single one broken) And it fixes the borken test run on jenkins with clang on 64bit. Tests have been segfaulting for this job and I really wondered where this came from. A nice valid bug coverity reported for us here. :) Oh yes ! I tried to find it, but couldn't reproduce it here and valgrind didn't complain at all. Cool stuff ! -- Cedric BAIL -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: Evas masking: Fix double free() with scaled images
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2e3ee0e658f884a126293a8fe41059c0bada5599
commit 2e3ee0e658f884a126293a8fe41059c0bada5599
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Fri Feb 27 17:56:49 2015 +0900
Evas masking: Fix double free() with scaled images
The function image_scaled_update() frees() the old scaled image
passed as input if it doesn't match the old dimensions. This commit
will avoid double frees.
---
src/lib/evas/canvas/evas_render.c | 2 --
src/modules/evas/engines/gl_generic/evas_engine.c | 13 +++--
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/lib/evas/canvas/evas_render.c
b/src/lib/evas/canvas/evas_render.c
index 32c989e..a087a45 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1850,8 +1850,6 @@ evas_render_mask_subrender(Evas_Public_Data *evas,
if (scaled)
{
done = EINA_TRUE;
-if (mdata-surface (mdata-surface != scaled))
- ENFN-image_map_surface_free(ENDT, mdata-surface);
mdata-surface = scaled;
mdata-w = w;
mdata-h = h;
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c
b/src/modules/evas/engines/gl_generic/evas_engine.c
index 95c4c97..edc85b5 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -959,6 +959,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void
*scaled, void *image,
Evas_GL_Image *dst = scaled;
Evas_GL_Image *src = image;
Evas_Engine_GL_Context *gc;
+ Eina_Bool reffed = EINA_FALSE;
if (!src) return NULL;
@@ -971,7 +972,15 @@ eng_image_scaled_update(void *data EINA_UNUSED, void
*scaled, void *image,
(dst-scaled.w == dst_w) (dst-scaled.h == dst_h))
return dst;
- if (dst) evas_gl_common_image_free(dst);
+ if (dst)
+ {
+if (dst-scaled.origin == src)
+ {
+ src-references++;
+ reffed = EINA_TRUE;
+ }
+evas_gl_common_image_free(dst);
+ }
evas_gl_common_image_update(gc, src);
if (!src-tex)
{
@@ -992,7 +1001,7 @@ eng_image_scaled_update(void *data EINA_UNUSED, void
*scaled, void *image,
dst-tex-references++;
dst-tex_only = 1;
- src-references++;
+ if (!reffed) src-references++;
dst-scaled.origin = src;
dst-scaled.w = dst_w;
dst-scaled.h = dst_h;
--
[EGIT] [tools/enventor] master 01/01: bin/text_setting: remove unused variable.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=0e885dfd040ff50f17d69ccea8db0e7754b5d0ea
commit 0e885dfd040ff50f17d69ccea8db0e7754b5d0ea
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Feb 27 17:28:01 2015 +0900
bin/text_setting: remove unused variable.
---
src/bin/text_setting.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 18c7764..5c940b2 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -768,8 +768,6 @@ font_name_selected_cb(void *data, Evas_Object *obj,
static char *
font_tag_create(const char *font_name, const char *font_style)
{
- text_setting_data *tsd = g_tsd;
-
if (!font_name) return NULL;
Eina_Strbuf *strbuf = eina_strbuf_new();
--
[EGIT] [tools/enventor] master 01/01: newfile: Fix that edj is not reloaded when newly opened edc is changed.
jaehyun pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cf7808197743696f6935237b72bd1e474f6c9368 commit cf7808197743696f6935237b72bd1e474f6c9368 Author: Jaehyun Cho jae_hyun@samsung.com Date: Fri Feb 27 17:32:24 2015 +0900 newfile: Fix that edj is not reloaded when newly opened edc is changed. edj was not reloaded when newly opened edc is changed since the new edc path was not stored in conifg edc path. --- src/bin/newfile.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/newfile.c b/src/bin/newfile.c index 1d9cc3a..9c48ed4 100644 --- a/src/bin/newfile.c +++ b/src/bin/newfile.c @@ -43,6 +43,7 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new) eina_file_mkstemp(DEFAULT_EDC_FORMAT, tmp_path); sprintf(path, %s, (const char *)tmp_path); eina_tmpstr_del(tmp_path); +config_edc_path_set(path); } success = eina_file_copy(buf, path, EINA_FILE_COPY_DATA, NULL, NULL); --
[EGIT] [core/elementary] master 01/01: gengrid/genlist/list: focus first item if first_item_focus_on_first_focus_in is on whether focus highlight is enabled or not
eunue pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=0d92e01920dfcb1d8ce29261025d655ca651510d
commit 0d92e01920dfcb1d8ce29261025d655ca651510d
Author: Jaeun Choi jaeun12.c...@samsung.com
Date: Fri Feb 27 18:14:20 2015 +0900
gengrid/genlist/list: focus first item if
first_item_focus_on_first_focus_in is on
whether focus highlight is enabled or not
@fix
---
src/lib/elm_gengrid.c | 4 +---
src/lib/elm_genlist.c | 3 +--
src/lib/elm_list.c| 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 901e9be..0f41654 100644
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -3132,13 +3132,11 @@ _elm_gengrid_elm_widget_on_focus(Eo *obj,
Elm_Gengrid_Data *sd)
eo_it = sd-last_focused_item;
else if (sd-last_selected_item)
eo_it = sd-last_selected_item;
-else if (_elm_config-first_item_focus_on_first_focus_in
- elm_widget_focus_highlight_enabled_get(obj))
+else if (_elm_config-first_item_focus_on_first_focus_in)
{
eo_it = elm_gengrid_first_item_get(obj);
is_sel = EINA_TRUE;
}
-
if (eo_it)
{
eo_it = _elm_gengrid_nearest_visible_item_get(obj, eo_it);
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 1a4b034..2169d61 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -3087,8 +3087,7 @@ _elm_genlist_elm_widget_on_focus(Eo *obj,
Elm_Genlist_Data *sd)
eo_it = sd-last_focused_item;
else if (sd-last_selected_item)
eo_it = sd-last_selected_item;
-else if (_elm_config-first_item_focus_on_first_focus_in
- elm_widget_focus_highlight_enabled_get(obj))
+else if (_elm_config-first_item_focus_on_first_focus_in)
{
eo_it = elm_genlist_first_item_get(obj);
is_sel = EINA_TRUE;
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 71bf207..819c9ba 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1276,8 +1276,7 @@ _elm_list_elm_widget_on_focus(Eo *obj, Elm_List_Data *sd)
eo_it = sd-last_focused_item;
else if (sd-last_selected_item)
eo_it = sd-last_selected_item;
-else if (_elm_config-first_item_focus_on_first_focus_in
- elm_widget_focus_highlight_enabled_get(obj))
+else if (_elm_config-first_item_focus_on_first_focus_in)
{
eo_it = elm_list_first_item_get(obj);
is_sel = EINA_TRUE;
--
Re: [E-devel] [EGIT] [core/efl] master 03/07: evas: Evas_3D - improve Shooter example.
On Fri, 27 Feb 2015 08:41:19 +0100 Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On 26/02/15 23:08, Daniel Kolesa wrote: On Thu, Feb 26, 2015 at 9:29 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 8:53 PM, Daniel Kolesa dan...@octaforge.org wrote: On Thu, Feb 26, 2015 at 7:19 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 11:19 AM, Tom Hacohen tom.haco...@samsung.com wrote: On 25/02/15 14:52, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 5:41 PM, Tom Hacohen tom.haco...@samsung.com wrote: On 23/02/15 16:27, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 4:56 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:55 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:50 PM, Oleksandr Shcherbina o.shcherb...@samsung.com wrote: Sorry guys, capital letters will be changed asap. Also we plan reduce quality of resources. It example useful for testing, because gathers features together. Can you advice acceptable size for 3d models and images for textures? 256x256 for this kind of stuff at most (everything above that is an overkill; i believe in most cases even 128x128 would do). Fix up the names and paths (all lowercase, no spaces). Keep all textures with power-of-two sizes (32, 64, 128 etc) so that mipmapping behaves correctly (and so that the examples work with all versions of opengl and with all supported hardware). As for the models, you can probably dramatically reduce polycount on everything (and scale down the skins). Make sure the assets dir stays small, 50MB is really bad. I think the requirement on being power-of-two is irrelevant in the case of Evas as we should be using Evas_GL_Image which already does automatic packing into an atlas with the right size for us (Otherwise we would have trouble with all the other image we load for widgets). As for size, I agree 256x256 should be enough for this example and I should start paying attention to file size... And yeah, as Tom said, this would best go into a separate repository. We don't really want this kind of stuff in efl.git. This I disagree. I think this is not orthogonal to efl. We are pushing a 3d and a vector scenegraph in efl to use it for widget and application. Showing how to use that infrastructure does make sense. Same actually goes with exactness data, as we are doing a graphical toolkit and we don't have visual test in our make check. It's just a shame and a bad excuse for not having it. If you really want that out of the main git, I guess we could use some submodule and force make check/examples to pull that part if necessary, but that doesn't feel reliable at all. Submodules, as I've suggested a million times before. That's the only sane way of doing it. submodule only bring pain and agony to its users last time I tested them. And the web is still full of complains so nothing did change there, but you are welcome to enlighten me on how great they are. submodule are quite easy to use, but yeah, I guess they are a bit annoying for noobs. Luckily, we are not going to use them for anything that matters for the non technical user, we are only going to use it for external shit no one uses anyway. Seriously ? Either you never used submodule and are a complete ignorant, or you want to inflict pain on other and cripple EFL with problem. Everyone who used submodule will have lost commit, feel the pain of managing a branch or rebasing work while working with others. submodule is a sure recipe for poor quality delivered to user. Just use google to search about all the bad experience that come out of submodule (You don't even need to search for bad experience specifically, just google git submodule and you already have on the first page web page that explain why you should not use them...). I've used submodules successfully for similar purposes. Stop saying bullshit. They work just fine for this kind of stuff - people get problems when they use them wrong (for example when subtree should've been used instead); for an optional repo (and examples ARE optional) it's perfectly fine and easy to manage. Bullshit is not a valid argument to dismiss the fact that git submodule work by using a detached HEAD. That's what create problem and that didn't change in the past years as far as I know. How many people where active daily on your project where you used them ? How many branch did you manage ? The fact it worked for you is not a valid argument. Addressing the problem it create, would be. There is no problem, because majority of people are not even interested in downloading examples (look at how often make examples is broken - and nobody cares until release, when distcheck fails). Distcheck has
[EGIT] [core/enlightenment] master 01/01: wayland: Refactor output initialization code
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=9a4024a20af7c789f1672bde8f08c6a2896dbdff
commit 9a4024a20af7c789f1672bde8f08c6a2896dbdff
Author: Bryce Harrington br...@osg.samsung.com
Date: Fri Feb 27 19:23:11 2015 -0500
wayland: Refactor output initialization code
Summary:
The code to initialize outputs has duplicate stanzas for updating the
data members of the output structure. This set of refactoring steps
shuffles things around to eliminate the redundant code. I think this
also makes the code easier to follow too.
This also breaks out a new internal routine for looking up outputs by
id. I suspect this will have general usefulness later.
Reviewers: devilhorns, cedric, zmike
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2077
---
src/bin/e_comp_wl.c | 92 +++--
1 file changed, 47 insertions(+), 45 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 46c1e66..43b0e30 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2734,6 +2734,21 @@ e_comp_wl_idle_time_get(void)
return (ecore_loop_time_get() - _last_event_time);
}
+static E_Comp_Wl_Output *
+_e_comp_wl_output_get(Eina_List *outputs, const char *id)
+{
+ Eina_List *l;
+ E_Comp_Wl_Output *output;
+
+ EINA_LIST_FOREACH(outputs, l, output)
+ {
+ if (!strcmp(output-id, id))
+ return output;
+ }
+
+ return NULL;
+}
+
/**
* Initializes information about one display output.
*
@@ -2758,54 +2773,29 @@ e_comp_wl_output_init(const char *id, const char *make,
const char *model, int x
{
E_Comp_Data *cdata;
E_Comp_Wl_Output *output;
- Eina_List *l, *l2;
+ Eina_List *l2;
struct wl_resource *resource;
if (!(cdata = e_comp-wl_comp_data)) return;
- EINA_LIST_FOREACH(cdata-outputs, l, output)
+ /* retrieve named output; or create it if it doesn't exist */
+ output = _e_comp_wl_output_get(cdata-outputs, id);
+ if (!output)
{
-if (!strcmp(output-id, id))
- {
- output-x = x;
- output-y = y;
- output-w = w;
- output-h = h;
- output-phys_width = pw;
- output-phys_height = ph;
- output-refresh = refresh * 1000;
- output-subpixel = subpixel;
- output-transform = transform;
-
- /* if we have bound resources, send updates */
- EINA_LIST_FOREACH(output-resources, l2, resource)
- {
- wl_output_send_geometry(resource, output-x, output-y,
- output-phys_width,
- output-phys_height,
- output-subpixel,
- output-make, output-model,
- output-transform);
-
- if (wl_resource_get_version(resource) =
- WL_OUTPUT_SCALE_SINCE_VERSION)
- wl_output_send_scale(resource, e_scale);
+if (!(output = E_NEW(E_Comp_Wl_Output, 1))) return;
- /* 3 == preferred + current */
- wl_output_send_mode(resource, 3, output-w, output-h,
- output-refresh);
+if (id) output-id = eina_stringshare_add(id);
+if (make) output-make = eina_stringshare_add(make);
+if (model) output-model = eina_stringshare_add(model);
- if (wl_resource_get_version(resource) =
- WL_OUTPUT_DONE_SINCE_VERSION)
- wl_output_send_done(resource);
+cdata-outputs = eina_list_append(cdata-outputs, output);
- }
- return;
- }
+output-global = wl_global_create(cdata-wl.disp, wl_output_interface,
+ 2, output,
_e_comp_wl_cb_output_bind);
+output-resources = NULL;
}
- if (!(output = E_NEW(E_Comp_Wl_Output, 1))) return;
-
+ /* update the output details */
output-x = x;
output-y = y;
output-w = w;
@@ -2815,13 +2805,25 @@ e_comp_wl_output_init(const char *id, const char *make,
const char *model, int x
output-refresh = refresh * 1000;
output-subpixel = subpixel;
output-transform = transform;
- if (id) output-id = eina_stringshare_add(id);
- if (make) output-make = eina_stringshare_add(make);
- if (model) output-model = eina_stringshare_add(model);
- cdata-outputs = eina_list_append(cdata-outputs, output);
+ /* if we have bound resources, send updates */
+ EINA_LIST_FOREACH(output-resources, l2, resource)
+ {
+wl_output_send_geometry(resource,
+output-x, output-y,
+output-phys_width,
+
[EGIT] [core/enlightenment] master 01/01: wayland: Make sure we're initializing output scale sensibly
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=f92e241e8edbe221b3985308bf4ed7e6660f02bd
commit f92e241e8edbe221b3985308bf4ed7e6660f02bd
Author: Bryce Harrington br...@osg.samsung.com
Date: Fri Feb 27 19:45:24 2015 -0500
wayland: Make sure we're initializing output scale sensibly
Summary:
By default the E_NEW() will create our output objects with a 0.0 scale,
which doesn't make any sense and if anything will lead to crashes.
Instead use a scale factor of 1.0.
When updating output details, if the scale setting is invalid then set
it to 1.0 as a sensible value.
Note this doesn't actually enable scaling, just helps make sure we're
not injecting invalid scale parameters from the start.
Reviewers: zmike, devilhorns, cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D2078
---
src/bin/e_comp_wl.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 43b0e30..6e72a53 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2793,6 +2793,7 @@ e_comp_wl_output_init(const char *id, const char *make,
const char *model, int x
output-global = wl_global_create(cdata-wl.disp, wl_output_interface,
2, output,
_e_comp_wl_cb_output_bind);
output-resources = NULL;
+output-scale = 1.0;
}
/* update the output details */
@@ -2806,6 +2807,9 @@ e_comp_wl_output_init(const char *id, const char *make,
const char *model, int x
output-subpixel = subpixel;
output-transform = transform;
+ if (output-scale = 0)
+ output-scale = 1.0;
+
/* if we have bound resources, send updates */
EINA_LIST_FOREACH(output-resources, l2, resource)
{
--
Re: [E-devel] [EGIT] [core/efl] master 03/07: evas: Evas_3D - improve Shooter example.
On Fri, Feb 27, 2015 at 7:41 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On 26/02/15 23:08, Daniel Kolesa wrote: On Thu, Feb 26, 2015 at 9:29 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 8:53 PM, Daniel Kolesa dan...@octaforge.org wrote: On Thu, Feb 26, 2015 at 7:19 PM, Cedric BAIL cedric.b...@free.fr wrote: On Thu, Feb 26, 2015 at 11:19 AM, Tom Hacohen tom.haco...@samsung.com wrote: On 25/02/15 14:52, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 5:41 PM, Tom Hacohen tom.haco...@samsung.com wrote: On 23/02/15 16:27, Cedric BAIL wrote: On Mon, Feb 23, 2015 at 4:56 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:55 PM, Daniel Kolesa dan...@octaforge.org wrote: On Mon, Feb 23, 2015 at 3:50 PM, Oleksandr Shcherbina o.shcherb...@samsung.com wrote: Sorry guys, capital letters will be changed asap. Also we plan reduce quality of resources. It example useful for testing, because gathers features together. Can you advice acceptable size for 3d models and images for textures? 256x256 for this kind of stuff at most (everything above that is an overkill; i believe in most cases even 128x128 would do). Fix up the names and paths (all lowercase, no spaces). Keep all textures with power-of-two sizes (32, 64, 128 etc) so that mipmapping behaves correctly (and so that the examples work with all versions of opengl and with all supported hardware). As for the models, you can probably dramatically reduce polycount on everything (and scale down the skins). Make sure the assets dir stays small, 50MB is really bad. I think the requirement on being power-of-two is irrelevant in the case of Evas as we should be using Evas_GL_Image which already does automatic packing into an atlas with the right size for us (Otherwise we would have trouble with all the other image we load for widgets). As for size, I agree 256x256 should be enough for this example and I should start paying attention to file size... And yeah, as Tom said, this would best go into a separate repository. We don't really want this kind of stuff in efl.git. This I disagree. I think this is not orthogonal to efl. We are pushing a 3d and a vector scenegraph in efl to use it for widget and application. Showing how to use that infrastructure does make sense. Same actually goes with exactness data, as we are doing a graphical toolkit and we don't have visual test in our make check. It's just a shame and a bad excuse for not having it. If you really want that out of the main git, I guess we could use some submodule and force make check/examples to pull that part if necessary, but that doesn't feel reliable at all. Submodules, as I've suggested a million times before. That's the only sane way of doing it. submodule only bring pain and agony to its users last time I tested them. And the web is still full of complains so nothing did change there, but you are welcome to enlighten me on how great they are. submodule are quite easy to use, but yeah, I guess they are a bit annoying for noobs. Luckily, we are not going to use them for anything that matters for the non technical user, we are only going to use it for external shit no one uses anyway. Seriously ? Either you never used submodule and are a complete ignorant, or you want to inflict pain on other and cripple EFL with problem. Everyone who used submodule will have lost commit, feel the pain of managing a branch or rebasing work while working with others. submodule is a sure recipe for poor quality delivered to user. Just use google to search about all the bad experience that come out of submodule (You don't even need to search for bad experience specifically, just google git submodule and you already have on the first page web page that explain why you should not use them...). I've used submodules successfully for similar purposes. Stop saying bullshit. They work just fine for this kind of stuff - people get problems when they use them wrong (for example when subtree should've been used instead); for an optional repo (and examples ARE optional) it's perfectly fine and easy to manage. Bullshit is not a valid argument to dismiss the fact that git submodule work by using a detached HEAD. That's what create problem and that didn't change in the past years as far as I know. How many people where active daily on your project where you used them ? How many branch did you manage ? The fact it worked for you is not a valid argument. Addressing the problem it create, would be. There is no problem, because majority of people are not even interested in downloading examples (look at how often make examples is broken - and nobody cares until release, when distcheck fails). Distcheck has nothing whatsoever to do with the
[EGIT] [tools/enventor] master 01/01: edc_editor: Fix not to set entry non-editable.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f5d344c129da9b018a4fbd578206be0d5f83f07a
commit f5d344c129da9b018a4fbd578206be0d5f83f07a
Author: Jaehyun Cho jae_hyun@samsung.com
Date: Fri Feb 27 19:36:11 2015 +0900
edc_editor: Fix not to set entry non-editable.
Since elm_entry_editable_set() reloads entry theme, the registered
textblock of redoundo is replaced. This causes segmentation fault when
ctxpopup is dismissed.
Although entry is editable, entry text cannot not be changed if entry
does not have focus.
---
src/lib/edc_editor.c | 5 -
1 file changed, 5 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 7afe779..49523eb 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -366,7 +366,6 @@ ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj,
{
edit_data *ed = data;
evas_object_del(obj);
- elm_entry_editable_set(ed-en_edit, EINA_TRUE);
elm_object_tree_focus_allow_set(ed-layout, EINA_TRUE);
elm_object_focus_set(ed-en_edit, EINA_TRUE);
evas_object_smart_callback_call(ed-enventor, SIG_CTXPOPUP_DISMISSED, NULL);
@@ -419,7 +418,6 @@ ctxpopup_preview_dismiss_cb(void *data, Evas_Object *obj,
//Since the ctxpopup will be shown again, Don't revert the focus.
if (skip_focus) return;
- elm_entry_editable_set(ed-en_edit, EINA_TRUE);
elm_object_tree_focus_allow_set(ed-layout, EINA_TRUE);
elm_object_focus_set(ed-en_edit, EINA_TRUE);
evas_object_smart_callback_call(ed-enventor, SIG_CTXPOPUP_DISMISSED, NULL);
@@ -549,7 +547,6 @@ image_preview_show(edit_data *ed, char *cur, Evas_Coord x,
Evas_Coord y)
evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
ctxpopup_del_cb, ed);
ed-ctxpopup = ctxpopup;
-elm_entry_editable_set(ed-en_edit, EINA_FALSE);
elm_object_tree_focus_allow_set(ed-layout, EINA_FALSE);
succeed = EINA_TRUE;
}
@@ -584,7 +581,6 @@ candidate_list_show(edit_data *ed, char *text, char *cur,
char *selected)
evas_object_show(ctxpopup);
evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
ctxpopup_del_cb, ed);
ed-ctxpopup = ctxpopup;
- elm_entry_editable_set(ed-en_edit, EINA_FALSE);
elm_object_tree_focus_allow_set(ed-layout, EINA_FALSE);
}
@@ -1416,7 +1412,6 @@ edit_redoundo_region_push(edit_data *ed, int cursor_pos1,
int cursor_pos2)
void
edit_disabled_set(edit_data *ed, Eina_Bool disabled)
{
- elm_entry_editable_set(ed-en_edit, !disabled);
elm_object_tree_focus_allow_set(ed-layout, !disabled);
if (disabled)
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: evas scale sample - fix useage of eina thread queue
On Fri, 27 Feb 2015 09:32:49 +0100 Cedric BAIL cedric.b...@free.fr said: On Fri, Feb 27, 2015 at 8:51 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On 27/02/15 02:33, Carsten Haitzler wrote: raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6d5b2b32a0d1e2d7f2c7b46d4a0adc09d5c35ef6 commit 6d5b2b32a0d1e2d7f2c7b46d4a0adc09d5c35ef6 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Feb 27 10:35:01 2015 +0900 evas scale sample - fix useage of eina thread queue pass in ref not ref (other uses were fine - this single one broken) And it fixes the borken test run on jenkins with clang on 64bit. Tests have been segfaulting for this job and I really wondered where this came from. A nice valid bug coverity reported for us here. :) Oh yes ! I tried to find it, but couldn't reproduce it here and valgrind didn't complain at all. Cool stuff ! it was surprising that all the other thread queue uses wre right in that file.. except that one.. with an added ... odd. :) -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 02/02: examples/performance: Fix another typo to include the image into the tarball
stefan pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=e5cdd5d505d4bd8c17992f679e445532b3ccb9f3 commit e5cdd5d505d4bd8c17992f679e445532b3ccb9f3 Author: Stefan Schmidt s.schm...@samsung.com Date: Fri Feb 27 12:23:27 2015 +0100 examples/performance: Fix another typo to include the image into the tarball Same file but different typo compared to the previous commit. Nice. :) --- src/examples/performance/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/examples/performance/Makefile.am b/src/examples/performance/Makefile.am index 9693539..8b4124f 100644 --- a/src/examples/performance/Makefile.am +++ b/src/examples/performance/Makefile.am @@ -41,4 +41,4 @@ examples_PROGRAMS = \ endif -EXTRA_DIST = layout.edc backgroud.png target_texture.png +EXTRA_DIST = layout.edc background.png target_texture.png --
[EGIT] [core/elementary] master 01/02: examples/performance: Fix typo in file nacme to be named background
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=834d5c9aa04e6ec9010e332cb3d173b097435492
commit 834d5c9aa04e6ec9010e332cb3d173b097435492
Author: Stefan Schmidt s.schm...@samsung.com
Date: Fri Feb 27 12:21:31 2015 +0100
examples/performance: Fix typo in file nacme to be named background
---
src/examples/performance/{backgroung.png = background.png} | Bin
src/examples/performance/performance.c | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/examples/performance/backgroung.png
b/src/examples/performance/background.png
similarity index 100%
rename from src/examples/performance/backgroung.png
rename to src/examples/performance/background.png
diff --git a/src/examples/performance/performance.c
b/src/examples/performance/performance.c
index 990e584..089cbdd 100644
--- a/src/examples/performance/performance.c
+++ b/src/examples/performance/performance.c
@@ -616,7 +616,7 @@ EAPI_MAIN
bg = elm_bg_add(win);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_bg_file_set(bg, backgroung.png, NULL);
+ elm_bg_file_set(bg, background.png, NULL);
elm_win_resize_object_add(win, bg);
evas_object_show(bg);
--
