bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6a3f10d719a289a293d2ac48d52d4963b56eb2d8
commit 6a3f10d719a289a293d2ac48d52d4963b56eb2d8
Author: Mike Blumenkrantz <zm...@samsung.com>
Date: Thu Jan 30 11:40:40 2020 -0500
efl/config: add missing gesture config value handlers
these are stored in the config here so they should be manageable here as
well
Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D11250
---
src/lib/elementary/elm_config.c | 103 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 99 insertions(+), 4 deletions(-)
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index a78f9b05c4..ae047cfb0d 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -4945,6 +4945,7 @@ _efl_config_global_efl_config_config_set(Eo *obj
EINA_UNUSED, void *_pd EINA_UNU
#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)
@@ -5043,8 +5044,7 @@ _efl_config_global_efl_config_config_set(Eo *obj
EINA_UNUSED, void *_pd EINA_UNU
CONFIG_SETB(first_item_focus_on_first_focusin);
CONFIG_SETB(mirrored);
CONFIG_SETB(clouseau_enabled);
- CONFIG_SETD(glayer_long_tap_start_timeout);
- CONFIG_SETD(glayer_double_tap_timeout);
+
//color_overlay const char *color_class,
//elm_config.h:EAPI void elm_config_color_overlay_unset(const char
*color_class);
CONFIG_SETB(magnifier_enable);
@@ -5058,6 +5058,65 @@ _efl_config_global_efl_config_config_set(Eo *obj
EINA_UNUSED, void *_pd EINA_UNU
CONFIG_SETB(offline);
CONFIG_SETI(powersave);
+ CONFIG_SETD(glayer_long_tap_start_timeout);
+ CONFIG_SETD(glayer_double_tap_timeout);
+
+#undef CONFIG_SET
+#define CONFIG_SET(opt, primityp, valtyp, alttyp) do { \
+ if (!strcmp(name, #opt)) \
+ { \
+ primityp v = 0; \
+ alttyp alt = 0; \
+ const Eina_Value_Type *typ = EINA_VALUE_TYPE_ ## valtyp; \
+ if (eina_value_type_get(val) == typ) \
+ { \
+ if (!eina_value_get(val, &v)) return EINA_FALSE; \
+ } \
+ else if (_eina_value_to_ ## alttyp(val, &alt)) \
+ { \
+ v = alt; \
+ } \
+ else \
+ { \
+ ERR("Invalid value type for config '%s' (got %s wanted %s)", \
+ name, eina_value_type_name_get(eina_value_type_get(val)), \
+ eina_value_type_name_get(EINA_VALUE_TYPE_ ## valtyp)); \
+ return EINA_FALSE; \
+ } \
+ _elm_config->opt = v; \
+ _elm_config->priv.opt = EINA_TRUE; \
+ efl_event_callback_call(_efl_config_obj,
EFL_CONFIG_EVENT_CONFIG_CHANGED, (void*)name); \
+ return EINA_TRUE; \
+ } \
+ } while (0)
+
+
+ CONFIG_SETB(glayer_zoom_finger_enable);
+ CONFIG_SETD(glayer_zoom_finger_factor);
+ CONFIG_SETD(glayer_zoom_wheel_factor);
+ CONFIG_SETD(glayer_zoom_distance_tolerance);
+ CONFIG_SETD(glayer_rotate_finger_enable);
+ CONFIG_SETD(glayer_rotate_angular_tolerance);
+ CONFIG_SETD(glayer_line_min_length);
+ CONFIG_SETD(glayer_line_distance_tolerance);
+ CONFIG_SETD(glayer_line_angular_tolerance);
+ CONFIG_SETU(glayer_flick_time_limit_ms);
+ CONFIG_SETD(glayer_long_tap_start_timeout);
+ CONFIG_SETD(glayer_double_tap_timeout);
+ CONFIG_SETI(glayer_tap_finger_size);
+ CONFIG_SETB(glayer_continues_enable);
+
+ CONFIG_SETI(thumbscroll_momentum_distance_max);
+ CONFIG_SETD(thumbscroll_momentum_friction);
+ CONFIG_SETD(thumbscroll_momentum_animation_duration_min_limit);
+ CONFIG_SETD(thumbscroll_momentum_animation_duration_max_limit);
+ CONFIG_SETD(thumbscroll_momentum_threshold);
+ CONFIG_SETD(thumbscroll_bounce_friction);
+ CONFIG_SETD(thumbscroll_acceleration_threshold);
+ CONFIG_SETD(thumbscroll_acceleration_time_limit);
+ CONFIG_SETD(thumbscroll_acceleration_weight);
+
+
const size_t len = sizeof("audio_mute") - 1;
if (!strncmp(name, "audio_mute", len))
{
@@ -5109,6 +5168,7 @@ _efl_config_global_efl_config_config_get(const Eo *obj
EINA_UNUSED, void *_pd EI
#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, unsigned int, UINT)
#define CONFIG_GETD(opt) CONFIG_GET(opt, double, DOUBLE)
#define CONFIG_GETS(opt) CONFIG_GET(opt, const char *, STRING)
@@ -5187,8 +5247,7 @@ _efl_config_global_efl_config_config_get(const Eo *obj
EINA_UNUSED, void *_pd EI
CONFIG_GETB(first_item_focus_on_first_focusin);
CONFIG_GETB(mirrored);
CONFIG_GETB(clouseau_enabled);
- CONFIG_GETD(glayer_long_tap_start_timeout);
- CONFIG_GETD(glayer_double_tap_timeout);
+
//color_overlay
//color_overlay_unset
CONFIG_GETB(magnifier_enable);
@@ -5203,6 +5262,42 @@ _efl_config_global_efl_config_config_get(const Eo *obj
EINA_UNUSED, void *_pd EI
CONFIG_GETI(powersave);
CONFIG_GETD(drag_anim_duration);
+ CONFIG_GETD(glayer_long_tap_start_timeout);
+ CONFIG_GETD(glayer_double_tap_timeout);
+#undef CONFIG_GET
+#define CONFIG_GET(opt, primityp, valtyp) do { \
+ if (!strcmp(name, #opt)) \
+ { \
+ val = eina_value_new(EINA_VALUE_TYPE_ ## valtyp); \
+ eina_value_set(val, _elm_config->opt); \
+ return val; \
+ } \
+ } while (0)
+ CONFIG_GETB(glayer_zoom_finger_enable);
+ CONFIG_GETD(glayer_zoom_finger_factor);
+ CONFIG_GETD(glayer_zoom_wheel_factor);
+ CONFIG_GETD(glayer_zoom_distance_tolerance);
+ CONFIG_GETD(glayer_rotate_finger_enable);
+ CONFIG_GETD(glayer_rotate_angular_tolerance);
+ CONFIG_GETD(glayer_line_min_length);
+ CONFIG_GETD(glayer_line_distance_tolerance);
+ CONFIG_GETD(glayer_line_angular_tolerance);
+ CONFIG_GETU(glayer_flick_time_limit_ms);
+ CONFIG_GETD(glayer_long_tap_start_timeout);
+ CONFIG_GETD(glayer_double_tap_timeout);
+ CONFIG_GETI(glayer_tap_finger_size);
+ CONFIG_GETB(glayer_continues_enable);
+
+ CONFIG_GETI(thumbscroll_momentum_distance_max);
+ CONFIG_GETD(thumbscroll_momentum_friction);
+ CONFIG_GETD(thumbscroll_momentum_animation_duration_min_limit);
+ CONFIG_GETD(thumbscroll_momentum_animation_duration_max_limit);
+ CONFIG_GETD(thumbscroll_momentum_threshold);
+ CONFIG_GETD(thumbscroll_bounce_friction);
+ CONFIG_GETD(thumbscroll_acceleration_threshold);
+ CONFIG_GETD(thumbscroll_acceleration_time_limit);
+ CONFIG_GETD(thumbscroll_acceleration_weight);
+
const size_t len = sizeof("audio_mute") - 1;
if (!strncmp(name, "audio_mute", len))
{
--
