[EGIT] [core/efl] master 01/03: efl loop message stuff - document the eo files.

2017-12-15 Thread Carsten Haitzler
raster pushed a commit to branch master.

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

commit d9e149eb4d55cf4bd03845cfdd412713bdd080a5
Author: Carsten Haitzler (Rasterman) 
Date:   Sat Dec 16 11:55:43 2017 +0900

efl loop message stuff - document the eo files.
---
 src/lib/ecore/efl_loop.eo | 23 +++
 src/lib/ecore/efl_loop_message.eo |  3 ++-
 src/lib/ecore/efl_loop_message_handler.eo | 29 ++---
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo
index 2162039113..df39a642b1 100644
--- a/src/lib/ecore/efl_loop.eo
+++ b/src/lib/ecore/efl_loop.eo
@@ -129,20 +129,27 @@ class Efl.Loop (Efl.Object)
  return: bool; [[$true if successfully unregistered, $false 
otherwise.]]
   }
   message_handler_get @class {
- [[ ]]
+ [[Get a message handler object that is created by and owned by
+   the Efl.Loop object, so you can listen to this message type by
+   listening to message events on the handler as well as send
+   objects as events.]]
  params {
-@in loop: Efl.Loop; [[ ]]
-@in klass: const(Efl.Class); [[ ]]
+@in loop: Efl.Loop; [[The loop to get the object from.]]
+@in klass: const(Efl.Class); [[The class of the message object.]]
  }
- return: Efl.Loop.Message.Handler; [[ ]]
+ return: Efl.Loop.Message.Handler; [[The message handler to use.]]
   }
   message_process {
- [[ ]]
- return: bool; [[ ]]
+ [[Process all messages in the queue that have been sent by
+   Efl.Loop.Message.Handler objects and thus call the event
+   callbacks for these messages in order in the queue. There
+   should never be a need to call this method as it is
+   automatically called as part of the loop execution.]]
+ return: bool; [[True if messages existed and were called.]]
   }
   message_exists {
- [[ ]]
- return: bool; [[ ]]
+ [[Checks if there are any messages on the queue to call.]]
+ return: bool; [[True if there are messages to call. ]]
   }
}
events {
diff --git a/src/lib/ecore/efl_loop_message.eo 
b/src/lib/ecore/efl_loop_message.eo
index 7368c28802..3ef851c55e 100644
--- a/src/lib/ecore/efl_loop_message.eo
+++ b/src/lib/ecore/efl_loop_message.eo
@@ -3,7 +3,8 @@ import eina_types;
 
 class Efl.Loop.Message (Efl.Object)
 {
-   [[ ]]
+   [[Base message payload object class. Inherit this and extend for
+ specific message types.]]
methods {
}
implements {
diff --git a/src/lib/ecore/efl_loop_message_handler.eo 
b/src/lib/ecore/efl_loop_message_handler.eo
index b934364013..f0be9c4484 100644
--- a/src/lib/ecore/efl_loop_message_handler.eo
+++ b/src/lib/ecore/efl_loop_message_handler.eo
@@ -3,33 +3,40 @@ import eina_types;
 
 class Efl.Loop.Message.Handler (Efl.Object)
 {
-   [[ ]]
+   [[Message handlers represent a single message type on the Efl.Loop
+ parent object. These message handlers can be used to listen for
+ that message type by listening to the message event for the generic
+ case or a class specific event type to get specific message object
+ typing correct.]]
methods {
   message_add {
- [[ ]]
- return: Efl.Loop.Message; [[ ]]
+ [[Creates a new message object of the correct type for this
+   message type.]]
+ return: Efl.Loop.Message; [[The new message payload object.]]
   }
   message_send {
- [[ Plase the message on the queue to be called later ]]
+ [[Place the message on the queue to be called later when
+   message_process() is called on the loop object.]]
  params {
-@in message: Efl.Loop.Message; [[ ]]
+@in message: Efl.Loop.Message; [[The message to place on the 
queue.]]
  }
   }
   message_call {
- [[ Overide me (implement) then call super after calling the
-right callback type if you specialize the message type
- ]]
+ [[Overide me (implement) then call super after calling the
+   right callback type if you specialize the message type.]]
  params {
 @in message: Efl.Loop.Message; [[ Generic message event type ]]
  }
   }
   message_clear {
- [[ ]]
- return: bool; [[ ]]
+ [[Delete all queued messages belonging to this message handler
+   that are pending on the queue so they are not processed
+   later.]]
+ return: bool; [[True if any messages of this type were cleared.]]
   }
}
events {
-  message: Efl.Loop.Message; [[ ]]
+  message: Efl.Loop.Message; [[The message payload data]]
}
implements {
   Efl.Object.constructor;

-- 




[EGIT] [core/efl] master 03/03: elm widget - remove unused vars from new shadow part code

2017-12-15 Thread Carsten Haitzler
raster pushed a commit to branch master.

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

commit 90d0f695b4a4b7b504ea8f667a94df06ba672ec4
Author: Carsten Haitzler (Rasterman) 
Date:   Sat Dec 16 12:09:12 2017 +0900

elm widget - remove unused vars from new shadow part code

fill isn't used... maybe at some point someone jpeg wanted to.. but he
didn't, so let's not have warnings.
---
 src/lib/elementary/elm_widget.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index d67ec8008b..bf983bc8d9 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -5689,7 +5689,7 @@ static void
 _widget_shadow_update(Widget_Shadow *ws)
 {
int l = 0, r = 0, t = 0, b = 0;
-   Eina_Rect srect, wrect, fill;
+   Eina_Rect srect, wrect;
char filter[1024];
 
 #define FILTER_FMT \
@@ -5723,9 +5723,6 @@ _widget_shadow_update(Widget_Shadow *ws)
srect.y = wrect.y + (int) (-t + ws->props.oy);
srect.w = wrect.w + (int) (l + r);
srect.h = wrect.h + (int) (t + b);
-   fill.size = wrect.size;
-   fill.x = 0;
-   fill.y = 0;
 
if ((!ws->props.a && !ws->code) ||
!efl_gfx_visible_get(ws->widget))

-- 




[EGIT] [core/efl] master 02/03: efl loop - fix merge issue with future changes.

2017-12-15 Thread Carsten Haitzler
raster pushed a commit to branch master.

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

commit 24d43f2f487048596cd835aee53b439cf4442f44
Author: Carsten Haitzler (Rasterman) 
Date:   Sat Dec 16 12:01:30 2017 +0900

efl loop - fix merge issue with future changes.
---
 src/lib/ecore/efl_loop.c | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index 661bf654a9..09ea62a1ac 100644
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -357,27 +357,26 @@ _efl_loop_arguments_cleanup(Eina_Array *arga)
eina_array_free(arga);
 }
 
-static void
-_efl_loop_arguments_send(void *data, const Efl_Event *ev EINA_UNUSED)
+static Eina_Value
+_efl_loop_arguments_send(void *data, const Eina_Value v,
+ const Eina_Future *dead EINA_UNUSED)
+
 {
static Eina_Bool initialization = EINA_TRUE;
Efl_Loop_Arguments arge;
Eina_Array *arga = data;
 
+   if (v.type == EINA_VALUE_TYPE_ERROR) goto on_error;
+
arge.argv = arga;
arge.initialization = initialization;
initialization = EINA_FALSE;
 
efl_event_callback_call(ecore_main_loop_get(),
EFL_LOOP_EVENT_ARGUMENTS, );
-
+on_error:
_efl_loop_arguments_cleanup(arga);
-}
-
-static void
-_efl_loop_arguments_cancel(void *data, const Efl_Event *ev EINA_UNUSED)
-{
-   _efl_loop_arguments_cleanup(data);
+   return v;
 }
 
 // It doesn't make sense to send those argument to any other mainloop

-- 




[EGIT] [core/efl] master 02/03: efl_mono: fix test and example compilation on Windows

2017-12-15 Thread Vitor Sousa
vitorsousa pushed a commit to branch master.

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

commit b55542889baaec9ae25ce13d2804d5123f040cc6
Author: Vitor Sousa 
Date:   Fri Dec 15 22:09:43 2017 -0200

efl_mono: fix test and example compilation on Windows
---
 src/Makefile_Efl_Mono.am   | 11 +--
 src/examples/efl_mono/Makefile.am  |  2 +-
 src/tests/efl_mono/mono_test_driver.sh |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index ad45a22b81..4715fff4c6 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -352,16 +352,17 @@ tests/efl_mono/libefl_mono_test.dll: 
$(efl_mono_test_eolian_mono_files) tests/ef
 AM_TESTS_ENVIRONMENT += MONO='mono'; export MONO;
 AM_TESTS_ENVIRONMENT += MONO_BUILDPATH='$(abs_top_builddir)'; export 
MONO_BUILDPATH;
 AM_TESTS_ENVIRONMENT += MONO_PATH='$(TEST_PATHS)'; export MONO_PATH;
+AM_TESTS_ENVIRONMENT += EXEEXT='$(EXEEXT)'; export EXEEXT;
 if HAVE_WIN32
 AM_TESTS_ENVIRONMENT += PATH='$(PATH):$(TEST_PATHS):$(WIN_ADD_TEST_PATHS)'; 
export PATH;
 else
 AM_TESTS_ENVIRONMENT += LD_LIBRARY_PATH='$(LD_LIBRARY_PATH):$(TEST_PATHS)'; 
export LD_LIBRARY_PATH;
 endif
 
-check_PROGRAMS += tests/efl_mono/efl_mono.exe
+check_PROGRAMS += tests/efl_mono/efl_mono
 TESTS += tests/efl_mono/mono_test_driver.sh
 
-tests_efl_mono_efl_mono_exe_SOURCES = \
+tests_efl_mono_efl_mono_SOURCES = \
  tests/efl_mono/Main.cs \
  tests/efl_mono/Eina.cs \
  tests/efl_mono/Eldbus.cs \
@@ -384,12 +385,10 @@ lib/efl_mono/libefl_mono.dll.config:
echo "  " >> 
$@
echo "" >> $@
 
-tests/efl_mono/efl_mono.exe$(EXEEXT): $(tests_efl_mono_efl_mono_exe_SOURCES) 
tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll 
tests/efl_mono/libefl_mono_test.dll
-   @rm -f tests/efl_mono/efl_mono.exe
+tests/efl_mono/efl_mono$(EXEEXT): $(tests_efl_mono_efl_mono_SOURCES) 
tests/efl_mono/$(am__dirstamp) lib/efl_mono/libefl_mono.dll 
tests/efl_mono/libefl_mono_test.dll
+   @rm -f $@
$(AM_V_MCS) $(MCS) $(MCS_FLAGS) 
-r:$(abs_top_builddir)/src/lib/efl_mono/libefl_mono.dll 
-r:$(abs_top_builddir)/src/tests/efl_mono/libefl_mono_test.dll -out:$@ $(filter 
%.cs, $(^))
 
-###EXTRA_DIST2 += $(tests_efl_mono_efl_mono_exe_srcs)
-
 # Rule for generating the .cs files
 tests/efl_mono/%.eo.cs: tests/efl_mono/%.eo $(_EOLIAN_MONO_DEP)
$(AM_V_EOLMONO) \
diff --git a/src/examples/efl_mono/Makefile.am 
b/src/examples/efl_mono/Makefile.am
index 9f696fabaa..fe271e9f10 100644
--- a/src/examples/efl_mono/Makefile.am
+++ b/src/examples/efl_mono/Makefile.am
@@ -51,7 +51,7 @@ noinst_lib_LTLIBRARIES = libexample_numberwrapper.la
 noinst_libdir = $(abs_top_builddir)
 
 libexample_numberwrapper_la_SOURCES = example_numberwrapper.c
-libexample_numberwrapper_la_LDFLAGS = -shared
+libexample_numberwrapper_la_LDFLAGS = -shared @EFL_LTMODULE_FLAGS@
 libexample_numberwrapper_la_CFLAGS = $(COMMON_FLAGS) -DEFL_BETA_API_SUPPORT
 
 GENERATED += example_numberwrapper.eo.h example_numberwrapper.eo.c 
EoInherit01$(EXEEXT).config
diff --git a/src/tests/efl_mono/mono_test_driver.sh 
b/src/tests/efl_mono/mono_test_driver.sh
index e8e8772f9f..fc8f44876e 100755
--- a/src/tests/efl_mono/mono_test_driver.sh
+++ b/src/tests/efl_mono/mono_test_driver.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 echo $LD_LIBRARY_PATH
-EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO 
$MONO_BUILDPATH/src/tests/efl_mono/efl_mono.exe
+EINA_LOG_LEVEL=8 MONO_LOG_LEVEL=debug $MONO 
$MONO_BUILDPATH/src/tests/efl_mono/efl_mono${EXEEXT}
 

-- 




[EGIT] [core/efl] master 03/03: eolian_mono: fix handling of regular ptr() types

2017-12-15 Thread Vitor Sousa
vitorsousa pushed a commit to branch master.

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

commit 00fb5b228a0c7011381943eaa909b908336c8ff5
Author: Vitor Sousa 
Date:   Fri Dec 15 22:15:00 2017 -0200

eolian_mono: fix handling of regular ptr() types
---
 src/bin/eolian_mono/eolian/mono/helpers.hh | 25 +++-
 .../eolian_mono/eolian/mono/marshall_type_impl.hh  | 15 +++--
 src/bin/eolian_mono/eolian/mono/parameter.hh   | 70 +++---
 .../eolian_mono/eolian/mono/struct_definition.hh   | 14 +
 src/bin/eolian_mono/eolian/mono/type.hh|  4 +-
 src/bin/eolian_mono/eolian/mono/type_impl.hh   |  2 +
 src/bindings/mono/eina_mono/eina_common.cs | 30 ++
 .../mono/eina_mono/eina_container_common.cs| 15 +
 8 files changed, 147 insertions(+), 28 deletions(-)

diff --git a/src/bin/eolian_mono/eolian/mono/helpers.hh 
b/src/bin/eolian_mono/eolian/mono/helpers.hh
index 28b54a5aef..7d013bd6f5 100644
--- a/src/bin/eolian_mono/eolian/mono/helpers.hh
+++ b/src/bin/eolian_mono/eolian/mono/helpers.hh
@@ -33,7 +33,6 @@ inline std::string struct_full_name(attributes::struct_def 
const& struct_)
 inline bool is_struct_blacklisted(std::string const& full_name)
 {
return full_name == "Efl.Event.Description"
-   // || full_name == "Eina.File"
|| full_name == "Eina.Binbuf"
|| full_name == "Eina.Slice"
|| full_name == "Eina.Rw_Slice";
@@ -54,6 +53,30 @@ inline bool 
need_struct_conversion(attributes::regular_type_def const* regular)
return regular && regular->is_struct() && !is_struct_blacklisted(*regular);
 }
 
+inline bool need_pointer_conversion(attributes::regular_type_def const* 
regular)
+{
+   if (!regular)
+ return false;
+
+   if (regular->is_enum()
+   || (regular->is_struct() && type_full_name(*regular) != "Eina.Binbuf")
+  )
+ return true;
+
+   std::set const types {
+ "bool", "char"
+ , "byte" , "short" , "int" , "long" , "llong" , "int8" , "int16" , 
"int32" , "int64" , "ssize"
+ , "ubyte", "ushort", "uint", "ulong", "ullong", "uint8", "uint16", 
"uint32", "uint64", "size"
+ , "ptrdiff"
+ , "float", "double"
+   };
+   if (types.find(regular->base_type) != types.end())
+ return true;
+
+   return false;
+}
+
+
 }
 
 #endif
diff --git a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh 
b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
index 7950b31213..89efc7f3e2 100644
--- a/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
+++ b/src/bin/eolian_mono/eolian/mono/marshall_type_impl.hh
@@ -149,7 +149,7 @@ struct marshall_type_visitor_generate
}}
 };
 
-if (regular.is_struct() && !is_struct_blacklisted(regular))
+if (!is_ptr && regular.is_struct() && !is_struct_blacklisted(regular))
   {
  return as_generator(*(lower_case[string] << ".") << string << 
"_StructInternal")
 .generate(sink, 
std::make_tuple(eolian_mono::escape_namespace(regular.namespaces), 
regular.base_type), *context);
@@ -169,14 +169,21 @@ struct marshall_type_visitor_generate
 {
return *b;
 }
+  else if (is_ptr && need_pointer_conversion())
+{
+   regular_type_def r = regular;
+   r.base_type = " System.IntPtr";
+   r.namespaces.clear();
+   return visitor_generate{sink, context, 
c_type, is_out, is_return, is_ptr}(r);
+}
   else
 {
-  return visitor_generate{sink, context, 
c_type, is_out, is_return}(regular);
+  return visitor_generate{sink, context, 
c_type, is_out, is_return, is_ptr}(regular);
 }
}
bool operator()(attributes::klass_name klass_name) const
{
- return visitor_generate{sink, context, c_type, 
is_out, is_return}(klass_name);
+ return visitor_generate{sink, context, c_type, 
is_out, is_return, is_ptr}(klass_name);
  // return as_generator(" System.IntPtr").generate(sink, 
attributes::unused, *context);
}
bool operator()(attributes::complex_type_def const& complex) const
@@ -259,7 +266,7 @@ struct marshall_type_visitor_generate
 }
 
   //return default_match(complex);
