cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=48b22214493958fc852f101009b0e8a88aa77e05
commit 48b22214493958fc852f101009b0e8a88aa77e05
Author: Guilherme Lepsch <lep...@expertisesolutions.com.br>
Date: Thu Jul 30 15:48:41 2015 -0300
efl: common Efl.Model implementation functions helpers.
Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
src/Makefile_Efl.am | 1 +
src/lib/efl/Efl.h | 1 -
src/lib/efl/Efl_Model_Common.h | 82 ++++++++++++--
src/lib/efl/interfaces/efl_model_common.c | 174 ++++++++++++++++++++++++++++++
4 files changed, 248 insertions(+), 10 deletions(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c79cde2..f6b1c28 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -48,6 +48,7 @@ lib_LTLIBRARIES += lib/efl/libefl.la
lib_efl_libefl_la_SOURCES = \
lib/efl/interfaces/efl_interfaces_main.c \
+lib/efl/interfaces/efl_model_common.c \
lib/efl/interfaces/efl_gfx_shape.c
lib_efl_libefl_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl
-I$(top_srcdir)/src/lib/efl @EFL_CFLAGS@ -DEFL_GFX_FILTER_BETA
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index c97b0b5..8f1b420 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -174,7 +174,6 @@ struct _Efl_Gfx_Shape_Public
#include "interfaces/efl_player.eo.h"
#include "interfaces/efl_text.eo.h"
#include "interfaces/efl_text_properties.eo.h"
-#include "interfaces/efl_model_base.eo.h"
EAPI extern const Eo_Event_Description _EFL_GFX_CHANGED;
EAPI extern const Eo_Event_Description _EFL_GFX_PATH_CHANGED;
diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index ce1ed3b..1afa5e1 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -1,9 +1,5 @@
-#ifndef _EFL_MODEL_COMMON_H
-#define _EFL_MODEL_COMMON_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef EFL_MODEL_COMMON_H__
+# define EFL_MODEL_COMMON_H__
/**
* @struct _Efl_Model_Children_Event
@@ -31,8 +27,76 @@ struct _Efl_Model_Children_Event
*/
typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event;
+#include "interfaces/efl_model_base.eo.h"
+
+ /**
+ * @brief Sets the new load status signaling an event if changed
+ *
+ * @param model The model to call the event @c EFL_MODEL_EVENT_LOAD_STATUS
+ * @param load The load status to be changed
+ * @param status The new status
+ */
+EAPI void efl_model_load_set(Efl_Model_Base *model, Efl_Model_Load *load,
Efl_Model_Load_Status status) EINA_ARG_NONNULL(1, 2);
+
+/**
+ * @brief Slices a list
+ *
+ * If the @p start and @p count are 0, a new accessor of the entire list is
returned
+ *
+ * @param list The list to get the slice
+ * @param start The nth element to start the slice
+ * @param count The number of elements
+ * @return The accessor to the sliced elements or @c NULL if error
+ */
+EAPI Eina_Accessor *efl_model_list_slice(Eina_List *list, unsigned start,
unsigned count) EINA_ARG_NONNULL(1);
+
+/**
+ * @brief Notifies an error with an @c EFL_MODEL_EVENT_LOAD_STATUS
+ *
+ * @param model The model to be notified
+ */
+EAPI void efl_model_error_notify(Efl_Model_Base *model) EINA_ARG_NONNULL(1);
+
+/**
+ * @brief Notifies a property changed event with an @c
EFL_MODEL_EVENT_PROPERTIES_CHANGED
+ *
+ * @param model The model to be notified
+ * @param property The changed property
+ */
+EAPI void efl_model_property_changed_notify(Efl_Model_Base *model, const char
*property);
+
+/**
+ * @brief Notifies a property invalidated event with an @c
EFL_MODEL_EVENT_PROPERTIES_CHANGED
+ *
+ * @param model The model to be notified
+ * @param property The invalidated property
+ */
+EAPI void efl_model_property_invalidated_notify(Efl_Model_Base *model, const
char *property);
+
+/**
+ * @brief Callback to setup a member of @c Eina_Value_Struct
+ *
+ * @param data The user data
+ * @param index The member index
+ * @param member The member to fill its name and type. Must use @c
Eina_Stringshare for name.
+ */
+typedef void (*Efl_Model_Value_Struct_Member_Setup_Cb)(void *data, int index,
Eina_Value_Struct_Member *member);
+
+/**
+ * @brief Creates a new struct description
+ *
+ * @param member_count The number of struct members
+ * @param setup_cb The callback to setup struct members
+ * @param data The user data
+ * @return Returns the struct description
+ */
+EAPI Eina_Value_Struct_Desc *efl_model_value_struct_description_new(unsigned
int member_count, Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data)
EINA_ARG_NONNULL(2);
+
+/**
+ * @brief Frees the memory allocated to the struct description.
+ *
+ * @param desc The struct description. If @c NULL, the function returns
immediately.
+ */
+EAPI void efl_model_value_struct_description_free(Eina_Value_Struct_Desc
*desc);
-#ifdef __cplusplus
-}
-#endif
#endif
diff --git a/src/lib/efl/interfaces/efl_model_common.c
b/src/lib/efl/interfaces/efl_model_common.c
new file mode 100644
index 0000000..5f3e057
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_model_common.c
@@ -0,0 +1,174 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Efl.h"
+
+EAPI void
+efl_model_load_set(Efl_Model_Base *model, Efl_Model_Load *load,
Efl_Model_Load_Status status)
+{
+ Efl_Model_Load new_load = {.status = status};
+
+ if ((load->status & (EFL_MODEL_LOAD_STATUS_LOADED |
EFL_MODEL_LOAD_STATUS_LOADING)) &&
+ (new_load.status & (EFL_MODEL_LOAD_STATUS_LOADED |
EFL_MODEL_LOAD_STATUS_LOADING)))
+ {
+ // Merge status
+ new_load.status = load->status | new_load.status;
+
+ // Removes incompatible statuses (LOADING vs LOADED)
+ switch (status)
+ {
+ case EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADING_PROPERTIES;
+ break;
+ case EFL_MODEL_LOAD_STATUS_LOADING_PROPERTIES:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADED_PROPERTIES;
+ break;
+ case EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN;
+ break;
+ case EFL_MODEL_LOAD_STATUS_LOADING_CHILDREN:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADED_CHILDREN;
+ break;
+ case EFL_MODEL_LOAD_STATUS_LOADED:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADING;
+ break;
+ case EFL_MODEL_LOAD_STATUS_LOADING:
+ new_load.status &= ~EFL_MODEL_LOAD_STATUS_LOADED;
+ break;
+ default: break;
+ }
+ }
+
+ if (load->status != new_load.status)
+ {
+ load->status = new_load.status;
+ eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS,
load));
+ }
+}
+
+EAPI Eina_Accessor *
+efl_model_list_slice(Eina_List *list, unsigned start, unsigned count)
+{
+ fprintf(stderr, "efl_model_list_slice\n");
+ if ((start == 0) && (count == 0))
+ {
+ fprintf(stderr, "efl_model_list_slice start == 0 count == 0\n");
+ return eina_list_accessor_new(list);
+ }
+
+ Eina_List *nth_list = eina_list_nth_list(list, (start - 1));
+ if (!nth_list)
+ return NULL;
+
+ Eina_List *it, *result = NULL;
+ const void *data;
+ EINA_LIST_FOREACH(nth_list, it, data)
+ {
+ result = eina_list_append(result, data);
+ if (eina_list_count(result) == count)
+ break;
+ }
+
+ return eina_list_accessor_new(result);
+}
+
+EAPI void
+efl_model_error_notify(Efl_Model_Base *model)
+{
+ Efl_Model_Load load = {.status = EFL_MODEL_LOAD_STATUS_ERROR};
+ eo_do(model, eo_event_callback_call(EFL_MODEL_BASE_EVENT_LOAD_STATUS,
&load));
+}
+
+EAPI void
+efl_model_property_changed_notify(Efl_Model_Base *model, const char *property)
+{
+ Eina_Array *changed_properties = eina_array_new(1);
+ EINA_SAFETY_ON_NULL_RETURN(changed_properties);
+
+ Eina_Bool ret = eina_array_push(changed_properties, property);
+ EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
+
+ Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
+ eo_do(model,
eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
+
+on_error:
+ eina_array_free(changed_properties);
+}
+
+EAPI void
+efl_model_property_invalidated_notify(Efl_Model_Base *model, const char
*property)
+{
+ Eina_Array *invalidated_properties = eina_array_new(1);
+ EINA_SAFETY_ON_NULL_RETURN(invalidated_properties);
+
+ Eina_Bool ret = eina_array_push(invalidated_properties, property);
+ EINA_SAFETY_ON_FALSE_GOTO(ret, on_error);
+
+ Efl_Model_Property_Event evt = {.invalidated_properties =
invalidated_properties};
+ eo_do(model,
eo_event_callback_call(EFL_MODEL_BASE_EVENT_PROPERTIES_CHANGED, &evt));
+
+on_error:
+ eina_array_free(invalidated_properties);
+}
+
+typedef struct _Efl_Model_Value_Struct_Desc Efl_Model_Value_Struct_Desc;
+
+struct _Efl_Model_Value_Struct_Desc
+{
+ Eina_Value_Struct_Desc base;
+ void *data;
+ Eina_Value_Struct_Member members[];
+};
+
+EAPI Eina_Value_Struct_Desc *
+efl_model_value_struct_description_new(unsigned int member_count,
Efl_Model_Value_Struct_Member_Setup_Cb setup_cb, void *data)
+{
+ Efl_Model_Value_Struct_Desc *desc;
+ unsigned int offset = 0;
+ size_t i;
+
+ EINA_SAFETY_ON_FALSE_RETURN_VAL(member_count > 0, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(setup_cb, NULL);
+ EINA_SAFETY_ON_NULL_RETURN_VAL(data, NULL);
+
+ desc = malloc(sizeof(Efl_Model_Value_Struct_Desc) + member_count *
sizeof(Eina_Value_Struct_Member));
+ EINA_SAFETY_ON_NULL_RETURN_VAL(desc, NULL);
+
+ desc->base.version = EINA_VALUE_STRUCT_DESC_VERSION;
+ desc->base.ops = EINA_VALUE_STRUCT_OPERATIONS_STRINGSHARE;
+ desc->base.members = desc->members;
+ desc->base.member_count = member_count;
+ desc->base.size = 0;
+ desc->data = data;
+
+ for (i = 0; i < member_count; ++i)
+ {
+ Eina_Value_Struct_Member *m = (Eina_Value_Struct_Member
*)desc->members + i;
+ unsigned int size;
+
+ m->offset = offset;
+ setup_cb(data, i, m);
+
+ size = m->type->value_size;
+ if (size % sizeof(void *) != 0)
+ size += size - (size % sizeof(void *));
+
+ offset += size;
+ }
+
+ desc->base.size = offset;
+ return &desc->base;
+}
+
+EAPI void
+efl_model_value_struct_description_free(Eina_Value_Struct_Desc *desc)
+{
+ size_t i;
+
+ if (!desc) return;
+
+ for (i = 0; i < desc->member_count; i++)
+ eina_stringshare_del(desc->members[i].name);
+ free(desc);
+}
--
