Merge "enable vsync configuration"

diff --git a/src/lib/elm_config.c b/src/lib/elm_config.c
index 1051f06..d54f69d 100644 (file)
--- a/src/lib/elm_config.c
+++ b/src/lib/elm_config.c
@@ -623,7 +623,7 @@ _desc_init(void)
 #define D _config_edd
    ELM_CONFIG_VAL(D, T, config_version, T_INT);
    ELM_CONFIG_VAL(D, T, engine, T_STRING);
-   //ELM_CONFIG_VAL(D, T, vsync, 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);
    ELM_CONFIG_VAL(D, T, thumbscroll_momentum_threshold, T_DOUBLE);
@@ -1178,7 +1178,7 @@ _config_load(void)
    _elm_config = ELM_NEW(Elm_Config);
    _elm_config->config_version = ELM_CONFIG_VERSION;
    _elm_config->engine = eina_stringshare_add("software_x11");
-  // _elm_config->vsync = 0;
+   _elm_config->vsync = 0;
    _elm_config->thumbscroll_enable = EINA_TRUE;
    _elm_config->thumbscroll_threshold = 24;
    _elm_config->thumbscroll_momentum_threshold = 100.0;
@@ -1505,7 +1505,7 @@ _env_get(void)
      }
    
    s = getenv("ELM_VSYNC");
-//   if (s) _elm_config->vsync = !!atoi(s);
+   if (s) _elm_config->vsync = !!atoi(s);
 
    s = getenv("ELM_THUMBSCROLL_ENABLE");
    if (s) _elm_config->thumbscroll_enable = !!atoi(s);

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index 164eb9d..3d371a3 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -153,6 +153,7 @@ struct _Elm_Config
 {
    int            config_version;
    const char    *engine;
+   unsigned char  vsync;
    unsigned char  thumbscroll_enable;
    int            thumbscroll_threshold;
    double         thumbscroll_momentum_threshold;

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 797db3e..bada87d 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -1021,9 +1021,9 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
      }
    else if (ENGINE_COMPARE(ELM_OPENGL_X11))
      {
-/*      int opt[10];
+        int opt[10];
         int opt_i = 0;
-        
+
         if (_elm_config->vsync)
           {
              opt[opt_i] = ECORE_EVAS_GL_X11_OPT_VSYNC;
@@ -1033,7 +1033,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
           }
         if (opt_i > 0)
            win->ee = ecore_evas_gl_x11_options_new(NULL, 0, 0, 0, 1, 1, opt);
-        else */
+        else
            win->ee = ecore_evas_gl_x11_new(NULL, 0, 0, 0, 1, 1);
         FALLBACK_TRY("OpenGL");
 #ifdef HAVE_ELEMENTARY_X