- return visitor_generate{sink, context, c_type, 
is_out, is_return}(complex);
+ return visitor_generate{sink, context, c_type, 
is_out, is_return, is_ptr}(complex);
  // return as_generator(" System.IntPtr").generate(sink, 
attributes::unused, *context);
}
 };
diff --git a/src/bin/eolian_mono/eolian/mono/parameter.hh 
b/src/bin/eolian_mono/eolian/mono/parameter.hh
index 0e3fa326d5..834ca1248d 100644
--- a/src/bin/eolian_mono/eolian/mono/parameter.hh
+++ b/src/bin/eolian_mono/eolian/mono/parameter.hh
@@ -269,6 +269,9 

[EGIT] [core/efl] master 01/03: efl_mono: tests and better support for structs, plus some other fixes

2017-12-15 Thread Vitor Sousa
vitorsousa pushed a commit to branch master.

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

commit acd99be98bc6f3218af9322b23acb52ed29fb008
Author: Vitor Sousa 
Date:   Tue Dec 12 12:06:46 2017 -0200

efl_mono: tests and better support for structs, plus some other fixes

Fix several integer binding type deduction based in its size on C.

Generation for function pointers no longer use modified argument name
which is different from the parameter name.

New generation context for structs.

bool from UnmanagedType.I1 to UnmanagedType.U1 (correct use
inside structs according to mono documentation).

