discomfitor pushed a commit to branch elementary-1.11. http://git.enlightenment.org/core/elementary.git/commit/?id=d3cbdd1d72904d73d02c2c7ec4342dd2734b87cd
commit d3cbdd1d72904d73d02c2c7ec4342dd2734b87cd Author: Mike Blumenkrantz <[email protected]> Date: Wed Sep 24 11:32:24 2014 -0400 revert most recent two elm engine commits This reverts commits 123ca6a8744729525889bbc09ee1aff4b2b97b75, 0d527b03f4f630e81ab4480d7160bbf6352b0bac this is still unusable even after being fixed so the fix was unnecessary to begin with --- src/lib/elm_config.c | 2 +- src/lib/elm_win.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c index 701b18d..44fbc2e 100644 --- a/src/lib/elm_config.c +++ b/src/lib/elm_config.c @@ -484,6 +484,7 @@ _desc_init(void) ELM_CONFIG_VAL(D, T, config_version, T_INT); ELM_CONFIG_VAL(D, T, engine, T_STRING); ELM_CONFIG_VAL(D, T, accel, T_STRING); + ELM_CONFIG_VAL(D, T, accel_override, T_UCHAR); ELM_CONFIG_VAL(D, T, vsync, T_UCHAR); ELM_CONFIG_VAL(D, T, thumbscroll_enable, T_UCHAR); ELM_CONFIG_VAL(D, T, thumbscroll_threshold, T_INT); @@ -1492,7 +1493,6 @@ _config_load(void) if (_elm_config->thumbscroll_flick_distance_tolerance == 0) _elm_config->thumbscroll_flick_distance_tolerance = 1000; - _elm_config->accel_override = 0; return; } diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 0a17368..f75c15b 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -2928,17 +2928,15 @@ _window_layout_stack(Evas_Object *o, Evas_Object_Box_Data *p, void *data) static Eina_Bool _accel_is_gl(void) { - const char *str; - - str = _elm_config->accel; - if (!_elm_config->accel_override) - { - const char *env = NULL; - - env = getenv("ELM_ACCEL"); - if (env) str = env; - else if (_elm_accel_preference) str = _elm_accel_preference; - } + const char *env = NULL; + const char *str = NULL; + + if (_elm_config->accel) str = _elm_config->accel; + if (_elm_accel_preference) str = _elm_accel_preference; + if ((_elm_config->accel_override) && (_elm_config->accel)) + str = _elm_config->accel; + env = getenv("ELM_ACCEL"); + if (env) str = env; if ((str) && ((!strcasecmp(str, "gl")) || (!strcasecmp(str, "opengl")) || --
