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

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index fb8e9b6f647947a9d9079d3bcf2be791b4a4d897..193ec6be754e28db69acf92fc7de3efe0123b654 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -480,6 +480,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);
@@ -1488,7 +1489,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 116896a163a9e5c06495d983e1895a21829da818..e3b05650d14d2d27659dd2223360dbc564870aa6 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2943,17 +2943,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")) ||