Re: [E-devel] Latest build failures on jenkins during this merge window
Hello. On 25/08/14 14:39, Stefan Schmidt wrote: > Hello. > > Some build problems have sneaked in over the last few days. Sending a > summary here to get them some attention. > Our nightly build is now failing for almost 20 days. (We just wondered why the coverage stats are so old) *15:53:43* config.status: error: cannot find input file: `src/examples/eina_cxx/Makefile.in' *15:53:43* Makefile:2452: recipe for target 'distcheck' failed https://build.enlightenment.org/view/Nightly/job/nightly_efl_gcc_x86_64/lastFailedBuild/console I'm pretty sure other problems will show up once this gets fixed, but getting this resolved would be a good start. regards Stefan Schmidt -- Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce. Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/enlightenment] master 01/02: add dblequal() util function to be used for addressing the infinite comparison warnings
Hello.
On 08/09/14 05:02, Mike Blumenkrantz wrote:
> discomfitor pushed a commit to branch master.
>
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=a69a5a1796d5aafe5c45167bca43769562b70dd0
>
> commit a69a5a1796d5aafe5c45167bca43769562b70dd0
> Author: Mike Blumenkrantz
> Date: Sun Sep 7 23:01:54 2014 -0400
>
> add dblequal() util function to be used for addressing the infinite
> comparison warnings
> ---
> src/bin/e_utils.h | 6 ++
> 1 file changed, 6 insertions(+)
>
> diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
> index ae5d8bc..39c1a71 100644
> --- a/src/bin/e_utils.h
> +++ b/src/bin/e_utils.h
> @@ -93,5 +93,11 @@ isedje(const Evas_Object *obj)
> return obj && !e_util_strcmp(evas_object_type_get(obj), "edje");
> }
>
> +static inline Eina_Bool
> +dblequal(double a, double b)
> +{
> + return fabs(a - b) < DBL_EPSILON;
> +}
> +
> #endif
> #endif
>
Any special reason you did your own macro instead of using islessequal()
and friends? They need C99 but we require that for E anyway.
regards
Stefan Schmidt
--
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 02/02: e_fm: Include config.h to know about HAVE_UDISKS_MOUNT
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=452048354d9a5103355085c049e0d200f1f632ee commit 452048354d9a5103355085c049e0d200f1f632ee Author: Stefan Schmidt Date: Tue Sep 9 10:40:33 2014 +0200 e_fm: Include config.h to know about HAVE_UDISKS_MOUNT We are checking for the various mount options here given by configure. -Wundef showed that we might not have the defines right so better include config.h here. --- src/bin/e_fm_shared_device.c | 4 1 file changed, 4 insertions(+) diff --git a/src/bin/e_fm_shared_device.c b/src/bin/e_fm_shared_device.c index 25e45ce..a140f0d 100644 --- a/src/bin/e_fm_shared_device.c +++ b/src/bin/e_fm_shared_device.c @@ -1,3 +1,7 @@ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "e_fm_shared_types.h" #include "e_fm_shared_device.h" --
[EGIT] [core/enlightenment] master 01/02: configure: Fix naming of E profile configure variable.
stefan pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=01ce196efaa0f246ed18c092360430e62de7856b commit 01ce196efaa0f246ed18c092360430e62de7856b Author: Stefan Schmidt Date: Tue Sep 9 10:29:34 2014 +0200 configure: Fix naming of E profile configure variable. Looks like a long standing bug to me as we are checking for E19_PROFILE in e_config.c but assign the profile here to E18_PROFILE. It also shows us that nobody is using the option(?) Found thanks to -Wundef. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 78bb466..fba9c55 100644 --- a/configure.ac +++ b/configure.ac @@ -624,7 +624,7 @@ AC_ARG_WITH(profile, [profile=$withval]) AC_MSG_NOTICE([Enlightenment build profile set to $profile]) EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6" -EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile +EDJE_DEF=$EDJE_DEF" -DE19_PROFILE"=$profile AC_SUBST([EDJE_DEF]) AC_ARG_WITH(edje-cc, --
[EGIT] [core/efl] master 04/05: autotools: let's not forget to include necessary .eo for make check
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3d21c05a4096659d34bfb27e7d967179a99ac034 commit 3d21c05a4096659d34bfb27e7d967179a99ac034 Author: Cedric BAIL Date: Tue Sep 9 12:29:13 2014 +0200 autotools: let's not forget to include necessary .eo for make check --- src/Makefile_Eolian.am | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Makefile_Eolian.am b/src/Makefile_Eolian.am index 128d32d..03b4cb3 100644 --- a/src/Makefile_Eolian.am +++ b/src/Makefile_Eolian.am @@ -118,5 +118,8 @@ tests/eolian/data/free_func.eo \ tests/eolian/data/typedef_ref.c \ tests/eolian/data/struct_ref.c \ tests/eolian/data/class_simple_ref.c \ -tests/eolian/data/override_ref.c - +tests/eolian/data/override_ref.c \ +tests/eolian/data/nmsp1_class1.eo \ +tests/eolian/data/nmsp1_nmsp11_class2.eo \ +tests/eolian/data/nmsp2_class1.eo \ +tests/eolian/data/no_nmsp.eo --
[EGIT] [core/efl] master 02/05: autotools: extra dist subdirs must be filled with all directory.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=48ee3ed15f7c5a0191fcdd602c80964413dc5553 commit 48ee3ed15f7c5a0191fcdd602c80964413dc5553 Author: Cedric BAIL Date: Tue Sep 9 12:27:51 2014 +0200 autotools: extra dist subdirs must be filled with all directory. It is important to remember to also include the one we don't build. --- src/Makefile.am | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 689a55f..a4e211d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -115,17 +115,19 @@ if HAVE_ELUA EXAMPLES_SUBDIRS += examples/elua endif -if HAVE_CXX11 -EXAMPLES_SUBDIRS += \ +EXAMPLES_CXX = \ examples/eina_cxx \ examples/eolian_cxx + +if HAVE_CXX11 +EXAMPLES_SUBDIRS += $(EXAMPLES_CXX) endif if ALWAYS_BUILD_EXAMPLES SUBDIRS += . $(EXAMPLES_SUBDIRS) endif -DIST_SUBDIRS += $(EXAMPLES_SUBDIRS) +DIST_SUBDIRS += $(EXAMPLES_SUBDIRS) $(EXAMPLES_CXX) examples: all-am @for d in $(EXAMPLES_SUBDIRS); do \ --
[EGIT] [core/efl] master 01/05: autotools: We now have some headers in lib/efl that are not autogenerated.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=58e241b01b6aa78e6e58dd8969bc6039372c6f69 commit 58e241b01b6aa78e6e58dd8969bc6039372c6f69 Author: Cedric BAIL Date: Tue Sep 9 12:27:07 2014 +0200 autotools: We now have some headers in lib/efl that are not autogenerated. --- doc/previews/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/previews/Makefile.am b/doc/previews/Makefile.am index 03f6159..2303656 100644 --- a/doc/previews/Makefile.am +++ b/doc/previews/Makefile.am @@ -5,6 +5,7 @@ if EFL_BUILD_DOC AM_CPPFLAGS = \ -I$(top_builddir)/src/lib/efl \ +-I$(top_srcdir)/src/lib/efl \ -I. \ -I$(builddir) \ -I$(top_srcdir)/src/lib/evil \ --
[EGIT] [core/efl] master 03/05: autotools: let's not forget to ship lib/efl headers.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=760a75fc15f9a3b2667229e8e1248a026298179e
commit 760a75fc15f9a3b2667229e8e1248a026298179e
Author: Cedric BAIL
Date: Tue Sep 9 12:28:43 2014 +0200
autotools: let's not forget to ship lib/efl headers.
---
src/Makefile_Efl.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index ff7a5ae..3b0298f 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -22,7 +22,9 @@ efleolianfiles_DATA = \
lib/efl/interfaces/efl_text_properties.eo
EXTRA_DIST += \
- ${efleolianfiles_DATA}
+ ${efleolianfiles_DATA} \
+ lib/efl/Efl_Config.h \
+ lib/efl/Efl.h
lib_LTLIBRARIES += lib/efl/libefl.la
--
[E-devel] Get your changes in for 1.11.2
Hello. I'm planning to put together a pre-release tarball tomorrow and get the release out on Thursday. If you have anything that is not yet backported but needs to go into 1.11.2 this is your call. regards Stefan Schmidt -- Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce. Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Enlightenment Developer day is on again - Düsseldorg, Germany, 12th of October
On 27/08/14 11:02, Carsten Haitzler (The Rasterman) wrote: > Enlightenment developer day is on again! > > https://phab.enlightenment.org/phame/live/3//post/enlightenment_developer_day_2014/ > > come one, come all! > Registration is now open, and space is limited. Register at: https://www.regonline.com/efldeveloperday2014 More info: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Dev day's hash tag: #EDevDay See you all there! -- Tom. -- Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce. Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: eo: update the EFL to use builtin complex types
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=487512347218b48535020ea15e03ea7e34b12c40
commit 487512347218b48535020ea15e03ea7e34b12c40
Author: Daniel Kolesa
Date: Tue Sep 9 14:21:39 2014 +0100
eo: update the EFL to use builtin complex types
---
src/lib/ecore_audio/ecore_audio_out.eo | 2 +-
src/lib/edje/edje_object.eo | 8
src/lib/eo/eo_base.eo| 2 +-
src/lib/evas/canvas/evas_3d_node.eo | 4 ++--
src/lib/evas/canvas/evas_3d_scene.eo | 6 +++---
src/lib/evas/canvas/evas_box.eo | 6 --
src/lib/evas/canvas/evas_canvas.eo | 13 +++--
src/lib/evas/canvas/evas_grid.eo | 8 +---
src/lib/evas/canvas/evas_object.eo | 4 ++--
src/lib/evas/canvas/evas_object_smart.eo | 5 +++--
src/lib/evas/canvas/evas_table.eo| 8 +---
src/lib/evas/canvas/evas_textblock.eo| 2 +-
12 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo
b/src/lib/ecore_audio/ecore_audio_out.eo
index 437a57e..1ea52d0 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -29,7 +29,7 @@ class Ecore_Audio_Out (Ecore_Audio)
Returns the list of all attached inputs
@since 1.8 */
- return: Eina.List *; /*An @ref Eina_List of the inputs that are
attached to the output*/
+ return: list *; /*An @ref Eina_List of the inputs that are
attached to the output*/
}
}
implements {
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 8d2fa3d..618d5fd 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -391,7 +391,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return A list all accessibility part names on @p obj
@since 1.7.0 */
-return: Eina.List *;
+return: list *;
}
}
load_error {
@@ -1173,7 +1173,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
This function return a list of Evas_Textblock_Rectangle anchor
rectangles. */
- return: const(Eina.List)*;
+ return: const(list)*;
params {
@in const(char)* part; /*@ The part name */
@in const(char)* anchor; /*@ The anchor name */
@@ -2179,7 +2179,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The list of anchors (const char *), do not modify!
This function returns a list of char anchor names. */
- return: const(Eina.List)*;
+ return: const(list)*;
params {
@in const(char)* part; /*@ The part name */
}
@@ -2314,7 +2314,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@return The list of items (const char *), do not modify!
This function returns a list of char item names. */
- return: const(Eina.List)*;
+ return: const(list)*;
params {
@in const(char)* part; /*@ The part name */
}
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index b76b45b..dc05c3e 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -171,7 +171,7 @@ callbacks of the same priority are called in reverse order
of creation. */
}
children_iterator_new {
/*@ Get an iterator on all childrens */
- return: Eina.Iterator *;
+ return: free(own(iterator *), eina_iterator_free) @warn_unused;
}
}
implements {
diff --git a/src/lib/evas/canvas/evas_3d_node.eo
b/src/lib/evas/canvas/evas_3d_node.eo
index ec862e1..b78079b 100644
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -75,7 +75,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Node
*/
- return: const(Eina.List)*;
+ return: const(list)*;
}
position_set {
@@ -319,7 +319,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Node
*/
- return: const(Eina.List)*;
+ return: const(list)*;
}
bounding_box_get{
diff --git a/src/lib/evas/canvas/evas_3d_scene.eo
b/src/lib/evas/canvas/evas_3d_scene.eo
index df4de87..c165ef1 100644
--- a/src/lib/evas/canvas/evas_3d_scene.eo
+++ b/src/lib/evas/canvas/evas_3d_scene.eo
@@ -105,7 +105,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Scene
*/
- return: Eina.List *;
+ return: list *;
params {
@in Evas_Real x; /*@ X coordinate of the picking position.
*/
@in Evas_Real y; /*@ Y coordinate of the picking position.
*/
@@ -121,7 +121,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
@ingroup Evas_3D_Scene
*/
params {
-@in Eina_Bool
[EGIT] [editors/jedit-configs] master 01/01: eo: update
q66 pushed a commit to branch master. http://git.enlightenment.org/editors/jedit-configs.git/commit/?id=d2d0faf3f03ae3b661c3922ede09566d0ad83407 commit d2d0faf3f03ae3b661c3922ede09566d0ad83407 Author: Daniel Kolesa Date: Tue Sep 9 14:44:06 2014 +0100 eo: update --- eo/eo.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/eo/eo.xml b/eo/eo.xml index 4e2fdb1..a2ce848 100644 --- a/eo/eo.xml +++ b/eo/eo.xml @@ -112,6 +112,11 @@ struct enum +accessor +array +iterator +hash +list byte ubyte char --
[EGIT] [core/elementary] master 01/01: update to eolian complex types (without complex part for now)
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=5ffc1dc3d336ccff99145dea0a3c4b7e0c70bb8c
commit 5ffc1dc3d336ccff99145dea0a3c4b7e0c70bb8c
Author: Daniel Kolesa
Date: Tue Sep 9 14:50:35 2014 +0100
update to eolian complex types (without complex part for now)
---
src/lib/elm_app_client.eo | 2 +-
src/lib/elm_app_server.eo | 2 +-
src/lib/elm_box.eo| 2 +-
src/lib/elm_calendar.eo | 4 ++--
src/lib/elm_colorselector.eo | 2 +-
src/lib/elm_container.eo | 2 +-
src/lib/elm_ctxpopup.eo | 2 +-
src/lib/elm_dayselector.eo| 2 +-
src/lib/elm_diskselector.eo | 4 ++--
src/lib/elm_flipselector.eo | 2 +-
src/lib/elm_gengrid.eo| 4 ++--
src/lib/elm_genlist.eo| 4 ++--
src/lib/elm_grid.eo | 2 +-
src/lib/elm_hoversel.eo | 2 +-
src/lib/elm_interface_atspi_accessible.eo | 6 +++---
src/lib/elm_interface_atspi_action.eo | 2 +-
src/lib/elm_interface_atspi_text.eo | 6 +++---
src/lib/elm_interface_fileselector.eo | 2 +-
src/lib/elm_list.eo | 8
src/lib/elm_map.eo| 2 +-
src/lib/elm_menu.eo | 4 ++--
src/lib/elm_multibuttonentry.eo | 2 +-
src/lib/elm_naviframe.eo | 4 ++--
src/lib/elm_slideshow.eo | 6 +++---
src/lib/elm_widget.eo | 10 +-
25 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/src/lib/elm_app_client.eo b/src/lib/elm_app_client.eo
index bd3ee94..d54264a 100644
--- a/src/lib/elm_app_client.eo
+++ b/src/lib/elm_app_client.eo
@@ -8,7 +8,7 @@ class Elm_App_Client (Eo.Base)
/*@ Return a iterator with all views of application. */
}
values {
-Eina_Iterator *ret; /*@ the iterator with all views, must be freed
after use */
+iterator *ret; /*@ the iterator with all views, must be freed
after use */
}
}
package {
diff --git a/src/lib/elm_app_server.eo b/src/lib/elm_app_server.eo
index 76f2499..bd7748e 100644
--- a/src/lib/elm_app_server.eo
+++ b/src/lib/elm_app_server.eo
@@ -17,7 +17,7 @@ class Elm_App_Server (Eo.Base)
/*@ Return a iterator with all views of application */
}
values {
-Eina_Iterator *ret; /*@ Iterator with all views of application,
you must free iterator after use */
+iterator *ret; /*@ Iterator with all views of application, you
must free iterator after use */
}
}
path {
diff --git a/src/lib/elm_box.eo b/src/lib/elm_box.eo
index 465e8b4..3c08969 100644
--- a/src/lib/elm_box.eo
+++ b/src/lib/elm_box.eo
@@ -143,7 +143,7 @@ class Elm_Box (Elm_Widget)
/*@
Retrieve a list of the objects packed into the box
-Returns a new @c Eina_List with a pointer to @c Evas_Object in its
nodes.
+Returns a new @c list with a pointer to @c Evas_Object in its
nodes.
The order of the list corresponds to the packing order the box
uses.
You must free this list with eina_list_free() once you are done
with it.
diff --git a/src/lib/elm_calendar.eo b/src/lib/elm_calendar.eo
index 1dfcbce..92ec454 100644
--- a/src/lib/elm_calendar.eo
+++ b/src/lib/elm_calendar.eo
@@ -238,14 +238,14 @@ class Elm_Calendar (Elm_Layout,
Elm_Interface_Atspi_Widget_Action)
/*@
Get a list of all the calendar marks.
-@return An @c Eina_List of calendar marks objects, or @c NULL on
failure.
+@return A @c list of calendar marks objects, or @c NULL on failure.
@see elm_calendar_mark_add()
@see elm_calendar_mark_del()
@see elm_calendar_marks_clear()
@ingroup Calendar */
-return: const(Eina_List)*;
+return: const(list)*;
}
}
}
diff --git a/src/lib/elm_colorselector.eo b/src/lib/elm_colorselector.eo
index d22a345..f3acf5f 100644
--- a/src/lib/elm_colorselector.eo
+++ b/src/lib/elm_colorselector.eo
@@ -82,7 +82,7 @@ class Elm_Colorselector (Elm_Layout,
Elm_Interface_Atspi_Widget_Action)
@since 1.9
@ingroup Colorselector */
-return: const(Eina_List)*;
+return: const(list)*;
}
}
palette_selected_item {
diff --git a/src/lib/elm_container.eo b/src/lib/elm_container.eo
index 58d7d03..b306f7e 100644
--- a/src/lib/elm_container.eo
+++ b/src/lib/elm_container.eo
@@ -9,7 +9,7 @@ class Elm_Container (Elm_Widget)
/*@ No description supplied by the EAPI. */
}
values {
-Eina_List *ret; /*@ Eina_List */
+list *ret; /*@ list */
}
}
}
[EGIT] [core/efl] master 01/01: elua: update eolian bindings to latest version
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=599bee0553d6ce72b3f56c74c007f580603c98ff
commit 599bee0553d6ce72b3f56c74c007f580603c98ff
Author: Daniel Kolesa
Date: Tue Sep 9 16:30:46 2014 +0100
elua: update eolian bindings to latest version
---
src/bin/elua/modules/lualian.lua | 8 -
src/bindings/luajit/eolian.lua | 319 ---
2 files changed, 268 insertions(+), 59 deletions(-)
diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua
index 1a963f7..d976162 100644
--- a/src/bin/elua/modules/lualian.lua
+++ b/src/bin/elua/modules/lualian.lua
@@ -617,14 +617,6 @@ local gen_contents = function(klass)
cnt[#cnt + 1] = Method(v)
end
end
--- and constructors
-local ctors = klass:functions_get(ft.CTOR):to_array()
-for i, v in ipairs(ctors) do
-cnt[#cnt + 1] = Constructor(v)
-end
-if #ctors == 0 then
-cnt[#cnt + 1] = Default_Constructor()
-end
-- events
local evs = {}
local events = klass:events_get():to_array()
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index 9b8f65c..037310a 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -17,9 +17,12 @@ ffi.cdef [[
typedef struct _Eolian_Type Eolian_Type;
typedef struct _Eolian_Function_Parameter Eolian_Function_Parameter;
typedef struct _Eolian_Implement Eolian_Implement;
+typedef struct _Eolian_Constructor Eolian_Constructor;
typedef struct _Eolian_Event Eolian_Event;
typedef struct _Eolian_Expression Eolian_Expression;
typedef struct _Eolian_Variable Eolian_Variable;
+typedef struct _Eolian_Struct_Type_Field Eolian_Struct_Type_Field;
+typedef struct _Eolian_Enum_Type_Field Eolian_Enum_Type_Field;
typedef struct _Eolian_Value Eolian_Value;
typedef enum
@@ -28,8 +31,7 @@ ffi.cdef [[
EOLIAN_PROPERTY,
EOLIAN_PROP_SET,
EOLIAN_PROP_GET,
-EOLIAN_METHOD,
-EOLIAN_CTOR
+EOLIAN_METHOD
} Eolian_Function_Type;
typedef enum
@@ -61,6 +63,7 @@ ffi.cdef [[
EOLIAN_TYPE_REGULAR,
EOLIAN_TYPE_REGULAR_STRUCT,
EOLIAN_TYPE_REGULAR_ENUM,
+EOLIAN_TYPE_COMPLEX,
EOLIAN_TYPE_POINTER,
EOLIAN_TYPE_FUNCTION,
EOLIAN_TYPE_STRUCT,
@@ -130,6 +133,42 @@ ffi.cdef [[
Eolian_Value_Union value;
} Eolian_Value_t;
+typedef enum {
+EOLIAN_BINOP_INVALID = -1,
+
+EOLIAN_BINOP_ADD, /* + int, float */
+EOLIAN_BINOP_SUB, /* - int, float */
+EOLIAN_BINOP_MUL, /* * int, float */
+EOLIAN_BINOP_DIV, /* / int, float */
+EOLIAN_BINOP_MOD, /* % int */
+
+EOLIAN_BINOP_EQ, /* == all types */
+EOLIAN_BINOP_NQ, /* != all types */
+EOLIAN_BINOP_GT, /* > int, float */
+EOLIAN_BINOP_LT, /* < int, float */
+EOLIAN_BINOP_GE, /* >= int, float */
+EOLIAN_BINOP_LE, /* <= int, float */
+
+EOLIAN_BINOP_AND, /* && all types */
+EOLIAN_BINOP_OR, /* || all types */
+
+EOLIAN_BINOP_BAND, /* & int */
+EOLIAN_BINOP_BOR, /* | int */
+EOLIAN_BINOP_BXOR, /* ^ int */
+EOLIAN_BINOP_LSH, /* << int */
+EOLIAN_BINOP_RSH /* >> int */
+} Eolian_Binary_Operator;
+
+typedef enum {
+EOLIAN_UNOP_INVALID = -1,
+
+EOLIAN_UNOP_UNM, /* - sint */
+EOLIAN_UNOP_UNP, /* + sint */
+
+EOLIAN_UNOP_NOT, /* ! int, float, bool */
+EOLIAN_UNOP_BNOT, /* ~ int */
+} Eolian_Unary_Operator;
+
Eina_Bool eolian_eo_file_parse(const char *filename);
Eina_Bool eolian_eot_file_parse(const char *filepath);
int eolian_init(void);
@@ -168,15 +207,17 @@ ffi.cdef [[
const char *eolian_function_legacy_get(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
const char *eolian_function_description_get(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
+Eina_Bool eolian_function_is_auto(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
+Eina_Bool eolian_function_is_empty(const Eolian_Function *function_id,
Eolian_Function_Type f_type);
Eina_Bool eolian_function_is_legacy_only(const Eolian_Function
*function_id, Eolian_Function_Type ftype);
Eina_Bool eolian_function_is_class(const Eolian_Function *function_id);
-Eina_Bool eolian_function_is_constructing(const Eolian_Function
*function_id);
const Eolian_Function_Parameter
*eolian_function_parameter_get_by_name(const Eolian_Function *function_id,
const char *param_name);
Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id);
Eina_Iterator *eolian_property_values_get(const Eolian_Function *foo_id);
Eina_Iterator *eolian_function_parameters_get(co
[EGIT] [core/efl] master 01/01: ecore: fix documentation.
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7e0631eafb6aad7fc6b8be60b7cc0e97e78cb95f
commit 7e0631eafb6aad7fc6b8be60b7cc0e97e78cb95f
Author: Cedric BAIL
Date: Tue Sep 9 18:10:23 2014 +0200
ecore: fix documentation.
---
src/lib/ecore/Ecore_Common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 6dbb555..aa158c4 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2616,7 +2616,7 @@ typedef enum _Ecore_Pos_Map Ecore_Pos_Map;
enum _Ecore_Animator_Source/* Timing sources for animators */
{
ECORE_ANIMATOR_SOURCE_TIMER, /**< The default system clock/timer based
animator that ticks every "frametime" seconds */
- ECORE_ANIMATOR_SOURCE_CUSTOM /**< A custom animator trigger that you need
to call ecore_animator_trigger() to make it tick */
+ ECORE_ANIMATOR_SOURCE_CUSTOM /**< A custom animator trigger that you need
to call ecore_animator_custom_tick() to make it tick */
};
typedef enum _Ecore_Animator_Source Ecore_Animator_Source;
--
[EGIT] [core/enlightenment] master 01/01: rename E19* defines/texts to just E so they don't need to keep being updated
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ec1cd25cfe65b9e5641c91d3ad1fd2f9f11c
commit ec1cd25cfe65b9e5641c91d3ad1fd2f9f11c
Author: Mike Blumenkrantz
Date: Tue Sep 9 12:30:50 2014 -0400
rename E19* defines/texts to just E so they don't need to keep being updated
---
configure.ac | 4 ++--
src/bin/e_alert_main.c| 12 ++--
src/bin/e_comp_object.c | 2 +-
src/bin/e_comp_x.c| 2 +-
src/bin/e_config.c| 6 +++---
src/bin/e_gadcon.c| 14 +++---
src/bin/e_main.c | 4 ++--
src/bin/e_module.c| 4 ++--
src/bin/e_start_main.c| 2 +-
src/bin/e_xinerama.c | 2 +-
src/modules/gadman/e_mod_gadman.c | 2 +-
11 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/configure.ac b/configure.ac
index fba9c55..8937090 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version])
AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version])
AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
-##AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it])
+##AC_DEFINE_UNQUOTED(E_RELEASE_BUILD, [1], [doin it])
version_info="lt_cur:lt_rev:lt_age"
release_info="v_rel"
AC_SUBST([version_info])
@@ -624,7 +624,7 @@ AC_ARG_WITH(profile,
[profile=$withval])
AC_MSG_NOTICE([Enlightenment build profile set to $profile])
EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4
-DMEDIUM_PC=5 -DFAST_PC=6"
-EDJE_DEF=$EDJE_DEF" -DE19_PROFILE"=$profile
+EDJE_DEF=$EDJE_DEF" -DE_PROFILE"=$profile
AC_SUBST([EDJE_DEF])
AC_ARG_WITH(edje-cc,
diff --git a/src/bin/e_alert_main.c b/src/bin/e_alert_main.c
index ea4ad3f..9075760 100644
--- a/src/bin/e_alert_main.c
+++ b/src/bin/e_alert_main.c
@@ -94,7 +94,7 @@ main(int argc, char **argv)
fprintf(stderr, "exit_gdb: %i\n", exit_gdb);
- tmp = getenv("E19_TAINTED");
+ tmp = getenv("E_TAINTED");
if (tmp && !strcmp(tmp, "NO"))
tainted = EINA_FALSE;
@@ -560,7 +560,7 @@ _e_alert_draw_text(void)
"on. We were not able to generate a backtrace, check \n"
"if your 'sysactions.conf' has an 'gdb' action line.\n"
"\n"
- "Please compile latest Git E19 and EFL with\n"
+ "Please compile latest Git E and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n");
}
else if (backtrace_str)
@@ -568,9 +568,9 @@ _e_alert_draw_text(void)
snprintf(msg, sizeof(msg),
"This is not meant to happen and is likely a sign of \n"
"a bug in Enlightenment or the libraries it relies \n"
- "on. You will find an backtrace of E19 (%d) in :\n"
+ "on. You will find an backtrace of E (%d) in :\n"
"'%s'\n"
- "Before reporting issue, compile latest E19 and EFL\n"
+ "Before reporting issue, compile latest E and EFL\n"
"from Git with '-g -ggdb3' in your CFLAGS.\n"
"You can then report this crash on :\n"
"https://phab.enlightenment.org/maniphest/.\n";,
@@ -586,7 +586,7 @@ _e_alert_draw_text(void)
"recover to try and get your desktop back the way \n"
"it was.\n"
"\n"
- "Please compile latest Git E19 and EFL with\n"
+ "Please compile latest Git E and EFL with\n"
"-g and -ggdb3 in your CFLAGS.\n", pid);
}
}
@@ -598,7 +598,7 @@ _e_alert_draw_text(void)
"modules; before reporting this issue, please\n"
"unload them and try to see if the bug is still\n"
"there. Also update to latest Git and be sure to\n"
- "compile E19 and EFL with -g and -ggdb3 in your CFLAGS");
+ "compile E and EFL with -g and -ggdb3 in your CFLAGS");
}
strcpy(warn, "");
diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index 60c2108..7fc1eaf 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -218,7 +218,7 @@ _e_comp_object_layers_add(E_Comp_Object *cw, E_Comp_Object
*above, E_Comp_Object
cw->comp->layers[cw->layer].clients =
eina_inlist_append(cw->comp->layers[cw->layer].clients,
EINA_INLIST_GET(cw->ec));
}
cw->comp->layers[cw->layer].clients_count++;
-#ifndef E19_RELEASE_BUILD
+#ifndef E_RELEASE_BUILD
if (layer_cw)
{
E_Client *below_ec = e_client_below_get(cw->ec);
diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 6218ef1..a32a262 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4564,7 +4564,
Re: [E-devel] Pen support in EFL?
I've finished making the requested updates, but forgot to check to see
what your thoughts are about the coordinate system used in the events.
Right now data is being passed through pretty much as-is, but this
might not be appropriate if a window has been rotated. I assume we
want to adjust the reported AZIMUTH and TWIST values so that the
application doesn't have to worry about it, but where can I find the
necessary information? Also, is there any sense in adjusting the other
axes (e.g. X, Y, {TOUCH,TOOL}_WIDTH_{MAJOR,MINOR}) to account for e.g.
scaling?
Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three,/
So you look at the sixty-fours
On Sat, Aug 30, 2014 at 7:32 PM, Carsten Haitzler wrote:
> On Sat, 30 Aug 2014 18:37:13 -0700 Jason Gerecke said:
>
>> On Fri, Aug 29, 2014 at 7:25 PM, Carsten Haitzler
>> wrote:
>> > On Fri, 29 Aug 2014 13:18:37 -0700 Jason Gerecke
>> > said:
>> >
>> > review below. btw. it'd be really awesome if you could use arc to land
>> > these
>> > patches for review. this is part of our "getting organized" and using tools
>> > to make sure patches don't vanish in an inbox. :) there is a special
>> > limited sized review list for patches which allows inline code comments
>> > etc. etc. see http://phab.enlightenment.org
>> > http://phab.enlightenment.org/w/arcanist/
>> >
>> > 0001-Break-_ecore_x_input_handler-into-task-specific-sub-.patch:
>> >
>> > it'd be nice if it didn't have so many whitespace changes. it'd be REALLY
>> > nice if you could "fix" the whitespace to match what was there before. i'm
>> > sifting through it and almost all of this patch is whitespace changes (that
>> > are not needed as no extra if, whole, for etc. clauses).
>> >
>> My editor seems to have gotten a little indent happy... I'll work on
>> cleaning up that mess up :)
>>
>> > 0002-Select-XI2-events-whenever-possible.patch:
>> >
>> > i am not sure here, but this may break multitouch support mpx-style that
>> > checks for floating slaves vs slaves. (reading the diff is not fun :) it is
>> > removing all the detection code and that is worrying, especially as it's
>> > hard to test this support (but has been tested in the past when written).
>> >
>> Basically this patch has the X server send Button, Motion, and Touch
>> events without regard to if the device is floating. A driver with MPX
>> multitouch that uses a floating device per finger shouldn't be sending
>> XI2 touch events, so I doubt adding them to the mask would break
>> anything. On the flip side, a driver with XI2 multitouch devices
>> *will* send button/motion events (for the first finger) along with
>> touch events, but the '_ecore_x_input_multi_handler' function only
>> responds to touch events, so requesting more events from the server
>> shouldn't break anything in this case either.
>
> hmmm - for now, ok.
>
>> > 0003-Define-and-implement-new-Ecore_Event_Axis_Update-eve.patch:
>> >
>> > you have some ome todo's and fixme's... :)). one thing - the #include of
>> > xserver-properties.h ... that literally is not an existing installed file
>> > anywhere on my xorg installation. so this is going to be a problem... it
>> > won't compile. and it likely isn't going to compile for anyone else. what
>> > is this doing there and why? (oh .. and we don;'t use egyptian brackets in
>> > count_bits ()) also @since 1.12 in the doxy comments so we know what
>> > version of efl this was introduced from :) oh and typedef enum
>> > _Ecore_Axis_Label like Ecore_Event_Axis_Update was. and in fact like 0004
>> > below - flatten out Ecore_Axis that isnt even typedeffed. :)
>> >
>> The xserver-properties.h file contains the names that drivers are
>> expected to use when naming their axes. It defines the constants I use
>> later in that file (e.g. AXIS_LABEL_PROP_ABS_X). It looks like GTK at
>> least just hard-codes the strings instead of depending on the header
>> (which is part of the xorg server devel package).
>
> i'd recommend hardcoding them here ala gtk. :) there is nothing in these
> patches to check for this header, and since it's part of server devel 'd
> probably avoid relying on it. :)
>
>> I'll see what I can do about the todos and fixmes :D I expected more
>> critique on my design so only roughed out the implementation and
>> punted on the really hard parts in case they needed to be changed
>> anyway.
>
> design doesn't seem much of a problem :)
>
>> > 0004-Implement-EVAS_CALLBACK_AXIS_UPDATE-event-and-friend.patch:
>> >
>> > might i suggest not using struct _Evas_Axis * as a parameter but actually
>> > passing in the enum lable and double. this makes it easier for bindings to
>> > other languages. so pass them in as 2 params. that prbably means removing
>> > this struct entirely (also being a raw struct is inconsistent with our
>> > typedeffing of all of these) so just break out enum (actually also typedef
>> > the enu
[EGIT] [core/enlightenment] master 01/01: Updating italian translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=eb31a9f765f0081d993ee41739d068e9968f3021 commit eb31a9f765f0081d993ee41739d068e9968f3021 Author: maxerba Date: Tue Sep 9 22:16:36 2014 +0200 Updating italian translation --- po/it.po | 794 +++ 1 file changed, 437 insertions(+), 357 deletions(-) diff --git a/po/it.po b/po/it.po index c861dbf..afd83ea 100644 --- a/po/it.po +++ b/po/it.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Enlightenment 0.17\n" "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n" -"POT-Creation-Date: 2014-08-12 23:28+0200\n" -"PO-Revision-Date: 2014-08-12 23:48+0200\n" +"POT-Creation-Date: 2014-09-09 22:10+0200\n" +"PO-Revision-Date: 2014-09-09 22:16+0200\n" "Last-Translator: Massimo Maiurana \n" "Language-Team: General\n" "Language: it\n" @@ -20,7 +20,7 @@ msgstr "" msgid "About Enlightenment" msgstr "Informazioni su Enlightenment" -#: src/bin/e_about.c:20 src/bin/e_actions.c:2958 src/bin/e_config_dialog.c:287 +#: src/bin/e_about.c:20 src/bin/e_actions.c:2958 src/bin/e_config_dialog.c:288 #: src/bin/e_fm.c:1072 src/bin/e_int_client_menu.c:230 #: src/bin/e_int_client_prop.c:81 src/bin/e_theme_about.c:24 #: src/modules/conf/e_conf.c:169 @@ -77,8 +77,8 @@ msgstr "Uccidi" #: src/bin/e_actions.c:375 src/bin/e_actions.c:2084 src/bin/e_actions.c:2178 #: src/bin/e_actions.c:2238 src/bin/e_actions.c:2298 src/bin/e_actions.c:2363 #: src/bin/e_actions.c:2428 src/bin/e_confirm_dialog.c:53 -#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10580 src/bin/e_fm.c:10933 -#: src/bin/e_screensaver.c:197 +#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10582 src/bin/e_fm.c:10935 +#: src/bin/e_screensaver.c:196 #: src/modules/quickaccess/e_mod_quickaccess.c:1308 msgid "No" msgstr "No" @@ -93,8 +93,8 @@ msgstr "Siete sicuri di voler uscire da Enlightement?" #: src/bin/e_actions.c:2082 src/bin/e_actions.c:2176 src/bin/e_actions.c:2236 #: src/bin/e_actions.c:2296 src/bin/e_actions.c:2361 src/bin/e_actions.c:2426 -#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10583 -#: src/bin/e_screensaver.c:195 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10585 +#: src/bin/e_screensaver.c:194 #: src/modules/quickaccess/e_mod_quickaccess.c:1308 msgid "Yes" msgstr "Sì" @@ -107,7 +107,7 @@ msgstr "Chiudi sessione" msgid "Are you sure you want to logout?" msgstr "Siete sicuri di voler chiudere la sessione?" -#: src/bin/e_actions.c:2232 src/bin/e_sys.c:971 +#: src/bin/e_actions.c:2232 src/bin/e_sys.c:977 msgid "Power off" msgstr "Spegni" @@ -148,7 +148,7 @@ msgstr "Siete sicuri di voler ibernare il computer?" msgid "Window : Actions" msgstr "Finestre : Azioni" -#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11709 +#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11711 #: src/bin/e_int_client_menu.c:720 msgid "Move" msgstr "Sposta" @@ -658,7 +658,7 @@ msgstr "Mostra menù..." #: src/bin/e_actions.c:3316 src/bin/e_actions.c:3321 src/bin/e_actions.c:3326 #: src/modules/conf/e_mod_main.c:273 -#: src/modules/everything/evry_plug_apps.c:1170 +#: src/modules/everything/evry_plug_apps.c:1171 #: src/modules/fileman/e_mod_main.c:56 msgid "Launch" msgstr "Lancia" @@ -719,7 +719,7 @@ msgstr "Commuta il modulo specificato" #: src/bin/e_int_config_modules.c:52 #: src/modules/conf_applications/e_int_config_apps.c:277 #: src/modules/conf_display/e_int_config_desklock_fsel.c:102 -#: src/modules/conf_intl/e_int_config_imc.c:808 +#: src/modules/conf_intl/e_int_config_imc.c:818 #: src/modules/conf_theme/e_int_config_theme.c:668 #: src/modules/conf_theme/e_int_config_wallpaper.c:426 #: src/modules/conf_theme/e_int_config_wallpaper.c:580 @@ -795,9 +795,9 @@ msgstr "Seleziona" #: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:891 #: src/bin/e_desktop_editor.c:954 src/bin/e_entry_dialog.c:64 -#: src/bin/e_fm.c:10093 src/bin/e_fm_prop.c:625 +#: src/bin/e_fm.c:10095 src/bin/e_fm_prop.c:625 #: src/bin/e_import_config_dialog.c:542 src/bin/e_import_dialog.c:199 -#: src/modules/bluez4/agent.c:136 src/modules/bluez4/agent.c:149 +#: src/modules/bluez4/agent.c:138 src/modules/bluez4/agent.c:151 #: src/modules/conf_bindings/e_int_config_signalbindings.c:623 #: src/modules/conf_intl/e_int_config_imc_import.c:124 #: src/modules/conf_theme/e_int_config_theme_import.c:123 @@ -811,55 +811,55 @@ msgstr "Seleziona" msgid "Cancel" msgstr "Annulla" -#: src/bin/e_comp.c:1007 src/bin/e_comp.c:1013 src/bin/e_comp.c:1019 +#: src/bin/e_comp.c:1017 src/bin/e_comp.c:1023 src/bin/e_comp.c:1029 #: src/bin/e_configure.c:33 msgid "Compositor" msgstr "Compositor" -#: src/bin/e_comp.c:1008 +#: src/bin/e_comp.c:1018 msgid "Change current window opacity" msgstr "Cambia opacità finestra corrente" -#: src/bin/e_comp.c:1014 +#: src/bin/e_comp.c:1024 msgid "Set current window opacity" msgstr "Imposta opacità finestra cor
[EGIT] [apps/rage] master 01/01: dnd: Recurse into directories
etrunko pushed a commit to branch master.
http://git.enlightenment.org/apps/rage.git/commit/?id=7c80b9a131b729bd244b40c194dc36bf24dde661
commit 7c80b9a131b729bd244b40c194dc36bf24dde661
Author: Eduardo Lima (Etrunko)
Date: Mon Aug 25 15:36:44 2014 -0300
dnd: Recurse into directories
Signed-off-by: Eduardo Lima (Etrunko)
---
AUTHORS | 1 +
src/bin/dnd.c | 66 +--
2 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index b9a9404..230cb46 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1 +1,2 @@
Carsten Haitzler
+Eduardo Lima (Etrunko)
diff --git a/src/bin/dnd.c b/src/bin/dnd.c
index f8faba4..1a8b9d2 100644
--- a/src/bin/dnd.c
+++ b/src/bin/dnd.c
@@ -60,6 +60,39 @@ _escape_parse(const char *str)
return dest;
}
+static Eina_Bool
+_recurse_dir(Evas_Object *win, const char *path)
+{
+ Eina_Bool ret = EINA_FALSE;
+ Eina_List *ls, *l;
+ char *p, *escape;
+ const char *full;
+
+ ls = ecore_file_ls(path);
+ EINA_LIST_FOREACH(ls, l, p)
+ {
+escape = _escape_parse(p);
+full = eina_stringshare_printf("%s/%s", path, escape);
+free(escape);
+if (ecore_file_is_dir(full))
+ {
+ ret = _recurse_dir(win, full);
+ eina_stringshare_del(full);
+ continue;
+ }
+
+printf("inserting '%s'\n", full);
+win_video_insert(win, full);
+eina_stringshare_del(full);
+ret = EINA_TRUE;
+ }
+
+ EINA_LIST_FREE(ls, p)
+ free(p);
+
+ return ret;
+}
+
Eina_Bool
_cb_drop(void *data, Evas_Object *o EINA_UNUSED, Elm_Selection_Data *ev)
{
@@ -94,8 +127,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
tt = _escape_parse(tb);
if (tt)
{
- win_video_insert(win, tt);
- inserted = EINA_TRUE;
+ if (ecore_file_is_dir(tt))
+ {
+ inserted = _recurse_dir(win, tt);
+ }
+ else
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ }
free(tt);
}
}
@@ -108,8 +148,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
tt = _escape_parse(tb);
if (tt)
{
- win_video_insert(win, tt);
- inserted = EINA_TRUE;
+ if (ecore_file_is_dir(tt))
+ {
+ inserted = _recurse_dir(win, tt);
+ }
+ else
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ }
free(tt);
}
}
@@ -124,8 +171,15 @@ _cb_drop(void *data, Evas_Object *o EINA_UNUSED,
Elm_Selection_Data *ev)
char *tt = _escape_parse(ev->data);
if (tt)
{
- win_video_insert(win, tt);
- inserted = EINA_TRUE;
+ if (ecore_file_is_dir(tt))
+ {
+ inserted = _recurse_dir(win, tt);
+ }
+ else
+ {
+ win_video_insert(win, tt);
+ inserted = EINA_TRUE;
+ }
free(tt);
}
}
--
