change gl engine api a little - fixed in ecore-evas and expedite. expose

indirect option in ecore-evas with a new opt param for gl engines - will add
more opts over time.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@46177 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h
index 30562ba..ad946ed 100644 (file)
--- a/src/lib/ecore_evas/Ecore_Evas.h
+++ b/src/lib/ecore_evas/Ecore_Evas.h
@@ -152,7 +152,12 @@ EAPI void            ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, i
 EAPI int             ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
 
+#define ECORE_EVAS_GL_X11_OPT_NONE     0
+#define ECORE_EVAS_GL_X11_OPT_INDIRECT 1
+#define ECORE_EVAS_GL_X11_OPT_LAST     2
+
 EAPI Ecore_Evas     *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
+EAPI Ecore_Evas     *ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h, int *opt);
 EAPI Ecore_X_Window  ecore_evas_gl_x11_window_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on);
 EAPI int             ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);

diff --git a/src/lib/ecore_evas/ecore_evas_x.c b/src/lib/ecore_evas/ecore_evas_x.c
index 6620c26..e2d65d0 100644 (file)
--- a/src/lib/ecore_evas/ecore_evas_x.c
+++ b/src/lib/ecore_evas/ecore_evas_x.c
@@ -92,7 +92,7 @@ xcb_visualtype_get(xcb_screen_t *screen, xcb_visualid_t visual)
 /* noop */
 # else
 static Ecore_X_Window
-_ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, int w, int h, int override)
+_ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y, int w, int h, int override, int *opt)
 {
    Evas_Engine_Info_GL_X11 *einfo;
    Ecore_X_Window win;
@@ -103,7 +103,21 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
        XSetWindowAttributes attr;
        int screen;
 
-       /* FIXME: this is inefficient as its a round trip */
+        if (opt)
+          {
+             int op;
+             
+             for (op = 0; opt[op]; op++)
+               {
+                  if (opt[op] == ECORE_EVAS_GL_X11_OPT_INDIRECT)
+                    {
+                       op++;
+                       einfo->indirect = opt[op];
+                    }
+               }
+          }
+        
+       /* FIXME: this is inefficient as its 1 or more round trips */
        screen = DefaultScreen(ecore_x_display_get());
        if (ScreenCount(ecore_x_display_get()) > 1)
          {
@@ -131,9 +145,15 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
                  free(roots);
               }
          }
+       einfo->info.display  = ecore_x_display_get();
+        einfo->info.screen   = screen;
+       einfo->info.visual   = einfo->func.best_visual_get(einfo);
+       einfo->info.colormap = einfo->func.best_colormap_get(einfo);
+       einfo->info.depth    = einfo->func.best_depth_get(einfo);
+        
        attr.backing_store = NotUseful;
        attr.override_redirect = override;
-       attr.colormap = einfo->func.best_colormap_get(ecore_x_display_get(), screen);
+       attr.colormap = einfo->info.colormap;
        attr.border_pixel = 0;
        attr.background_pixmap = None;
        attr.event_mask =
@@ -145,23 +165,12 @@ _ecore_evas_x_gl_window_new(Ecore_Evas *ee, Ecore_X_Window parent, int x, int y,
        attr.bit_gravity = ForgetGravity;
 
        win =
-         XCreateWindow(ecore_x_display_get(),
-                       parent,
-                       x, y,
-                       w, h, 0,
-                       einfo->func.best_depth_get(ecore_x_display_get(), screen),
-                       InputOutput,
-                       einfo->func.best_visual_get(ecore_x_display_get(), screen),
-                       CWBackingStore | CWColormap |
-                       CWBackPixmap | CWBorderPixel |
-                       CWBitGravity | CWEventMask |
-                       CWOverrideRedirect,
-                       &attr);
-       einfo->info.display  = ecore_x_display_get();
-       einfo->info.visual   = einfo->func.best_visual_get(ecore_x_display_get(), screen);
-       einfo->info.colormap = einfo->func.best_colormap_get(ecore_x_display_get(), screen);
+         XCreateWindow(einfo->info.display, parent, x, y, w, h, 0,
+                       einfo->info.depth, InputOutput, einfo->info.visual,
+                       CWBackingStore | CWColormap | CWBackPixmap | 
+                        CWBorderPixel | CWBitGravity | CWEventMask |
+                       CWOverrideRedirect, &attr);
        einfo->info.drawable = win;
-       einfo->info.depth    = einfo->func.best_depth_get(ecore_x_display_get(), screen);
         
        evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo);
         ecore_x_window_defaults_set(win);
@@ -2766,6 +2775,13 @@ EAPI Ecore_Evas *
 ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
                      int x, int y, int w, int h)
 {
+   return ecore_evas_gl_x11_options_new(disp_name, parent, x, y, w, h, NULL);
+}
+
+EAPI Ecore_Evas *
+ecore_evas_gl_x11_options_new(const char *disp_name, Ecore_X_Window parent,
+                              int x, int y, int w, int h, int *opt)
+{
 # ifdef HAVE_ECORE_X_XCB
    Ecore_Evas *ee = NULL;
 # else
@@ -2813,7 +2829,7 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
    if (parent == 0) parent = DefaultRootWindow(ecore_x_display_get());
    ee->engine.x.win_root = parent;
 
-   ee->prop.window = _ecore_evas_x_gl_window_new(ee, ee->engine.x.win_root, x, y, w, h, 0);
+   ee->prop.window = _ecore_evas_x_gl_window_new(ee, ee->engine.x.win_root, x, y, w, h, 0, opt);
 
    if (getenv("DESKTOP_STARTUP_ID"))
      {