[entry] fixed bug in non-editable entry selection handlers and fixed migration issue

[framework/uifw/elementary.git] / src / lib / elm_glview.c

diff --git a/src/lib/elm_glview.c b/src/lib/elm_glview.c
index e0a5e8a..339f23f 100644 (file)
--- a/src/lib/elm_glview.c
+++ b/src/lib/elm_glview.c
@@ -5,14 +5,14 @@ typedef struct _Widget_Data Widget_Data;
 
 struct _Widget_Data
 {
-   Evas_Object             *glview_image;
+   Evas_Object              *glview_image;
 
    Elm_GLView_Mode           mode;
    Elm_GLView_Resize_Policy  scale_policy;
    Elm_GLView_Render_Policy  render_policy;
 
    Evas_GL                  *evasgl;
-   Evas_GL_Config            config;
+   Evas_GL_Config           *config;
    Evas_GL_Surface          *surface;
    Evas_GL_Context          *context;
 
@@ -53,6 +53,7 @@ _del_hook(Evas_Object *obj)
 
    if (wd->surface) evas_gl_surface_destroy(wd->evasgl, wd->surface);
    if (wd->context) evas_gl_context_destroy(wd->evasgl, wd->context);
+   if (wd->config) evas_gl_config_free(wd->config);
    if (wd->evasgl) evas_gl_free(wd->evasgl);
 
    free(wd);
@@ -95,7 +96,7 @@ _glview_update_surface(Evas_Object *obj)
      {
         Evas_Native_Surface ns;
 
-        wd->surface = evas_gl_surface_create(wd->evasgl, &wd->config,
+        wd->surface = evas_gl_surface_create(wd->evasgl, wd->config,
                                              wd->w, wd->h);
         evas_gl_native_surface_get(wd->evasgl, wd->surface, &ns);
         evas_object_image_native_surface_set(wd->glview_image, &ns);
@@ -125,13 +126,6 @@ _glview_resize(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void
         wd->w = w;
         wd->h = h;
         _glview_update_surface(data);
-        /*
-        if (wd->render_func)
-          {
-             evas_gl_make_current(wd->evasgl, wd->surface, wd->context);
-             wd->render_func(data);
-          }
-          */
      }
 }
 
@@ -219,9 +213,6 @@ elm_glview_add(Evas_Object *parent)
    Evas_Object *obj;
    Evas *e;
    Widget_Data *wd;
-   Evas_GL_Config cfg = { EVAS_GL_RGB_888,
-                          EVAS_GL_DEPTH_NONE,
-                          EVAS_GL_STENCIL_NONE };
 
    ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
 
@@ -240,6 +231,16 @@ elm_glview_add(Evas_Object *parent)
         return NULL;
      }
 
+   // Create a default config
+   wd->config = evas_gl_config_new();
+   if (!wd->config)
+     {
+        ERR("Failed Creating a Config Object.\n");
+        evas_gl_free(wd->evasgl);
+        return NULL;
+     }
+   wd->config->color_format = EVAS_GL_RGB_888;
+
    // Create image to render Evas_GL Surface
    wd->glview_image = evas_object_image_filled_add(e);
    evas_object_image_size_set(wd->glview_image, 1, 1);
@@ -252,7 +253,6 @@ elm_glview_add(Evas_Object *parent)
    wd->mode                = 0;
    wd->scale_policy        = ELM_GLVIEW_RESIZE_POLICY_RECREATE;
    wd->render_policy       = ELM_GLVIEW_RENDER_POLICY_ON_DEMAND;
-   wd->config              = cfg;
    wd->surface             = NULL;
 
    // Initialize it to (64,64)  (It's an arbitrary value)
@@ -295,20 +295,28 @@ elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode)
 {
    ELM_CHECK_WIDTYPE(obj, widtype) EINA_FALSE;
    Widget_Data *wd = elm_widget_data_get(obj);
-   Evas_GL_Config cfg = { EVAS_GL_RGBA_8888,
-                          EVAS_GL_DEPTH_NONE,
-                          EVAS_GL_STENCIL_NONE };
    if (!wd) return EINA_FALSE;
 
    // Set the configs
    if (mode & ELM_GLVIEW_ALPHA)
-     cfg.color_format = EVAS_GL_RGBA_8888;
+      wd->config->color_format = EVAS_GL_RGBA_8888;
+   else
+      wd->config->color_format = EVAS_GL_RGB_888;
 
    if (mode & ELM_GLVIEW_DEPTH)
-     cfg.depth_bits = EVAS_GL_DEPTH_BIT_24;
+      wd->config->depth_bits = EVAS_GL_DEPTH_BIT_24;
+   else
+      wd->config->depth_bits = EVAS_GL_DEPTH_NONE;
 
    if (mode & ELM_GLVIEW_STENCIL)
-     cfg.stencil_bits = EVAS_GL_STENCIL_BIT_8;
+      wd->config->stencil_bits = EVAS_GL_STENCIL_BIT_8;
+   else
+      wd->config->stencil_bits = EVAS_GL_STENCIL_NONE;
+
+   if (mode & ELM_GLVIEW_DIRECT)
+      wd->config->options_bits = EVAS_GL_OPTIONS_DIRECT;
+   else
+      wd->config->options_bits = EVAS_GL_OPTIONS_NONE;
 
    // Check for Alpha Channel and enable it
    if (mode & ELM_GLVIEW_ALPHA)
@@ -316,8 +324,7 @@ elm_glview_mode_set(Evas_Object *obj, Elm_GLView_Mode mode)
    else
      evas_object_image_alpha_set(wd->glview_image, EINA_FALSE);
 
-   wd->mode   = mode;
-   wd->config = cfg;
+   wd->mode = mode;
 
    elm_glview_changed_set(obj);
 
@@ -367,28 +374,28 @@ elm_glview_render_policy_set(Evas_Object *obj, Elm_GLView_Render_Policy policy)
 }
 
 EAPI void
-elm_glview_size_set(Evas_Object *obj, int width, int height)
+elm_glview_size_set(Evas_Object *obj, int w, int h)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   if ((width == wd->w) && (height == wd->h)) return;
-   wd->w = width;
-   wd->h = height;
+   if ((w == wd->w) && (h == wd->h)) return;
+   wd->w = w;
+   wd->h = h;
    _glview_update_surface(obj);
    elm_glview_changed_set(obj);
 }
 
 EAPI void
-elm_glview_size_get(const Evas_Object *obj, int *width, int *height)
+elm_glview_size_get(const Evas_Object *obj, int *w, int *h)
 {
    ELM_CHECK_WIDTYPE(obj, widtype);
    Widget_Data *wd = elm_widget_data_get(obj);
    if (!wd) return;
 
-   if (width) *width = wd->w;
-   if (height) *height = wd->h;
+   if (w) *w = wd->w;
+   if (h) *h = wd->h;
 }
 
 EAPI void