kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: Simplify Efl.Config API, make C helpers only 

This removes the mixin functions and uses static inline functions
instead. Much cleaner, looks the same to C devs.
This commit is contained in:
Jean-Philippe Andre 2016-06-23 19:33:34 +09:00
parent 8b8430214a
commit 07613bf2f6
9 changed files with 117 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile_Efl.am
View File

@ -83,7 +83,6 @@ lib_LTLIBRARIES += lib/efl/libefl.la
lib_efl_libefl_la_SOURCES = \
lib/efl/interfaces/efl_interfaces_main.c \
lib/efl/interfaces/efl_config.c \
lib/efl/interfaces/efl_model_common.c \
lib/efl/interfaces/efl_gfx_shape.c \
lib/efl/interfaces/efl_vpath_file.c \

4
src/lib/efl/Efl.h
View File

@ -141,10 +141,6 @@ static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
#include "interfaces/efl_input_interface.eo.h"
#include "interfaces/efl_event.eo.h"
#ifdef EFL_EFL_BUILD
EAPI void __efl_internal_elm_config_set(Efl_Config *cfg);
#endif
#else
#ifndef EFL_NOLEGACY_API_SUPPORT

128
src/lib/efl/interfaces/efl_config.c
View File

@ -1,128 +0,0 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <Efl.h>
static Efl_Config *_main_config = NULL;
EAPI void
__efl_internal_elm_config_set(Efl_Config *cfg)
{
_main_config = cfg;
}
EOLIAN static Eina_Bool
_efl_config_config_bool_set(Eo *obj, void *_pd EINA_UNUSED, const char * name, Eina_Bool val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_UCHAR);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
EOLIAN static Eina_Bool
_efl_config_config_bool_get(Eo *obj, void *_pd EINA_UNUSED, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
Eina_Bool b = 0;
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
EOLIAN static Eina_Bool
_efl_config_config_int_set(Eo *obj, void *_pd EINA_UNUSED, const char * name, int val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_INT);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
EOLIAN static int
_efl_config_config_int_get(Eo *obj, void *_pd EINA_UNUSED, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
int b = 0;
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
EOLIAN static Eina_Bool
_efl_config_config_uint_set(Eo *obj, void *_pd EINA_UNUSED, const char * name, unsigned int val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_UINT);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
EOLIAN static unsigned int
_efl_config_config_uint_get(Eo *obj, void *_pd EINA_UNUSED, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
unsigned int b = 0;
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
EOLIAN static Eina_Bool
_efl_config_config_double_set(Eo *obj, void *_pd EINA_UNUSED, const char * name, double val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_DOUBLE);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
EOLIAN static double
_efl_config_config_double_get(Eo *obj, void *_pd EINA_UNUSED, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
double b = 0;
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
EOLIAN static Eina_Bool
_efl_config_config_string_set(Eo *obj, void *_pd EINA_UNUSED, const char *name, const char *val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_STRING);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
EOLIAN static const char *
_efl_config_config_string_get(Eo *obj, void *_pd EINA_UNUSED, const char *name)
{
Eina_Value *v = efl_config_get(obj, name);
Eina_Stringshare *s;
const char *b = 0;
eina_value_get(v, &b);
s = eina_stringshare_add(b);
eina_value_free(v);
return s;
}
EOLIAN static Efl_Config *
_efl_config_config_global_get(Eo *klass EINA_UNUSED, void *_pd EINA_UNUSED)
{
return _main_config;
}
#include "interfaces/efl_config.eo.c"

91
src/lib/efl/interfaces/efl_config.eo
View File

@ -1,27 +1,9 @@
mixin Efl.Config (Eo.Interface)
interface Efl.Config ()
{
[[A generic configuration interface, that holds key-value pairs.]]
data: null;
methods {
/* FIXME: make this a property -- @own is a problem */
/*
@property config @virtual_pure {
[[Holds a generic value under a given key.
Most common value types are: string, int, uint, bool, double.
]]
keys {
name: string;
}
values {
val: const(generic_value)*;
}
get {
return: free(own(generic_value *), eina_value_free);
}
}
*/
config_set @virtual_pure {
config_set {
params {
name: string;
val: const(generic_value)*;
@ -29,84 +11,19 @@ mixin Efl.Config (Eo.Interface)
return: bool; [[$false in case of error: value type was invalid, the
config can't be changed, config does not exist...]]
}
config_get @virtual_pure @const {
config_get @const {
params {
name: string;
}
return: free(own(generic_value *), eina_value_free);
}
config_list_get @virtual_pure @const {
config_list_get @const {
[[Returns a list of generic values under a given key.]]
params {
@in name: string;
}
return: free(own(iterator<generic_value*>), eina_iterator_free);
}
@property config_bool {
[[Helper for boolean properties (most useful in C).]]
keys {
name: string;
}
values {
val: bool;
}
get {}
set { return: bool; }
}
@property config_int {
[[Helper for int properties (most useful in C).]]
keys {
name: string;
}
values {
val: int;
}
get {}
set { return: bool; }
}
@property config_uint {
[[Helper for unsigned int properties (most useful in C).]]
keys {
name: string;
}
values {
val: uint;
}
get {}
set { return: bool; }
}
@property config_double {
[[Helper for double properties (most useful in C).]]
keys {
name: string;
}
values {
val: double;
}
get {}
set { return: bool; }
}
@property config_string {
[[Helper for string properties (most useful in C).]]
keys {
name: string;
}
values {
val: string;
}
set { return: bool; }
}
config_string_get {
[[Helper for string properties (most useful in C).]]
params {
name: string;
}
return: stringshare;
}
config_global_get @class {
[[Get a handle on the main configuration.]]
return: Efl.Config;
}
}
}

1
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -4,6 +4,7 @@
#include <Efl.h>
#include "interfaces/efl_config.eo.c"
#include "interfaces/efl_control.eo.c"
#include "interfaces/efl_file.eo.c"
#include "interfaces/efl_image.eo.c"

18
src/lib/elementary/elm_config.c
View File

@ -1683,7 +1683,7 @@ static void
_config_load(void)
{
_efl_config_obj = eo_add(EFL_CONFIG_INTERNAL_CLASS, NULL);
__efl_internal_elm_config_set(_efl_config_obj);
efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
_elm_config = _config_user_load();
if (_elm_config)
{
@ -4243,7 +4243,7 @@ void
_elm_config_shutdown(void)
{
ELM_SAFE_FREE(_efl_config_obj, eo_del);
__efl_internal_elm_config_set(NULL);
efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, NULL);
ELM_SAFE_FREE(_elm_config, _config_free);
ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del);
ELM_SAFE_FREE(_elm_accel_preference, eina_stringshare_del);
@ -4367,7 +4367,6 @@ _efl_config_internal_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_U
#define CONFIG_SETB(opt) CONFIG_SET(opt, Eina_Bool, UCHAR, int)
#define CONFIG_SETI(opt) CONFIG_SET(opt, int, INT, int)
#define CONFIG_SETU(opt) CONFIG_SET(opt, unsigned int, UINT, int)
#define CONFIG_SETD(opt) CONFIG_SET(opt, double, DOUBLE, int)
#define CONFIG_SETS(opt) CONFIG_SET(opt, const char *, STRING, cstring)
@ -4407,10 +4406,10 @@ _efl_config_internal_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_U
CONFIG_SETD(scroll_bring_in_scroll_friction);
CONFIG_SETD(scroll_zoom_friction);
CONFIG_SETB(scroll_thumbscroll_enabled);
CONFIG_SETU(scroll_thumbscroll_threshold);
CONFIG_SETU(scroll_thumbscroll_hold_threshold);
CONFIG_SETI(scroll_thumbscroll_threshold);
CONFIG_SETI(scroll_thumbscroll_hold_threshold);
CONFIG_SETD(scroll_thumbscroll_momentum_threshold);
CONFIG_SETU(scroll_thumbscroll_flick_distance_tolerance);
CONFIG_SETI(scroll_thumbscroll_flick_distance_tolerance);
CONFIG_SETD(scroll_thumbscroll_friction);
CONFIG_SETD(scroll_thumbscroll_min_friction);
CONFIG_SETD(scroll_thumbscroll_friction_standard);
@ -4497,7 +4496,6 @@ _efl_config_internal_efl_config_config_get(const Eo *obj EINA_UNUSED, void *_pd
#define CONFIG_GETB(opt) CONFIG_GET(opt, Eina_Bool, UCHAR)
#define CONFIG_GETI(opt) CONFIG_GET(opt, int, INT)
#define CONFIG_GETU(opt) CONFIG_GET(opt, int, INT)
#define CONFIG_GETD(opt) CONFIG_GET(opt, double, DOUBLE)
#define CONFIG_GETS(opt) CONFIG_GET(opt, const char *, STRING)
@ -4520,10 +4518,10 @@ _efl_config_internal_efl_config_config_get(const Eo *obj EINA_UNUSED, void *_pd
CONFIG_GETD(scroll_bring_in_scroll_friction);
CONFIG_GETD(scroll_zoom_friction);
CONFIG_GETB(scroll_thumbscroll_enabled);
CONFIG_GETU(scroll_thumbscroll_threshold);
CONFIG_GETU(scroll_thumbscroll_hold_threshold);
CONFIG_GETI(scroll_thumbscroll_threshold);
CONFIG_GETI(scroll_thumbscroll_hold_threshold);
CONFIG_GETD(scroll_thumbscroll_momentum_threshold);
CONFIG_GETU(scroll_thumbscroll_flick_distance_tolerance);
CONFIG_GETI(scroll_thumbscroll_flick_distance_tolerance);
CONFIG_GETD(scroll_thumbscroll_friction);
CONFIG_GETD(scroll_thumbscroll_min_friction);
CONFIG_GETD(scroll_thumbscroll_friction_standard);

99
src/lib/elementary/elm_config.h
View File

@ -2129,6 +2129,105 @@ EAPI void elm_config_web_backend_set(const char *backend);
*/
EAPI const char *elm_config_web_backend_get(void);
/* new efl.config interface helpers in C */
#ifdef EFL_EO_API_SUPPORT
static inline Eina_Bool
efl_config_bool_set(Efl_Config *obj, const char * name, Eina_Bool val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_UCHAR);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
static inline Eina_Bool
efl_config_bool_get(const Efl_Config *obj, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
Eina_Bool b = 0;
if (eina_value_type_get(v) == EINA_VALUE_TYPE_UCHAR)
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
static inline Eina_Bool
efl_config_int_set(Efl_Config *obj, const char * name, int val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_INT);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
static inline int
efl_config_int_get(const Efl_Config *obj, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
int b = 0;
if (eina_value_type_get(v) == EINA_VALUE_TYPE_INT)
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
static inline Eina_Bool
efl_config_double_set(Efl_Config *obj, const char * name, double val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_DOUBLE);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
static inline double
efl_config_double_get(const Efl_Config *obj, const char * name)
{
Eina_Value *v = efl_config_get(obj, name);
double b = 0;
if (eina_value_type_get(v) == EINA_VALUE_TYPE_DOUBLE)
eina_value_get(v, &b);
eina_value_free(v);
return b;
}
static inline Eina_Bool
efl_config_string_set(Efl_Config *obj, const char *name, const char *val)
{
Eina_Value *v = eina_value_new(EINA_VALUE_TYPE_STRING);
Eina_Bool b;
eina_value_set(v, val);
b = efl_config_set(obj, name, v);
eina_value_free(v);
return b;
}
static inline Eina_Stringshare *
efl_config_string_get(const Efl_Config *obj, const char *name)
{
Eina_Value *v = efl_config_get(obj, name);
Eina_Stringshare *s = 0;
if (eina_value_type_get(v) == EINA_VALUE_TYPE_STRING)
{
const char *b = 0;
eina_value_get(v, &b);
s = eina_stringshare_add(b);
}
eina_value_free(v);
return s;
}
#endif
/**
* @}
*/

2
src/lib/elementary/elm_widget.c
View File

@ -6073,7 +6073,7 @@ _elm_widget_eo_base_provider_find(Eo *obj, Elm_Widget_Smart_Data *pd, const Eo_B
{
Eo_Base *lookup = NULL;
if (klass == EFL_CONFIG_MIXIN)
if (klass == EFL_CONFIG_INTERFACE)
return _efl_config_obj;
if (pd->provider_lookup) return NULL;

9
src/tests/elementary/elm_test_config.c
View File

@ -13,7 +13,7 @@ START_TEST (elm_config_eoapi)
{
elm_init(1, NULL);
Eo *cfg = efl_config_global_get(EFL_CONFIG_MIXIN);
Eo *cfg = eo_provider_find(ecore_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
#define CONFIG_CHK(opt, typ, val) do { \
@ -26,7 +26,6 @@ START_TEST (elm_config_eoapi)
#define CONFIG_CHKB(opt, val) CONFIG_CHK(opt, bool, val)
#define CONFIG_CHKI(opt, val) CONFIG_CHK(opt, int, val)
#define CONFIG_CHKU(opt, val) CONFIG_CHK(opt, uint, val)
#define CONFIG_CHKD(opt, val) CONFIG_CHK(opt, double, val)
// note: leaks badly
@ -52,10 +51,10 @@ START_TEST (elm_config_eoapi)
CONFIG_CHKD(scroll_bring_in_scroll_friction, 0);
CONFIG_CHKD(scroll_zoom_friction, 0);
CONFIG_CHKB(scroll_thumbscroll_enabled, !old);
CONFIG_CHKU(scroll_thumbscroll_threshold, 0);
CONFIG_CHKU(scroll_thumbscroll_hold_threshold, 0);
CONFIG_CHKI(scroll_thumbscroll_threshold, 0);
CONFIG_CHKI(scroll_thumbscroll_hold_threshold, 0);
CONFIG_CHKD(scroll_thumbscroll_momentum_threshold, 0);
CONFIG_CHKU(scroll_thumbscroll_flick_distance_tolerance, 0);
CONFIG_CHKI(scroll_thumbscroll_flick_distance_tolerance, 0);
CONFIG_CHKD(scroll_thumbscroll_friction, 0);
CONFIG_CHKD(scroll_thumbscroll_min_friction, 0);
CONFIG_CHKD(scroll_thumbscroll_friction_standard, 0);