byte (signed char) and int8 now is correctly represented by
sbyte in C#.

Check parameter direction in some out generators in parameter.hh.

Add efl_libs.csv to gitignore.

Make eina.Value pointer constructor public.

Add missing fields to efl.kw_event.Description struct.

Remove eina.File workaround (let struct gen handle it).

Remove is_function_ptr bool from regular_type_def and
add a typedecl_type enum to it. Also add some helper
methods for easier comparison.

Left some test cases commented for when pointer parameters
are properly working.
---
 src/Makefile_Efl_Mono.am   |   1 +
 .../eolian_mono/eolian/mono/function_pointer.hh|   4 +-
 .../eolian_mono/eolian/mono/generation_contexts.hh |   1 +
 src/bin/eolian_mono/eolian/mono/helpers.hh |  59 +++
 .../eolian_mono/eolian/mono/marshall_annotation.hh |   8 +-
 .../eolian_mono/eolian/mono/marshall_type_impl.hh  |   8 +-
 src/bin/eolian_mono/eolian/mono/parameter.hh   | 114 +-
 .../eolian_mono/eolian/mono/struct_definition.hh   | 437 +++--
 src/bin/eolian_mono/eolian/mono/type_impl.hh   |  39 +-
 src/bin/eolian_mono/eolian_mono.cc |   3 +-
 src/bindings/mono/efl_mono/.gitignore  |   1 +
 src/bindings/mono/eina_mono/eina_value.cs  |   2 +-
 src/bindings/mono/eo_mono/workaround.cs|  17 +-
 src/lib/eolian_cxx/grammar/converting_argument.hpp |   2 +-
 src/lib/eolian_cxx/grammar/klass_def.hpp   |  89 +++--
 src/lib/eolian_cxx/grammar/parameter.hpp   |   2 +-
 src/tests/efl_mono/Structs.cs  | 355 +
 src/tests/efl_mono/libefl_mono_native_test.c   | 394 +++
 src/tests/efl_mono/test_testing.eo | 184 +
 19 files changed, 1618 insertions(+), 102 deletions(-)

diff --git a/src/Makefile_Efl_Mono.am b/src/Makefile_Efl_Mono.am
index 72a1916515..ad45a22b81 100644
--- a/src/Makefile_Efl_Mono.am
+++ b/src/Makefile_Efl_Mono.am
@@ -371,6 +371,7 @@ tests_efl_mono_efl_mono_exe_SOURCES = \
  tests/efl_mono/Events.cs \
  tests/efl_mono/FunctionPointers.cs \
  tests/efl_mono/Strings.cs \
+ tests/efl_mono/Structs.cs \
  tests/efl_mono/TestUtils.cs \
  tests/efl_mono/Value.cs \
  tests/efl_mono/ValueEolian.cs
diff --git a/src/bin/eolian_mono/eolian/mono/function_pointer.hh 
b/src/bin/eolian_mono/eolian/mono/function_pointer.hh
index 84fdb79881..0f91a4c41c 100644
--- a/src/bin/eolian_mono/eolian/mono/function_pointer.hh
+++ b/src/bin/eolian_mono/eolian/mono/function_pointer.hh
@@ -69,14 +69,14 @@ struct function_pointer {
 
   << scope_tab << "public " << type << " ManagedCb(" << 
(parameter % ",") << ")\n"
   << scope_tab << "{\n"
-  << scope_tab << scope_tab << (f.return_type.c_type != "void" 
? "return ": "") << "_cb(_cb_data, " << (argument_invocation % ", ") << ");\n"
+  << scope_tab << scope_tab << (f.return_type.c_type != "void" 
? "return ": "") << "_cb(_cb_data, " << (argument_invocation_no_conversion % ", 
") << ");\n"
   << scope_tab << "}\n\n"
 
   << scope_tab << "public static " << type << " Cb(IntPtr 
cb_data, " << (parameter % ", ") << ")\n"
   << scope_tab << "{\n"
   << scope_tab << scope_tab << "GCHandle handle = 
GCHandle.FromIntPtr(cb_data);\n"
   << scope_tab << scope_tab << string << " cb = (" << string 
<< ")handle.Target;\n"
-  << scope_tab << scope_tab << (f.return_type.c_type != "void" 
? "return " : "") << "cb(" << (argument_invocation % ", ") << ");\n"
+  << scope_tab << scope_tab << (f.return_type.c_type != "void" 
? "return " : "") << "cb(" << (argument_invocation_no_conversion % ", ") << 
");\n"
   << scope_tab << "}\n"
   << "}\n"
   ).generate(sink, std::make_tuple(f.return_type, 
f.parameters, f.parameters, f.return_type, f.parameters, f_name, f_name, 
f.parameters), context))
diff --git a/src/bin/eolian_mono/eolian/mono/generation_contexts.hh 
b/src/bin/eolian_mono/eolian/mono/generation_contexts.hh
index 

[EGIT] [core/efl] master 01/01: elementary: fix definition of EAPI.

2017-12-15 Thread Cedric BAIL
cedric pushed a commit to branch master.

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

commit b20dd869a4a10fb28a9c743910e2f2a1d2e7d1cc
Author: Cedric BAIL 
Date:   Fri Dec 15 15:48:17 2017 -0800

elementary: fix definition of EAPI.
---
 src/lib/elementary/Efl_Ui.h | 2 +-
 src/lib/elementary/Elementary.h | 4 
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 9e549e0a87..96a7b65259 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -58,7 +58,7 @@
 #endif
 
 #ifdef _WIN32
-# ifdef EFL_ECORE_BUILD
+# ifdef EFL_ELEMENTARY_BUILD
 #  ifdef DLL_EXPORT
 #   define EAPI __declspec(dllexport)
 #  else
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index d9e35f0273..e404d6b3ab 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -329,10 +329,6 @@ EAPI extern Elm_Version *elm_version;
 
 #include 
 
-#if defined (EFL_EO_API_SUPPORT) && defined (EFL_BETA_API_SUPPORT)
-# include "Efl_Ui.h"
-#endif
-
 #ifdef __cplusplus
 }
 #endif

-- 




[EGIT] [core/enlightenment] master 01/01: luncher: fix slider on mouse scroll.

2017-12-15 Thread Al Poole
netstar pushed a commit to branch master.

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

commit 43928a70fca8d7bf7a9fd4611af7f69d321e5f54
Author: Al Poole 
Date:   Fri Dec 15 20:08:10 2017 +

luncher: fix slider on mouse scroll.
---
 src/modules/luncher/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/luncher/config.c b/src/modules/luncher/config.c
index 71023f41d..557691217 100644
--- a/src/modules/luncher/config.c
+++ b/src/modules/luncher/config.c
@@ -433,7 +433,7 @@ config_luncher(E_Zone *zone, Instance *inst, Eina_Bool bar)
elm_slider_indicator_format_set(slider, "%1.0f");
elm_slider_min_max_set(slider, 1, 256);
elm_slider_value_set(slider, inst->cfg->preview_size);
-   elm_slider_step_set(slider, 1);
+   elm_slider_step_set(slider, 1 /  256.0);
elm_slider_span_size_set(slider, 256);
E_ALIGN(slider, 0.0, 0.0);
E_WEIGHT(slider, EVAS_HINT_EXPAND, 0);

-- 




[EGIT] [core/enlightenment] master 01/01: build: fix meson build on FreeBSD.

2017-12-15 Thread Al Poole
cedric pushed a commit to branch master.

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

commit 481a4d66116c277855e4bd7afc9508185909
Author: Al Poole 
Date:   Fri Dec 15 11:32:17 2017 -0800

build: fix meson build on FreeBSD.

Summary: -Dsystemd=false and -Ddevice-udev=false with this.

Reviewers: raster, zmike!

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D5648

Signed-off-by: Cedric BAIL 
---
 meson.build | 2 +-
 src/bin/e_fm/meson.build| 1 +
 src/bin/meson.build | 9 +
 src/modules/temperature/meson.build | 7 ++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 5ab590b1b..87c1abbee 100644
--- a/meson.build
+++ b/meson.build
@@ -213,7 +213,7 @@ if get_option('systemd') == true
   endif
 endif
 
-if cc.has_function('eeze_disk_function', dependencies: dependency('eeze')) == 
true
+if host_os.startswith('linux') and cc.has_function('eeze_disk_function', 
dependencies: dependency('eeze')) == true
   config_h.set('HAVE_EEZE_MOUNT', '1')
   eeze_mount = true
 endif
