aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-06-20 18:50:38 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-06-20 20:25:26 -0300
commit65f21ff2f76601303f1a99b54b6fd5c309994edf (patch)
tree5f8f54a4b5d204fd0f0a3b776da1d55b9d0f2a00
parenteina: Add eina_iterator_clone function for copying Eina_Iterator (WIP) (diff)
downloadefl-devs/felipealmeida/boolean-model.tar.gz
efl: Composite model for boolean properties (WIP)devs/felipealmeida/boolean-model
-rw-r--r--src/lib/efl/Efl_Model_Common.h1
-rw-r--r--src/lib/efl/interfaces/efl_model_composite_boolean.c326
-rw-r--r--src/lib/efl/interfaces/efl_model_composite_boolean.eo23
-rw-r--r--src/lib/efl/interfaces/efl_model_composite_boolean_children.eo12
-rw-r--r--src/tests/efl/efl_suite.c51
-rw-r--r--src/tests/efl/efl_suite.h26
-rw-r--r--src/tests/efl/efl_test_model_composite_boolean.c42
7 files changed, 481 insertions, 0 deletions
diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h
index 68de92a0a1..372144da6a 100644
--- a/src/lib/efl/Efl_Model_Common.h
+++ b/src/lib/efl/Efl_Model_Common.h
@@ -38,6 +38,7 @@ struct _Efl_Model_Children_Event
typedef struct _Efl_Model_Children_Event Efl_Model_Children_Event;
#include "interfaces/efl_model.eo.h"
+#include "interfaces/efl_model_composite_boolean.eo.h"
EAPI int efl_model_init(void);
diff --git a/src/lib/efl/interfaces/efl_model_composite_boolean.c b/src/lib/efl/interfaces/efl_model_composite_boolean.c
new file mode 100644
index 0000000000..3a2944614a
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_model_composite_boolean.c
@@ -0,0 +1,326 @@
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eina.h"
+#include "Efl.h"
+
+#include "interfaces/efl_model_composite_boolean_children.eo.h"
+
+typedef struct _Efl_Model_Hash_Value
+{
+ unsigned char* buffer;
+ unsigned int bits_count;
+ Eina_Bool default_value : 1;
+} Efl_Model_Hash_Value;
+
+typedef struct _Efl_Model_Composite_Boolean_Data
+{
+ Efl_Model* composite_model;
+ Eina_Array* empty_properties;
+ Eina_Hash* values; // [property_name, Efl_Model_Hash_Value*]
+} Efl_Model_Composite_Boolean_Data;
+
+typedef struct _Efl_Model_Composite_Boolean_Children_Data
+{
+ Efl_Model_Composite_Boolean_Data* parent_pd;
+ Efl_Model* composite_children;
+ Eina_Array* properties_names;
+ unsigned int index;
+} Efl_Model_Composite_Boolean_Children_Data;
+
+typedef struct _Efl_Model_Iterator_Slice
+{
+ Eina_Iterator vtable;
+ Eina_Iterator* composite_iterator;
+ Efl_Model* parent;
+ Efl_Model_Composite_Boolean_Data* parent_pd;
+ Eina_Promise_Owner* promise;
+ unsigned int index;
+} Efl_Model_Iterator_Slice;
+
+/**************** efl_mmodel_composite_boolean_children **************/
+
+static const Eina_Array*
+_efl_model_composite_boolean_children_efl_model_properties_get(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd)
+{
+ Eina_Array const* composite_properties;
+ unsigned int i;
+
+ if(pd->properties_names) return pd->properties_names;
+ else
+ {
+ composite_properties = efl_model_properties_get(pd->parent_pd->composite_model);
+ unsigned int composite_count = eina_array_count_get(composite_properties),
+ self_count = eina_hash_population(pd->parent_pd->values);
+ pd->properties_names = eina_array_new(composite_count + self_count);
+ for(i = 0; i != composite_count; ++i)
+ {
+ const char* name = strdup(eina_array_data_get(composite_properties, i));
+ eina_array_push(pd->properties_names, name);
+ }
+ return pd->properties_names;
+ }
+}
+
+static Eina_Promise*
+_efl_model_composite_boolean_children_efl_model_property_get(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd, const char *property)
+{
+ Efl_Model_Hash_Value* value = eina_hash_find(pd->parent_pd->values, property);
+ if(value)
+ {
+ Eina_Promise_Owner* promise = eina_promise_add();
+ Eina_Value* eina_value = eina_value_new(EINA_VALUE_TYPE_UCHAR);
+ if(value->bits_count <= pd->index)
+ {
+ unsigned char f = value->default_value;
+ eina_value_set(eina_value, f);
+ }
+ else
+ {
+ eina_value_set(eina_value, (value->buffer[pd->index / 8] >> (pd->index % 8))&1);
+ }
+ eina_promise_owner_value_set(promise, eina_value, (Eina_Promise_Free_Cb)eina_value_free);
+ return eina_promise_owner_promise_get(promise);
+ }
+ else if(pd->composite_children)
+ return efl_model_property_get(pd->composite_children, property);
+ else
+ {
+ Eina_Promise_Owner* promise = eina_promise_add();
+ eina_promise_owner_error_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
+ return eina_promise_owner_promise_get(promise);
+ }
+}
+
+static void
+_efl_model_composite_boolean_children_efl_model_property_set(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd, const char *property, const Eina_Value *value, Eina_Promise_Owner *promise)
+{
+
+}
+
+static Eina_Promise*
+_efl_model_composite_boolean_children_efl_model_children_slice_get(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd, unsigned int start, unsigned int count)
+{
+ return efl_model_children_slice_get(pd->composite_children, start, count);
+}
+
+static Eina_Promise*
+_efl_model_composite_boolean_children_efl_model_children_count_get(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd)
+{
+ return efl_model_children_count_get(pd->composite_children);
+}
+
+static Eo_Base*
+_efl_model_composite_boolean_children_efl_model_child_add(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd)
+{
+ return efl_model_child_add(pd->composite_children);
+}
+
+static void
+_efl_model_composite_boolean_children_efl_model_child_del(Eo *obj EINA_UNUSED,
+ Efl_Model_Composite_Boolean_Children_Data *pd, Eo_Base *child)
+{
+ return efl_model_child_del(pd->composite_children, child);
+}
+
+/**************** efl_mmodel_iterator_slice **************/
+
+static Eina_Bool
+efl_model_iterator_slice_next(Efl_Model_Iterator_Slice* iterator, void** data)
+{
+ Efl_Model* child;
+ if(eina_iterator_next(iterator->composite_iterator, (void**)&child))
+ {
+ Efl_Model* model = eo_add(EFL_MODEL_COMPOSITE_BOOLEAN_CHILDREN_CLASS, iterator->parent);
+ Efl_Model_Composite_Boolean_Children_Data* pd =
+ eo_data_scope_get(model, EFL_MODEL_COMPOSITE_BOOLEAN_CHILDREN_CLASS);
+ pd->parent_pd = iterator->parent_pd;
+ pd->composite_children = eo_ref(child);
+ pd->index = iterator->index++;
+ eo_data_ref(iterator->parent, EFL_MODEL_COMPOSITE_BOOLEAN_CLASS);
+ eo_data_unref(model, pd);
+ *data = model;
+ return EINA_TRUE;
+ }
+ else
+ return EINA_FALSE;
+}
+
+static void*
+efl_model_iterator_slice_container(Efl_Model_Iterator_Slice* iterator)
+{
+ return iterator->composite_iterator;
+}
+
+static void
+efl_model_iterator_slice_free(Efl_Model_Iterator_Slice* iterator)
+{
+ eina_iterator_free(iterator->composite_iterator);
+ free(iterator);
+}
+
+static Eina_Bool
+efl_model_iterator_slice_lock(Efl_Model_Iterator_Slice* iterator EINA_UNUSED)
+{
+ return EINA_FALSE;
+}
+
+static void
+efl_model_iterator_slice_setup(Efl_Model_Iterator_Slice* iterator,
+ Efl_Model* parent, Efl_Model_Composite_Boolean_Data* parent_pd, Eina_Promise_Owner* promise)
+{
+ iterator->vtable.version = EINA_ITERATOR_VERSION;
+ iterator->vtable.next = FUNC_ITERATOR_NEXT(efl_model_iterator_slice_next);
+ iterator->vtable.get_container = FUNC_ITERATOR_GET_CONTAINER(efl_model_iterator_slice_container);
+ iterator->vtable.free = FUNC_ITERATOR_FREE(efl_model_iterator_slice_free);
+ iterator->vtable.lock = FUNC_ITERATOR_LOCK(efl_model_iterator_slice_lock);
+ EINA_MAGIC_SET(&iterator->vtable, EINA_MAGIC_ITERATOR);
+ iterator->parent = eo_ref(parent);
+ iterator->parent_pd = parent_pd;
+ iterator->promise = promise;
+}
+
+static void
+_efl_model_composite_boolean_slice_then_cb(void* data, void* value)
+{
+ Efl_Model_Iterator_Slice* slice_iterator = data;
+ Eina_Iterator* iterator = value;
+
+ slice_iterator->composite_iterator = eina_iterator_clone(iterator);
+ if(slice_iiterator->composite_iterator)
+ eina_promise_owner_value_set(slice_iterator->promise, slice_iterator, (Eina_Promise_Free_Cb)&eina_iterator_free);
+ else
+ {
+ eina_promise_owner_error_set(slice_iterator->promise, EFL_MODEL_ERROR_NOT_SUPPORTED);
+ free(slice_iterator);
+ }
+}
+
+static void
+_efl_model_composite_boolean_slice_error_cb(void* data, Eina_Error error)
+{
+ Efl_Model_Iterator_Slice* slice_iterator = data;
+ eina_promise_owner_error_set(slice_iterator->promise, error);
+ free(slice_iterator);
+}
+
+static void efl_model_hash_value_free(void* p)
+{
+ Efl_Model_Hash_Value* value = p;
+ if(value)
+ {
+ free(value->buffer);
+ free(value);
+ }
+}
+
+/**************** efl_mmodel_composite_boolean **************/
+
+static const Eina_Array *
+_efl_model_composite_boolean_efl_model_properties_get(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd)
+{
+ if(pd->composite_model)
+ return efl_model_properties_get(pd->composite_model);
+ else if(pd->empty_properties)
+ return pd->empty_properties;
+ else
+ return pd->empty_properties = eina_array_new(1);
+
+}
+
+static void
+_efl_model_composite_boolean_property_add(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd,
+ const char *name, Eina_Bool initial_value)
+{
+ if(!pd->values)
+ pd->values = eina_hash_string_small_new(&efl_model_hash_value_free);
+ Efl_Model_Hash_Value* value = calloc(sizeof(Efl_Model_Hash_Value), 1);
+ value->default_value = initial_value;
+ eina_hash_add(pd->values, name, value);
+}
+
+static Eina_Promise *
+_efl_model_composite_boolean_efl_model_property_get(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd EINA_UNUSED, const char *property EINA_UNUSED)
+{
+ if(pd->composite_model)
+ return efl_model_property_get(pd->composite_model, property);
+ else
+ {
+ Eina_Promise_Owner* promise = eina_promise_add();
+ eina_promise_owner_error_set(promise, EFL_MODEL_ERROR_NOT_FOUND);
+ return eina_promise_owner_promise_get(promise);
+ }
+}
+
+static void
+_efl_model_composite_boolean_efl_model_property_set(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd EINA_UNUSED, const char *property EINA_UNUSED, const Eina_Value *value EINA_UNUSED, Eina_Promise_Owner *promise EINA_UNUSED)
+{
+
+}
+
+static Eina_Promise*
+_efl_model_composite_boolean_efl_model_children_slice_get(Eo *obj, Efl_Model_Composite_Boolean_Data *pd, unsigned int start, unsigned int count)
+{
+ Eina_Promise_Owner* promise = eina_promise_add();
+ if(pd->composite_model)
+ {
+ Eina_Promise* composite_promise = efl_model_children_slice_get(pd->composite_model, start, count);
+ Efl_Model_Iterator_Slice* iterator = calloc(sizeof(*iterator), 1);
+ efl_model_iterator_slice_setup(iterator, obj, pd, promise);
+ eina_promise_then(composite_promise, &_efl_model_composite_boolean_slice_then_cb,
+ &_efl_model_composite_boolean_slice_error_cb, iterator);
+ }
+ else
+ {
+ eina_promise_owner_error_set(promise, EFL_MODEL_ERROR_NOT_SUPPORTED);
+ }
+ return eina_promise_owner_promise_get(promise);
+}
+
+static Eina_Promise*
+_efl_model_composite_boolean_efl_model_children_count_get(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd)
+{
+ if(pd->composite_model)
+ return efl_model_children_count_get(pd->composite_model);
+ else
+ {
+ Eina_Promise_Owner* promise = eina_promise_add();
+ unsigned int* count = malloc(sizeof(unsigned int));
+ *count = eina_hash_population(pd->values);
+ eina_promise_owner_value_set(promise, count, free);
+ return eina_promise_owner_promise_get(promise);
+ }
+}
+
+static Eo_Base*
+_efl_model_composite_boolean_efl_model_child_add(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd)
+{
+ if(pd->composite_model)
+ return efl_model_child_add(pd->composite_model);
+ else
+ {
+ eina_error_set(EFL_MODEL_ERROR_NOT_SUPPORTED);
+ return NULL;
+ }
+}
+
+static void
+_efl_model_composite_boolean_efl_model_child_del(Eo *obj EINA_UNUSED, Efl_Model_Composite_Boolean_Data *pd, Eo_Base *child)
+{
+ if(pd->composite_model)
+ return efl_model_child_del(pd->composite_model, child);
+ else
+ {
+ eina_error_set(EFL_MODEL_ERROR_NOT_SUPPORTED);
+ }
+}
+
+#include "interfaces/efl_model_composite_boolean.eo.c"
+#include "interfaces/efl_model_composite_boolean_children.eo.c"
diff --git a/src/lib/efl/interfaces/efl_model_composite_boolean.eo b/src/lib/efl/interfaces/efl_model_composite_boolean.eo
new file mode 100644
index 0000000000..9302051a31
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_model_composite_boolean.eo
@@ -0,0 +1,23 @@
+class Efl.Model.Composite.Boolean (Eo.Base, Efl.Model)
+{
+ methods {
+ property_add {
+ params {
+ @in name: string;
+ @in initial_value: bool;
+ }
+ }
+ }
+ implements {
+ Efl.Model.properties.get;
+ Efl.Model.property_get;
+ Efl.Model.property_set;
+ Efl.Model.children_slice_get;
+ Efl.Model.children_count_get;
+ Efl.Model.child_add;
+ Efl.Model.child_del;
+ }
+ constructors {
+ .property_add;
+ }
+}
diff --git a/src/lib/efl/interfaces/efl_model_composite_boolean_children.eo b/src/lib/efl/interfaces/efl_model_composite_boolean_children.eo
new file mode 100644
index 0000000000..8044a0e474
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_model_composite_boolean_children.eo
@@ -0,0 +1,12 @@
+class Efl.Model.Composite.Boolean.Children (Eo.Base, Efl.Model)
+{
+ implements {
+ Efl.Model.properties.get;
+ Efl.Model.property_get;
+ Efl.Model.property_set;
+ Efl.Model.children_slice_get;
+ Efl.Model.children_count_get;
+ Efl.Model.child_add;
+ Efl.Model.child_del;
+ }
+}
diff --git a/src/tests/efl/efl_suite.c b/src/tests/efl/efl_suite.c
new file mode 100644
index 0000000000..a76fb7bbf7
--- /dev/null
+++ b/src/tests/efl/efl_suite.c
@@ -0,0 +1,51 @@
+/* EINA - EFL data type library
+ * Copyright (C) 2008 Cedric Bail
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <Eina.h>
+
+#include "efl_suite.h"
+#include "../efl_check.h"
+
+static const Efl_Test_Case etc[] = {
+ { "Efl_Model_Composite_Boolean ", efl_test_model_composite_boolean },
+ { NULL, NULL }
+};
+
+int
+main(int argc, char **argv)
+{
+ int failed_count;
+
+ if (!_efl_test_option_disp(argc, argv, etc))
+ return 0;
+
+ putenv("EFL_RUN_IN_TREE=1");
+
+ eina_init();
+
+ failed_count = _efl_suite_build_and_run(argc - 1, (const char **)argv + 1,
+ "Efl", etc);
+
+ eina_shutdown();
+
+ return (failed_count == 0) ? 0 : 255;
+}
diff --git a/src/tests/efl/efl_suite.h b/src/tests/efl/efl_suite.h
new file mode 100644
index 0000000000..b41766508a
--- /dev/null
+++ b/src/tests/efl/efl_suite.h
@@ -0,0 +1,26 @@
+/* EFL - EFL library
+ * Copyright (C) 2008 Cedric Bail
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef EFL_SUITE_H_
+#define EFL_SUITE_H_
+
+#include <check.h>
+
+void efl_test_model_composite_boolean(TCase *tc);
+
+#endif /* EFL_SUITE_H_ */
diff --git a/src/tests/efl/efl_test_model_composite_boolean.c b/src/tests/efl/efl_test_model_composite_boolean.c
new file mode 100644
index 0000000000..2d4dbe9456
--- /dev/null
+++ b/src/tests/efl/efl_test_model_composite_boolean.c
@@ -0,0 +1,42 @@
+/* EFL - EFL library
+ * Copyright (C) 2013 Cedric Bail
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library;
+ * if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "efl_suite.h"
+
+#include <Efl.h>
+
+START_TEST(efl_model_composite_boolean)
+{
+ eo_init();
+
+ Efl_Model_Composite_Boolean* model
+ = eo_add(EFL_MODEL_COMPOSITE_BOOLEAN_CLASS, NULL);
+
+ eo_shutdown();
+}
+END_TEST
+
+void
+efl_test_model_composite_boolean(TCase *tc)
+{
+ tcase_add_test(tc, efl_model_composite_boolean);
+}