diff --git a/src/bin/e_fm/meson.build b/src/bin/e_fm/meson.build
index 8d5796b75..55480bb10 100644
--- a/src/bin/e_fm/meson.build
+++ b/src/bin/e_fm/meson.build
@@ -1,6 +1,7 @@
 deps = [
   dep_eina,
   dep_ecore,
+  dep_eet,
   dep_ecore_con,
   dep_ecore_file,
   dep_ecore_ipc,
diff --git a/src/bin/meson.build b/src/bin/meson.build
index e63114572..b5c8d69c3 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -557,10 +557,11 @@ suid_exes += join_paths(dir_e_utils, 'enlightenment_sys')
 if freebsd == true
   executable('enlightenment_ckpasswd',
  'e_ckpasswd_main.c',
- c_args : suid_cflags,
- link_args  : suid_ldflags,
- install_dir: dir_e_utils,
- install: true
+ dependencies : [ dep_crypt ],
+ c_args   : suid_cflags,
+ link_args: suid_ldflags,
+ install_dir  : dir_e_utils,
+ install  : true
 )
   suid_exes += join_paths(dir_e_utils, 'enlightenment_ckpasswd')
 endif
diff --git a/src/modules/temperature/meson.build 
b/src/modules/temperature/meson.build
index ade13081c..0846a8654 100644
--- a/src/modules/temperature/meson.build
+++ b/src/modules/temperature/meson.build
@@ -2,6 +2,11 @@ src = files(
   'e_mod_main.c',
   'e_mod_config.c',
   'e_mod_tempget.c',
-  'e_mod_udev.c',
   'e_mod_main.h'
  )
+
+if get_option('device-udev') == true
+   src += files(
+'e_mod_udev.c'
+   )
+endif

-- 




[EGIT] [core/enlightenment] master 01/01: conf_theme: show appropriate background list.

2017-12-15 Thread Al Poole
netstar pushed a commit to branch master.

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

commit cb66473320bbde536aa2cc0bc2b06f2ccbbf565a
Author: Al Poole 
Date:   Fri Dec 15 19:15:27 2017 +

conf_theme: show appropriate background list.

If a new install show the system wallpapers. If a user supplied
wallpaper show the list of user supplied. If a system, show the
system list of wallpapers. On a fresh install on first use people
realise there are wallpapers!!!
---
 src/modules/conf_theme/e_int_config_wallpaper.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c 
b/src/modules/conf_theme/e_int_config_wallpaper.c
index 599c6662e..3342a28e3 100644
--- a/src/modules/conf_theme/e_int_config_wallpaper.c
+++ b/src/modules/conf_theme/e_int_config_wallpaper.c
@@ -480,6 +480,12 @@ _basic_create(E_Config_Dialog *cfd EINA_UNUSED, Evas 
*evas, E_Config_Dialog_Data
evas_object_show(ow);
e_widget_table_object_append(ot, oa, 0, 2, 2, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);
+
+   if (!cfdata->bg || cfdata->fmdir == 1)
+ e_widget_radio_toggle_set(cfdata->o_system, EINA_TRUE);
+   else
+ e_widget_radio_toggle_set(cfdata->o_personal, EINA_TRUE);
+
return o;
 }
 

-- 




[EGIT] [core/efl] master 01/01: eio: remove uneeded function.

2017-12-15 Thread Cedric BAIL
cedric pushed a commit to branch master.

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

commit fa0ba4c0c9fe6800ea86a2664b6496e85195de2b
Author: Cedric BAIL 
Date:   Fri Dec 15 09:45:48 2017 -0800

eio: remove uneeded function.
---
 src/lib/eio/efl_io_manager.c | 57 
 1 file changed, 57 deletions(-)

diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index e6066eaa3b..d25f4c7c77 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -146,19 +146,6 @@ _file_done_cb(void *data, Eio_File *handler)
 
 /* Basic listing callbacks */
 static void
-_cleanup_string_progress(void *data)
-{
-   Eina_Array *existing = data;
-   Eina_Stringshare *s;
-   Eina_Array_Iterator it;
-   unsigned int i;
-
-   EINA_ARRAY_ITER_NEXT(existing, i, s, it)
- eina_stringshare_del(s);
-   eina_array_free(existing);
-}
-
-static void
 _cleanup_info_progress(void *data)
 {
Eina_Array *existing = data;
@@ -196,50 +183,6 @@ _future_string_cb(void *data EINA_UNUSED, Eio_File 
*handler, Eina_Array *gather)
eina_array_free(gather);
 }
 
-static void
-_file_string_cb(void *data, Eio_File *handler, Eina_Array *gather)
-{
-   Efl_Promise *p = data;
-   Eina_Array *existing = efl_key_data_get(p, "_eio.stored");
-   void **tmp;
-
-   // If a future is set, but without progress, we should assume
-   // that we should discard all future progress. [[FIXME]]
-   if (existing)
- {
-tmp = realloc(existing->data, sizeof (void*) * (existing->count + 
gather->count));
-if (!tmp)
-  {
- eina_array_free(gather);
- eina_array_free(existing);
- efl_key_data_set(p, "_eio.stored", NULL);
- handler->error = ENOMEM;
- eio_file_cancel(handler);
- return ;
-  }
-
-existing->data = tmp;
-memcpy(existing->data + existing->count, gather->data, gather->count * 
sizeof (void*));
-existing->count += gather->count;
-existing->total = existing->count;
-eina_array_free(gather);
- }
-   else
- {
-existing = gather;
- }
-
-   if (!efl_key_data_get(p, "_eio.progress"))
- {
-efl_key_data_set(p, "_eio.stored", existing);
-return ;
- }
-
-   efl_promise_progress_set(p, existing);
-   efl_key_data_set(p, "_eio.stored", NULL);
-   _cleanup_string_progress(existing);
-}
-
 /* Direct listing callbacks */
 static void
 _file_info_cb(void *data, Eio_File *handler, Eina_Array *gather)

-- 




[EGIT] [core/efl] master 01/01: docs: link to the module list in legacy docs This should improve visibility of stuff that is not specifically mentioned on the home page

2017-12-15 Thread Andy Williams
ajwillia-ms pushed a commit to branch master.

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

commit 5937b1a3de09994b5ce62745ff1b7a96cf6c4a42
Author: Andy Williams 
Date:   Fri Dec 15 17:22:04 2017 +

docs: link to the module list in legacy docs
This should improve visibility of stuff that is not specifically
mentioned on the home page
---
 doc/main.dox | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/doc/main.dox b/doc/main.dox
index df4bd0c879..d9e50bcb79 100644
--- a/doc/main.dox
+++ b/doc/main.dox
@@ -45,6 +45,8 @@
  * @li @ref eolian_main an EO file parser and code generator.
  * @li @ref elocation_main awareness library.
  *
+ * If you are looking for methods that do not fit into the above list you can
+ * see the full module listing.
  */
 
 /**

-- 




[EGIT] [core/enlightenment] master 01/01: Revert "wl-drm: Enable all degrees of screen rotation"

2017-12-15 Thread Christopher Michael
devilhorns pushed a commit to branch master.

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

commit cf80e5d2b21018b073aebd4bcebcb82a24a0ce1f
Author: Chris Michael 
Date:   Fri Dec 15 11:41:14 2017 -0500

Revert "wl-drm: Enable all degrees of screen rotation"

Reverting this as it has issues still, and when multi-output support
for wayland lands this is not going to work anyway.

This reverts commit 8f5299be088acbc2baf823ba01defc96f8743b13.
---
 src/modules/wl_drm/e_mod_main.c | 47 +
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index f3c466a21..51ea01280 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -413,10 +413,24 @@ _drm2_randr_create(void)
  s->config.geom.w, s->config.geom.h);
}
 
- s->info.can_rot_0 = EINA_TRUE;
- s->info.can_rot_90 = EINA_TRUE;
- s->info.can_rot_180 = EINA_TRUE;
- s->info.can_rot_270 = EINA_TRUE;
+ s->info.can_rot_0 = EINA_FALSE;
+ s->info.can_rot_90 = EINA_FALSE;
+ s->info.can_rot_180 = EINA_FALSE;
+ s->info.can_rot_270 = EINA_FALSE;
+
+ int rotations;
+
+ rotations =
+   ecore_drm2_output_supported_rotations_get(output);
+
+ if (rotations & ECORE_DRM2_ROTATION_NORMAL)
+   s->info.can_rot_0 = EINA_TRUE;
+ if (rotations & ECORE_DRM2_ROTATION_90)
+   s->info.can_rot_90 = EINA_TRUE;
+ if (rotations & ECORE_DRM2_ROTATION_180)
+   s->info.can_rot_180 = EINA_TRUE;
+ if (rotations & ECORE_DRM2_ROTATION_270)
+   s->info.can_rot_270 = EINA_TRUE;
 
  if (cs)
{
@@ -575,12 +589,25 @@ _drm2_randr_apply(void)
 ecore_drm2_output_mode_set(output, mode, s->config.geom.x,
s->config.geom.y);
 
-ecore_drm2_output_enabled_set(output, s->config.enabled);
+/* TODO: cannot support rotations until we support planes
+ * and we cannot support planes until Atomic support is in */
+int orient = 0;
+
+if (s->config.rotation == 0)
+  orient = ECORE_DRM2_ROTATION_NORMAL;
+else if (s->config.rotation == 90)
+  orient = ECORE_DRM2_ROTATION_90;
+else if (s->config.rotation == 180)
+  orient = ECORE_DRM2_ROTATION_180;
+else if (s->config.rotation == 270)
+  orient = ECORE_DRM2_ROTATION_270;
+
+ecore_drm2_output_rotation_set(output, orient);
 
 if (s->config.priority == top_priority)
   _drm2_output_primary_set(outputs, output);
 
-if (!s->config.enabled) continue;
+ecore_drm2_output_enabled_set(output, s->config.enabled);
 
 printf("\tDRM2 RRR: Mode\n");
 printf("\t\tDRM2 RRR: Geom: %d %d %dx%d\n",
@@ -592,15 +619,7 @@ _drm2_randr_apply(void)
 printf("\tDRM2 RRR: Relative Mode: %d\n", s->config.relative.mode);
 printf("\tDRM2 RRR: Relative To: %s\n", s->config.relative.to);
 printf("\tDRM2 RRR: Align: %f\n", s->config.relative.align);
-
-ecore_evas_rotation_with_resize_set(e_comp->ee, s->config.rotation);
-
-/* TODO: rotate e_comp pointer to match screen ?? */
-/* ecore_drm2_device_pointer_rotation_set(dev, s->config.rotation); */
  }
-
-   ecore_drm2_device_calibrate(dev, vw, vh);
-   ecore_drm2_device_pointer_max_set(dev, vw, vh);
 }
 
 static void

-- 




[EGIT] [core/efl] master 03/04: eolian: remove remaining global state (+ modify APIs accordingly)

2017-12-15 Thread Daniel Kolesa
q66 pushed a commit to branch master.

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

commit 18e18ca74c5456e0ecb7f03065959fb9fb7b58f4
Author: Daniel Kolesa 
Date:   Fri Dec 15 17:00:36 2017 +0100

eolian: remove remaining global state (+ modify APIs accordingly)
---
 src/bin/eolian/docs.c|  2 +-
 src/bin/eolian/headers.c | 18 ++-
 src/bin/eolian/headers.h |  2 +-
 src/bin/eolian/sources.c | 51 
 src/bin/eolian/types.c   | 10 +++
 src/bindings/luajit/eolian.lua   | 24 +++
 src/lib/eolian/Eolian.h  | 12 +---
 src/lib/eolian/database_expr.c   |  2 +-
 src/lib/eolian/database_expr_api.c   |  4 +--
 src/lib/eolian/database_type.c   | 35 --
 src/lib/eolian/database_type_api.c   | 19 ++--
 src/lib/eolian/database_validate.c   |  8 ++---
 src/lib/eolian/database_var.c|  4 +--
 src/lib/eolian/eo_parser.c   | 10 +++
 src/lib/eolian/eolian_database.c | 39 +++-
 src/lib/eolian/eolian_database.h | 13 
 src/lib/eolian_cxx/grammar/klass_def.hpp |  4 +--
 src/scripts/elua/apps/docgen/doctree.lua |  9 --
 src/scripts/elua/modules/lualian.lua | 16 +-
 src/tests/eolian/eolian_parsing.c| 48 +++---
 20 files changed, 170 insertions(+), 160 deletions(-)

diff --git a/src/bin/eolian/docs.c b/src/bin/eolian/docs.c
index 09e63bf9ac..a38ac19ff7 100644
--- a/src/bin/eolian/docs.c
+++ b/src/bin/eolian/docs.c
@@ -377,7 +377,7 @@ eo_gen_docs_event_gen(const Eolian_Unit *src, const 
Eolian_Event *ev,
if (rt)
  {
 p = buf;
-Eina_Stringshare *rts = eolian_type_c_type_get(rt, 
EOLIAN_C_TYPE_DEFAULT);
+Eina_Stringshare *rts = eolian_type_c_type_get(src, rt, 
EOLIAN_C_TYPE_DEFAULT);
 snprintf(buf, sizeof(buf), "@return %s", rts);
 eina_stringshare_del(rts);
  }
diff --git a/src/bin/eolian/headers.c b/src/bin/eolian/headers.c
index 90fc1ea611..b2fe73a00c 100644
--- a/src/bin/eolian/headers.c
+++ b/src/bin/eolian/headers.c
@@ -12,12 +12,13 @@ _get_add_star(Eolian_Function_Type ftype, 
Eolian_Parameter_Dir pdir)
 }
 
 static int
-_gen_param(Eina_Strbuf *buf, Eolian_Function_Parameter *pr, 
Eolian_Function_Type ftype, int *rpid)
+_gen_param(const Eolian_Unit *src, Eina_Strbuf *buf,
+   Eolian_Function_Parameter *pr, Eolian_Function_Type ftype, int 
*rpid)
 {
const Eolian_Type *prt = eolian_parameter_type_get(pr);
-   const Eolian_Typedecl *ptd = eolian_type_typedecl_get(prt);
+   const Eolian_Typedecl *ptd = eolian_type_typedecl_get(src, prt);
const char *prn = eolian_parameter_name_get(pr);
-   Eina_Stringshare *prtn = eolian_type_c_type_get(prt, EOLIAN_C_TYPE_PARAM);
+   Eina_Stringshare *prtn = eolian_type_c_type_get(src, prt, 
EOLIAN_C_TYPE_PARAM);
 
if (ptd && (eolian_typedecl_type_get(ptd) == 
EOLIAN_TYPEDECL_FUNCTION_POINTER))
  {
@@ -39,7 +40,8 @@ _gen_param(Eina_Strbuf *buf, Eolian_Function_Parameter *pr, 
Eolian_Function_Type
 }
 
 void
-eo_gen_params(Eina_Iterator *itr, Eina_Strbuf *buf, Eina_Strbuf **flagbuf, int 
*nidx, Eolian_Function_Type ftype)
+eo_gen_params(const Eolian_Unit *src, Eina_Iterator *itr, Eina_Strbuf *buf,
+  Eina_Strbuf **flagbuf, int *nidx, Eolian_Function_Type ftype)
 {
Eolian_Function_Parameter *pr;
EINA_ITERATOR_FOREACH(itr, pr)
@@ -47,7 +49,7 @@ eo_gen_params(Eina_Iterator *itr, Eina_Strbuf *buf, 
Eina_Strbuf **flagbuf, int *
 int rpid = 0;
 if (*nidx)
   eina_strbuf_append(buf, ", ");
-*nidx += _gen_param(buf, pr, ftype, );
+*nidx += _gen_param(src, buf, pr, ftype, );
 
 if (!eolian_parameter_is_nonull(pr) || !flagbuf)
   continue;
@@ -110,7 +112,7 @@ _gen_func(const Eolian_Unit *src, const Eolian_Function 
*fid,
eina_strbuf_append(buf, legacy ? "EAPI " : "EOAPI ");
if (rtp)
  {
-Eina_Stringshare *rtps = eolian_type_c_type_get(rtp, 
EOLIAN_C_TYPE_RETURN);
+Eina_Stringshare *rtps = eolian_type_c_type_get(src, rtp, 
EOLIAN_C_TYPE_RETURN);
 eina_strbuf_append(buf, rtps);
 if (rtps[strlen(rtps) - 1] != '*')
   eina_strbuf_append_char(buf, ' ');
@@ -139,7 +141,7 @@ _gen_func(const Eolian_Unit *src, const Eolian_Function 
*fid,
   eina_strbuf_append(buf, "Eo *obj");
  }
 
-   eo_gen_params(eolian_property_keys_get(fid, ftype), buf, , , 
EOLIAN_PROPERTY);
+   eo_gen_params(src, eolian_property_keys_get(fid, ftype), buf, , 
, EOLIAN_PROPERTY);
 
if (!var_as_ret)
  {
@@ -148,7 +150,7 @@ _gen_func(const Eolian_Unit *src, const Eolian_Function 
*fid,
   itr = eolian_property_values_get(fid, ftype);
 else
   itr = eolian_function_parameters_get(fid);
-

[EGIT] [core/efl] master 04/04: eolian: remove now unused database init/shutdown

2017-12-15 Thread Daniel Kolesa
q66 pushed a commit to branch master.

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

commit 373392d56e73cd29456a75ba5d3d79a73ee2a70b
Author: Daniel Kolesa 
Date:   Fri Dec 15 17:10:40 2017 +0100

eolian: remove now unused database init/shutdown
---
 src/lib/eolian/eolian.c  |  2 --
 src/lib/eolian/eolian_database.c | 44 +++-
 src/lib/eolian/eolian_database.h |  3 ---
 3 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/src/lib/eolian/eolian.c b/src/lib/eolian/eolian.c
index edb91829b2..4a38fb90db 100644
--- a/src/lib/eolian/eolian.c
+++ b/src/lib/eolian/eolian.c
@@ -36,7 +36,6 @@ EAPI int eolian_init(void)
 return EINA_FALSE;
  }
 
-   database_init();
eo_lexer_init();
return ++_eolian_init_counter;
 }
@@ -58,7 +57,6 @@ EAPI int eolian_shutdown(void)
   EINA_LOG_STATE_SHUTDOWN);
 
 eo_lexer_shutdown();
-database_shutdown();
 eina_prefix_free(_eolian_prefix);
 _eolian_prefix = NULL;
 
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index fdba068728..8b82503e7e 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -8,34 +8,6 @@
 #include "eolian_database.h"
 #include "eolian_priv.h"
 
-static int _database_init_count = 0;
-
-static void
-_hashlist_free(void *data)
-{
-   eina_list_free((Eina_List*)data);
-}
-
-int
-database_init()
-{
-   if (_database_init_count > 0) return ++_database_init_count;
-   return ++_database_init_count;
-}
-
-int
-database_shutdown()
-{
-   if (_database_init_count <= 0)
- {
-ERR("Init count not greater than 0 in shutdown.");
-return 0;
- }
-   _database_init_count--;
-
-   return _database_init_count;
-}
-
 void
 database_decl_add(Eolian *state, Eina_Stringshare *name,
   Eolian_Declaration_Type type,
@@ -560,6 +532,12 @@ database_unit_del(Eolian_Unit *unit)
eina_hash_free(unit->decls);
 }
 
+static void
+_hashlist_free(void *data)
+{
+   eina_list_free((Eina_List*)data);
+}
+
 EAPI Eolian *
 eolian_new(void)
 {
@@ -687,8 +665,7 @@ _eolian_file_parse_nodep(Eolian_Unit *parent, const char 
*filepath)
 {
Eina_Bool is_eo;
const char *eopath;
-   if (_database_init_count <= 0)
- return NULL;
+
is_eo = eina_str_has_suffix(filepath, EO_SUFFIX);
if (!is_eo && !eina_str_has_suffix(filepath, EOT_SUFFIX))
  {
@@ -734,6 +711,9 @@ _parse_deferred(Eolian_Unit *parent)
 EAPI const Eolian_Unit *
 eolian_file_parse(Eolian *state, const char *filepath)
 {
+   if (!state)
+ return NULL;
+
Eolian_Unit *ret = _eolian_file_parse_nodep((Eolian_Unit *)state, filepath);
if (!ret)
  return NULL;
@@ -767,7 +747,7 @@ eolian_all_eot_files_parse(Eolian *state)
 {
Parse_Data pd = { state, EINA_TRUE };
 
-   if (_database_init_count <= 0)
+   if (!state)
  return EINA_FALSE;
 
eina_hash_foreach(state->filenames_eot, _tfile_parse, );
@@ -795,7 +775,7 @@ eolian_all_eo_files_parse(Eolian *state)
 {
Parse_Data pd = { state, EINA_TRUE };
 
-   if (_database_init_count <= 0)
+   if (!state)
  return EINA_FALSE;
 
eina_hash_foreach(state->filenames_eo, _file_parse, );
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index edef41e94c..e7e75393a4 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -314,9 +314,6 @@ struct _Eolian_Variable
Eina_Bool is_extern :1;
 };
 
-int database_init(void);
-int database_shutdown(void);
-
 char *database_class_to_filename(const char *cname);
 Eina_Bool database_validate(Eolian *state, const Eolian_Unit *src);
 

-- 




[EGIT] [core/efl] master 01/04: eolian: make declaration APIs use units

2017-12-15 Thread Daniel Kolesa
q66 pushed a commit to branch master.

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

commit c8aa30e698fa95cf425c35bb359fbab55cb64110
Author: Daniel Kolesa 
Date:   Fri Dec 15 16:08:27 2017 +0100

eolian: make declaration APIs use units
---
 src/bin/eolian/docs.c |  2 +-
 src/bin/eolian/main.c | 22 --
 src/bin/eolian/types.c| 10 --
 src/bin/eolian/types.h|  4 ++--
 src/bindings/luajit/eolian.lua| 24 
 src/lib/eolian/Eolian.h   |  9 ++---
 src/lib/eolian/eolian_database.c  |  8 
 src/tests/eolian/eolian_parsing.c |  6 +++---
 8 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/bin/eolian/docs.c b/src/bin/eolian/docs.c
index 9807b727b7..09e63bf9ac 100644
--- a/src/bin/eolian/docs.c
+++ b/src/bin/eolian/docs.c
@@ -22,7 +22,7 @@ static void
 _generate_ref(const Eolian_Unit *src, const char *refn, Eina_Strbuf *wbuf,
   Eina_Bool use_legacy)
 {
-   const Eolian_Declaration *decl = eolian_declaration_get_by_name(refn);
+   const Eolian_Declaration *decl = eolian_declaration_get_by_name(src, refn);
if (decl)
  {
 char *n = strdup(eolian_declaration_name_get(decl));
diff --git a/src/bin/eolian/main.c b/src/bin/eolian/main.c
index 92643c6f7e..4c51e18d17 100644
--- a/src/bin/eolian/main.c
+++ b/src/bin/eolian/main.c
@@ -318,13 +318,14 @@ void eo_gen_class_names_get(const Eolian_Class *cl, char 
**cname,
 }
 
 static Eina_Bool
-_write_header(const Eolian_Unit *src, const char *ofname,
+_write_header(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
   const char *ifname, Eina_Bool legacy)
 {
INF("generating header: %s (legacy: %d)", ofname, legacy);
Eina_Strbuf *buf = eina_strbuf_new();
 
-   eo_gen_types_header_gen(src, ifname, buf, EINA_TRUE, legacy);
+   eo_gen_types_header_gen(src, eolian_declarations_get_by_file(eos, ifname),
+   buf, EINA_TRUE, legacy);
buf = _include_guard(ifname, "TYPES", buf);
 
Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
@@ -353,13 +354,14 @@ _write_header(const Eolian_Unit *src, const char *ofname,
 }
 
 static Eina_Bool
-_write_stub_header(const Eolian_Unit *src, const char *ofname,
+_write_stub_header(const Eolian *eos, const Eolian_Unit *src, const char 
*ofname,
const char *ifname)
 {
INF("generating stub header: %s", ofname);
Eina_Strbuf *buf = eina_strbuf_new();
 
-   eo_gen_types_header_gen(src, ifname, buf, EINA_FALSE, EINA_FALSE);
+   eo_gen_types_header_gen(src, eolian_declarations_get_by_file(eos, ifname),
+   buf, EINA_FALSE, EINA_FALSE);
 
Eina_Strbuf *cltd = eo_gen_class_typedef_gen(src, ifname);
if (cltd)
@@ -377,14 +379,14 @@ _write_stub_header(const Eolian_Unit *src, const char 
*ofname,
 }
 
 static Eina_Bool
-_write_source(const Eolian_Unit *src, const char *ofname,
+_write_source(const Eolian *eos, const Eolian_Unit *src, const char *ofname,
   const char *ifname, Eina_Bool eot)
 {
INF("generating source: %s", ofname);
Eina_Strbuf *buf = eina_strbuf_new();
 
const Eolian_Class *cl = eolian_class_get_by_file(src, ifname);
-   eo_gen_types_source_gen(src, ifname, buf);
+   eo_gen_types_source_gen(src, eolian_declarations_get_by_file(eos, ifname), 
buf);
eo_gen_source_gen(src, cl, buf);
if (cl || (eot && eina_strbuf_length_get(buf)))
  {
@@ -565,13 +567,13 @@ main(int argc, char **argv)
 
Eina_Bool succ = EINA_TRUE;
if (gen_what & GEN_H)
- succ = _write_header(src, outs[_get_bit_pos(GEN_H)], eobn, EINA_FALSE);
+ succ = _write_header(eos, src, outs[_get_bit_pos(GEN_H)], eobn, 
EINA_FALSE);
if (succ && (gen_what & GEN_H_LEGACY))
- succ = _write_header(src, outs[_get_bit_pos(GEN_H_LEGACY)], eobn, 
EINA_TRUE);
+ succ = _write_header(eos, src, outs[_get_bit_pos(GEN_H_LEGACY)], eobn, 
EINA_TRUE);
if (succ && (gen_what & GEN_H_STUB))
- succ = _write_stub_header(src, outs[_get_bit_pos(GEN_H_STUB)], eobn);
+ succ = _write_stub_header(eos, src, outs[_get_bit_pos(GEN_H_STUB)], eobn);
if (succ && (gen_what & GEN_C))
- succ = _write_source(src, outs[_get_bit_pos(GEN_C)], eobn, !strcmp(ext, 
".eot"));
+ succ = _write_source(eos, src, outs[_get_bit_pos(GEN_C)], eobn, 
!strcmp(ext, ".eot"));
if (succ && (gen_what & GEN_C_IMPL))
  succ = _write_impl(src, outs[_get_bit_pos(GEN_C_IMPL)], eobn);
 
diff --git a/src/bin/eolian/types.c b/src/bin/eolian/types.c
index ae4cd72d63..c98791e965 100644
--- a/src/bin/eolian/types.c
+++ b/src/bin/eolian/types.c
@@ -204,12 +204,10 @@ _var_generate(const Eolian_Unit *src, const 
Eolian_Variable *vr, Eina_Bool legac
 }
 
 void eo_gen_types_header_gen(const Eolian_Unit *src,
- const char *eof, Eina_Strbuf *buf,
+ Eina_Iterator 

[EGIT] [core/efl] master 02/04: eolian: filename retrieval APIs are read only

2017-12-15 Thread Daniel Kolesa
q66 pushed a commit to branch master.

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

commit d624464ab4c61140ed3d46a2bbc183b8cb500d2b
Author: Daniel Kolesa 
Date:   Fri Dec 15 16:12:14 2017 +0100

eolian: filename retrieval APIs are read only
---
 src/lib/eolian/Eolian.h  | 8 
 src/lib/eolian/eolian_database.c | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index d109ea12a2..ad35d16c0a 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -523,7 +523,7 @@ EAPI const Eolian_Unit *eolian_file_parse(Eolian *state, 
const char *filepath);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eo_file_paths_get(Eolian *state);
+EAPI Eina_Iterator *eolian_all_eo_file_paths_get(const Eolian *state);
 
 /*
  * @brief Get an iterator to all .eot file names with paths.
@@ -536,7 +536,7 @@ EAPI Eina_Iterator *eolian_all_eo_file_paths_get(Eolian 
*state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eot_file_paths_get(Eolian *state);
+EAPI Eina_Iterator *eolian_all_eot_file_paths_get(const Eolian *state);
 
 /*
  * @brief Get an iterator to all .eo file names (without paths).
@@ -549,7 +549,7 @@ EAPI Eina_Iterator *eolian_all_eot_file_paths_get(Eolian 
*state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eo_files_get(Eolian *state);
+EAPI Eina_Iterator *eolian_all_eo_files_get(const Eolian *state);
 
 /*
  * @brief Get an iterator to all .eot file names (without paths).
@@ -562,7 +562,7 @@ EAPI Eina_Iterator *eolian_all_eo_files_get(Eolian *state);
  *
  * @ingroup Eolian
  */
-EAPI Eina_Iterator *eolian_all_eot_files_get(Eolian *state);
+EAPI Eina_Iterator *eolian_all_eot_files_get(const Eolian *state);
 
 /*
  * @brief Scan the given directory (recursively) and search for .eo and
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 0c1513ab8f..bf8f17f1af 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -813,28 +813,28 @@ eolian_all_eo_files_parse(Eolian *state)
 }
 
 EAPI Eina_Iterator *
-eolian_all_eot_files_get(Eolian *state)
+eolian_all_eot_files_get(const Eolian *state)
 {
if (!state) return NULL;
return eina_hash_iterator_key_new(state->filenames_eot);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eo_files_get(Eolian *state)
+eolian_all_eo_files_get(const Eolian *state)
 {
if (!state) return NULL;
return eina_hash_iterator_key_new(state->filenames_eo);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eot_file_paths_get(Eolian *state)
+eolian_all_eot_file_paths_get(const Eolian *state)
 {
if (!state) return NULL;
return eina_hash_iterator_data_new(state->filenames_eot);
 }
 
 EAPI Eina_Iterator *
-eolian_all_eo_file_paths_get(Eolian *state)
+eolian_all_eo_file_paths_get(const Eolian *state)
 {
if (!state) return NULL;
return eina_hash_iterator_data_new(state->filenames_eo);

-- 




[EGIT] [core/enlightenment] master 01/01: wl-drm: sort screen modes and assign zone->output

2017-12-15 Thread Christopher Michael
devilhorns pushed a commit to branch master.

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

commit 61b07a16ffe2962279f34d6831bb37804966fabb
Author: Chris Michael 
Date:   Fri Dec 15 11:09:56 2017 -0500

wl-drm: sort screen modes and assign zone->output

Signed-off-by: Chris Michael 
---
 src/modules/wl_drm/e_mod_main.c | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index f9c3d2c30..f3c466a21 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -271,6 +271,7 @@ _drm2_randr_create(void)
const Eina_List *outputs;
Ecore_Drm2_Output *output;
unsigned int type;
+   E_Zone *zone;
 
dev = ecore_evas_data_get(e_comp->ee, "device");
if (!dev) return NULL;
@@ -355,6 +356,8 @@ _drm2_randr_create(void)
  s->info.modes = eina_list_append(s->info.modes, rmode);
   }
 
+e_randr2_screen_modes_sort(s);
+
 if (e_randr2_cfg)
   cs = e_randr2_config_screen_find(s, e_randr2_cfg);
 if (cs)
@@ -425,6 +428,9 @@ _drm2_randr_create(void)
}
   }
 
+zone = e_zone_for_id_get(s->id);
+if ((zone) && (!zone->output)) zone->output = s;
+
 r->screens = eina_list_append(r->screens, s);
  }
 

-- 




[EGIT] [tools/eflete] eflete-1.19.0 01/01: fix svace warnings

2017-12-15 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch eflete-1.19.0.

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

commit 69bdf40b907a80e603e41fefebb52ce67c136b48
Author: Vyacheslav Reutskiy 
Date:   Fri Dec 15 17:11:56 2017 +0200

fix svace warnings
---
 src/bin/external/syntax_color.c | 1 +
 src/bin/ui/cursor.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/bin/external/syntax_color.c b/src/bin/external/syntax_color.c
index 23b583fe7..e85c6494e 100644
--- a/src/bin/external/syntax_color.c
+++ b/src/bin/external/syntax_color.c
@@ -457,6 +457,7 @@ macro_apply(Eina_Strbuf *strbuf, const char **src, int 
length, char **cur,
{
   while (bracket_inside > 0)
 {
+   if (!macro_end) return 0;
macro_end = strchr(macro_end, ')');
bracket_inside--;
 }
diff --git a/src/bin/ui/cursor.c b/src/bin/ui/cursor.c
index 7178b26aa..d4e79f777 100644
--- a/src/bin/ui/cursor.c
+++ b/src/bin/ui/cursor.c
@@ -113,6 +113,7 @@ _eflete_cursor_mouse_out(void *data __UNUSED__,
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return;
 
cursor = evas_object_data_get(obj, CURSOR_KEY);
+   if (!cursor) return;
cursor = ecore_evas_data_get(cursor->ee, CURSOR_KEY);
if (cursor)
  {

-- 




[EGIT] [tools/eflete] eflete-1.19.0 01/07: menu: avoid incorrect error message

2017-12-15 Thread Yeongjong Lee
rimmed pushed a commit to branch eflete-1.19.0.

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

commit edddff7835ec570e6984dd32b513b864265c0e5d
Author: Yeongjong Lee 
Date:   Fri Oct 6 11:22:37 2017 +0300

menu: avoid incorrect error message

Test Plan:
1. Open eflete
2. Click File, Edit, View, Window, Help menu
3. check that console doesn't print error message.

Reviewers: rimmed

Reviewed By: rimmed

Differential Revision: https://phab.enlightenment.org/D5257
---
 src/bin/ui/menu.c | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/src/bin/ui/menu.c b/src/bin/ui/menu.c
index 2ce6bda0c..579e7406e 100644
--- a/src/bin/ui/menu.c
+++ b/src/bin/ui/menu.c
@@ -203,6 +203,13 @@ _menu_cb(void *data __UNUSED__,
   case MENU_HELP_SHORTCUTS:
  shortcuts_window_add();
  break;
+  case MENU_FILE:
+  case MENU_EDIT:
+  case MENU_VIEW:
+  case MENU_WINDOW:
+  case MENU_HELP:
+ //do nothing
+ break;
   default:
  ERR("unknown menu id: %d", menu_event->mid);
  break;

-- 




[EGIT] [tools/eflete] eflete-1.19.0 02/07: project manager: remove unnecessary codes of _trylock

2017-12-15 Thread Yeongjong Lee
rimmed pushed a commit to branch eflete-1.19.0.

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

commit db04ffe84008b3aab6d99a427106dfa3c28c0418
Author: Yeongjong Lee 
Date:   Fri Oct 6 11:50:23 2017 +0300

project manager: remove unnecessary codes of _trylock

Summary:
_project_lock_pid_check can check lock permission, so it doesn't need to
recheck about lock.
actually the open function(open(path, O_RDWR);) always return -1, because
the file always does not exist. (see line 567)

also, this fixes bug that eflete can't open existing projects.

Test Plan:
1. Create new project.
2. Close eflete successfully.
3. Open the project again.
4. Check that eflete can open the project.

Reviewers: rimmed

Reviewed By: rimmed

Differential Revision: https://phab.enlightenment.org/D5259
---
 src/bin/project_manager/project_manager2.c | 29 ++---
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/src/bin/project_manager/project_manager2.c 
b/src/bin/project_manager/project_manager2.c
index 3b6cf1037..10f2b5840 100644
--- a/src/bin/project_manager/project_manager2.c
+++ b/src/bin/project_manager/project_manager2.c
@@ -532,6 +532,7 @@ _project_lock_pid_check(const char *lock_file)
lf = fopen(lock_file, "r");
if (!lf)
  {
+ERR(" %s\n", strerror(errno));
 return PM_PROJECT_LOCKED_PERMISSION;
  }
if (fscanf(lf, "%i", ) <= 0)
@@ -564,10 +565,8 @@ _project_lock_pid_check(const char *lock_file)
 static PM_Project_Result
 _project_trylock(const char *pro_path)
 {
-   int fd;
char *dir;
char path[PATH_MAX];
-   PM_Project_Result ret = true;
 
assert(path != NULL);
 
@@ -582,31 +581,7 @@ _project_trylock(const char *pro_path)
  return PM_PROJECT_SUCCESS;
 
 
-   fd = open(path, O_RDWR);
-   if (fd < 1)
- {
-ERR(" %s\n", strerror(errno));
-return PM_PROJECT_LOCKED_PERMISSION;
- }
-
-#ifndef _WIN32
-   struct flock fl;
-   fl.l_type = F_UNLCK;
-   fl.l_whence = SEEK_SET;
-   fl.l_start = 0;
-   fl.l_len = 0;
-   fl.l_pid = 0;
-   if (fcntl(fd, F_GETLK, ) != -1)
- {
-if (fl.l_type != F_UNLCK)
-  ret = PM_PROJECT_LOCKED_PERMISSION;
- }
-   else
- ret = PM_PROJECT_LOCKED_PERMISSION;
-#endif /* _WIN32 */
-
-   close(fd);
-   return ret;
+   return PM_PROJECT_SUCCESS;
 }
 
 static Eina_Bool

-- 




[EGIT] [tools/eflete] eflete-1.19.0 06/07: main_window: remove unreachable code

2017-12-15 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch eflete-1.19.0.

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

commit 257fa6d7567cc29c87a7743d0d29051609959a94
Author: Vyacheslav Reutskiy 
Date:   Fri Sep 22 08:25:07 2017 +0300

main_window: remove unreachable code
---
 src/bin/ui/main_window.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index e00e0d17a..98569854b 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -478,7 +478,6 @@ _label_get(void *data, Evas_Object *obj __UNUSED__, const 
char *pr __UNUSED__)
  {
 Shortcut_Data *sc = (Shortcut_Data *)data;
 return strdup(sc->description);
-return  sc->description != NULL ? strdup(sc->description) : 
strdup("NONE");
  }
else if (!strcmp(pr, "elm.text"))
  {

-- 




[EGIT] [tools/eflete] eflete-1.19.0 03/07: property: update property_dummy example, return random subitems

2017-12-15 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch eflete-1.19.0.

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

commit 8a8c3822dbb482966a243a0ba5d991d2709f1842
Author: Vyacheslav Reutskiy 
Date:   Fri Sep 22 14:21:33 2017 +0300

property: update property_dummy example, return random subitems
---
 src/bin/ui/property/property_dummy.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/bin/ui/property/property_dummy.c 
b/src/bin/ui/property/property_dummy.c
index d489f635a..248c495c3 100644
--- a/src/bin/ui/property/property_dummy.c
+++ b/src/bin/ui/property/property_dummy.c
@@ -188,8 +188,7 @@ _dynamic_subitems_get(Property_Attribute *pa __UNUSED__)
Property_Attribute *new_pa;
Eina_List *items = NULL;
int i, num;
-   /* num = rand()%200; */
-   num = 0;
+   num = rand()%200;
for (i = 0; i < num; i++)
  {
 new_pa = mem_calloc(1, sizeof(Property_Attribute));

-- 




[EGIT] [tools/eflete] eflete-1.19.0 05/07: image_manager: fix the argument order

2017-12-15 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch eflete-1.19.0.

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

commit 0bcbf3531411f8b658fd7cabca3e8d1be6f943f3
Author: Vyacheslav Reutskiy 
Date:   Fri Sep 22 08:28:30 2017 +0300

image_manager: fix the argument order
---
 src/bin/ui/image_manager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/image_manager.c b/src/bin/ui/image_manager.c
index d53c33c56..0322c659e 100644
--- a/src/bin/ui/image_manager.c
+++ b/src/bin/ui/image_manager.c
@@ -354,7 +354,7 @@ _image_manager_image_set_grid_create(Evas_Object *parent,
 image_set_item->set.position = place;
 edje_edit_image_set_image_border_get(ap.project->global_object, 
res->common.name, place,
  _set_item->set.border_l, 
_set_item->set.border_r,
- _set_item->set.border_t, 
_set_item->set.border_b);
+ _set_item->set.border_b, 
_set_item->set.border_t);
 edje_edit_image_set_image_max_get(ap.project->global_object, 
res->common.name, place,
   _set_item->set.max_w, 
_set_item->set.max_h);
 edje_edit_image_set_image_min_get(ap.project->global_object, 
res->common.name, place,

-- 




[EGIT] [tools/eflete] eflete-1.19.0 07/07: about: update Copyright

2017-12-15 Thread Vyacheslav Reutskiy
rimmed pushed a commit to branch eflete-1.19.0.

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

commit 37ef5decba7ddf705941ac314c4d154f855321f7
Author: Vyacheslav Reutskiy 
Date:   Tue Jul 25 14:13:18 2017 +0300

about: update Copyright
---
 src/bin/ui/main_window.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index 98569854b..c9239948a 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -285,7 +285,7 @@ _about_window_content_get(void *data, Evas_Object *popup 
__UNUSED__, Evas_Object
  "This application was written for Enlightenment 
project."
  "It is designed to create and modify styles of 
Elementary widgets."
  ""
- "Copyright (C) 2013 - 2015 Samsung 
Electronics."
+ "Copyright (C) 2013 - 2017 Samsung 
Electronics."
  ""
  

[EGIT] [website/www-content] master 01/01: Wiki page events.md changed with summary [Just satisfying my OCD] by Xavi Artigas

2017-12-15 Thread Xavi Artigas
WWW-www.enlightenment.org pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=9be9fa746ecf411480a4ccd08fa1df0f5fcdf6a1

commit 9be9fa746ecf411480a4ccd08fa1df0f5fcdf6a1
Author: Xavi Artigas 
Date:   Fri Dec 15 03:17:53 2017 -0800

Wiki page events.md changed with summary [Just satisfying my OCD] by Xavi 
Artigas
---
 pages/develop/guides/c/core/events.md.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/develop/guides/c/core/events.md.txt 
b/pages/develop/guides/c/core/events.md.txt
index 62c98d1b3..cb761a862 100644
--- a/pages/develop/guides/c/core/events.md.txt
+++ b/pages/develop/guides/c/core/events.md.txt
@@ -35,11 +35,11 @@ void callback(void *data, const Efl_Event *event);
 
 In the above example *data* is the last parameter you used when registering 
the callback with ``efl_event_callback_add()``. *event* contains information 
about the event itself:
 
-| Attribute | Type | Content   |
-| - |  | - |
+| Attribute | Type | Content   
|
+| - |  | - 
|
 | ``event->object`` | ``Eo *`` | The Object that emitted the event 
|
 | ``event->info``   | ``void *``   | Used by some events to provide 
additional information. Must be cast to the appropriate type (see below). |
-| ``event->desc->name`` | ``const char *`` | Name of the event |
+| ``event->desc->name`` | ``const char *`` | Name of the event 
|
 
 The [API Reference documentation](/develop/api/) for each event tells you how 
to use ``event->info``. See 
[EFL_EVENT_POINTER_DOWN](/develop/api/interface/efl/input/interface/event/pointer_down)
 for more examples.
 

-- 




[EGIT] [core/efl] master 01/01: eo: Fix crash with invalid objects

2017-12-15 Thread Jean-Philippe ANDRÉ
jpeg pushed a commit to branch master.

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

commit 69c595b5fdd07596fef4462b8a7e7b8efc03e12b
Author: Jean-Philippe Andre 
Date:   Fri Dec 15 16:16:19 2017 +0900

eo: Fix crash with invalid objects

Not a legacy fix as auto-unref is new in 1.21.
---
 src/lib/eo/eo.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 32939afa50..d421c58bc8 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -744,8 +744,9 @@ _efl_object_op_api_id_get(const void *api_func, const Eo 
*eo_obj, const char *ap
 EO_OBJ_POINTER(eo_obj, obj);
 eina_log_print(_eo_log_dom, EINA_LOG_LEVEL_ERR,
file, api_func_name, line,
-   "Unable to resolve op for api func %p for obj=%p (%s)", 
api_func, eo_obj, efl_class_name_get(eo_obj));
-if (EINA_UNLIKELY(obj->auto_unref))
+   "Unable to resolve op for api func %p for obj=%p (%s)",
+   api_func, eo_obj, efl_class_name_get(eo_obj));
+if (EINA_UNLIKELY(obj && obj->auto_unref))
   {
  if (obj->finalized && !(--obj->auto_unref))
efl_unref(eo_obj);

--